external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

refine framework to calc the kbps

Browse source
This commit is contained in:
winlin 2014-05-12 17:27:50 +08:00
parent 3f33dffdb3
commit 9006194cd7
21 changed files with 153 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/src/rtmp/srs_protocol_io.hpp
View file

@ -47,8 +47,6 @@ public:
virtual void set_recv_timeout(int64_t timeout_us) = 0;
virtual int64_t get_recv_timeout() = 0;
virtual int64_t get_recv_bytes() = 0;
// TODO: FIXME: remove this interface.
virtual int get_recv_kbps() = 0;
};
/**
@ -64,8 +62,6 @@ public:
virtual void set_send_timeout(int64_t timeout_us) = 0;
virtual int64_t get_send_timeout() = 0;
virtual int64_t get_send_bytes() = 0;
// TODO: FIXME: remove this interface.
virtual int get_send_kbps() = 0;
virtual int writev(const iovec *iov, int iov_size, ssize_t* nwrite) = 0;
};

20
trunk/src/rtmp/srs_protocol_rtmp.cpp
View file

@ -375,16 +375,6 @@ int64_t SrsRtmpClient::get_send_bytes()
return protocol->get_send_bytes();
}
int SrsRtmpClient::get_recv_kbps()
{
return protocol->get_recv_kbps();
}
int SrsRtmpClient::get_send_kbps()
{
return protocol->get_send_kbps();
}
int SrsRtmpClient::recv_message(SrsMessage** pmsg)
{
return protocol->recv_message(pmsg);
@ -730,16 +720,6 @@ int64_t SrsRtmpServer::get_send_bytes()
return protocol->get_send_bytes();
}
int SrsRtmpServer::get_recv_kbps()
{
return protocol->get_recv_kbps();
}
int SrsRtmpServer::get_send_kbps()
{
return protocol->get_send_kbps();
}
int SrsRtmpServer::recv_message(SrsMessage** pmsg)
{
return protocol->recv_message(pmsg);

4
trunk/src/rtmp/srs_protocol_rtmp.hpp
View file

@ -161,8 +161,6 @@ public:
virtual void set_send_timeout(int64_t timeout_us);
virtual int64_t get_recv_bytes();
virtual int64_t get_send_bytes();
virtual int get_recv_kbps();
virtual int get_send_kbps();
virtual int recv_message(SrsMessage** pmsg);
virtual int decode_message(SrsMessage* msg, SrsPacket** ppacket);
virtual int send_and_free_message(SrsMessage* msg);
@ -208,8 +206,6 @@ public:
virtual int64_t get_send_timeout();
virtual int64_t get_recv_bytes();
virtual int64_t get_send_bytes();
virtual int get_recv_kbps();
virtual int get_send_kbps();
virtual int recv_message(SrsMessage** pmsg);
virtual int decode_message(SrsMessage* msg, SrsPacket** ppacket);
virtual int send_and_free_message(SrsMessage* msg);

10
trunk/src/rtmp/srs_protocol_rtmp_stack.cpp
View file

@ -359,16 +359,6 @@ int64_t SrsProtocol::get_send_bytes()
return skt->get_send_bytes();
}
int SrsProtocol::get_recv_kbps()
{
return skt->get_recv_kbps();
}
int SrsProtocol::get_send_kbps()
{
return skt->get_send_kbps();
}
int SrsProtocol::recv_message(SrsMessage** pmsg)
{
*pmsg = NULL;

2
trunk/src/rtmp/srs_protocol_rtmp_stack.hpp
View file

@ -138,8 +138,6 @@ public:
virtual int64_t get_send_timeout();
virtual int64_t get_recv_bytes();
virtual int64_t get_send_bytes();
virtual int get_recv_kbps();
virtual int get_send_kbps();
public:
/**
* recv a RTMP message, which is bytes oriented.