mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
remove src/main/srs_main_bandcheck.cpp, and --with-bwtc(use librtmp instead). 0.9.159
This commit is contained in:
winlin
parent
8984ba9d56
commit
fd1e8aa882
6 changed files with 16 additions and 896 deletions
70
trunk/configure
vendored
70
trunk/configure
vendored
|
|
@ -115,7 +115,6 @@ SrsHttpServerSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_SERVER = YES ]
|
|||
SrsHttpApiSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_API = YES ]; then SrsHttpApiSummaryColor="\${GREEN}"; fi
|
||||
SrsLibrtmpSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_LIBRTMP = YES ]; then SrsLibrtmpSummaryColor="\${GREEN}"; fi
|
||||
SrsLibrtmpSSLSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_LIBRTMP = YES ]; then if [ $SRS_SSL = YES ]; then SrsLibrtmpSSLSummaryColor="\${GREEN}"; fi fi
|
||||
SrsBWTCSummaryColor="\${GREEN}{disabled} "; if [ $SRS_BWTC = YES ]; then SrsBWTCSummaryColor="\${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
|
||||
|
|
@ -159,8 +158,6 @@ echo -e " | ${SrsGprofSummaryColor}gprof -b ./objs/srs gmon.out > gprof.
|
|||
echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
|
||||
echo -e " |${SrsResearchSummaryColor}research: ./objs/research, api server, players, ts info, librtmp.\${BLACK}"
|
||||
echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
|
||||
echo -e " |${SrsBWTCSummaryColor}bandwidth: ./objs/bandwidth, the bandwidth test client\${BLACK}"
|
||||
echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
|
||||
echo -e " |${SrsUtestSummaryColor}utest: ./objs/srs_utest, the utest for srs\${BLACK}"
|
||||
echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
|
||||
echo -e " |${SrsLibrtmpSummaryColor}librtmp @see: https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLibrtmp\${BLACK}"
|
||||
|
|
@ -168,6 +165,10 @@ echo -e " |${SrsLibrtmpSummaryColor}librtmp: ./objs/include, ./objs/lib, the
|
|||
echo -e " | ${SrsLibrtmpSummaryColor}simple handshake: publish/play stream with simple handshake to server\${BLACK}"
|
||||
echo -e " | ${SrsLibrtmpSSLSummaryColor}complex handshake: it's not required for client, recommend disable it\${BLACK}"
|
||||
echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp, the srs-librtmp client sample\${BLACK}"
|
||||
echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_ingest_flv\${BLACK}"
|
||||
echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_ingest_rtmp\${BLACK}"
|
||||
echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_detect_rtmp\${BLACK}"
|
||||
echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_bandwidth_check\${BLACK}"
|
||||
echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
|
||||
echo -e " |\${GREEN}server: ./objs/srs -c conf/srs.conf, start the srs server\${BLACK}"
|
||||
echo -e " | ${SrsHlsSummaryColor}hls @see: https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS\${BLACK}"
|
||||
|
|
@ -204,7 +205,7 @@ END
|
|||
# makefile
|
||||
echo "generate Makefile"
|
||||
cat << END > ${SRS_MAKEFILE}
|
||||
.PHONY: default _default install install-api help clean server bandwidth librtmp librtmp-sample utest _prepare_dir
|
||||
.PHONY: default _default install install-api help clean server librtmp utest _prepare_dir
|
||||
|
||||
# install prefix.
|
||||
SRS_PREFIX=${SRS_PREFIX}
|
||||
|
|
@ -230,24 +231,22 @@ fi
|
|||
|
||||
# the real entry for all platform.
|
||||
cat << END >> ${SRS_MAKEFILE}
|
||||
_default: bandwidth librtmp-sample utest
|
||||
_default: server librtmp utest
|
||||
@bash objs/_srs_build_summary.sh
|
||||
|
||||
help:
|
||||
@echo "Usage: make <help>|<clean>|<server>|<bandwidth>|<librtmp>|<librtmp-sample>|<utest>|<install>|<install-api>|<uninstall>"
|
||||
@echo "Usage: make <help>|<clean>|<server>|<librtmp>|<utest>|<install>|<install-api>|<uninstall>"
|
||||
@echo " help display this help menu"
|
||||
@echo " clean cleanup project"
|
||||
@echo " server build the srs(simple rtmp server) over st(state-threads)"
|
||||
@echo " bandwidth build the bandwidth test client tool."
|
||||
@echo " librtmp build the client publish/play library."
|
||||
@echo " librtmp-sample build the srs-librtmp sample"
|
||||
@echo " librtmp build the client publish/play library, and samples"
|
||||
@echo " utest build the utest for srs"
|
||||
@echo " install install srs to the prefix path"
|
||||
@echo " install-api install srs api to the prefix path"
|
||||
@echo " install-api install srs and api-server to the prefix path"
|
||||
@echo " uninstall uninstall srs from prefix path"
|
||||
|
||||
clean:
|
||||
(cd ${SRS_OBJS}; rm -rf srs bandwidth srs_utest)
|
||||
(cd ${SRS_OBJS}; rm -rf srs srs_utest)
|
||||
(cd ${SRS_OBJS}; rm -rf src research include lib)
|
||||
(cd ${SRS_OBJS}/utest; rm -rf *.o *.a)
|
||||
(cd research/librtmp; make clean)
|
||||
|
|
@ -313,26 +312,13 @@ install:
|
|||
|
||||
END
|
||||
|
||||
if [ $SRS_BWTC = YES ]; then
|
||||
cat << END >> ${SRS_MAKEFILE}
|
||||
bandwidth: server
|
||||
@echo "build the bandwidth test client tool"
|
||||
\$(MAKE) -f ${SRS_OBJS}/${SRS_MAKEFILE} bandwidth
|
||||
|
||||
END
|
||||
else
|
||||
cat << END >> ${SRS_MAKEFILE}
|
||||
bandwidth: server
|
||||
@echo "bandwidth test client tool is disabled, ignore."
|
||||
|
||||
END
|
||||
fi
|
||||
|
||||
if [ $SRS_LIBRTMP = YES ]; then
|
||||
cat << END >> ${SRS_MAKEFILE}
|
||||
librtmp: server
|
||||
@echo "build the client publish/play library."
|
||||
\$(MAKE) -f ${SRS_OBJS}/${SRS_MAKEFILE} librtmp
|
||||
@echo "build the srs-librtmp sample"
|
||||
(cd research/librtmp; \$(MAKE) ${SrsLibrtmpSampleEntry})
|
||||
|
||||
END
|
||||
else
|
||||
|
|
@ -340,23 +326,6 @@ else
|
|||
librtmp: server
|
||||
@echo "srs-librtmp is disabled, ignore."
|
||||
|
||||
END
|
||||
fi
|
||||
if [ $SRS_LIBRTMP = YES ]; then
|
||||
cat << END >> ${SRS_MAKEFILE}
|
||||
|
||||
librtmp-sample: librtmp
|
||||
@echo "build the srs-librtmp sample"
|
||||
(cd research/librtmp; \$(MAKE) ${SrsLibrtmpSampleEntry})
|
||||
@echo "srs-librtmp sample build success"
|
||||
|
||||
END
|
||||
else
|
||||
cat << END >> ${SRS_MAKEFILE}
|
||||
|
||||
librtmp-sample: librtmp
|
||||
@echo "srs-librtmp sample is disabled, ignore."
|
||||
|
||||
END
|
||||
fi
|
||||
|
||||
|
|
@ -406,7 +375,7 @@ AR = ar
|
|||
LINK = g++
|
||||
CXXFLAGS = ${CXXFLAGS}
|
||||
|
||||
.PHONY: default srs bandwidth librtmp
|
||||
.PHONY: default srs librtmp
|
||||
|
||||
default:
|
||||
|
||||
|
|
@ -491,7 +460,7 @@ LIBS_OBJS="${MODULE_OBJS[@]}"
|
|||
MODULE_ID="MAIN"
|
||||
MODULE_DEPENDS=("CORE" "KERNEL" "RTMP" "APP")
|
||||
ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS} ${LibGperfRoot})
|
||||
MODULE_FILES=("srs_main_server" "srs_main_bandcheck")
|
||||
MODULE_FILES=("srs_main_server")
|
||||
MAIN_INCS="src/main"; MODULE_DIR=${MAIN_INCS} . auto/modules.sh
|
||||
MAIN_OBJS="${MODULE_OBJS[@]}"
|
||||
|
||||
|
|
@ -500,7 +469,7 @@ MAIN_OBJS="${MODULE_OBJS[@]}"
|
|||
# then link to a binary, for example, objs/srs
|
||||
#
|
||||
# all main entrances
|
||||
MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck")
|
||||
MAIN_ENTRANCES=("srs_main_server")
|
||||
#
|
||||
# all depends libraries
|
||||
ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile} ${LibGperfFile})
|
||||
|
|
@ -511,10 +480,6 @@ LINK_OPTIONS="${SrsLinkOptions}${SrsGprofLink}${SrsGperfLink}"
|
|||
# srs:
|
||||
# srs(simple rtmp server) over st(state-threads)
|
||||
BUILD_KEY="srs" APP_MAIN="srs_main_server" APP_NAME="srs" . auto/apps.sh
|
||||
# bandwidth test tool, to test the bandwidth to server
|
||||
if [ $SRS_BWTC = YES ]; then
|
||||
BUILD_KEY="bandwidth" APP_MAIN="srs_main_bandcheck" APP_NAME="bandwidth" . auto/apps.sh
|
||||
fi
|
||||
# srs librtmp
|
||||
if [ $SRS_LIBRTMP = YES ]; then
|
||||
MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${LIBS_OBJS[@]}"
|
||||
|
|
@ -601,11 +566,6 @@ if [ $SRS_LIBRTMP = YES ]; then
|
|||
else
|
||||
echo -e "${YELLOW}note: srs-librtmp for client is disabled${BLACK}"
|
||||
fi
|
||||
if [ $SRS_BWTC = YES ]; then
|
||||
echo -e "${GREEN}srs bandwidth test client is enabled${BLACK}"
|
||||
else
|
||||
echo -e "${GREEN}note: srs bandwidth test client is disabled${BLACK}"
|
||||
fi
|
||||
if [ $SRS_RESEARCH = YES ]; then
|
||||
echo -e "${GREEN}research tools are builded${BLACK}"
|
||||
else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue