mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Suqash: Merge 4.0
This commit is contained in:
parent
7ab3e4a86c
commit
19c0a9eb4b
17 changed files with 84 additions and 184 deletions
|
|
@ -15,6 +15,7 @@
|
|||
#include <srs_app_pithy_print.hpp>
|
||||
#include <srs_app_rtc_server.hpp>
|
||||
#include <srs_app_log.hpp>
|
||||
#include <srs_app_async_call.hpp>
|
||||
|
||||
#ifdef SRS_RTC
|
||||
#include <srs_app_rtc_dtls.hpp>
|
||||
|
|
@ -268,6 +269,7 @@ srs_error_t SrsCircuitBreaker::on_timer(srs_utime_t interval)
|
|||
}
|
||||
|
||||
SrsCircuitBreaker* _srs_circuit_breaker = NULL;
|
||||
SrsAsyncCallWorker* _srs_dvr_async = NULL;
|
||||
|
||||
srs_error_t srs_thread_initialize()
|
||||
{
|
||||
|
|
@ -408,6 +410,12 @@ srs_error_t srs_thread_initialize()
|
|||
_srs_pps_objs_rothers = new SrsPps();
|
||||
#endif
|
||||
|
||||
// Create global async worker for DVR.
|
||||
_srs_dvr_async = new SrsAsyncCallWorker();
|
||||
if ((err = _srs_dvr_async->start()) != srs_success) {
|
||||
return srs_error_wrap(err, "dvr async");
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue