diff --git a/trunk/auto/auto_headers.sh b/trunk/auto/auto_headers.sh index a0bf149b2..fa6a55e58 100755 --- a/trunk/auto/auto_headers.sh +++ b/trunk/auto/auto_headers.sh @@ -39,11 +39,6 @@ function srs_undefine_macro() echo "#define ${macro}_BOOL false" >> $file } -# export the preset. -echo "#undef SRS_EXPORT_LIBRTMP" >> $SRS_AUTO_HEADERS_H - -echo "" >> $SRS_AUTO_HEADERS_H - ##################################################################################### # generate auto headers file, depends on the finished of options.sh ##################################################################################### diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index 35354c465..633eaad34 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -349,6 +349,13 @@ function parse_user_option() { --without-mips-ubuntu12) SRS_CROSS_BUILD=NO ;; --mips-ubuntu12) if [[ $value == off ]]; then SRS_CROSS_BUILD=NO; else SRS_CROSS_BUILD=YES; fi ;; + # Removed features. + --export-librtmp-project) SRS_EXPORT_LIBRTMP_PROJECT=${value} ;; + --export-librtmp-single) SRS_EXPORT_LIBRTMP_SINGLE=${value} ;; + --with-librtmp) SRS_LIBRTMP=YES ;; + --without-librtmp) SRS_LIBRTMP=NO ;; + --librtmp) if [[ $value == off ]]; then SRS_LIBRTMP=NO; else SRS_LIBRTMP=YES; fi ;; + # Deprecated, might be removed in future. --with-nginx) SRS_NGINX=YES ;; --without-nginx) SRS_NGINX=NO ;; @@ -356,11 +363,6 @@ function parse_user_option() { --with-ffmpeg) SRS_FFMPEG_TOOL=YES ;; --without-ffmpeg) SRS_FFMPEG_TOOL=NO ;; --ffmpeg-tool) if [[ $value == off ]]; then SRS_FFMPEG_TOOL=NO; else SRS_FFMPEG_TOOL=YES; fi ;; - --export-librtmp-project) SRS_EXPORT_LIBRTMP_PROJECT=${value} ;; - --export-librtmp-single) SRS_EXPORT_LIBRTMP_SINGLE=${value} ;; - --with-librtmp) SRS_LIBRTMP=YES ;; - --without-librtmp) SRS_LIBRTMP=NO ;; - --librtmp) if [[ $value == off ]]; then SRS_LIBRTMP=NO; else SRS_LIBRTMP=YES; fi ;; # Ignore the options. --demo) echo "Ignore $option" ;; @@ -476,19 +478,16 @@ function apply_detail_options() { # if specified export single file, export project first. if [ $SRS_EXPORT_LIBRTMP_SINGLE != NO ]; then - echo "Warning: Ingore --export-librtmp-single" - SRS_EXPORT_LIBRTMP_SINGLE=NO + echo "Error: srs-librtmp is removed, please read https://github.com/ossrs/srs-librtmp/issues/32"; exit 1 fi # disable almost all features for export srs-librtmp. if [ $SRS_EXPORT_LIBRTMP_PROJECT != NO ]; then - echo "Warning: Ingore --export-librtmp-project" - SRS_EXPORT_LIBRTMP_PROJECT=NO + echo "Error: srs-librtmp is removed, please read https://github.com/ossrs/srs-librtmp/issues/32"; exit 1 fi if [[ $SRS_LIBRTMP != NO ]]; then - echo "Warning: Ingore --librtmp" - SRS_LIBRTMP=NO + echo "Error: srs-librtmp is removed, please read https://github.com/ossrs/srs-librtmp/issues/32"; exit 1 fi if [[ $SRS_RESEARCH != NO ]]; then diff --git a/trunk/src/app/srs_app_gb28181_stack.cpp b/trunk/src/app/srs_app_gb28181_stack.cpp index 198a270c6..c5bcfda0c 100644 --- a/trunk/src/app/srs_app_gb28181_stack.cpp +++ b/trunk/src/app/srs_app_gb28181_stack.cpp @@ -23,8 +23,6 @@ #include -#if !defined(SRS_EXPORT_LIBRTMP) - #include #include #include @@ -1457,5 +1455,3 @@ void SrsSipStack::req_ptz(std::stringstream& ss, SrsSipRequest *req, uint8_t cmd } -#endif - diff --git a/trunk/src/app/srs_app_gb28181_stack.hpp b/trunk/src/app/srs_app_gb28181_stack.hpp index 67651e740..87e7e1509 100644 --- a/trunk/src/app/srs_app_gb28181_stack.hpp +++ b/trunk/src/app/srs_app_gb28181_stack.hpp @@ -26,8 +26,6 @@ #include -#if !defined(SRS_EXPORT_LIBRTMP) - #include #include #include @@ -185,5 +183,3 @@ public: #endif -#endif - diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index c649f76bb..d24cb1b84 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -98,13 +98,10 @@ } \ (void)0 -// For librtmp, it is pure c++ and supports all OS. -#ifndef SRS_EXPORT_LIBRTMP - // Checking for st(state-threads), only support the following cpus: i386/amd64/x86_64/arm - // @reamrk To patch ST for arm, read https://github.com/ossrs/state-threads/issues/1 - #if !defined(__amd64__) && !defined(__x86_64__) && !defined(__i386__) && !defined(__arm__) && !defined(__aarch64__) - #error "only support i386/amd64/x86_64/arm cpu" - #endif +// Checking for st(state-threads), only support the following cpus: i386/amd64/x86_64/arm +// @reamrk To patch ST for arm, read https://github.com/ossrs/state-threads/issues/1 +#if !defined(__amd64__) && !defined(__x86_64__) && !defined(__i386__) && !defined(__arm__) && !defined(__aarch64__) + #error "only support i386/amd64/x86_64/arm cpu" #endif // Error predefined for all modules. diff --git a/trunk/src/kernel/srs_kernel_aac.cpp b/trunk/src/kernel/srs_kernel_aac.cpp index 89d28a2b1..47749c5f0 100644 --- a/trunk/src/kernel/srs_kernel_aac.cpp +++ b/trunk/src/kernel/srs_kernel_aac.cpp @@ -23,8 +23,6 @@ #include -#if !defined(SRS_EXPORT_LIBRTMP) - // for srs-librtmp, @see https://github.com/ossrs/srs/issues/213 #ifndef _WIN32 #include @@ -202,5 +200,3 @@ srs_error_t SrsAacTransmuxer::write_audio(int64_t timestamp, char* data, int siz return err; } -#endif - diff --git a/trunk/src/kernel/srs_kernel_aac.hpp b/trunk/src/kernel/srs_kernel_aac.hpp index 5136b6210..14281827f 100644 --- a/trunk/src/kernel/srs_kernel_aac.hpp +++ b/trunk/src/kernel/srs_kernel_aac.hpp @@ -26,8 +26,6 @@ #include -#if !defined(SRS_EXPORT_LIBRTMP) - #include #include @@ -61,5 +59,3 @@ public: #endif -#endif - diff --git a/trunk/src/kernel/srs_kernel_mp3.cpp b/trunk/src/kernel/srs_kernel_mp3.cpp index 6b7d9229d..df5c91788 100644 --- a/trunk/src/kernel/srs_kernel_mp3.cpp +++ b/trunk/src/kernel/srs_kernel_mp3.cpp @@ -23,8 +23,6 @@ #include -#if !defined(SRS_EXPORT_LIBRTMP) - // for srs-librtmp, @see https://github.com/ossrs/srs/issues/213 #ifndef _WIN32 #include @@ -126,5 +124,3 @@ srs_error_t SrsMp3Transmuxer::write_audio(int64_t timestamp, char* data, int siz return err; } -#endif - diff --git a/trunk/src/kernel/srs_kernel_mp3.hpp b/trunk/src/kernel/srs_kernel_mp3.hpp index f2e9c6055..581fe38dc 100644 --- a/trunk/src/kernel/srs_kernel_mp3.hpp +++ b/trunk/src/kernel/srs_kernel_mp3.hpp @@ -26,8 +26,6 @@ #include -#if !defined(SRS_EXPORT_LIBRTMP) - #include class SrsBuffer; @@ -65,5 +63,3 @@ public: #endif -#endif - diff --git a/trunk/src/kernel/srs_kernel_ts.cpp b/trunk/src/kernel/srs_kernel_ts.cpp index 8bce1e9c4..0db82e797 100644 --- a/trunk/src/kernel/srs_kernel_ts.cpp +++ b/trunk/src/kernel/srs_kernel_ts.cpp @@ -23,8 +23,6 @@ #include -#if !defined(SRS_EXPORT_LIBRTMP) - // for srs-librtmp, @see https://github.com/ossrs/srs/issues/213 #ifndef _WIN32 #include @@ -3174,5 +3172,3 @@ srs_error_t SrsTsTransmuxer::flush_video() return err; } -#endif - diff --git a/trunk/src/kernel/srs_kernel_ts.hpp b/trunk/src/kernel/srs_kernel_ts.hpp index 303a5262b..14a77e422 100644 --- a/trunk/src/kernel/srs_kernel_ts.hpp +++ b/trunk/src/kernel/srs_kernel_ts.hpp @@ -26,8 +26,6 @@ #include -#if !defined(SRS_EXPORT_LIBRTMP) - #include #include #include @@ -1350,5 +1348,3 @@ private: #endif -#endif - diff --git a/trunk/src/protocol/srs_http_stack.cpp b/trunk/src/protocol/srs_http_stack.cpp index 440a3de1f..acb196f70 100644 --- a/trunk/src/protocol/srs_http_stack.cpp +++ b/trunk/src/protocol/srs_http_stack.cpp @@ -23,8 +23,6 @@ #include -#if !defined(SRS_EXPORT_LIBRTMP) - #include #include #include @@ -1346,9 +1344,6 @@ srs_error_t SrsHttpUri::path_unescape(std::string s, std::string& value) return unescapse(s, value, encodePathSegment); } -// For #if !defined(SRS_EXPORT_LIBRTMP) -#endif - // LCOV_EXCL_START ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/trunk/src/protocol/srs_http_stack.hpp b/trunk/src/protocol/srs_http_stack.hpp index 736b81800..99a867b7a 100644 --- a/trunk/src/protocol/srs_http_stack.hpp +++ b/trunk/src/protocol/srs_http_stack.hpp @@ -28,8 +28,6 @@ #include -#if !defined(SRS_EXPORT_LIBRTMP) - #include #include #include @@ -549,9 +547,6 @@ public: static srs_error_t path_unescape(std::string s, std::string& value); }; -// For #if !defined(SRS_EXPORT_LIBRTMP) -#endif - // For #ifndef SRS_PROTOCOL_HTTP_HPP #endif diff --git a/trunk/src/protocol/srs_rtsp_stack.cpp b/trunk/src/protocol/srs_rtsp_stack.cpp index 8755dcea9..618b2d456 100644 --- a/trunk/src/protocol/srs_rtsp_stack.cpp +++ b/trunk/src/protocol/srs_rtsp_stack.cpp @@ -23,8 +23,6 @@ #include -#if !defined(SRS_EXPORT_LIBRTMP) - #include #include using namespace std; @@ -1100,5 +1098,3 @@ srs_error_t SrsRtspStack::recv_token(std::string& token, SrsRtspTokenState& stat return err; } -#endif - diff --git a/trunk/src/protocol/srs_rtsp_stack.hpp b/trunk/src/protocol/srs_rtsp_stack.hpp index 0f8359f10..3b0da4538 100644 --- a/trunk/src/protocol/srs_rtsp_stack.hpp +++ b/trunk/src/protocol/srs_rtsp_stack.hpp @@ -26,8 +26,6 @@ #include -#if !defined(SRS_EXPORT_LIBRTMP) - #include #include @@ -578,5 +576,3 @@ private: #endif -#endif -