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 2016-10-26 09:53:27 +08:00
commit 5796e4bf89
2 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_http_stream.hpp Normal file → Executable file
View file

@ -51,6 +51,7 @@ private:
public:
SrsBufferCache(SrsSource* s, SrsRequest* r);
virtual ~SrsBufferCache();
virtual int update(SrsSource* s, SrsRequest* r);
public:
virtual int start();
virtual int dump_cache(SrsConsumer* consumer, SrsRtmpJitterAlgorithm jitter);
@ -227,6 +228,7 @@ private:
public:
SrsLiveStream(SrsSource* s, SrsRequest* r, SrsBufferCache* c);
virtual ~SrsLiveStream();
virtual int update(SrsSource* s, SrsRequest* r);
public:
virtual int serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r);
private: