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 90e0131dc0 into 93cba246bc

Browse source
This commit is contained in:
Jacob Su 2025-02-23 20:27:46 +08:00 • committed by GitHub
commit aab7ad5cc1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 1 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -703,10 +703,6 @@ void SrsDash::dispose()
srs_error_t SrsDash::cycle() srs_error_t SrsDash::cycle()
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
if (!enabled) {
return err;
}
if (last_update_time_ <= 0) { if (last_update_time_ <= 0) {
last_update_time_ = srs_get_system_time(); last_update_time_ = srs_get_system_time();
@ -738,10 +734,6 @@ srs_error_t SrsDash::cycle()
srs_utime_t SrsDash::cleanup_delay() srs_utime_t SrsDash::cleanup_delay()
{ {
if (!enabled) {
return 0;
}
// We use larger timeout to cleanup the HLS, after disposed it if required. // We use larger timeout to cleanup the HLS, after disposed it if required.
return _srs_config->get_dash_dispose(req->vhost) * 1.1; return _srs_config->get_dash_dispose(req->vhost) * 1.1;
} }

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

@ -1237,10 +1237,6 @@ srs_error_t SrsHls::cycle()
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
if (!enabled) {
return err;
}
if (last_update_time <= 0) { if (last_update_time <= 0) {
last_update_time = srs_get_system_time(); last_update_time = srs_get_system_time();
} }
@ -1278,10 +1274,6 @@ srs_error_t SrsHls::cycle()
srs_utime_t SrsHls::cleanup_delay() srs_utime_t SrsHls::cleanup_delay()
{ {
if (!enabled) {
return 0;
}
// We use larger timeout to cleanup the HLS, after disposed it if required. // We use larger timeout to cleanup the HLS, after disposed it if required.
return _srs_config->get_hls_dispose(req->vhost) * 1.1; return _srs_config->get_hls_dispose(req->vhost) * 1.1;
} }

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

@ -1961,7 +1961,7 @@ bool SrsLiveSource::stream_is_dead()
return false; return false;
} }
// Delay cleanup source. // Delay cleanup source for at least SRS_SOURCE_CLEANUP=3 seconds
srs_utime_t now = srs_get_system_time(); srs_utime_t now = srs_get_system_time();
if (now < stream_die_at_ + SRS_SOURCE_CLEANUP) { if (now < stream_die_at_ + SRS_SOURCE_CLEANUP) {
return false; return false;