external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Merge branch '4.0release' into merge/develop

Browse source
This commit is contained in:
winlin 2021-05-08 11:50:26 +08:00
commit 6bab0eb8c8
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
trunk/src/app/srs_app_threads.cpp
View file

@ -33,6 +33,7 @@
#include <srs_app_rtc_server.hpp> #include <srs_app_rtc_server.hpp>
#include <srs_app_rtc_dtls.hpp> #include <srs_app_rtc_dtls.hpp>
#include <srs_app_rtc_conn.hpp> #include <srs_app_rtc_conn.hpp>
#include <srs_app_log.hpp>
#include <string> #include <string>
using namespace std; using namespace std;

9
trunk/src/utest/srs_utest.cpp
View file

@ -42,10 +42,10 @@ int _srs_tmp_port = 11935;
srs_utime_t _srs_tmp_timeout = (100 * SRS_UTIME_MILLISECONDS); srs_utime_t _srs_tmp_timeout = (100 * SRS_UTIME_MILLISECONDS);
// kernel module. // kernel module.
ISrsLog* _srs_log = new MockEmptyLog(SrsLogLevelDisabled); ISrsLog* _srs_log = NULL;
ISrsContext* _srs_context = new SrsThreadContext(); ISrsContext* _srs_context = NULL;
// app module. // app module.
SrsConfig* _srs_config = new SrsConfig(); SrsConfig* _srs_config = NULL;
SrsServer* _srs_server = NULL; SrsServer* _srs_server = NULL;
bool _srs_in_docker = false; bool _srs_in_docker = false;
@ -59,6 +59,9 @@ srs_error_t prepare_main() {
return srs_error_wrap(err, "init st"); return srs_error_wrap(err, "init st");
} }
srs_freep(_srs_log);
_srs_log = new MockEmptyLog(SrsLogLevelDisabled);
if ((err = _srs_rtc_dtls_certificate->initialize()) != srs_success) { if ((err = _srs_rtc_dtls_certificate->initialize()) != srs_success) {
return srs_error_wrap(err, "rtc dtls certificate initialize"); return srs_error_wrap(err, "rtc dtls certificate initialize");
} }