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 #738, write mp4 samples.

Browse source
This commit is contained in:
winlin 2017-02-05 09:15:46 +08:00
parent e24674e9cf
commit 733ba73d54
8 changed files with 87 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
trunk/src/app/srs_app_config.cpp
View file

@ -4462,7 +4462,7 @@ bool SrsConfig::get_gop_cache(string vhost)
}
conf = conf->get("play");
if (!conf || conf->arg0().empty()) {
if (!conf) {
return SRS_PERF_GOP_CACHE;
}
@ -4484,7 +4484,7 @@ bool SrsConfig::get_debug_srs_upnode(string vhost)
}
conf = conf->get("cluster");
if (!conf || conf->arg0().empty()) {
if (!conf) {
return DEFAULT;
}
@ -4506,7 +4506,7 @@ bool SrsConfig::get_atc(string vhost)
}
conf = conf->get("play");
if (!conf || conf->arg0().empty()) {
if (!conf) {
return DEFAULT;
}
@ -4528,7 +4528,7 @@ bool SrsConfig::get_atc_auto(string vhost)
}
conf = conf->get("play");
if (!conf || conf->arg0().empty()) {
if (!conf) {
return DEFAULT;
}
@ -4550,7 +4550,7 @@ int SrsConfig::get_time_jitter(string vhost)
}
conf = conf->get("play");
if (!conf || conf->arg0().empty()) {
if (!conf) {
return _srs_time_jitter_string2int(DEFAULT);
}
@ -4572,7 +4572,7 @@ bool SrsConfig::get_mix_correct(string vhost)
}
conf = conf->get("play");
if (!conf || conf->arg0().empty()) {
if (!conf) {
return DEFAULT;
}
@ -4594,7 +4594,7 @@ double SrsConfig::get_queue_length(string vhost)
}
conf = conf->get("play");
if (!conf || conf->arg0().empty()) {
if (!conf) {
return DEFAULT;
}
@ -4807,7 +4807,7 @@ int SrsConfig::get_mw_sleep_ms(string vhost)
}
conf = conf->get("play");
if (!conf || conf->arg0().empty()) {
if (!conf) {
return SRS_PERF_MW_SLEEP;
}

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

@ -288,7 +288,7 @@ SrsPublishRecvThread::~SrsPublishRecvThread()
st_cond_destroy(error);
}
int SrsPublishRecvThread::wait(int timeout_ms)
int SrsPublishRecvThread::wait(uint64_t timeout_ms)
{
if (recv_error_code != ERROR_SUCCESS) {
return recv_error_code;

2
trunk/src/app/srs_app_recv_thread.hpp
View file

@ -196,7 +196,7 @@ public:
/**
* wait for error for some timeout.
*/
virtual int wait(int timeout_ms);
virtual int wait(uint64_t timeout_ms);
virtual int64_t nb_msgs();
virtual int error_code();
virtual void set_cid(int v);