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

RTC: Remove --research

Browse source
This commit is contained in:
winlin 2020-05-29 17:02:10 +08:00
parent d43d9674a3
commit a78b6b8cda
4 changed files with 5 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

13
trunk/auto/depends.sh
View file

@ -691,19 +691,6 @@ if [[ $SRS_SRT == YES ]]; then
fi fi
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 # build utest code
##################################################################################### #####################################################################################

18
trunk/auto/options.sh
View file

@ -442,7 +442,6 @@ function apply_user_presets() {
# all disabled. # all disabled.
if [ $SRS_DISABLE_ALL = YES ]; then if [ $SRS_DISABLE_ALL = YES ]; then
SRS_HDS=NO SRS_HDS=NO
SRS_RESEARCH=NO
SRS_UTEST=NO SRS_UTEST=NO
SRS_STATIC=NO SRS_STATIC=NO
fi fi
@ -450,7 +449,6 @@ function apply_user_presets() {
# all enabled. # all enabled.
if [ $SRS_ENABLE_ALL = YES ]; then if [ $SRS_ENABLE_ALL = YES ]; then
SRS_HDS=YES SRS_HDS=YES
SRS_RESEARCH=YES
SRS_UTEST=YES SRS_UTEST=YES
SRS_STATIC=NO SRS_STATIC=NO
fi fi
@ -458,7 +456,6 @@ function apply_user_presets() {
# only rtmp vp6 # only rtmp vp6
if [ $SRS_FAST = YES ]; then if [ $SRS_FAST = YES ]; then
SRS_HDS=NO SRS_HDS=NO
SRS_RESEARCH=NO
SRS_UTEST=NO SRS_UTEST=NO
SRS_STATIC=NO SRS_STATIC=NO
fi fi
@ -466,7 +463,6 @@ function apply_user_presets() {
# only ssl for RTMP with complex handshake. # only ssl for RTMP with complex handshake.
if [ $SRS_PURE_RTMP = YES ]; then if [ $SRS_PURE_RTMP = YES ]; then
SRS_HDS=NO SRS_HDS=NO
SRS_RESEARCH=NO
SRS_UTEST=NO SRS_UTEST=NO
SRS_STATIC=NO SRS_STATIC=NO
fi fi
@ -474,7 +470,6 @@ function apply_user_presets() {
# defaults for x86/x64 # defaults for x86/x64
if [ $SRS_X86_X64 = YES ]; then if [ $SRS_X86_X64 = YES ]; then
SRS_HDS=YES SRS_HDS=YES
SRS_RESEARCH=NO
SRS_UTEST=NO SRS_UTEST=NO
SRS_STATIC=NO SRS_STATIC=NO
fi fi
@ -482,7 +477,6 @@ function apply_user_presets() {
# if dev specified, open features if possible. # if dev specified, open features if possible.
if [ $SRS_DEV = YES ]; then if [ $SRS_DEV = YES ]; then
SRS_HDS=YES SRS_HDS=YES
SRS_RESEARCH=YES
SRS_UTEST=YES SRS_UTEST=YES
SRS_STATIC=NO SRS_STATIC=NO
fi fi
@ -490,7 +484,6 @@ function apply_user_presets() {
# if fast dev specified, open main server features. # if fast dev specified, open main server features.
if [ $SRS_FAST_DEV = YES ]; then if [ $SRS_FAST_DEV = YES ]; then
SRS_HDS=YES SRS_HDS=YES
SRS_RESEARCH=NO
SRS_UTEST=NO SRS_UTEST=NO
SRS_STATIC=NO SRS_STATIC=NO
fi fi
@ -498,7 +491,6 @@ function apply_user_presets() {
# for srs demo # for srs demo
if [ $SRS_DEMO = YES ]; then if [ $SRS_DEMO = YES ]; then
SRS_HDS=YES SRS_HDS=YES
SRS_RESEARCH=NO
SRS_UTEST=NO SRS_UTEST=NO
SRS_STATIC=NO SRS_STATIC=NO
fi fi
@ -506,7 +498,6 @@ function apply_user_presets() {
# if raspberry-pi specified, open ssl/hls/static features # if raspberry-pi specified, open ssl/hls/static features
if [ $SRS_PI = YES ]; then if [ $SRS_PI = YES ]; then
SRS_HDS=YES SRS_HDS=YES
SRS_RESEARCH=NO
SRS_UTEST=NO SRS_UTEST=NO
SRS_STATIC=NO SRS_STATIC=NO
fi fi
@ -514,14 +505,12 @@ function apply_user_presets() {
# if cubieboard specified, open features except ffmpeg/nginx. # if cubieboard specified, open features except ffmpeg/nginx.
if [ $SRS_CUBIE = YES ]; then if [ $SRS_CUBIE = YES ]; then
SRS_HDS=YES SRS_HDS=YES
SRS_RESEARCH=NO
SRS_UTEST=NO SRS_UTEST=NO
SRS_STATIC=NO SRS_STATIC=NO
fi fi
# if crossbuild, disable research and librtmp. # if crossbuild, disable research and librtmp.
if [[ $SRS_CROSS_BUILD == YES ]]; then if [[ $SRS_CROSS_BUILD == YES ]]; then
SRS_RESEARCH=NO
SRS_UTEST=NO SRS_UTEST=NO
SRS_STATIC=NO SRS_STATIC=NO
fi fi
@ -580,6 +569,11 @@ function apply_user_detail_options() {
exit -1 exit -1
fi fi
if [[ $SRS_RESEARCH != NO ]]; then
echo "Not support --research"
exit -1
fi
if [[ $SRS_SRTP_ASM == YES && $SRS_RTC == NO ]]; then if [[ $SRS_SRTP_ASM == YES && $SRS_RTC == NO ]]; then
echo "Disable SRTP ASM, because RTC is disabled." echo "Disable SRTP ASM, because RTC is disabled."
SRS_SRTP_ASM=NO 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_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_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_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_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_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 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_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_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_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_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 = 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 if [ $SRS_GPERF_MC = RESERVED ]; then echo "you must specifies the gperf-mc, see: ./configure --help"; __check_ok=NO; fi

1
trunk/auto/summary.sh
View file

@ -12,7 +12,6 @@ SrsHttpCallbackSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_HTTP_CALLBACK = Y
SrsHttpServerSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_HTTP_SERVER = YES ]; then SrsHttpServerSummaryColor="\${GREEN}"; fi SrsHttpServerSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_HTTP_SERVER = YES ]; then SrsHttpServerSummaryColor="\${GREEN}"; fi
SrsHttpApiSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_HTTP_API = YES ]; then SrsHttpApiSummaryColor="\${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 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 SrsUtestSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_UTEST = YES ]; then SrsUtestSummaryColor="\${GREEN}"; fi
SrsGperfSummaryColor="\${GREEN}(Disabled) "; if [ $SRS_GPERF = YES ]; then SrsGperfSummaryColor="\${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 SrsGperfMCSummaryColor="\${GREEN}(Disabled) "; if [ $SRS_GPERF_MC = YES ]; then SrsGperfMCSummaryColor="\${YELLOW}"; fi

5
trunk/configure vendored
View file

@ -700,11 +700,6 @@ if [ $SRS_HTTP_API = YES ]; then
else else
echo -e "${YELLOW}Warning: The HTTP API is disabled.${BLACK}" echo -e "${YELLOW}Warning: The HTTP API is disabled.${BLACK}"
fi 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 if [ $SRS_UTEST = YES ]; then
echo -e "${GREEN}The utests are enabled.${BLACK}" echo -e "${GREEN}The utests are enabled.${BLACK}"
else else