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

fix #136, support hls without io(in ram). 2.0.112

Browse source
This commit is contained in:
winlin 2015-02-03 16:01:07 +08:00
parent 89b37d3469
commit a23191497f
14 changed files with 688 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -61,6 +61,7 @@ class SrsDvr;
class SrsEncoder;
#endif
class SrsStream;
class ISrsHlsHandler;
/**
* the time jitter algorithm:
@ -376,9 +377,10 @@ public:
* find stream by vhost/app/stream.
* @param r the client request.
* @param h the event handler for source.
* @param hh the event handler for hls.
* @param pps the matched source, if success never be NULL.
*/
static int find(SrsRequest* r, ISrsSourceHandler* h, SrsSource** pps);
static int find(SrsRequest* r, ISrsSourceHandler* h, ISrsHlsHandler* hh, SrsSource** pps);
/**
* when system exit, destroy the sources,
* for gmc to analysis mem leaks.
@ -451,7 +453,7 @@ public:
* @param _req the client request object,
* this object will deep copy it for reload.
*/
SrsSource();
SrsSource(ISrsHlsHandler* hh);
virtual ~SrsSource();
// initialize, get and setter.
public: