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

Refine get_vhost_http_remux_fast_cache in time unit

Browse source
This commit is contained in:
winlin 2019-04-16 08:50:48 +08:00
parent 010e35bec2
commit 138d1e3cad
4 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6882,9 +6882,9 @@ bool SrsConfig::get_vhost_http_remux_enabled(string vhost)
return SRS_CONF_PERFER_FALSE(conf->arg0()); return SRS_CONF_PERFER_FALSE(conf->arg0());
} }
double SrsConfig::get_vhost_http_remux_fast_cache(string vhost) srs_utime_t SrsConfig::get_vhost_http_remux_fast_cache(string vhost)
{ {
static double DEFAULT = 0; static srs_utime_t DEFAULT = 0;
SrsConfDirective* conf = get_vhost(vhost); SrsConfDirective* conf = get_vhost(vhost);
if (!conf) { if (!conf) {
@ -6901,7 +6901,7 @@ double SrsConfig::get_vhost_http_remux_fast_cache(string vhost)
return DEFAULT; return DEFAULT;
} }
return ::atof(conf->arg0().c_str()); return srs_utime_t(::atof(conf->arg0().c_str()) * SRS_UTIME_SECONDS);
} }
string SrsConfig::get_vhost_http_remux_mount(string vhost) string SrsConfig::get_vhost_http_remux_mount(string vhost)

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

@ -1404,7 +1404,7 @@ public:
/** /**
* get the fast cache duration for http audio live stream. * get the fast cache duration for http audio live stream.
*/ */
virtual double get_vhost_http_remux_fast_cache(std::string vhost); virtual srs_utime_t get_vhost_http_remux_fast_cache(std::string vhost);
/** /**
* get the http flv live stream mount point for vhost. * get the http flv live stream mount point for vhost.
* used to generate the flv stream mount path. * used to generate the flv stream mount path.

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

@ -64,7 +64,7 @@ SrsBufferCache::SrsBufferCache(SrsSource* s, SrsRequest* r)
trd = new SrsSTCoroutine("http-stream", this); trd = new SrsSTCoroutine("http-stream", this);
// TODO: FIXME: support reload. // TODO: FIXME: support reload.
fast_cache = srs_utime_t(_srs_config->get_vhost_http_remux_fast_cache(req->vhost) * SRS_UTIME_SECONDS); fast_cache = _srs_config->get_vhost_http_remux_fast_cache(req->vhost);
} }
SrsBufferCache::~SrsBufferCache() SrsBufferCache::~SrsBufferCache()

8
trunk/src/utest/srs_utest_config.cpp
View file

@ -1898,6 +1898,14 @@ VOID TEST(ConfigUnitTest, CheckDefaultValuesVhost)
EXPECT_EQ(100 * SRS_UTIME_SECONDS, conf.get_queue_length("v")); EXPECT_EQ(100 * SRS_UTIME_SECONDS, conf.get_queue_length("v"));
EXPECT_EQ(10 * SRS_UTIME_MILLISECONDS, conf.get_send_min_interval("v")); EXPECT_EQ(10 * SRS_UTIME_MILLISECONDS, conf.get_send_min_interval("v"));
} }
if (true) {
EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_MIN_OK_CONF));
EXPECT_EQ(0, conf.get_vhost_http_remux_fast_cache(""));
EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_MIN_OK_CONF"vhost v{http_remux{fast_cache 10;}}"));
EXPECT_EQ(10 * SRS_UTIME_SECONDS, conf.get_vhost_http_remux_fast_cache("v"));
}
} }
VOID TEST(ConfigUnitTest, CheckDefaultValuesGlobal) VOID TEST(ConfigUnitTest, CheckDefaultValuesGlobal)