From a3c229472e4a5d7aae8d868457cd3f68918a2cc1 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 1 Oct 2015 13:04:28 +0800 Subject: [PATCH] fix #495, decrease the srs-librtmp size. 2.0.193 --- README.md | 2 ++ trunk/auto/auto_headers.sh | 5 +++++ trunk/src/core/srs_core.hpp | 2 +- trunk/src/kernel/srs_kernel_aac.cpp | 4 ++++ trunk/src/kernel/srs_kernel_aac.hpp | 4 ++++ trunk/src/kernel/srs_kernel_codec.cpp | 4 ++++ trunk/src/kernel/srs_kernel_codec.hpp | 5 +++++ trunk/src/kernel/srs_kernel_mp3.cpp | 4 ++++ trunk/src/kernel/srs_kernel_mp3.hpp | 4 ++++ trunk/src/kernel/srs_kernel_ts.cpp | 3 +++ trunk/src/kernel/srs_kernel_ts.hpp | 4 ++++ trunk/src/protocol/srs_http_stack.cpp | 5 +++++ trunk/src/protocol/srs_http_stack.hpp | 9 +++++++-- trunk/src/protocol/srs_rtsp_stack.cpp | 4 ++++ trunk/src/protocol/srs_rtsp_stack.hpp | 4 ++++ 15 files changed, 60 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c352bc492..c6810f853 100755 --- a/README.md +++ b/README.md @@ -335,6 +335,7 @@ Remark: ## History +* v2.0, 2015-10-01, for [#495][bug #495] decrease the srs-librtmp size. 2.0.193 * v2.0, 2015-09-23, for [#485][bug #485] error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192 * v2.0, 2015-09-23, for [#485][bug #485] srs for respberrypi and cubieboard. 2.0.191 * v2.0, 2015-09-21, fix [#484][bug #484] hotfix the openssl build script 2.0.190 @@ -1027,6 +1028,7 @@ Winlin [bug #474]: https://github.com/simple-rtmp-server/srs/issues/474 [bug #484]: https://github.com/simple-rtmp-server/srs/issues/484 [bug #485]: https://github.com/simple-rtmp-server/srs/issues/485 +[bug #495]: https://github.com/simple-rtmp-server/srs/issues/495 [bug #475]: https://github.com/simple-rtmp-server/srs/issues/475 [bug #458]: https://github.com/simple-rtmp-server/srs/issues/458 [bug #454]: https://github.com/simple-rtmp-server/srs/issues/454 diff --git a/trunk/auto/auto_headers.sh b/trunk/auto/auto_headers.sh index 1174ce9b9..11949e151 100755 --- a/trunk/auto/auto_headers.sh +++ b/trunk/auto/auto_headers.sh @@ -37,6 +37,11 @@ fi if [ $SRS_CUBIE = YES ]; then echo "#define SRS_CUBIE" >> $SRS_AUTO_HEADERS_H fi +if [ $SRS_EXPORT_LIBRTMP_PROJECT != NO ]; then + echo "#define SRS_EXPORT_LIBRTMP" >> $SRS_AUTO_HEADERS_H +else + echo "#undef SRS_EXPORT_LIBRTMP" >> $SRS_AUTO_HEADERS_H +fi echo "" >> $SRS_AUTO_HEADERS_H diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 942be228b..b3ac9b820 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR 2 #define VERSION_MINOR 0 -#define VERSION_REVISION 192 +#define VERSION_REVISION 193 // server info. #define RTMP_SIG_SRS_KEY "SRS" diff --git a/trunk/src/kernel/srs_kernel_aac.cpp b/trunk/src/kernel/srs_kernel_aac.cpp index 8c75e6a4c..362747731 100644 --- a/trunk/src/kernel/srs_kernel_aac.cpp +++ b/trunk/src/kernel/srs_kernel_aac.cpp @@ -23,6 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include +#if !defined(SRS_EXPORT_LIBRTMP) + // for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213 #ifndef _WIN32 #include @@ -218,3 +220,5 @@ int SrsAacEncoder::write_audio(int64_t timestamp, char* data, int size) return ret; } +#endif + diff --git a/trunk/src/kernel/srs_kernel_aac.hpp b/trunk/src/kernel/srs_kernel_aac.hpp index ac57823a4..0179832ba 100644 --- a/trunk/src/kernel/srs_kernel_aac.hpp +++ b/trunk/src/kernel/srs_kernel_aac.hpp @@ -29,6 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include +#if !defined(SRS_EXPORT_LIBRTMP) + #include #include @@ -71,3 +73,5 @@ public: #endif +#endif + diff --git a/trunk/src/kernel/srs_kernel_codec.cpp b/trunk/src/kernel/srs_kernel_codec.cpp index fddd112df..875f4ef26 100644 --- a/trunk/src/kernel/srs_kernel_codec.cpp +++ b/trunk/src/kernel/srs_kernel_codec.cpp @@ -380,6 +380,8 @@ int SrsCodecSample::add_sample_unit(char* bytes, int size) return ret; } +#if !defined(SRS_EXPORT_LIBRTMP) + SrsAvcAacCodec::SrsAvcAacCodec() { avc_parse_sps = true; @@ -1225,3 +1227,5 @@ int SrsAvcAacCodec::avc_demux_ibmf_format(SrsStream* stream, SrsCodecSample* sam return ret; } +#endif + diff --git a/trunk/src/kernel/srs_kernel_codec.hpp b/trunk/src/kernel/srs_kernel_codec.hpp index 3b1c7845b..c47628276 100644 --- a/trunk/src/kernel/srs_kernel_codec.hpp +++ b/trunk/src/kernel/srs_kernel_codec.hpp @@ -525,6 +525,8 @@ enum SrsAvcLevel }; std::string srs_codec_avc_level2str(SrsAvcLevel level); +#if !defined(SRS_EXPORT_LIBRTMP) + /** * the h264/avc and aac codec, for media stream. * @@ -663,3 +665,6 @@ private: }; #endif + +#endif + diff --git a/trunk/src/kernel/srs_kernel_mp3.cpp b/trunk/src/kernel/srs_kernel_mp3.cpp index 34998be03..123892c78 100644 --- a/trunk/src/kernel/srs_kernel_mp3.cpp +++ b/trunk/src/kernel/srs_kernel_mp3.cpp @@ -23,6 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include +#if !defined(SRS_EXPORT_LIBRTMP) + // for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213 #ifndef _WIN32 #include @@ -125,3 +127,5 @@ int SrsMp3Encoder::write_audio(int64_t timestamp, char* data, int size) return writer->write(data + stream->pos(), size - stream->pos(), NULL); } +#endif + diff --git a/trunk/src/kernel/srs_kernel_mp3.hpp b/trunk/src/kernel/srs_kernel_mp3.hpp index 5a42dc2db..1b8b0d97c 100644 --- a/trunk/src/kernel/srs_kernel_mp3.hpp +++ b/trunk/src/kernel/srs_kernel_mp3.hpp @@ -29,6 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include +#if !defined(SRS_EXPORT_LIBRTMP) + #include class SrsStream; @@ -68,3 +70,5 @@ public: #endif +#endif + diff --git a/trunk/src/kernel/srs_kernel_ts.cpp b/trunk/src/kernel/srs_kernel_ts.cpp index 433aaa201..0ae7d58a5 100644 --- a/trunk/src/kernel/srs_kernel_ts.cpp +++ b/trunk/src/kernel/srs_kernel_ts.cpp @@ -23,6 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include +#if !defined(SRS_EXPORT_LIBRTMP) + // for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213 #ifndef _WIN32 #include @@ -3212,4 +3214,5 @@ int SrsTsEncoder::flush_video() return ret; } +#endif diff --git a/trunk/src/kernel/srs_kernel_ts.hpp b/trunk/src/kernel/srs_kernel_ts.hpp index 772524f1d..e20778afc 100644 --- a/trunk/src/kernel/srs_kernel_ts.hpp +++ b/trunk/src/kernel/srs_kernel_ts.hpp @@ -29,6 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include +#if !defined(SRS_EXPORT_LIBRTMP) + #include #include #include @@ -1656,3 +1658,5 @@ private: #endif +#endif + diff --git a/trunk/src/protocol/srs_http_stack.cpp b/trunk/src/protocol/srs_http_stack.cpp index 33f89e7af..fb143805d 100755 --- a/trunk/src/protocol/srs_http_stack.cpp +++ b/trunk/src/protocol/srs_http_stack.cpp @@ -23,6 +23,8 @@ #include +#if !defined(SRS_EXPORT_LIBRTMP) + #include #include #include @@ -779,3 +781,6 @@ char* ISrsHttpMessage::http_ts_send_buffer() { return _http_ts_send_buffer; } + +#endif + diff --git a/trunk/src/protocol/srs_http_stack.hpp b/trunk/src/protocol/srs_http_stack.hpp index 5d119d16b..9116d51d5 100644 --- a/trunk/src/protocol/srs_http_stack.hpp +++ b/trunk/src/protocol/srs_http_stack.hpp @@ -25,10 +25,12 @@ #define SRS_PROTOCOL_HTTP_HPP /* - #include - */ +#include +*/ #include +#if !defined(SRS_EXPORT_LIBRTMP) + #include #include #include @@ -536,3 +538,6 @@ public: }; #endif + +#endif + diff --git a/trunk/src/protocol/srs_rtsp_stack.cpp b/trunk/src/protocol/srs_rtsp_stack.cpp index 1bc90ac93..5b691607f 100644 --- a/trunk/src/protocol/srs_rtsp_stack.cpp +++ b/trunk/src/protocol/srs_rtsp_stack.cpp @@ -23,6 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include +#if !defined(SRS_EXPORT_LIBRTMP) + #include #include using namespace std; @@ -1182,3 +1184,5 @@ int SrsRtspStack::recv_token(std::string& token, SrsRtspTokenState& state, char #endif +#endif + diff --git a/trunk/src/protocol/srs_rtsp_stack.hpp b/trunk/src/protocol/srs_rtsp_stack.hpp index 1d00e989c..a382f26ae 100644 --- a/trunk/src/protocol/srs_rtsp_stack.hpp +++ b/trunk/src/protocol/srs_rtsp_stack.hpp @@ -30,6 +30,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include +#if !defined(SRS_EXPORT_LIBRTMP) + #include #include @@ -714,3 +716,5 @@ private: #endif +#endif +