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

For #299, add dash files.

Browse source
This commit is contained in:
winlin 2017-02-11 21:14:28 +08:00
parent 7fd221ef63
commit 5e419c66f8
17 changed files with 354 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

26
trunk/src/app/srs_app_dvr.cpp
View file

@ -1019,7 +1019,7 @@ int SrsDvr::initialize(SrsOriginHub* h, SrsRequest* r)
return ret;
}
int SrsDvr::on_publish(bool fetch_sequence_header)
int SrsDvr::on_publish()
{
int ret = ERROR_SUCCESS;
@ -1032,10 +1032,6 @@ int SrsDvr::on_publish(bool fetch_sequence_header)
return ret;
}
if (fetch_sequence_header && (ret = hub->on_dvr_request_sh()) != ERROR_SUCCESS) {
return ret;
}
return ret;
}
@ -1088,11 +1084,21 @@ int SrsDvr::on_reload_vhost_dvr_apply(string vhost)
bool v = srs_config_apply_filter(conf, req);
// the apply changed, republish the dvr.
if (v != actived) {
actived = v;
on_unpublish();
return on_publish(true);
if (v == actived) {
return ret;
}
actived = v;
on_unpublish();
if (!actived) {
return ret;
}
if ((ret = on_publish()) != ERROR_SUCCESS) {
return ret;
}
if ((ret = hub->on_dvr_request_sh()) != ERROR_SUCCESS) {
return ret;
}
return ret;