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

merge from srs2.

Browse source
This commit is contained in:
winlin 2015-12-26 12:17:51 +08:00
commit 7ae2c6bf50
4 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
trunk/src/app/srs_app_source.hpp
View file

@ -52,6 +52,7 @@ class SrsRtmpServer;
class SrsEdgeProxyContext;
class SrsMessageArray;
class SrsNgExec;
class SrsConnection;
#ifdef SRS_AUTO_HLS
class SrsHls;
#endif
@ -225,6 +226,8 @@ private:
SrsRtmpJitter* jitter;
SrsSource* source;
SrsMessageQueue* queue;
// the owner connection for debug, maybe NULL.
SrsConnection* conn;
bool paused;
// when source id changed, notice all consumers
bool should_update_source_id;
@ -237,7 +240,7 @@ private:
int mw_duration;
#endif
public:
SrsConsumer(SrsSource* _source);
SrsConsumer(SrsSource* s, SrsConnection* c);
virtual ~SrsConsumer();
public:
/**
@ -575,7 +578,7 @@ public:
* @param dg, whether dumps the gop cache.
*/
virtual int create_consumer(
SrsConsumer*& consumer,
SrsConnection* conn, SrsConsumer*& consumer,
bool ds = true, bool dm = true, bool dg = true
);
virtual void on_consumer_destroy(SrsConsumer* consumer);