From f03646016456ba6fdfa1b375ee134fac27a6c1ea Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 23 Oct 2020 21:00:29 +0800 Subject: [PATCH 1/4] Update default srs.conf, enable HLS and HTTP-FLV --- trunk/conf/srs.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf index da062849a..736547445 100644 --- a/trunk/conf/srs.conf +++ b/trunk/conf/srs.conf @@ -5,6 +5,7 @@ listen 1935; max_connections 1000; srs_log_tank file; srs_log_file ./objs/srs.log; +daemon on; http_api { enabled on; listen 1985; @@ -19,4 +20,11 @@ stats { disk sda sdb xvda xvdb; } vhost __defaultVhost__ { + hls { + enabled on; + } + http_remux { + enabled on; + mount [vhost]/[app]/[stream].flv; + } } From e1ff69f292ead7b660241495c1b466739b310b47 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 23 Oct 2020 21:14:40 +0800 Subject: [PATCH 2/4] Refine build script, use libssl in docker. 3.0.146 --- README.md | 1 + trunk/auto/depends.sh | 4 ++-- trunk/src/core/srs_core_version3.hpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6c8e5be6a..d45fecb37 100755 --- a/README.md +++ b/README.md @@ -145,6 +145,7 @@ For previous versions, please read: ## V3 changes +* v3.0, 2020-10-23, Refine build script, use libssl in docker. 3.0.146 * v3.0, 2020-10-14, Fix [#1987][bug #1987], Fix Kbps resample bug. 3.0.145 * v3.0, 2020-10-10, [3.0 release1(3.0.144)][r3.0r1] released. 122674 lines. * v3.0, 2020-10-10, Fix [#1780][bug #1780], build fail on Ubuntu20(focal). 3.0.144 diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index b5d5aa627..0fbe764df 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -447,9 +447,9 @@ if [[ $SRS_SSL == YES && $SRS_USE_SYS_SSL != YES ]]; then OPENSSL_CONFIG="./Configure linux-armv4" else # If not crossbuild, try to use exists libraries. - if [[ -f /usr/local/lib64/libssl.a && ! -f ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib/libssl.a ]]; then + if [[ -f /usr/local/ssl/lib/libssl.a && ! -f ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib/libssl.a ]]; then (mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib && cd ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib && - ln -sf /usr/local/lib64/libssl.a && ln -sf /usr/local/lib64/libcrypto.a) + ln -sf /usr/local/ssl/lib/libssl.a && ln -sf /usr/local/ssl/lib/libcrypto.a) (mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/openssl/include && cd ${SRS_OBJS}/${SRS_PLATFORM}/openssl/include && ln -sf /usr/local/include/openssl) fi diff --git a/trunk/src/core/srs_core_version3.hpp b/trunk/src/core/srs_core_version3.hpp index 6b933fbfc..4f18f8a52 100644 --- a/trunk/src/core/srs_core_version3.hpp +++ b/trunk/src/core/srs_core_version3.hpp @@ -24,6 +24,6 @@ #ifndef SRS_CORE_VERSION3_HPP #define SRS_CORE_VERSION3_HPP -#define SRS_VERSION3_REVISION 145 +#define SRS_VERSION3_REVISION 146 #endif From 1d92ff73fb62ef8b5d8ee76bc344ba41aea20845 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 23 Oct 2020 21:24:29 +0800 Subject: [PATCH 3/4] Fix build script --- trunk/auto/depends.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 0fbe764df..3e3500681 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -446,12 +446,13 @@ if [[ $SRS_SSL == YES && $SRS_USE_SYS_SSL != YES ]]; then if [[ $SRS_CROSS_BUILD == YES ]]; then OPENSSL_CONFIG="./Configure linux-armv4" else - # If not crossbuild, try to use exists libraries. - if [[ -f /usr/local/ssl/lib/libssl.a && ! -f ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib/libssl.a ]]; then + # Try to use exists libraries. + if [[ -f /usr/local/ssl/lib/libssl.a ]]; then (mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib && cd ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib && - ln -sf /usr/local/ssl/lib/libssl.a && ln -sf /usr/local/ssl/lib/libcrypto.a) + ln -sf /usr/local/ssl/lib/libssl.a && ln -sf /usr/local/ssl/lib/libcrypto.a && + mkdir -p /usr/local/ssl/lib/pkgconfig && ln -sf /usr/local/ssl/lib/pkgconfig) (mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/openssl/include && cd ${SRS_OBJS}/${SRS_PLATFORM}/openssl/include && - ln -sf /usr/local/include/openssl) + ln -sf /usr/local/ssl/include/openssl) fi fi # Which lib we use. From 6dc3d85ded0b86e9d2cc291c57a7a720ac9c83f1 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 23 Oct 2020 21:32:57 +0800 Subject: [PATCH 4/4] Allow FFmpeg if exists at /usr/local/bin/ffmpeg. 3.0.147 --- README.md | 1 + trunk/auto/depends.sh | 11 ++++++++--- trunk/auto/options.sh | 4 ---- trunk/src/core/srs_core_version3.hpp | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d45fecb37..8a54613bb 100755 --- a/README.md +++ b/README.md @@ -145,6 +145,7 @@ For previous versions, please read: ## V3 changes +* v3.0, 2020-10-23, Allow FFmpeg if exists at /usr/local/bin/ffmpeg. 3.0.147 * v3.0, 2020-10-23, Refine build script, use libssl in docker. 3.0.146 * v3.0, 2020-10-14, Fix [#1987][bug #1987], Fix Kbps resample bug. 3.0.145 * v3.0, 2020-10-10, [3.0 release1(3.0.144)][r3.0r1] released. 122674 lines. diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 3e3500681..4c3e642cd 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -484,7 +484,7 @@ fi # live transcoding, ffmpeg-4.1, x264-core157, lame-3.99.5, libaacplus-2.0.2. ##################################################################################### # Always link the ffmpeg tools if exists. -if [[ -f /usr/local/bin/ffmpeg && ! -f ${SRS_OBJS}/ffmpeg/bin/ffmpeg ]]; then +if [[ -f /usr/local/bin/ffmpeg && ! -f ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg ]]; then mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg/bin && ln -sf /usr/local/bin/ffmpeg ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg/bin/ffmpeg && (cd ${SRS_OBJS} && rm -rf ffmpeg && ln -sf ${SRS_PLATFORM}/ffmpeg) @@ -493,11 +493,16 @@ if [ $SRS_FFMPEG_TOOL = YES ]; then if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg/bin/ffmpeg ]]; then echo "ffmpeg-4.1 is ok."; else - echo "no ffmpeg found, please use srs-docker or --without-ffmpeg"; + echo "Warning: No FFmpeg found at /usr/local/bin/ffmpeg"; + echo " please copy it from srs-docker"; + echo " or download from http://ffmpeg.org/download.html"; + echo " or disable it by --without-ffmpeg"; exit -1; fi # Always update the links. - (cd ${SRS_OBJS} && rm -rf ffmpeg && ln -sf ${SRS_PLATFORM}/ffmpeg) + if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg ]]; then + (cd ${SRS_OBJS} && rm -rf ffmpeg && ln -sf ${SRS_PLATFORM}/ffmpeg) + fi fi ##################################################################################### diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index d6a52d83d..d6d1ddd3c 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -569,10 +569,6 @@ function check_option_conflicts() { echo "Don't support building NGINX, please use docker https://github.com/ossrs/srs-docker"; exit -1; fi - if [[ $SRS_FFMPEG_TOOL == YES ]]; then - echo "Don't support building FFMPEG, please use docker https://github.com/ossrs/srs-docker"; exit -1; - fi - # TODO: FIXME: check more os. __check_ok=YES diff --git a/trunk/src/core/srs_core_version3.hpp b/trunk/src/core/srs_core_version3.hpp index 4f18f8a52..b29289a07 100644 --- a/trunk/src/core/srs_core_version3.hpp +++ b/trunk/src/core/srs_core_version3.hpp @@ -24,6 +24,6 @@ #ifndef SRS_CORE_VERSION3_HPP #define SRS_CORE_VERSION3_HPP -#define SRS_VERSION3_REVISION 146 +#define SRS_VERSION3_REVISION 147 #endif