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

for bug #241, support merged read. 2.0.48

Browse source
This commit is contained in:
winlin 2014-12-03 19:27:27 +08:00
parent adf95d239e
commit f35ec2155b
9 changed files with 152 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
trunk/src/app/srs_app_recv_thread.hpp
View file

@ -33,6 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <vector>
#include <srs_app_thread.hpp>
#include <srs_protocol_buffer.hpp>
class SrsRtmpServer;
class SrsMessage;
@ -132,7 +133,7 @@ public:
* the publish recv thread got message and callback the source method to process message.
* @see: https://github.com/winlinvip/simple-rtmp-server/issues/237
*/
class SrsPublishRecvThread : public ISrsMessageHandler
class SrsPublishRecvThread : virtual public ISrsMessageHandler, virtual public IMergeReadHandler
{
private:
SrsRecvThread trd;
@ -163,13 +164,16 @@ public:
public:
virtual int start();
virtual void stop();
virtual void on_thread_start();
virtual void on_thread_stop();
// interface ISrsMessageHandler
public:
virtual bool can_handle();
virtual int handle(SrsMessage* msg);
virtual void on_recv_error(int ret);
// interface IMergeReadHandler
public:
virtual void on_thread_start();
virtual void on_thread_stop();
virtual void on_read(ssize_t nread);
};
#endif