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 the config consts

Browse source
This commit is contained in:
winlin 2014-07-20 13:16:24 +08:00
parent 736ec48c71
commit baa20b2f31
4 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1288,12 +1288,12 @@ int SrsConfig::get_pithy_print_publish()
{ {
SrsConfDirective* pithy = root->get("pithy_print"); SrsConfDirective* pithy = root->get("pithy_print");
if (!pithy) { if (!pithy) {
return SRS_STAGE_PUBLISH_USER_INTERVAL_MS; return SRS_CONF_DEFAULT_STAGE_PUBLISH_USER_INTERVAL_MS;
} }
pithy = pithy->get("publish"); pithy = pithy->get("publish");
if (!pithy) { if (!pithy) {
return SRS_STAGE_PUBLISH_USER_INTERVAL_MS; return SRS_CONF_DEFAULT_STAGE_PUBLISH_USER_INTERVAL_MS;
} }
return ::atoi(pithy->arg0().c_str()); return ::atoi(pithy->arg0().c_str());
@ -1303,12 +1303,12 @@ int SrsConfig::get_pithy_print_forwarder()
{ {
SrsConfDirective* pithy = root->get("pithy_print"); SrsConfDirective* pithy = root->get("pithy_print");
if (!pithy) { if (!pithy) {
return SRS_STAGE_FORWARDER_INTERVAL_MS; return SRS_CONF_DEFAULT_STAGE_FORWARDER_INTERVAL_MS;
} }
pithy = pithy->get("forwarder"); pithy = pithy->get("forwarder");
if (!pithy) { if (!pithy) {
return SRS_STAGE_FORWARDER_INTERVAL_MS; return SRS_CONF_DEFAULT_STAGE_FORWARDER_INTERVAL_MS;
} }
return ::atoi(pithy->arg0().c_str()); return ::atoi(pithy->arg0().c_str());
@ -1318,12 +1318,12 @@ int SrsConfig::get_pithy_print_encoder()
{ {
SrsConfDirective* pithy = root->get("pithy_print"); SrsConfDirective* pithy = root->get("pithy_print");
if (!pithy) { if (!pithy) {
return SRS_STAGE_ENCODER_INTERVAL_MS; return SRS_CONF_DEFAULT_STAGE_ENCODER_INTERVAL_MS;
} }
pithy = pithy->get("encoder"); pithy = pithy->get("encoder");
if (!pithy) { if (!pithy) {
return SRS_STAGE_ENCODER_INTERVAL_MS; return SRS_CONF_DEFAULT_STAGE_ENCODER_INTERVAL_MS;
} }
return ::atoi(pithy->arg0().c_str()); return ::atoi(pithy->arg0().c_str());
@ -1333,12 +1333,12 @@ int SrsConfig::get_pithy_print_ingester()
{ {
SrsConfDirective* pithy = root->get("pithy_print"); SrsConfDirective* pithy = root->get("pithy_print");
if (!pithy) { if (!pithy) {
return SRS_STAGE_INGESTER_INTERVAL_MS; return SRS_CONF_DEFAULT_STAGE_INGESTER_INTERVAL_MS;
} }
pithy = pithy->get("ingester"); pithy = pithy->get("ingester");
if (!pithy) { if (!pithy) {
return SRS_STAGE_INGESTER_INTERVAL_MS; return SRS_CONF_DEFAULT_STAGE_INGESTER_INTERVAL_MS;
} }
return ::atoi(pithy->arg0().c_str()); return ::atoi(pithy->arg0().c_str());
@ -1348,12 +1348,12 @@ int SrsConfig::get_pithy_print_hls()
{ {
SrsConfDirective* pithy = root->get("pithy_print"); SrsConfDirective* pithy = root->get("pithy_print");
if (!pithy) { if (!pithy) {
return SRS_STAGE_HLS_INTERVAL_MS; return SRS_CONF_DEFAULT_STAGE_HLS_INTERVAL_MS;
} }
pithy = pithy->get("hls"); pithy = pithy->get("hls");
if (!pithy) { if (!pithy) {
return SRS_STAGE_HLS_INTERVAL_MS; return SRS_CONF_DEFAULT_STAGE_HLS_INTERVAL_MS;
} }
return ::atoi(pithy->arg0().c_str()); return ::atoi(pithy->arg0().c_str());
@ -1363,12 +1363,12 @@ int SrsConfig::get_pithy_print_play()
{ {
SrsConfDirective* pithy = root->get("pithy_print"); SrsConfDirective* pithy = root->get("pithy_print");
if (!pithy) { if (!pithy) {
return SRS_STAGE_PLAY_USER_INTERVAL_MS; return SRS_CONF_DEFAULT_STAGE_PLAY_USER_INTERVAL_MS;
} }
pithy = pithy->get("play"); pithy = pithy->get("play");
if (!pithy) { if (!pithy) {
return SRS_STAGE_PLAY_USER_INTERVAL_MS; return SRS_CONF_DEFAULT_STAGE_PLAY_USER_INTERVAL_MS;
} }
return ::atoi(pithy->arg0().c_str()); return ::atoi(pithy->arg0().c_str());
@ -1378,12 +1378,12 @@ int SrsConfig::get_pithy_print_edge()
{ {
SrsConfDirective* pithy = root->get("pithy_print"); SrsConfDirective* pithy = root->get("pithy_print");
if (!pithy) { if (!pithy) {
return SRS_STAGE_EDGE_INTERVAL_MS; return SRS_CONF_DEFAULT_STAGE_EDGE_INTERVAL_MS;
} }
pithy = pithy->get("edge"); pithy = pithy->get("edge");
if (!pithy) { if (!pithy) {
return SRS_STAGE_EDGE_INTERVAL_MS; return SRS_CONF_DEFAULT_STAGE_EDGE_INTERVAL_MS;
} }
return ::atoi(pithy->arg0().c_str()); return ::atoi(pithy->arg0().c_str());
@ -2311,13 +2311,13 @@ string SrsConfig::get_ingest_input_type(SrsConfDirective* ingest)
SrsConfDirective* conf = ingest->get("input"); SrsConfDirective* conf = ingest->get("input");
if (!conf) { if (!conf) {
return SRS_AUTO_INGEST_TYPE_FILE; return SRS_CONF_DEFAULT_INGEST_TYPE_FILE;
} }
conf = conf->get("type"); conf = conf->get("type");
if (!conf) { if (!conf) {
return SRS_AUTO_INGEST_TYPE_FILE; return SRS_CONF_DEFAULT_INGEST_TYPE_FILE;
} }
return conf->arg0(); return conf->arg0();

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

@ -77,16 +77,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SRS_CONF_DEFAULT_HTTP_HEAETBEAT_INDEX 0 #define SRS_CONF_DEFAULT_HTTP_HEAETBEAT_INDEX 0
#define SRS_CONF_DEFAULT_HTTP_HEAETBEAT_SUMMARIES false #define SRS_CONF_DEFAULT_HTTP_HEAETBEAT_SUMMARIES false
#define SRS_STAGE_PLAY_USER_INTERVAL_MS 10000 #define SRS_CONF_DEFAULT_STAGE_PLAY_USER_INTERVAL_MS 10000
#define SRS_STAGE_PUBLISH_USER_INTERVAL_MS 10000 #define SRS_CONF_DEFAULT_STAGE_PUBLISH_USER_INTERVAL_MS 10000
#define SRS_STAGE_FORWARDER_INTERVAL_MS 10000 #define SRS_CONF_DEFAULT_STAGE_FORWARDER_INTERVAL_MS 10000
#define SRS_STAGE_ENCODER_INTERVAL_MS 10000 #define SRS_CONF_DEFAULT_STAGE_ENCODER_INTERVAL_MS 10000
#define SRS_STAGE_INGESTER_INTERVAL_MS 10000 #define SRS_CONF_DEFAULT_STAGE_INGESTER_INTERVAL_MS 10000
#define SRS_STAGE_HLS_INTERVAL_MS 10000 #define SRS_CONF_DEFAULT_STAGE_HLS_INTERVAL_MS 10000
#define SRS_STAGE_EDGE_INTERVAL_MS 10000 #define SRS_CONF_DEFAULT_STAGE_EDGE_INTERVAL_MS 10000
#define SRS_AUTO_INGEST_TYPE_FILE "file" #define SRS_CONF_DEFAULT_INGEST_TYPE_FILE "file"
#define SRS_AUTO_INGEST_TYPE_STREAM "stream" #define SRS_CONF_DEFAULT_INGEST_TYPE_STREAM "stream"
#define SRS_CONF_DEFAULT_TRANSCODE_IFORMAT "flv" #define SRS_CONF_DEFAULT_TRANSCODE_IFORMAT "flv"
#define SRS_CONF_DEFAULT_TRANSCODE_OFORMAT "flv" #define SRS_CONF_DEFAULT_TRANSCODE_OFORMAT "flv"

4
trunk/src/app/srs_app_ingest.cpp
View file

@ -284,7 +284,7 @@ int SrsIngester::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* vhost, S
return ret; return ret;
} }
if (input_type == SRS_AUTO_INGEST_TYPE_FILE) { if (input_type == SRS_CONF_DEFAULT_INGEST_TYPE_FILE) {
std::string input_url = _srs_config->get_ingest_input_url(ingest); std::string input_url = _srs_config->get_ingest_input_url(ingest);
if (input_url.empty()) { if (input_url.empty()) {
ret = ERROR_ENCODER_NO_INPUT; ret = ERROR_ENCODER_NO_INPUT;
@ -298,7 +298,7 @@ int SrsIngester::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* vhost, S
if ((ret = ffmpeg->initialize(input_url, output, log_file)) != ERROR_SUCCESS) { if ((ret = ffmpeg->initialize(input_url, output, log_file)) != ERROR_SUCCESS) {
return ret; return ret;
} }
} else if (input_type == SRS_AUTO_INGEST_TYPE_STREAM) { } else if (input_type == SRS_CONF_DEFAULT_INGEST_TYPE_STREAM) {
std::string input_url = _srs_config->get_ingest_input_url(ingest); std::string input_url = _srs_config->get_ingest_input_url(ingest);
if (input_url.empty()) { if (input_url.empty()) {
ret = ERROR_ENCODER_NO_INPUT; ret = ERROR_ENCODER_NO_INPUT;

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

@ -109,31 +109,31 @@ VOID TEST(ConfigTest, CheckMacros)
#ifndef SRS_CONF_DEFAULT_HTTP_HEAETBEAT_SUMMARIES #ifndef SRS_CONF_DEFAULT_HTTP_HEAETBEAT_SUMMARIES
EXPECT_TRUE(false); EXPECT_TRUE(false);
#endif #endif
#ifndef SRS_STAGE_PLAY_USER_INTERVAL_MS #ifndef SRS_CONF_DEFAULT_STAGE_PLAY_USER_INTERVAL_MS
EXPECT_TRUE(false); EXPECT_TRUE(false);
#endif #endif
#ifndef SRS_STAGE_PUBLISH_USER_INTERVAL_MS #ifndef SRS_CONF_DEFAULT_STAGE_PUBLISH_USER_INTERVAL_MS
EXPECT_TRUE(false); EXPECT_TRUE(false);
#endif #endif
#ifndef SRS_STAGE_FORWARDER_INTERVAL_MS #ifndef SRS_CONF_DEFAULT_STAGE_FORWARDER_INTERVAL_MS
EXPECT_TRUE(false); EXPECT_TRUE(false);
#endif #endif
#ifndef SRS_STAGE_ENCODER_INTERVAL_MS #ifndef SRS_CONF_DEFAULT_STAGE_ENCODER_INTERVAL_MS
EXPECT_TRUE(false); EXPECT_TRUE(false);
#endif #endif
#ifndef SRS_STAGE_INGESTER_INTERVAL_MS #ifndef SRS_CONF_DEFAULT_STAGE_INGESTER_INTERVAL_MS
EXPECT_TRUE(false); EXPECT_TRUE(false);
#endif #endif
#ifndef SRS_STAGE_HLS_INTERVAL_MS #ifndef SRS_CONF_DEFAULT_STAGE_HLS_INTERVAL_MS
EXPECT_TRUE(false); EXPECT_TRUE(false);
#endif #endif
#ifndef SRS_STAGE_EDGE_INTERVAL_MS #ifndef SRS_CONF_DEFAULT_STAGE_EDGE_INTERVAL_MS
EXPECT_TRUE(false); EXPECT_TRUE(false);
#endif #endif
#ifndef SRS_AUTO_INGEST_TYPE_FILE #ifndef SRS_CONF_DEFAULT_INGEST_TYPE_FILE
EXPECT_TRUE(false); EXPECT_TRUE(false);
#endif #endif
#ifndef SRS_AUTO_INGEST_TYPE_STREAM #ifndef SRS_CONF_DEFAULT_INGEST_TYPE_STREAM
EXPECT_TRUE(false); EXPECT_TRUE(false);
#endif #endif
#ifndef SRS_CONF_DEFAULT_TRANSCODE_IFORMAT #ifndef SRS_CONF_DEFAULT_TRANSCODE_IFORMAT