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

9
trunk/src/app/srs_app_source.cpp
View file

@ -713,7 +713,7 @@ ISrsSourceHandler::~ISrsSourceHandler()
std::map<std::string, SrsSource*> SrsSource::pool;
int SrsSource::find(SrsRequest* r, ISrsSourceHandler* h, SrsSource** pps)
int SrsSource::find(SrsRequest* r, ISrsSourceHandler* h, ISrsHlsHandler* hh, SrsSource** pps)
{
int ret = ERROR_SUCCESS;
@ -721,7 +721,7 @@ int SrsSource::find(SrsRequest* r, ISrsSourceHandler* h, SrsSource** pps)
string vhost = r->vhost;
if (pool.find(stream_url) == pool.end()) {
SrsSource* source = new SrsSource();
SrsSource* source = new SrsSource(hh);
if ((ret = source->initialize(r, h)) != ERROR_SUCCESS) {
srs_freep(source);
return ret;
@ -754,13 +754,14 @@ void SrsSource::destroy()
pool.clear();
}
SrsSource::SrsSource()
SrsSource::SrsSource(ISrsHlsHandler* hh)
{
_req = NULL;
jitter_algorithm = SrsRtmpJitterAlgorithmOFF;
#ifdef SRS_AUTO_HLS
hls = new SrsHls(this);
// TODO: FIXME: refine code, use subscriber pattern.
hls = new SrsHls(this, hh);
#endif
#ifdef SRS_AUTO_DVR
dvr = new SrsDvr(this);