From 7b24788445031dba778c01ef0610985caffb78ea Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 2 Aug 2014 22:18:39 +0800 Subject: [PATCH] for bug #143, build on centos5. --- trunk/src/app/srs_app_avc_aac.cpp | 1 + trunk/src/app/srs_app_avc_aac.hpp | 1 + trunk/src/app/srs_app_bandwidth.cpp | 1 + trunk/src/app/srs_app_bandwidth.hpp | 2 +- trunk/src/app/srs_app_config.cpp | 3 ++- trunk/src/app/srs_app_config.hpp | 2 +- trunk/src/app/srs_app_conn.cpp | 1 + trunk/src/app/srs_app_conn.hpp | 2 +- trunk/src/app/srs_app_dvr.cpp | 1 + trunk/src/app/srs_app_dvr.hpp | 1 + trunk/src/app/srs_app_edge.cpp | 1 + trunk/src/app/srs_app_edge.hpp | 1 + trunk/src/app/srs_app_empty.cpp | 1 + trunk/src/app/srs_app_empty.hpp | 1 + trunk/src/app/srs_app_encoder.cpp | 1 + trunk/src/app/srs_app_encoder.hpp | 1 + trunk/src/app/srs_app_ffmpeg.cpp | 1 + trunk/src/app/srs_app_ffmpeg.hpp | 1 + trunk/src/app/srs_app_forward.cpp | 1 + trunk/src/app/srs_app_forward.hpp | 1 + trunk/src/app/srs_app_heartbeat.cpp | 1 + trunk/src/app/srs_app_heartbeat.hpp | 1 + trunk/src/app/srs_app_hls.cpp | 5 +++-- trunk/src/app/srs_app_hls.hpp | 2 +- trunk/src/app/srs_app_http.cpp | 1 + trunk/src/app/srs_app_http.hpp | 2 +- trunk/src/app/srs_app_http_api.cpp | 1 + trunk/src/app/srs_app_http_api.hpp | 1 + trunk/src/app/srs_app_http_client.cpp | 1 + trunk/src/app/srs_app_http_client.hpp | 1 + trunk/src/app/srs_app_http_conn.cpp | 1 + trunk/src/app/srs_app_http_conn.hpp | 1 + trunk/src/app/srs_app_http_hooks.cpp | 1 + trunk/src/app/srs_app_http_hooks.hpp | 1 + trunk/src/app/srs_app_ingest.cpp | 1 + trunk/src/app/srs_app_ingest.hpp | 1 + trunk/src/app/srs_app_json.cpp | 1 + trunk/src/app/srs_app_json.hpp | 2 +- trunk/src/app/srs_app_kbps.cpp | 1 + trunk/src/app/srs_app_kbps.hpp | 2 +- trunk/src/app/srs_app_log.cpp | 1 + trunk/src/app/srs_app_log.hpp | 1 + trunk/src/app/srs_app_pithy_print.cpp | 1 + trunk/src/app/srs_app_pithy_print.hpp | 2 +- trunk/src/app/srs_app_refer.cpp | 1 + trunk/src/app/srs_app_refer.hpp | 2 +- trunk/src/app/srs_app_reload.cpp | 1 + trunk/src/app/srs_app_reload.hpp | 2 +- trunk/src/app/srs_app_rtmp_conn.cpp | 5 +++-- trunk/src/app/srs_app_rtmp_conn.hpp | 1 + trunk/src/app/srs_app_server.cpp | 1 + trunk/src/app/srs_app_server.hpp | 2 +- trunk/src/app/srs_app_source.cpp | 1 + trunk/src/app/srs_app_source.hpp | 2 +- trunk/src/app/srs_app_st.cpp | 1 + trunk/src/app/srs_app_st.hpp | 1 + trunk/src/app/srs_app_st_socket.cpp | 1 + trunk/src/app/srs_app_st_socket.hpp | 2 +- trunk/src/app/srs_app_thread.cpp | 1 + trunk/src/app/srs_app_thread.hpp | 1 + trunk/src/app/srs_app_utility.cpp | 1 + trunk/src/app/srs_app_utility.hpp | 1 + trunk/src/core/srs_core.cpp | 1 + trunk/src/core/srs_core.hpp | 1 + trunk/src/core/srs_core_autofree.cpp | 1 + trunk/src/core/srs_core_autofree.hpp | 2 +- trunk/src/kernel/srs_kernel_buffer.cpp | 1 + trunk/src/kernel/srs_kernel_buffer.hpp | 2 +- trunk/src/kernel/srs_kernel_codec.cpp | 1 + trunk/src/kernel/srs_kernel_codec.hpp | 2 +- trunk/src/kernel/srs_kernel_consts.cpp | 1 + trunk/src/kernel/srs_kernel_consts.hpp | 1 + trunk/src/kernel/srs_kernel_error.cpp | 1 + trunk/src/kernel/srs_kernel_error.hpp | 1 + trunk/src/kernel/srs_kernel_file.cpp | 1 + trunk/src/kernel/srs_kernel_file.hpp | 1 + trunk/src/kernel/srs_kernel_flv.cpp | 1 + trunk/src/kernel/srs_kernel_flv.hpp | 1 + trunk/src/kernel/srs_kernel_log.cpp | 1 + trunk/src/kernel/srs_kernel_log.hpp | 1 + trunk/src/kernel/srs_kernel_stream.cpp | 1 + trunk/src/kernel/srs_kernel_stream.hpp | 2 +- trunk/src/kernel/srs_kernel_utility.cpp | 1 + trunk/src/kernel/srs_kernel_utility.hpp | 1 + trunk/src/libs/srs_lib_bandwidth.cpp | 1 + trunk/src/libs/srs_lib_bandwidth.hpp | 1 + trunk/src/libs/srs_lib_simple_socket.cpp | 1 + trunk/src/libs/srs_lib_simple_socket.hpp | 1 + trunk/src/libs/srs_librtmp.cpp | 1 + trunk/src/libs/srs_librtmp.hpp | 1 + trunk/src/main/srs_main_server.cpp | 1 + trunk/src/rtmp/srs_protocol_amf0.cpp | 1 + trunk/src/rtmp/srs_protocol_amf0.hpp | 2 +- trunk/src/rtmp/srs_protocol_handshake.cpp | 1 + trunk/src/rtmp/srs_protocol_handshake.hpp | 2 +- trunk/src/rtmp/srs_protocol_io.cpp | 1 + trunk/src/rtmp/srs_protocol_io.hpp | 1 + trunk/src/rtmp/srs_protocol_msg_array.cpp | 1 + trunk/src/rtmp/srs_protocol_msg_array.hpp | 1 + trunk/src/rtmp/srs_protocol_rtmp.cpp | 1 + trunk/src/rtmp/srs_protocol_rtmp.hpp | 1 + trunk/src/rtmp/srs_protocol_stack.cpp | 1 + trunk/src/rtmp/srs_protocol_stack.hpp | 1 + trunk/src/rtmp/srs_protocol_utility.cpp | 1 + trunk/src/rtmp/srs_protocol_utility.hpp | 1 + trunk/src/srs/srs.upp | 1 + trunk/src/utest/srs_utest.cpp | 1 + trunk/src/utest/srs_utest.hpp | 1 + trunk/src/utest/srs_utest_amf0.cpp | 1 + trunk/src/utest/srs_utest_amf0.hpp | 1 + trunk/src/utest/srs_utest_config.cpp | 1 + trunk/src/utest/srs_utest_config.hpp | 1 + trunk/src/utest/srs_utest_core.cpp | 1 + trunk/src/utest/srs_utest_core.hpp | 1 + trunk/src/utest/srs_utest_kernel.cpp | 1 + trunk/src/utest/srs_utest_kernel.hpp | 1 + trunk/src/utest/srs_utest_protocol.cpp | 1 + trunk/src/utest/srs_utest_protocol.hpp | 1 + 118 files changed, 123 insertions(+), 24 deletions(-) diff --git a/trunk/src/app/srs_app_avc_aac.cpp b/trunk/src/app/srs_app_avc_aac.cpp index 62e522e0a..04830b902 100644 --- a/trunk/src/app/srs_app_avc_aac.cpp +++ b/trunk/src/app/srs_app_avc_aac.cpp @@ -498,3 +498,4 @@ int SrsAvcAacCodec::video_avc_demux(char* data, int size, SrsCodecSample* sample return ret; } + diff --git a/trunk/src/app/srs_app_avc_aac.hpp b/trunk/src/app/srs_app_avc_aac.hpp index c300e4247..1e0e42fe1 100644 --- a/trunk/src/app/srs_app_avc_aac.hpp +++ b/trunk/src/app/srs_app_avc_aac.hpp @@ -281,3 +281,4 @@ public: }; #endif + diff --git a/trunk/src/app/srs_app_bandwidth.cpp b/trunk/src/app/srs_app_bandwidth.cpp index fe01e1545..de0f1ea2f 100644 --- a/trunk/src/app/srs_app_bandwidth.cpp +++ b/trunk/src/app/srs_app_bandwidth.cpp @@ -476,3 +476,4 @@ int SrsBandwidth::finial(SrsBandwidthSample& play_sample, SrsBandwidthSample& pu return ret; } + diff --git a/trunk/src/app/srs_app_bandwidth.hpp b/trunk/src/app/srs_app_bandwidth.hpp index b94b0539f..e52c0ed23 100644 --- a/trunk/src/app/srs_app_bandwidth.hpp +++ b/trunk/src/app/srs_app_bandwidth.hpp @@ -199,4 +199,4 @@ private: virtual int finial(SrsBandwidthSample& play_sample, SrsBandwidthSample& publish_sample, int64_t start_time, int64_t& end_time); }; -#endif \ No newline at end of file +#endif diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index 8e603d31e..61c774ade 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -2156,7 +2156,7 @@ int SrsConfig::get_bw_check_interval_ms(string vhost) return SRS_CONF_DEFAULT_BANDWIDTH_INTERVAL * 1000; } - return ::atof(conf->arg0().c_str()) * 1000; + return (int)(::atof(conf->arg0().c_str()) * 1000); } int SrsConfig::get_bw_check_limit_kbps(string vhost) @@ -3316,3 +3316,4 @@ bool srs_directive_equals(SrsConfDirective* a, SrsConfDirective* b) return true; } + diff --git a/trunk/src/app/srs_app_config.hpp b/trunk/src/app/srs_app_config.hpp index 98243ea69..714e0725c 100644 --- a/trunk/src/app/srs_app_config.hpp +++ b/trunk/src/app/srs_app_config.hpp @@ -986,4 +986,4 @@ bool srs_directive_equals(SrsConfDirective* a, SrsConfDirective* b); // global config extern SrsConfig* _srs_config; -#endif \ No newline at end of file +#endif diff --git a/trunk/src/app/srs_app_conn.cpp b/trunk/src/app/srs_app_conn.cpp index c1467eeee..766af9c33 100644 --- a/trunk/src/app/srs_app_conn.cpp +++ b/trunk/src/app/srs_app_conn.cpp @@ -94,3 +94,4 @@ void SrsConnection::stop() srs_freep(pthread); } + diff --git a/trunk/src/app/srs_app_conn.hpp b/trunk/src/app/srs_app_conn.hpp index 71376a7aa..fda7f99bb 100644 --- a/trunk/src/app/srs_app_conn.hpp +++ b/trunk/src/app/srs_app_conn.hpp @@ -112,4 +112,4 @@ private: virtual void stop(); }; -#endif \ No newline at end of file +#endif diff --git a/trunk/src/app/srs_app_dvr.cpp b/trunk/src/app/srs_app_dvr.cpp index c4c382f2d..016e25c8e 100644 --- a/trunk/src/app/srs_app_dvr.cpp +++ b/trunk/src/app/srs_app_dvr.cpp @@ -551,3 +551,4 @@ int SrsDvr::on_video(SrsSharedPtrMessage* video) #endif + diff --git a/trunk/src/app/srs_app_dvr.hpp b/trunk/src/app/srs_app_dvr.hpp index b9003fb03..baf27bb50 100644 --- a/trunk/src/app/srs_app_dvr.hpp +++ b/trunk/src/app/srs_app_dvr.hpp @@ -219,3 +219,4 @@ public: #endif #endif + diff --git a/trunk/src/app/srs_app_edge.cpp b/trunk/src/app/srs_app_edge.cpp index c67c2561e..3ce87a662 100644 --- a/trunk/src/app/srs_app_edge.cpp +++ b/trunk/src/app/srs_app_edge.cpp @@ -722,3 +722,4 @@ void SrsPublishEdge::on_proxy_unpublish() state = SrsEdgeStateInit; srs_trace("edge change from %d to state %d (init).", pstate, state); } + diff --git a/trunk/src/app/srs_app_edge.hpp b/trunk/src/app/srs_app_edge.hpp index 6bcc7cbf2..e91f70f80 100644 --- a/trunk/src/app/srs_app_edge.hpp +++ b/trunk/src/app/srs_app_edge.hpp @@ -218,3 +218,4 @@ public: }; #endif + diff --git a/trunk/src/app/srs_app_empty.cpp b/trunk/src/app/srs_app_empty.cpp index 12f8cb1b2..0b95a3605 100644 --- a/trunk/src/app/srs_app_empty.cpp +++ b/trunk/src/app/srs_app_empty.cpp @@ -23,3 +23,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include + diff --git a/trunk/src/app/srs_app_empty.hpp b/trunk/src/app/srs_app_empty.hpp index 7db8e8006..ada8292b8 100644 --- a/trunk/src/app/srs_app_empty.hpp +++ b/trunk/src/app/srs_app_empty.hpp @@ -30,3 +30,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #endif + diff --git a/trunk/src/app/srs_app_encoder.cpp b/trunk/src/app/srs_app_encoder.cpp index 66d911e6a..2e0bb060f 100644 --- a/trunk/src/app/srs_app_encoder.cpp +++ b/trunk/src/app/srs_app_encoder.cpp @@ -338,3 +338,4 @@ void SrsEncoder::encoder() #endif + diff --git a/trunk/src/app/srs_app_encoder.hpp b/trunk/src/app/srs_app_encoder.hpp index c11114182..00209c31f 100644 --- a/trunk/src/app/srs_app_encoder.hpp +++ b/trunk/src/app/srs_app_encoder.hpp @@ -75,3 +75,4 @@ private: #endif #endif + diff --git a/trunk/src/app/srs_app_ffmpeg.cpp b/trunk/src/app/srs_app_ffmpeg.cpp index ae1a75a5a..7c0b955bd 100644 --- a/trunk/src/app/srs_app_ffmpeg.cpp +++ b/trunk/src/app/srs_app_ffmpeg.cpp @@ -498,3 +498,4 @@ void SrsFFMPEG::stop() #endif + diff --git a/trunk/src/app/srs_app_ffmpeg.hpp b/trunk/src/app/srs_app_ffmpeg.hpp index 6da372f13..54af4a9cd 100644 --- a/trunk/src/app/srs_app_ffmpeg.hpp +++ b/trunk/src/app/srs_app_ffmpeg.hpp @@ -89,3 +89,4 @@ public: #endif #endif + diff --git a/trunk/src/app/srs_app_forward.cpp b/trunk/src/app/srs_app_forward.cpp index 4e8e36a84..d1c1418e9 100644 --- a/trunk/src/app/srs_app_forward.cpp +++ b/trunk/src/app/srs_app_forward.cpp @@ -350,3 +350,4 @@ int SrsForwarder::forward() return ret; } + diff --git a/trunk/src/app/srs_app_forward.hpp b/trunk/src/app/srs_app_forward.hpp index 8e2dacd77..72ee62f77 100644 --- a/trunk/src/app/srs_app_forward.hpp +++ b/trunk/src/app/srs_app_forward.hpp @@ -88,3 +88,4 @@ private: }; #endif + diff --git a/trunk/src/app/srs_app_heartbeat.cpp b/trunk/src/app/srs_app_heartbeat.cpp index d31846e47..da48b8e2c 100644 --- a/trunk/src/app/srs_app_heartbeat.cpp +++ b/trunk/src/app/srs_app_heartbeat.cpp @@ -92,3 +92,4 @@ void SrsHttpHeartbeat::heartbeat() } #endif + diff --git a/trunk/src/app/srs_app_heartbeat.hpp b/trunk/src/app/srs_app_heartbeat.hpp index 2a3f036a4..dd809638e 100644 --- a/trunk/src/app/srs_app_heartbeat.hpp +++ b/trunk/src/app/srs_app_heartbeat.hpp @@ -49,3 +49,4 @@ public: #endif #endif + diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp index 00f3a9b62..97cc2df5c 100644 --- a/trunk/src/app/srs_app_hls.cpp +++ b/trunk/src/app/srs_app_hls.cpp @@ -993,8 +993,8 @@ int SrsHlsCache::on_publish(SrsHlsMuxer* muxer, SrsRequest* req, int64_t segment std::string stream = req->stream; std::string app = req->app; - int hls_fragment = _srs_config->get_hls_fragment(vhost); - int hls_window = _srs_config->get_hls_window(vhost); + int hls_fragment = (int)_srs_config->get_hls_fragment(vhost); + int hls_window = (int)_srs_config->get_hls_window(vhost); // get the hls path config std::string hls_path = _srs_config->get_hls_path(vhost); @@ -1531,3 +1531,4 @@ void SrsHls::hls_mux() #endif + diff --git a/trunk/src/app/srs_app_hls.hpp b/trunk/src/app/srs_app_hls.hpp index 8a52cef70..694499ae4 100644 --- a/trunk/src/app/srs_app_hls.hpp +++ b/trunk/src/app/srs_app_hls.hpp @@ -346,4 +346,4 @@ private: #endif -#endif \ No newline at end of file +#endif diff --git a/trunk/src/app/srs_app_http.cpp b/trunk/src/app/srs_app_http.cpp index 70b6f87f6..a1768130c 100644 --- a/trunk/src/app/srs_app_http.cpp +++ b/trunk/src/app/srs_app_http.cpp @@ -1089,3 +1089,4 @@ string SrsHttpUri::get_uri_field(string uri, http_parser_url* hp_u, http_parser_ } #endif + diff --git a/trunk/src/app/srs_app_http.hpp b/trunk/src/app/srs_app_http.hpp index ae7f8206d..a9dd80a59 100644 --- a/trunk/src/app/srs_app_http.hpp +++ b/trunk/src/app/srs_app_http.hpp @@ -366,4 +366,4 @@ private: #endif -#endif \ No newline at end of file +#endif diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp index 1e015b655..61cf43276 100644 --- a/trunk/src/app/srs_app_http_api.cpp +++ b/trunk/src/app/srs_app_http_api.cpp @@ -615,3 +615,4 @@ int SrsHttpApi::process_request(SrsStSocket* skt, SrsHttpMessage* req) } #endif + diff --git a/trunk/src/app/srs_app_http_api.hpp b/trunk/src/app/srs_app_http_api.hpp index 279e1762d..b79ce06a8 100644 --- a/trunk/src/app/srs_app_http_api.hpp +++ b/trunk/src/app/srs_app_http_api.hpp @@ -188,3 +188,4 @@ private: #endif #endif + diff --git a/trunk/src/app/srs_app_http_client.cpp b/trunk/src/app/srs_app_http_client.cpp index befa14c85..0fb7afa22 100644 --- a/trunk/src/app/srs_app_http_client.cpp +++ b/trunk/src/app/srs_app_http_client.cpp @@ -150,3 +150,4 @@ int SrsHttpClient::connect(SrsHttpUri* uri) } #endif + diff --git a/trunk/src/app/srs_app_http_client.hpp b/trunk/src/app/srs_app_http_client.hpp index 9c2c818c5..e62a5e54e 100644 --- a/trunk/src/app/srs_app_http_client.hpp +++ b/trunk/src/app/srs_app_http_client.hpp @@ -65,3 +65,4 @@ private: #endif #endif + diff --git a/trunk/src/app/srs_app_http_conn.cpp b/trunk/src/app/srs_app_http_conn.cpp index 17c8c8aea..eef1cf5a2 100644 --- a/trunk/src/app/srs_app_http_conn.cpp +++ b/trunk/src/app/srs_app_http_conn.cpp @@ -595,3 +595,4 @@ int SrsHttpConn::process_request(SrsStSocket* skt, SrsHttpMessage* req) } #endif + diff --git a/trunk/src/app/srs_app_http_conn.hpp b/trunk/src/app/srs_app_http_conn.hpp index 9957fcb5f..22c991461 100644 --- a/trunk/src/app/srs_app_http_conn.hpp +++ b/trunk/src/app/srs_app_http_conn.hpp @@ -105,3 +105,4 @@ private: #endif #endif + diff --git a/trunk/src/app/srs_app_http_hooks.cpp b/trunk/src/app/srs_app_http_hooks.cpp index 4b00f2311..4ab6cf18b 100644 --- a/trunk/src/app/srs_app_http_hooks.cpp +++ b/trunk/src/app/srs_app_http_hooks.cpp @@ -327,3 +327,4 @@ void SrsHttpHooks::on_stop(string url, int client_id, string ip, SrsRequest* req } #endif + diff --git a/trunk/src/app/srs_app_http_hooks.hpp b/trunk/src/app/srs_app_http_hooks.hpp index 2005b0f18..7b3ce32c8 100644 --- a/trunk/src/app/srs_app_http_hooks.hpp +++ b/trunk/src/app/srs_app_http_hooks.hpp @@ -103,3 +103,4 @@ public: #endif #endif + diff --git a/trunk/src/app/srs_app_ingest.cpp b/trunk/src/app/srs_app_ingest.cpp index 7798d8caa..80e1c10cb 100644 --- a/trunk/src/app/srs_app_ingest.cpp +++ b/trunk/src/app/srs_app_ingest.cpp @@ -463,3 +463,4 @@ int SrsIngester::on_reload_ingest_updated(string vhost, string ingest_id) } #endif + diff --git a/trunk/src/app/srs_app_ingest.hpp b/trunk/src/app/srs_app_ingest.hpp index 1be01b538..5ae88b21d 100644 --- a/trunk/src/app/srs_app_ingest.hpp +++ b/trunk/src/app/srs_app_ingest.hpp @@ -94,3 +94,4 @@ public: #endif #endif + diff --git a/trunk/src/app/srs_app_json.cpp b/trunk/src/app/srs_app_json.cpp index 646828581..4d6759b27 100644 --- a/trunk/src/app/srs_app_json.cpp +++ b/trunk/src/app/srs_app_json.cpp @@ -892,3 +892,4 @@ const nx_json* nx_json_item(const nx_json* json, int idx) { #endif + diff --git a/trunk/src/app/srs_app_json.hpp b/trunk/src/app/srs_app_json.hpp index 45ebd4101..ec7fdce6d 100644 --- a/trunk/src/app/srs_app_json.hpp +++ b/trunk/src/app/srs_app_json.hpp @@ -220,4 +220,4 @@ that is: #define __SRS_JARRAY_START "[" #define __SRS_JARRAY_END "]" -#endif \ No newline at end of file +#endif diff --git a/trunk/src/app/srs_app_kbps.cpp b/trunk/src/app/srs_app_kbps.cpp index 028195da9..6f66b5d89 100644 --- a/trunk/src/app/srs_app_kbps.cpp +++ b/trunk/src/app/srs_app_kbps.cpp @@ -284,3 +284,4 @@ void SrsKbpsLimit::send_limit() } } + diff --git a/trunk/src/app/srs_app_kbps.hpp b/trunk/src/app/srs_app_kbps.hpp index 8f1587681..63113888e 100644 --- a/trunk/src/app/srs_app_kbps.hpp +++ b/trunk/src/app/srs_app_kbps.hpp @@ -224,4 +224,4 @@ public: virtual void send_limit(); }; -#endif \ No newline at end of file +#endif diff --git a/trunk/src/app/srs_app_log.cpp b/trunk/src/app/srs_app_log.cpp index 7df15cc47..d2c920dc3 100644 --- a/trunk/src/app/srs_app_log.cpp +++ b/trunk/src/app/srs_app_log.cpp @@ -378,3 +378,4 @@ void SrsFastLog::open_log_file() ); } } + diff --git a/trunk/src/app/srs_app_log.hpp b/trunk/src/app/srs_app_log.hpp index b17b936ee..d53b9768d 100644 --- a/trunk/src/app/srs_app_log.hpp +++ b/trunk/src/app/srs_app_log.hpp @@ -94,3 +94,4 @@ private: }; #endif + diff --git a/trunk/src/app/srs_app_pithy_print.cpp b/trunk/src/app/srs_app_pithy_print.cpp index de4fa6d77..296e140e5 100644 --- a/trunk/src/app/srs_app_pithy_print.cpp +++ b/trunk/src/app/srs_app_pithy_print.cpp @@ -184,3 +184,4 @@ int64_t SrsPithyPrint::age() return _age; } + diff --git a/trunk/src/app/srs_app_pithy_print.hpp b/trunk/src/app/srs_app_pithy_print.hpp index ee6434226..ac76214eb 100644 --- a/trunk/src/app/srs_app_pithy_print.hpp +++ b/trunk/src/app/srs_app_pithy_print.hpp @@ -96,4 +96,4 @@ public: virtual int64_t age(); }; -#endif \ No newline at end of file +#endif diff --git a/trunk/src/app/srs_app_refer.cpp b/trunk/src/app/srs_app_refer.cpp index adc4e40b2..699569fa3 100644 --- a/trunk/src/app/srs_app_refer.cpp +++ b/trunk/src/app/srs_app_refer.cpp @@ -94,3 +94,4 @@ int SrsRefer::check_single_refer(std::string page_url, std::string refer) return ret; } + diff --git a/trunk/src/app/srs_app_refer.hpp b/trunk/src/app/srs_app_refer.hpp index 7070cfe8d..1e488ad19 100644 --- a/trunk/src/app/srs_app_refer.hpp +++ b/trunk/src/app/srs_app_refer.hpp @@ -49,4 +49,4 @@ private: virtual int check_single_refer(std::string page_url, std::string refer); }; -#endif \ No newline at end of file +#endif diff --git a/trunk/src/app/srs_app_reload.cpp b/trunk/src/app/srs_app_reload.cpp index b3ddfadb8..8bed3f19b 100644 --- a/trunk/src/app/srs_app_reload.cpp +++ b/trunk/src/app/srs_app_reload.cpp @@ -160,3 +160,4 @@ int ISrsReloadHandler::on_reload_ingest_updated(string /*vhost*/, string /*inges return ERROR_SUCCESS; } + diff --git a/trunk/src/app/srs_app_reload.hpp b/trunk/src/app/srs_app_reload.hpp index a7eb1e9aa..3b98a7009 100644 --- a/trunk/src/app/srs_app_reload.hpp +++ b/trunk/src/app/srs_app_reload.hpp @@ -71,4 +71,4 @@ public: virtual int on_reload_ingest_updated(std::string vhost, std::string ingest_id); }; -#endif \ No newline at end of file +#endif diff --git a/trunk/src/app/srs_app_rtmp_conn.cpp b/trunk/src/app/srs_app_rtmp_conn.cpp index d459de8e1..ae3ff7af3 100644 --- a/trunk/src/app/srs_app_rtmp_conn.cpp +++ b/trunk/src/app/srs_app_rtmp_conn.cpp @@ -197,13 +197,13 @@ int SrsRtmpConn::service_cycle() { int ret = ERROR_SUCCESS; - if ((ret = rtmp->set_window_ack_size(2.5 * 1000 * 1000)) != ERROR_SUCCESS) { + if ((ret = rtmp->set_window_ack_size((int)(2.5 * 1000 * 1000))) != ERROR_SUCCESS) { srs_error("set window acknowledgement size failed. ret=%d", ret); return ret; } srs_verbose("set window acknowledgement size success"); - if ((ret = rtmp->set_peer_bandwidth(2.5 * 1000 * 1000, 2)) != ERROR_SUCCESS) { + if ((ret = rtmp->set_peer_bandwidth((int)(2.5 * 1000 * 1000), 2)) != ERROR_SUCCESS) { srs_error("set peer bandwidth failed. ret=%d", ret); return ret; } @@ -1124,3 +1124,4 @@ void SrsRtmpConn::http_hooks_on_stop() return; } + diff --git a/trunk/src/app/srs_app_rtmp_conn.hpp b/trunk/src/app/srs_app_rtmp_conn.hpp index 65cfb4538..7888620a0 100644 --- a/trunk/src/app/srs_app_rtmp_conn.hpp +++ b/trunk/src/app/srs_app_rtmp_conn.hpp @@ -106,3 +106,4 @@ private: }; #endif + diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp index 3c7776b43..d5797ce28 100644 --- a/trunk/src/app/srs_app_server.cpp +++ b/trunk/src/app/srs_app_server.cpp @@ -1049,3 +1049,4 @@ int SrsServer::on_reload_http_stream_updated() return ret; } + diff --git a/trunk/src/app/srs_app_server.hpp b/trunk/src/app/srs_app_server.hpp index 5dd930ff3..64726c1de 100644 --- a/trunk/src/app/srs_app_server.hpp +++ b/trunk/src/app/srs_app_server.hpp @@ -243,4 +243,4 @@ public: virtual int on_reload_http_stream_updated(); }; -#endif \ No newline at end of file +#endif diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp index 87702842a..4d66b90ce 100644 --- a/trunk/src/app/srs_app_source.cpp +++ b/trunk/src/app/srs_app_source.cpp @@ -1555,3 +1555,4 @@ void SrsSource::destroy_forwarders() forwarders.clear(); } + diff --git a/trunk/src/app/srs_app_source.hpp b/trunk/src/app/srs_app_source.hpp index b2efce47b..2e9ae8d69 100644 --- a/trunk/src/app/srs_app_source.hpp +++ b/trunk/src/app/srs_app_source.hpp @@ -395,4 +395,4 @@ private: virtual void destroy_forwarders(); }; -#endif \ No newline at end of file +#endif diff --git a/trunk/src/app/srs_app_st.cpp b/trunk/src/app/srs_app_st.cpp index 8e54117bf..916893186 100644 --- a/trunk/src/app/srs_app_st.cpp +++ b/trunk/src/app/srs_app_st.cpp @@ -35,3 +35,4 @@ void srs_close_stfd(st_netfd_t& stfd) close(fd); } } + diff --git a/trunk/src/app/srs_app_st.hpp b/trunk/src/app/srs_app_st.hpp index 716e103e5..81e725fcf 100644 --- a/trunk/src/app/srs_app_st.hpp +++ b/trunk/src/app/srs_app_st.hpp @@ -36,3 +36,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern void srs_close_stfd(st_netfd_t& stfd); #endif + diff --git a/trunk/src/app/srs_app_st_socket.cpp b/trunk/src/app/srs_app_st_socket.cpp index dd8c06aea..63e3ae14a 100644 --- a/trunk/src/app/srs_app_st_socket.cpp +++ b/trunk/src/app/srs_app_st_socket.cpp @@ -172,3 +172,4 @@ int SrsStSocket::writev(const iovec *iov, int iov_size, ssize_t* nwrite) return ret; } + diff --git a/trunk/src/app/srs_app_st_socket.hpp b/trunk/src/app/srs_app_st_socket.hpp index 92357e305..e0f253183 100644 --- a/trunk/src/app/srs_app_st_socket.hpp +++ b/trunk/src/app/srs_app_st_socket.hpp @@ -69,4 +69,4 @@ public: virtual int writev(const iovec *iov, int iov_size, ssize_t* nwrite); }; -#endif \ No newline at end of file +#endif diff --git a/trunk/src/app/srs_app_thread.cpp b/trunk/src/app/srs_app_thread.cpp index 150a2dcd7..6c78ebb6b 100644 --- a/trunk/src/app/srs_app_thread.cpp +++ b/trunk/src/app/srs_app_thread.cpp @@ -199,3 +199,4 @@ void* SrsThread::thread_fun(void* arg) return NULL; } + diff --git a/trunk/src/app/srs_app_thread.hpp b/trunk/src/app/srs_app_thread.hpp index 35b936446..34801824e 100644 --- a/trunk/src/app/srs_app_thread.hpp +++ b/trunk/src/app/srs_app_thread.hpp @@ -147,3 +147,4 @@ private: }; #endif + diff --git a/trunk/src/app/srs_app_utility.cpp b/trunk/src/app/srs_app_utility.cpp index 1b4766c95..3b3e7885e 100644 --- a/trunk/src/app/srs_app_utility.cpp +++ b/trunk/src/app/srs_app_utility.cpp @@ -1119,3 +1119,4 @@ void srs_api_dump_summaries(std::stringstream& ss) << __SRS_JOBJECT_END << __SRS_JOBJECT_END; } + diff --git a/trunk/src/app/srs_app_utility.hpp b/trunk/src/app/srs_app_utility.hpp index 3b6b503c8..85ec1fae8 100644 --- a/trunk/src/app/srs_app_utility.hpp +++ b/trunk/src/app/srs_app_utility.hpp @@ -627,3 +627,4 @@ std::string srs_get_peer_ip(int fd); void srs_api_dump_summaries(std::stringstream& ss); #endif + diff --git a/trunk/src/core/srs_core.cpp b/trunk/src/core/srs_core.cpp index d6c40526d..f19cb903d 100644 --- a/trunk/src/core/srs_core.cpp +++ b/trunk/src/core/srs_core.cpp @@ -23,3 +23,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include + diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 8740eb8d7..e0e6f2ccd 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -97,3 +97,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. className& operator= (const className&) #endif + diff --git a/trunk/src/core/srs_core_autofree.cpp b/trunk/src/core/srs_core_autofree.cpp index cbd317870..e9e4538c7 100644 --- a/trunk/src/core/srs_core_autofree.cpp +++ b/trunk/src/core/srs_core_autofree.cpp @@ -22,3 +22,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include + diff --git a/trunk/src/core/srs_core_autofree.hpp b/trunk/src/core/srs_core_autofree.hpp index d021e0735..98c9761b8 100644 --- a/trunk/src/core/srs_core_autofree.hpp +++ b/trunk/src/core/srs_core_autofree.hpp @@ -66,4 +66,4 @@ public: } }; -#endif \ No newline at end of file +#endif diff --git a/trunk/src/kernel/srs_kernel_buffer.cpp b/trunk/src/kernel/srs_kernel_buffer.cpp index 2a5f96372..d60690de4 100644 --- a/trunk/src/kernel/srs_kernel_buffer.cpp +++ b/trunk/src/kernel/srs_kernel_buffer.cpp @@ -102,3 +102,4 @@ int SrsBuffer::grow(ISrsBufferReader* reader, int required_size) return ret; } + diff --git a/trunk/src/kernel/srs_kernel_buffer.hpp b/trunk/src/kernel/srs_kernel_buffer.hpp index f53c7963a..93d3a5683 100644 --- a/trunk/src/kernel/srs_kernel_buffer.hpp +++ b/trunk/src/kernel/srs_kernel_buffer.hpp @@ -91,4 +91,4 @@ public: virtual int grow(ISrsBufferReader* reader, int required_size); }; -#endif \ No newline at end of file +#endif diff --git a/trunk/src/kernel/srs_kernel_codec.cpp b/trunk/src/kernel/srs_kernel_codec.cpp index c39e3e760..41ee639ff 100644 --- a/trunk/src/kernel/srs_kernel_codec.cpp +++ b/trunk/src/kernel/srs_kernel_codec.cpp @@ -115,3 +115,4 @@ bool SrsFlvCodec::audio_is_aac(char* data, int size) return sound_format == SrsCodecAudioAAC; } + diff --git a/trunk/src/kernel/srs_kernel_codec.hpp b/trunk/src/kernel/srs_kernel_codec.hpp index 75694464e..32b019bd5 100644 --- a/trunk/src/kernel/srs_kernel_codec.hpp +++ b/trunk/src/kernel/srs_kernel_codec.hpp @@ -177,4 +177,4 @@ public: static bool audio_is_aac(char* data, int size); }; -#endif \ No newline at end of file +#endif diff --git a/trunk/src/kernel/srs_kernel_consts.cpp b/trunk/src/kernel/srs_kernel_consts.cpp index 6f5a6d915..f0c5a5358 100644 --- a/trunk/src/kernel/srs_kernel_consts.cpp +++ b/trunk/src/kernel/srs_kernel_consts.cpp @@ -23,3 +23,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include + diff --git a/trunk/src/kernel/srs_kernel_consts.hpp b/trunk/src/kernel/srs_kernel_consts.hpp index b17222c34..3f66203ef 100644 --- a/trunk/src/kernel/srs_kernel_consts.hpp +++ b/trunk/src/kernel/srs_kernel_consts.hpp @@ -263,3 +263,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define SRS_CONSTS_HTTP_HTTPVersionNotSupported_str "HTTP Version Not Supported" #endif + diff --git a/trunk/src/kernel/srs_kernel_error.cpp b/trunk/src/kernel/srs_kernel_error.cpp index 66ab81cac..873bac5ce 100644 --- a/trunk/src/kernel/srs_kernel_error.cpp +++ b/trunk/src/kernel/srs_kernel_error.cpp @@ -35,3 +35,4 @@ bool srs_is_client_gracefully_close(int error_code) || error_code == ERROR_SOCKET_READ_FULLY || error_code == ERROR_SOCKET_WRITE; } + diff --git a/trunk/src/kernel/srs_kernel_error.hpp b/trunk/src/kernel/srs_kernel_error.hpp index b70f911dd..2dbdd8b11 100644 --- a/trunk/src/kernel/srs_kernel_error.hpp +++ b/trunk/src/kernel/srs_kernel_error.hpp @@ -202,3 +202,4 @@ extern bool srs_is_client_gracefully_close(int error_code); */ #endif + diff --git a/trunk/src/kernel/srs_kernel_file.cpp b/trunk/src/kernel/srs_kernel_file.cpp index edfef304f..17f92586f 100644 --- a/trunk/src/kernel/srs_kernel_file.cpp +++ b/trunk/src/kernel/srs_kernel_file.cpp @@ -212,3 +212,4 @@ int SrsFileReader::read(void* buf, size_t count, ssize_t* pnread) return ret; } + diff --git a/trunk/src/kernel/srs_kernel_file.hpp b/trunk/src/kernel/srs_kernel_file.hpp index 9046a0e44..033dd3208 100644 --- a/trunk/src/kernel/srs_kernel_file.hpp +++ b/trunk/src/kernel/srs_kernel_file.hpp @@ -91,3 +91,4 @@ public: }; #endif + diff --git a/trunk/src/kernel/srs_kernel_flv.cpp b/trunk/src/kernel/srs_kernel_flv.cpp index 61383d281..2e69e7f6b 100644 --- a/trunk/src/kernel/srs_kernel_flv.cpp +++ b/trunk/src/kernel/srs_kernel_flv.cpp @@ -525,3 +525,4 @@ int SrsFlvVodStreamDecoder::lseek(int64_t offset) return ret; } + diff --git a/trunk/src/kernel/srs_kernel_flv.hpp b/trunk/src/kernel/srs_kernel_flv.hpp index b81b13c2b..845f7b61b 100644 --- a/trunk/src/kernel/srs_kernel_flv.hpp +++ b/trunk/src/kernel/srs_kernel_flv.hpp @@ -175,3 +175,4 @@ public: }; #endif + diff --git a/trunk/src/kernel/srs_kernel_log.cpp b/trunk/src/kernel/srs_kernel_log.cpp index bfc4b09f2..e832acc07 100644 --- a/trunk/src/kernel/srs_kernel_log.cpp +++ b/trunk/src/kernel/srs_kernel_log.cpp @@ -75,3 +75,4 @@ int ISrsThreadContext::get_id() return 0; } + diff --git a/trunk/src/kernel/srs_kernel_log.hpp b/trunk/src/kernel/srs_kernel_log.hpp index c92655295..9ebfcea3d 100644 --- a/trunk/src/kernel/srs_kernel_log.hpp +++ b/trunk/src/kernel/srs_kernel_log.hpp @@ -150,3 +150,4 @@ extern ISrsThreadContext* _srs_context; #endif #endif + diff --git a/trunk/src/kernel/srs_kernel_stream.cpp b/trunk/src/kernel/srs_kernel_stream.cpp index 580eace1b..115285dd1 100644 --- a/trunk/src/kernel/srs_kernel_stream.cpp +++ b/trunk/src/kernel/srs_kernel_stream.cpp @@ -252,3 +252,4 @@ void SrsStream::write_bytes(char* data, int size) p += size; } + diff --git a/trunk/src/kernel/srs_kernel_stream.hpp b/trunk/src/kernel/srs_kernel_stream.hpp index fd7d80136..161f08524 100644 --- a/trunk/src/kernel/srs_kernel_stream.hpp +++ b/trunk/src/kernel/srs_kernel_stream.hpp @@ -154,4 +154,4 @@ public: virtual void write_bytes(char* data, int size); }; -#endif \ No newline at end of file +#endif diff --git a/trunk/src/kernel/srs_kernel_utility.cpp b/trunk/src/kernel/srs_kernel_utility.cpp index 4ec9499ae..1bbfbf516 100644 --- a/trunk/src/kernel/srs_kernel_utility.cpp +++ b/trunk/src/kernel/srs_kernel_utility.cpp @@ -215,3 +215,4 @@ bool srs_string_ends_with(string str, string flag) { return str.rfind(flag) == str.length() - flag.length(); } + diff --git a/trunk/src/kernel/srs_kernel_utility.hpp b/trunk/src/kernel/srs_kernel_utility.hpp index 00dbc12ca..706a7e681 100644 --- a/trunk/src/kernel/srs_kernel_utility.hpp +++ b/trunk/src/kernel/srs_kernel_utility.hpp @@ -60,3 +60,4 @@ extern std::string srs_string_remove(std::string str, std::string remove_chars); extern bool srs_string_ends_with(std::string str, std::string flag); #endif + diff --git a/trunk/src/libs/srs_lib_bandwidth.cpp b/trunk/src/libs/srs_lib_bandwidth.cpp index 94ad53691..88c32c37d 100644 --- a/trunk/src/libs/srs_lib_bandwidth.cpp +++ b/trunk/src/libs/srs_lib_bandwidth.cpp @@ -393,3 +393,4 @@ int SrsBandwidthClient::final(SrsBandwidthPacket** ppkt) return ret; } + diff --git a/trunk/src/libs/srs_lib_bandwidth.hpp b/trunk/src/libs/srs_lib_bandwidth.hpp index 82db66d48..f7a459b23 100644 --- a/trunk/src/libs/srs_lib_bandwidth.hpp +++ b/trunk/src/libs/srs_lib_bandwidth.hpp @@ -87,3 +87,4 @@ private: }; #endif + diff --git a/trunk/src/libs/srs_lib_simple_socket.cpp b/trunk/src/libs/srs_lib_simple_socket.cpp index 191208fde..202155503 100644 --- a/trunk/src/libs/srs_lib_simple_socket.cpp +++ b/trunk/src/libs/srs_lib_simple_socket.cpp @@ -203,3 +203,4 @@ int SimpleSocketStream::write(void* buf, size_t size, ssize_t* nwrite) return ret; } + diff --git a/trunk/src/libs/srs_lib_simple_socket.hpp b/trunk/src/libs/srs_lib_simple_socket.hpp index 452d25cf3..2aa32bd39 100644 --- a/trunk/src/libs/srs_lib_simple_socket.hpp +++ b/trunk/src/libs/srs_lib_simple_socket.hpp @@ -72,3 +72,4 @@ public: }; #endif + diff --git a/trunk/src/libs/srs_librtmp.cpp b/trunk/src/libs/srs_librtmp.cpp index fa7f76736..10f2a7e68 100644 --- a/trunk/src/libs/srs_librtmp.cpp +++ b/trunk/src/libs/srs_librtmp.cpp @@ -996,3 +996,4 @@ char* srs_amf0_human_print(srs_amf0_t amf0, char** pdata, int* psize) #ifdef __cplusplus } #endif + diff --git a/trunk/src/libs/srs_librtmp.hpp b/trunk/src/libs/srs_librtmp.hpp index 90ae7612a..8db2adbd3 100644 --- a/trunk/src/libs/srs_librtmp.hpp +++ b/trunk/src/libs/srs_librtmp.hpp @@ -304,3 +304,4 @@ char* srs_amf0_human_print(srs_amf0_t amf0, char** pdata, int* psize); #endif #endif + diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index 653a65ac9..113251d62 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -189,3 +189,4 @@ int run_master() return 0; } + diff --git a/trunk/src/rtmp/srs_protocol_amf0.cpp b/trunk/src/rtmp/srs_protocol_amf0.cpp index 67ca634a9..864482eaa 100644 --- a/trunk/src/rtmp/srs_protocol_amf0.cpp +++ b/trunk/src/rtmp/srs_protocol_amf0.cpp @@ -1738,3 +1738,4 @@ namespace _srs_internal return value->write(stream); } } + diff --git a/trunk/src/rtmp/srs_protocol_amf0.hpp b/trunk/src/rtmp/srs_protocol_amf0.hpp index f78a57062..97df1f96d 100644 --- a/trunk/src/rtmp/srs_protocol_amf0.hpp +++ b/trunk/src/rtmp/srs_protocol_amf0.hpp @@ -784,4 +784,4 @@ namespace _srs_internal extern int srs_amf0_write_any(SrsStream* stream, SrsAmf0Any* value); }; -#endif \ No newline at end of file +#endif diff --git a/trunk/src/rtmp/srs_protocol_handshake.cpp b/trunk/src/rtmp/srs_protocol_handshake.cpp index 3f0aada4b..6fa3f86ac 100644 --- a/trunk/src/rtmp/srs_protocol_handshake.cpp +++ b/trunk/src/rtmp/srs_protocol_handshake.cpp @@ -1250,3 +1250,4 @@ int SrsComplexHandshake::handshake_with_server(SrsHandshakeBytes* hs_bytes, ISrs } #endif + diff --git a/trunk/src/rtmp/srs_protocol_handshake.hpp b/trunk/src/rtmp/srs_protocol_handshake.hpp index ea7f33ecc..0584e28bf 100644 --- a/trunk/src/rtmp/srs_protocol_handshake.hpp +++ b/trunk/src/rtmp/srs_protocol_handshake.hpp @@ -362,4 +362,4 @@ public: virtual int handshake_with_server(SrsHandshakeBytes* hs_bytes, ISrsProtocolReaderWriter* io); }; -#endif \ No newline at end of file +#endif diff --git a/trunk/src/rtmp/srs_protocol_io.cpp b/trunk/src/rtmp/srs_protocol_io.cpp index 2409a951f..a0dd8999c 100644 --- a/trunk/src/rtmp/srs_protocol_io.cpp +++ b/trunk/src/rtmp/srs_protocol_io.cpp @@ -62,3 +62,4 @@ ISrsProtocolReaderWriter::ISrsProtocolReaderWriter() ISrsProtocolReaderWriter::~ISrsProtocolReaderWriter() { } + diff --git a/trunk/src/rtmp/srs_protocol_io.hpp b/trunk/src/rtmp/srs_protocol_io.hpp index 72d9db9ca..9112f7087 100644 --- a/trunk/src/rtmp/srs_protocol_io.hpp +++ b/trunk/src/rtmp/srs_protocol_io.hpp @@ -167,3 +167,4 @@ public: }; #endif + diff --git a/trunk/src/rtmp/srs_protocol_msg_array.cpp b/trunk/src/rtmp/srs_protocol_msg_array.cpp index b1c90d620..c936fdb2c 100644 --- a/trunk/src/rtmp/srs_protocol_msg_array.cpp +++ b/trunk/src/rtmp/srs_protocol_msg_array.cpp @@ -49,3 +49,4 @@ SrsSharedPtrMessageArray::~SrsSharedPtrMessageArray() srs_freep(msgs); } + diff --git a/trunk/src/rtmp/srs_protocol_msg_array.hpp b/trunk/src/rtmp/srs_protocol_msg_array.hpp index 4a2569391..5d3bf894e 100644 --- a/trunk/src/rtmp/srs_protocol_msg_array.hpp +++ b/trunk/src/rtmp/srs_protocol_msg_array.hpp @@ -61,3 +61,4 @@ public: }; #endif + diff --git a/trunk/src/rtmp/srs_protocol_rtmp.cpp b/trunk/src/rtmp/srs_protocol_rtmp.cpp index 5b08d03b2..e82712669 100644 --- a/trunk/src/rtmp/srs_protocol_rtmp.cpp +++ b/trunk/src/rtmp/srs_protocol_rtmp.cpp @@ -1472,3 +1472,4 @@ int SrsRtmpServer::identify_play_client(SrsPlayPacket* req, SrsRtmpConnType& typ return ret; } + diff --git a/trunk/src/rtmp/srs_protocol_rtmp.hpp b/trunk/src/rtmp/srs_protocol_rtmp.hpp index f00e1dcc9..71bd95cbb 100644 --- a/trunk/src/rtmp/srs_protocol_rtmp.hpp +++ b/trunk/src/rtmp/srs_protocol_rtmp.hpp @@ -485,3 +485,4 @@ private: }; #endif + diff --git a/trunk/src/rtmp/srs_protocol_stack.cpp b/trunk/src/rtmp/srs_protocol_stack.cpp index c9aa5abd4..714a3558e 100644 --- a/trunk/src/rtmp/srs_protocol_stack.cpp +++ b/trunk/src/rtmp/srs_protocol_stack.cpp @@ -3888,3 +3888,4 @@ int SrsUserControlPacket::encode_packet(SrsStream* stream) return ret; } + diff --git a/trunk/src/rtmp/srs_protocol_stack.hpp b/trunk/src/rtmp/srs_protocol_stack.hpp index 28419ce51..c82a0466b 100644 --- a/trunk/src/rtmp/srs_protocol_stack.hpp +++ b/trunk/src/rtmp/srs_protocol_stack.hpp @@ -1548,3 +1548,4 @@ protected: }; #endif + diff --git a/trunk/src/rtmp/srs_protocol_utility.cpp b/trunk/src/rtmp/srs_protocol_utility.cpp index 111df5658..c931ca2f3 100644 --- a/trunk/src/rtmp/srs_protocol_utility.cpp +++ b/trunk/src/rtmp/srs_protocol_utility.cpp @@ -159,3 +159,4 @@ bool srs_bytes_equals(void* pa, void* pb, int size) return true; } + diff --git a/trunk/src/rtmp/srs_protocol_utility.hpp b/trunk/src/rtmp/srs_protocol_utility.hpp index a8682aa83..359c4f26e 100644 --- a/trunk/src/rtmp/srs_protocol_utility.hpp +++ b/trunk/src/rtmp/srs_protocol_utility.hpp @@ -86,3 +86,4 @@ extern std::string srs_generate_tc_url( extern bool srs_bytes_equals(void* pa, void* pb, int size); #endif + diff --git a/trunk/src/srs/srs.upp b/trunk/src/srs/srs.upp index f77f8763a..f725ba037 100755 --- a/trunk/src/srs/srs.upp +++ b/trunk/src/srs/srs.upp @@ -140,3 +140,4 @@ file mainconfig "" = "MAIN"; + diff --git a/trunk/src/utest/srs_utest.cpp b/trunk/src/utest/srs_utest.cpp index a65c2e123..2774c436b 100644 --- a/trunk/src/utest/srs_utest.cpp +++ b/trunk/src/utest/srs_utest.cpp @@ -84,3 +84,4 @@ VOID TEST(SampleTest, FastSampleMacrosTest) EXPECT_DOUBLE_EQ(1.0, 1.0000000000000001); EXPECT_NEAR(10, 15, 5); } + diff --git a/trunk/src/utest/srs_utest.hpp b/trunk/src/utest/srs_utest.hpp index df2ee88d4..db7639de1 100644 --- a/trunk/src/utest/srs_utest.hpp +++ b/trunk/src/utest/srs_utest.hpp @@ -62,3 +62,4 @@ public: }; #endif + diff --git a/trunk/src/utest/srs_utest_amf0.cpp b/trunk/src/utest/srs_utest_amf0.cpp index e94a5d1bb..98c88dfd8 100644 --- a/trunk/src/utest/srs_utest_amf0.cpp +++ b/trunk/src/utest/srs_utest_amf0.cpp @@ -1268,3 +1268,4 @@ VOID TEST(ProtocolAMF0Test, ObjectEcmaStrict) EXPECT_EQ(1, arr2->to_strict_array()->count()); EXPECT_EQ(0, arr3->to_ecma_array()->count()); } + diff --git a/trunk/src/utest/srs_utest_amf0.hpp b/trunk/src/utest/srs_utest_amf0.hpp index 567761510..b16f4c044 100644 --- a/trunk/src/utest/srs_utest_amf0.hpp +++ b/trunk/src/utest/srs_utest_amf0.hpp @@ -32,3 +32,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #endif + diff --git a/trunk/src/utest/srs_utest_config.cpp b/trunk/src/utest/srs_utest_config.cpp index 3226cca47..6f8c961b4 100644 --- a/trunk/src/utest/srs_utest_config.cpp +++ b/trunk/src/utest/srs_utest_config.cpp @@ -5451,3 +5451,4 @@ VOID TEST(ConfigMainTest, CheckConf_pithy_print) EXPECT_TRUE(ERROR_SUCCESS != conf.parse(_MIN_OK_CONF"pithy_print{edges 10000;}")); } } + diff --git a/trunk/src/utest/srs_utest_config.hpp b/trunk/src/utest/srs_utest_config.hpp index 776a672d7..ab7d09784 100644 --- a/trunk/src/utest/srs_utest_config.hpp +++ b/trunk/src/utest/srs_utest_config.hpp @@ -52,3 +52,4 @@ public: }; #endif + diff --git a/trunk/src/utest/srs_utest_core.cpp b/trunk/src/utest/srs_utest_core.cpp index d02f4b143..60ad82bb1 100644 --- a/trunk/src/utest/srs_utest_core.cpp +++ b/trunk/src/utest/srs_utest_core.cpp @@ -66,3 +66,4 @@ VOID TEST(CoreMacroseTest, Check) EXPECT_TRUE(false); #endif } + diff --git a/trunk/src/utest/srs_utest_core.hpp b/trunk/src/utest/srs_utest_core.hpp index 576fc80b6..9f8cffd91 100644 --- a/trunk/src/utest/srs_utest_core.hpp +++ b/trunk/src/utest/srs_utest_core.hpp @@ -32,3 +32,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #endif + diff --git a/trunk/src/utest/srs_utest_kernel.cpp b/trunk/src/utest/srs_utest_kernel.cpp index 118867f86..e11d01854 100644 --- a/trunk/src/utest/srs_utest_kernel.cpp +++ b/trunk/src/utest/srs_utest_kernel.cpp @@ -1509,3 +1509,4 @@ VOID TEST(KernelUtilityTest, UtilityString) EXPECT_TRUE(srs_string_ends_with("Hello", "o")); EXPECT_TRUE(srs_string_ends_with("Hello", "lo")); } + diff --git a/trunk/src/utest/srs_utest_kernel.hpp b/trunk/src/utest/srs_utest_kernel.hpp index 773f11880..44b7fd676 100644 --- a/trunk/src/utest/srs_utest_kernel.hpp +++ b/trunk/src/utest/srs_utest_kernel.hpp @@ -93,3 +93,4 @@ public: }; #endif + diff --git a/trunk/src/utest/srs_utest_protocol.cpp b/trunk/src/utest/srs_utest_protocol.cpp index e2cdcf065..281d7d783 100644 --- a/trunk/src/utest/srs_utest_protocol.cpp +++ b/trunk/src/utest/srs_utest_protocol.cpp @@ -5598,3 +5598,4 @@ VOID TEST(ProtocolRTMPTest, RTMPHandshakeBytes) EXPECT_TRUE(bytes.s0s1s2 != NULL); } + diff --git a/trunk/src/utest/srs_utest_protocol.hpp b/trunk/src/utest/srs_utest_protocol.hpp index 96869b4be..8ffb69112 100644 --- a/trunk/src/utest/srs_utest_protocol.hpp +++ b/trunk/src/utest/srs_utest_protocol.hpp @@ -108,3 +108,4 @@ public: }; #endif +