From a78b6b8cdabfeb3e84c7fffdfd3c566133a2ef35 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 29 May 2020 17:02:10 +0800 Subject: [PATCH] RTC: Remove --research --- trunk/auto/depends.sh | 13 ------------- trunk/auto/options.sh | 18 +++++------------- trunk/auto/summary.sh | 1 - trunk/configure | 5 ----- 4 files changed, 5 insertions(+), 32 deletions(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index fbbb82659..b0863bdab 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -691,19 +691,6 @@ if [[ $SRS_SRT == YES ]]; then fi fi -##################################################################################### -# build research code, librtmp -##################################################################################### -if [ $SRS_RESEARCH = YES ]; then - mkdir -p ${SRS_OBJS}/research - - (cd ${SRS_WORKDIR}/research/hls && make ${SRS_JOBS} && mv ts_info ../../${SRS_OBJS_DIR}/research) - ret=$?; if [[ $ret -ne 0 ]]; then echo "Build research/hls failed, ret=$ret"; exit $ret; fi - - (cd research/ffempty && make ${SRS_JOBS} && mv ffempty ../../${SRS_OBJS_DIR}/research) - ret=$?; if [[ $ret -ne 0 ]]; then echo "Build research/ffempty failed, ret=$ret"; exit $ret; fi -fi - ##################################################################################### # build utest code ##################################################################################### diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index 394a48c48..49cf21be6 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -442,7 +442,6 @@ function apply_user_presets() { # all disabled. if [ $SRS_DISABLE_ALL = YES ]; then SRS_HDS=NO - SRS_RESEARCH=NO SRS_UTEST=NO SRS_STATIC=NO fi @@ -450,7 +449,6 @@ function apply_user_presets() { # all enabled. if [ $SRS_ENABLE_ALL = YES ]; then SRS_HDS=YES - SRS_RESEARCH=YES SRS_UTEST=YES SRS_STATIC=NO fi @@ -458,7 +456,6 @@ function apply_user_presets() { # only rtmp vp6 if [ $SRS_FAST = YES ]; then SRS_HDS=NO - SRS_RESEARCH=NO SRS_UTEST=NO SRS_STATIC=NO fi @@ -466,7 +463,6 @@ function apply_user_presets() { # only ssl for RTMP with complex handshake. if [ $SRS_PURE_RTMP = YES ]; then SRS_HDS=NO - SRS_RESEARCH=NO SRS_UTEST=NO SRS_STATIC=NO fi @@ -474,7 +470,6 @@ function apply_user_presets() { # defaults for x86/x64 if [ $SRS_X86_X64 = YES ]; then SRS_HDS=YES - SRS_RESEARCH=NO SRS_UTEST=NO SRS_STATIC=NO fi @@ -482,7 +477,6 @@ function apply_user_presets() { # if dev specified, open features if possible. if [ $SRS_DEV = YES ]; then SRS_HDS=YES - SRS_RESEARCH=YES SRS_UTEST=YES SRS_STATIC=NO fi @@ -490,7 +484,6 @@ function apply_user_presets() { # if fast dev specified, open main server features. if [ $SRS_FAST_DEV = YES ]; then SRS_HDS=YES - SRS_RESEARCH=NO SRS_UTEST=NO SRS_STATIC=NO fi @@ -498,7 +491,6 @@ function apply_user_presets() { # for srs demo if [ $SRS_DEMO = YES ]; then SRS_HDS=YES - SRS_RESEARCH=NO SRS_UTEST=NO SRS_STATIC=NO fi @@ -506,7 +498,6 @@ function apply_user_presets() { # if raspberry-pi specified, open ssl/hls/static features if [ $SRS_PI = YES ]; then SRS_HDS=YES - SRS_RESEARCH=NO SRS_UTEST=NO SRS_STATIC=NO fi @@ -514,14 +505,12 @@ function apply_user_presets() { # if cubieboard specified, open features except ffmpeg/nginx. if [ $SRS_CUBIE = YES ]; then SRS_HDS=YES - SRS_RESEARCH=NO SRS_UTEST=NO SRS_STATIC=NO fi # if crossbuild, disable research and librtmp. if [[ $SRS_CROSS_BUILD == YES ]]; then - SRS_RESEARCH=NO SRS_UTEST=NO SRS_STATIC=NO fi @@ -580,6 +569,11 @@ function apply_user_detail_options() { exit -1 fi + if [[ $SRS_RESEARCH != NO ]]; then + echo "Not support --research" + exit -1 + fi + if [[ $SRS_SRTP_ASM == YES && $SRS_RTC == NO ]]; then echo "Disable SRTP ASM, because RTC is disabled." SRS_SRTP_ASM=NO @@ -614,7 +608,6 @@ function regenerate_options() { if [ $SRS_HTTP_SERVER = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --http-server=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --http-server=off"; fi if [ $SRS_STREAM_CASTER = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --stream-caster=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --stream-caster=off"; fi if [ $SRS_HTTP_API = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --http-api=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --http-api=off"; fi - if [ $SRS_RESEARCH = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --research=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --research=off"; fi if [ $SRS_UTEST = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --utest=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --utest=off"; fi if [ $SRS_SRT = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --srt=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --srt=off"; fi if [ $SRS_RTC = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --rtc=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --rtc=off"; fi @@ -702,7 +695,6 @@ function check_option_conflicts() { if [ $SRS_HDS = RESERVED ]; then echo "you must specifies the hds, see: ./configure --help"; __check_ok=NO; fi if [ $SRS_SSL = RESERVED ]; then echo "you must specifies the ssl, see: ./configure --help"; __check_ok=NO; fi if [ $SRS_STREAM_CASTER = RESERVED ]; then echo "you must specifies the stream-caster, see: ./configure --help"; __check_ok=NO; fi - if [ $SRS_RESEARCH = RESERVED ]; then echo "you must specifies the research, see: ./configure --help"; __check_ok=NO; fi if [ $SRS_UTEST = RESERVED ]; then echo "you must specifies the utest, see: ./configure --help"; __check_ok=NO; fi if [ $SRS_GPERF = RESERVED ]; then echo "you must specifies the gperf, see: ./configure --help"; __check_ok=NO; fi if [ $SRS_GPERF_MC = RESERVED ]; then echo "you must specifies the gperf-mc, see: ./configure --help"; __check_ok=NO; fi diff --git a/trunk/auto/summary.sh b/trunk/auto/summary.sh index d725997e8..46196df43 100755 --- a/trunk/auto/summary.sh +++ b/trunk/auto/summary.sh @@ -12,7 +12,6 @@ SrsHttpCallbackSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_HTTP_CALLBACK = Y SrsHttpServerSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_HTTP_SERVER = YES ]; then SrsHttpServerSummaryColor="\${GREEN}"; fi SrsHttpApiSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_HTTP_API = YES ]; then SrsHttpApiSummaryColor="\${GREEN}"; fi SrsStreamCasterSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_STREAM_CASTER = YES ]; then SrsStreamCasterSummaryColor="\${GREEN}"; fi -SrsResearchSummaryColor="\${GREEN}(Disabled) "; if [ $SRS_RESEARCH = YES ]; then SrsResearchSummaryColor="\${GREEN}"; fi SrsUtestSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_UTEST = YES ]; then SrsUtestSummaryColor="\${GREEN}"; fi SrsGperfSummaryColor="\${GREEN}(Disabled) "; if [ $SRS_GPERF = YES ]; then SrsGperfSummaryColor="\${GREEN}"; fi SrsGperfMCSummaryColor="\${GREEN}(Disabled) "; if [ $SRS_GPERF_MC = YES ]; then SrsGperfMCSummaryColor="\${YELLOW}"; fi diff --git a/trunk/configure b/trunk/configure index 023b84933..e6774731a 100755 --- a/trunk/configure +++ b/trunk/configure @@ -700,11 +700,6 @@ if [ $SRS_HTTP_API = YES ]; then else echo -e "${YELLOW}Warning: The HTTP API is disabled.${BLACK}" fi -if [ $SRS_RESEARCH = YES ]; then - echo -e "${GREEN}The research tools are enabled.${BLACK}" -else - echo -e "${GREEN}Note: The research tools are disabled.${BLACK}" -fi if [ $SRS_UTEST = YES ]; then echo -e "${GREEN}The utests are enabled.${BLACK}" else