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

Add author runner365

Browse source
This commit is contained in:
winlin 2020-01-24 18:41:09 +08:00
parent fddfbdde5f
commit 5d0833fcc3
6 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
AUTHORS.txt
View file

@ -52,4 +52,5 @@ CONTRIBUTORS ordered by first contribution.
* xialixin<xlx0625@163.com> * xialixin<xlx0625@163.com>
* alphonsetai<tyh_123@163.com> * alphonsetai<tyh_123@163.com>
* Michael.Ma<wnpllr@gmail.com> * Michael.Ma<wnpllr@gmail.com>
* lam2003<linmin3@yy.com> * lam2003<linmin3@yy.com>
* runner365<shi.weibd@hotmail.com>

4
trunk/auto/options.sh
View file

@ -510,9 +510,9 @@ apply_user_detail_options
function regenerate_options() { function regenerate_options() {
# save all config options to macro to write to auto headers file # save all config options to macro to write to auto headers file
SRS_AUTO_USER_CONFIGURE="$opt" SRS_AUTO_USER_CONFIGURE=`echo $opt`
# regenerate the options for default values. # regenerate the options for default values.
SRS_AUTO_CONFIGURE="--prefix=${SRS_PREFIX}" SRS_AUTO_CONFIGURE="--prefix=${SRS_PREFIX}"
if [ $SRS_HLS = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-hls"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-hls"; fi if [ $SRS_HLS = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-hls"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-hls"; fi
if [ $SRS_HDS = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-hds"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-hds"; fi if [ $SRS_HDS = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-hds"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-hds"; fi
if [ $SRS_DVR = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-dvr"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-dvr"; fi if [ $SRS_DVR = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-dvr"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-dvr"; fi

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

@ -3391,9 +3391,7 @@ srs_error_t SrsConfig::parse_argv(int& i, char** argv)
void SrsConfig::print_help(char** argv) void SrsConfig::print_help(char** argv)
{ {
printf( printf(
RTMP_SIG_SRS_SERVER ", " RTMP_SIG_SRS_URL ", licensed under " RTMP_SIG_SRS_LICENSE "%s, %s, %s, created by %s\n\n"
", built at " SRS_AUTO_BUILD_DATE ", configured by " SRS_AUTO_USER_CONFIGURE
", which means " SRS_AUTO_CONFIGURE "\n""\n"
"Usage: %s <-h?vVgG>|<[-t] -c filename>\n" "Usage: %s <-h?vVgG>|<[-t] -c filename>\n"
"Options:\n" "Options:\n"
" -?, -h : Show this help and exit 0.\n" " -?, -h : Show this help and exit 0.\n"
@ -3403,9 +3401,12 @@ void SrsConfig::print_help(char** argv)
" -c filename : Use config file to start server.\n" " -c filename : Use config file to start server.\n"
"For example:\n" "For example:\n"
" %s -v\n" " %s -v\n"
" %s -t -c " SRS_CONF_DEFAULT_COFNIG_FILE "\n" " %s -t -c %s\n"
" %s -c " SRS_CONF_DEFAULT_COFNIG_FILE "\n", " %s -c %s\n",
argv[0], argv[0], argv[0], argv[0]); RTMP_SIG_SRS_SERVER, RTMP_SIG_SRS_URL, RTMP_SIG_SRS_LICENSE,
RTMP_SIG_SRS_AUTHORS,
argv[0], argv[0], argv[0], SRS_CONF_DEFAULT_COFNIG_FILE,
argv[0], SRS_CONF_DEFAULT_COFNIG_FILE);
} }
srs_error_t SrsConfig::parse_file(const char* filename) srs_error_t SrsConfig::parse_file(const char* filename)

3
trunk/src/core/srs_core.hpp
View file

@ -41,7 +41,8 @@
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"
#define RTMP_SIG_SRS_CODE "OuXuli" #define RTMP_SIG_SRS_CODE "OuXuli"
#define RTMP_SIG_SRS_URL "https://github.com/ossrs/srs" #define RTMP_SIG_SRS_URL "https://github.com/ossrs/srs"
#define RTMP_SIG_SRS_LICENSE "The MIT License (MIT)" #define RTMP_SIG_SRS_LICENSE "MIT"
#define RTMP_SIG_SRS_AUTHORS "winlin,wenjie,runner365"
#define RTMP_SIG_SRS_VERSION SRS_XSTR(VERSION_MAJOR) "." SRS_XSTR(VERSION_MINOR) "." SRS_XSTR(VERSION_REVISION) #define RTMP_SIG_SRS_VERSION SRS_XSTR(VERSION_MAJOR) "." SRS_XSTR(VERSION_MINOR) "." SRS_XSTR(VERSION_REVISION)
#define RTMP_SIG_SRS_SERVER RTMP_SIG_SRS_KEY "/" RTMP_SIG_SRS_VERSION "(" RTMP_SIG_SRS_CODE ")" #define RTMP_SIG_SRS_SERVER RTMP_SIG_SRS_KEY "/" RTMP_SIG_SRS_VERSION "(" RTMP_SIG_SRS_CODE ")"

1
trunk/src/main/srs_main_server.cpp
View file

@ -124,6 +124,7 @@ srs_error_t do_main(int argc, char** argv)
// config already applied to log. // config already applied to log.
srs_trace("%s, %s", RTMP_SIG_SRS_SERVER, RTMP_SIG_SRS_LICENSE); srs_trace("%s, %s", RTMP_SIG_SRS_SERVER, RTMP_SIG_SRS_LICENSE);
srs_trace("authors: %s", RTMP_SIG_SRS_AUTHORS);
srs_trace("contributors: %s", SRS_AUTO_CONSTRIBUTORS); srs_trace("contributors: %s", SRS_AUTO_CONSTRIBUTORS);
srs_trace("cwd=%s, work_dir=%s, build: %s, configure: %s, uname: %s", srs_trace("cwd=%s, work_dir=%s, build: %s, configure: %s, uname: %s",
_srs_config->cwd().c_str(), cwd.c_str(), SRS_AUTO_BUILD_DATE, SRS_AUTO_USER_CONFIGURE, SRS_AUTO_UNAME); _srs_config->cwd().c_str(), cwd.c_str(), SRS_AUTO_BUILD_DATE, SRS_AUTO_USER_CONFIGURE, SRS_AUTO_UNAME);

1
trunk/src/protocol/srs_rtmp_stack.cpp
View file

@ -2399,6 +2399,7 @@ srs_error_t SrsRtmpServer::response_connect_app(SrsRequest *req, const char* ser
data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE)); data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE));
data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL)); data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL));
data->set("srs_version", SrsAmf0Any::str(RTMP_SIG_SRS_VERSION)); data->set("srs_version", SrsAmf0Any::str(RTMP_SIG_SRS_VERSION));
data->set("srs_authors", SrsAmf0Any::str(RTMP_SIG_SRS_AUTHORS));
if (server_ip) { if (server_ip) {
data->set("srs_server_ip", SrsAmf0Any::str(server_ip)); data->set("srs_server_ip", SrsAmf0Any::str(server_ip));