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

edge support play and ingest origin stream. change to 0.9.77

Browse source
This commit is contained in:
winlin 2014-04-26 21:41:18 +08:00
parent acba4cfdc6
commit 2bcaeccc51
17 changed files with 406 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -515,7 +515,7 @@ int SrsSource::initialize()
}
#endif
if ((ret = edge->initialize(_req)) != ERROR_SUCCESS) {
if ((ret = edge->initialize(this, _req)) != ERROR_SUCCESS) {
return ret;
}
@ -1168,6 +1168,10 @@ void SrsSource::on_consumer_destroy(SrsConsumer* consumer)
consumers.erase(it);
}
srs_info("handle consumer destroy success.");
if (consumers.empty()) {
edge->on_all_client_stop();
}
}
void SrsSource::set_cache(bool enabled)
@ -1180,7 +1184,7 @@ bool SrsSource::is_atc()
return atc;
}
int SrsSource::on_edge_play_stream()
int SrsSource::on_edge_start_play()
{
return edge->on_client_play();
}