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

Revert "supprot LAS(live adaptive stream)"

Browse source 
This reverts commit c1f98ddcc8.
This commit is contained in:
winlin 2020-08-06 12:02:32 +08:00
parent 0f62587303
commit 4984bcbaef
10 changed files with 10 additions and 844 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/auto/auto_headers.sh
View file

@ -63,12 +63,6 @@ else
srs_undefine_macro "SRS_HDS" $SRS_AUTO_HEADERS_H
fi
if [ $SRS_LAS = YES ]; then
srs_define_macro "SRS_LAS" $SRS_AUTO_HEADERS_H
else
srs_undefine_macro "SRS_LAS" $SRS_AUTO_HEADERS_H
fi
if [ $SRS_SRT = YES ]; then
srs_define_macro "SRS_SRT" $SRS_AUTO_HEADERS_H
else

8
trunk/auto/options.sh
View file

@ -16,7 +16,6 @@ help=no
################################################################
# feature options
SRS_HDS=NO
SRS_LAS=NO
SRS_SRT=NO
SRS_RTC=YES
SRS_GB28181=NO
@ -147,7 +146,6 @@ Features:
--ssl=on|off Whether build the rtmp complex handshake, requires openssl-devel installed.
--hds=on|off Whether build the hds streaming, mux RTMP to F4M/F4V files.
--las=on|off Whether use LAS for http-flv adaptive stream.
--stream-caster=on|off Whether build the stream caster to serve other stream over other protocol.
--stat=on|off Whether build the the data statistic, for http api.
--librtmp=on|off Whether build the srs-librtmp, library for client.
@ -281,10 +279,6 @@ function parse_user_option() {
--without-hds) SRS_HDS=NO ;;
--hds) if [[ $value == off ]]; then SRS_HDS=NO; else SRS_HDS=YES; fi ;;
--with-las) SRS_LAS=YES ;;
--without-las) SRS_LAS=NO ;;
--las) if [[ $value == off ]]; then SRS_LAS=NO; else SRS_LAS=YES; fi ;;
--with-nginx) SRS_NGINX=YES ;;
--without-nginx) SRS_NGINX=NO ;;
--nginx) if [[ $value == off ]]; then SRS_NGINX=NO; else SRS_NGINX=YES; fi ;;
@ -532,7 +526,6 @@ function regenerate_options() {
SRS_AUTO_CONFIGURE="--prefix=${SRS_PREFIX}"
if [ $SRS_HLS = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --hls=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --hls=off"; fi
if [ $SRS_HDS = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --hds=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --hds=off"; fi
if [ $SRS_LAS = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --las=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --las=off"; fi
if [ $SRS_DVR = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --dvr=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --dvr=off"; fi
if [ $SRS_SSL = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --ssl=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --ssl=off"; fi
if [ $SRS_USE_SYS_SSL = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --sys-ssl=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --sys-ssl=off"; fi
@ -631,7 +624,6 @@ function check_option_conflicts() {
# check variable neccessary
if [ $SRS_HDS = RESERVED ]; then echo "you must specifies the hds, see: ./configure --help"; __check_ok=NO; fi
if [ $SRS_LAS = RESERVED ]; then echo "you must specifies the las, 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_UTEST = RESERVED ]; then echo "you must specifies the utest, see: ./configure --help"; __check_ok=NO; fi