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

for srs-dolphin, support HTTP and RTMP.

Browse source
This commit is contained in:
winlin 2015-05-28 21:02:43 +08:00
parent 41ead65345
commit af4eec90ac
2 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -391,12 +391,16 @@ void SrsConfig::set_config_directive(SrsConfDirective* parent, string dir, strin
if (!d) { if (!d) {
d = new SrsConfDirective(); d = new SrsConfDirective();
d->name = dir; if (!dir.empty()) {
d->name = dir;
}
parent->directives.push_back(d); parent->directives.push_back(d);
} }
d->args.clear(); d->args.clear();
d->args.push_back(value); if (!value.empty()) {
d->args.push_back(value);
}
} }
void SrsConfig::subscribe(ISrsReloadHandler* handler) void SrsConfig::subscribe(ISrsReloadHandler* handler)
@ -1284,16 +1288,29 @@ int SrsConfig::parse_argv(int& i, char** argv)
case 'p': case 'p':
dolphin = true; dolphin = true;
if (*p) { if (*p) {
dolphin_port = p; dolphin_rtmp_port = p;
continue; continue;
} }
if (argv[++i]) { if (argv[++i]) {
dolphin_port = argv[i]; dolphin_rtmp_port = argv[i];
continue; continue;
} }
ret = ERROR_SYSTEM_CONFIG_INVALID; ret = ERROR_SYSTEM_CONFIG_INVALID;
srs_error("option \"-p\" requires params, ret=%d", ret); srs_error("option \"-p\" requires params, ret=%d", ret);
return ret; return ret;
case 'x':
dolphin = true;
if (*p) {
dolphin_http_port = p;
continue;
}
if (argv[++i]) {
dolphin_http_port = argv[i];
continue;
}
ret = ERROR_SYSTEM_CONFIG_INVALID;
srs_error("option \"-x\" requires params, ret=%d", ret);
return ret;
case 'v': case 'v':
case 'V': case 'V':
show_help = false; show_help = false;
@ -1338,6 +1355,9 @@ void SrsConfig::print_help(char** argv)
" -v, -V : show version and exit(0)\n" " -v, -V : show version and exit(0)\n"
" -t : test configuration file, exit(error_code).\n" " -t : test configuration file, exit(error_code).\n"
" -c filename : use configuration file for SRS\n" " -c filename : use configuration file for SRS\n"
"For srs-dolphin:\n"
" -p rtmp-port : the rtmp port to listen.\n"
" -x http-port : the http port to listen.\n"
"\n" "\n"
RTMP_SIG_SRS_WEB"\n" RTMP_SIG_SRS_WEB"\n"
RTMP_SIG_SRS_URL"\n" RTMP_SIG_SRS_URL"\n"
@ -1882,7 +1902,16 @@ int SrsConfig::parse_buffer(SrsConfigBuffer* buffer)
// mock by dolphin mode. // mock by dolphin mode.
// for the dolphin will start srs with specified params. // for the dolphin will start srs with specified params.
if (dolphin) { if (dolphin) {
set_config_directive(root, "listen", dolphin_port); // for RTMP.
set_config_directive(root, "listen", dolphin_rtmp_port);
// for HTTP
set_config_directive(root, "http_server", "");
SrsConfDirective* http_server = root->get("http_server");
set_config_directive(http_server, "enabled", "on");
set_config_directive(http_server, "listen", dolphin_http_port);
// others.
set_config_directive(root, "daemon", "off"); set_config_directive(root, "daemon", "off");
set_config_directive(root, "srs_log_tank", "console"); set_config_directive(root, "srs_log_tank", "console");
} }

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

@ -271,7 +271,8 @@ private:
* @see https://github.com/simple-rtmp-server/srs-dolphin * @see https://github.com/simple-rtmp-server/srs-dolphin
*/ */
bool dolphin; bool dolphin;
std::string dolphin_port; std::string dolphin_rtmp_port;
std::string dolphin_http_port;
/** /**
* whether show help and exit. * whether show help and exit.
*/ */