From f4c0af8bfcad3508d09e7949647404c6789eae47 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 16 Jan 2017 16:20:34 +0800 Subject: [PATCH] refine code remove dup api for #742 --- trunk/src/app/srs_app_caster_flv.cpp | 3 ++- trunk/src/app/srs_app_mpegts_udp.cpp | 3 ++- trunk/src/app/srs_app_rtmp_conn.cpp | 14 -------------- trunk/src/app/srs_app_rtmp_conn.hpp | 2 -- trunk/src/app/srs_app_rtsp.cpp | 3 ++- trunk/src/main/srs_main_ingest_hls.cpp | 3 ++- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/trunk/src/app/srs_app_caster_flv.cpp b/trunk/src/app/srs_app_caster_flv.cpp index dcfea5ac6..9f855ade6 100644 --- a/trunk/src/app/srs_app_caster_flv.cpp +++ b/trunk/src/app/srs_app_caster_flv.cpp @@ -43,6 +43,7 @@ using namespace std; #include #include #include +#include #define SRS_HTTP_FLV_STREAM_BUFFER 4096 @@ -216,7 +217,7 @@ int SrsDynamicHttpConn::do_proxy(ISrsHttpResponseReader* rr, SrsFlvDecoder* dec) } SrsSharedPtrMessage* msg = NULL; - if ((ret = sdk->rtmp_create_msg(type, time, data, size, &msg)) != ERROR_SUCCESS) { + if ((ret = srs_rtmp_create_msg(type, time, data, size, sdk->sid(), &msg)) != ERROR_SUCCESS) { return ret; } diff --git a/trunk/src/app/srs_app_mpegts_udp.cpp b/trunk/src/app/srs_app_mpegts_udp.cpp index 1f6137831..6c528616d 100644 --- a/trunk/src/app/srs_app_mpegts_udp.cpp +++ b/trunk/src/app/srs_app_mpegts_udp.cpp @@ -50,6 +50,7 @@ using namespace std; #include #include #include +#include SrsMpegtsQueue::SrsMpegtsQueue() { @@ -571,7 +572,7 @@ int SrsMpegtsOverUdp::rtmp_write_packet(char type, u_int32_t timestamp, char* da SrsSharedPtrMessage* msg = NULL; - if ((ret = sdk->rtmp_create_msg(type, timestamp, data, size, &msg)) != ERROR_SUCCESS) { + if ((ret = srs_rtmp_create_msg(type, timestamp, data, size, sdk->sid(), &msg)) != ERROR_SUCCESS) { srs_error("mpegts: create shared ptr msg failed. ret=%d", ret); return ret; } diff --git a/trunk/src/app/srs_app_rtmp_conn.cpp b/trunk/src/app/srs_app_rtmp_conn.cpp index d62beabcf..0c6e6d70d 100644 --- a/trunk/src/app/srs_app_rtmp_conn.cpp +++ b/trunk/src/app/srs_app_rtmp_conn.cpp @@ -270,20 +270,6 @@ int SrsSimpleRtmpClient::sid() return stream_id; } -int SrsSimpleRtmpClient::rtmp_create_msg(char type, u_int32_t timestamp, char* data, int size, SrsSharedPtrMessage** pmsg) -{ - *pmsg = NULL; - - int ret = ERROR_SUCCESS; - - if ((ret = srs_rtmp_create_msg(type, timestamp, data, size, stream_id, pmsg)) != ERROR_SUCCESS) { - srs_error("sdk: create shared ptr msg failed. ret=%d", ret); - return ret; - } - - return ret; -} - int SrsSimpleRtmpClient::recv_message(SrsCommonMessage** pmsg) { return client->recv_message(pmsg); diff --git a/trunk/src/app/srs_app_rtmp_conn.hpp b/trunk/src/app/srs_app_rtmp_conn.hpp index 233a645c4..6f503ea4c 100644 --- a/trunk/src/app/srs_app_rtmp_conn.hpp +++ b/trunk/src/app/srs_app_rtmp_conn.hpp @@ -89,8 +89,6 @@ public: virtual void kbps_sample(const char* label, int64_t age); virtual void kbps_sample(const char* label, int64_t age, int msgs); virtual int sid(); -public: - virtual int rtmp_create_msg(char type, u_int32_t timestamp, char* data, int size, SrsSharedPtrMessage** pmsg); public: virtual int recv_message(SrsCommonMessage** pmsg); virtual int decode_message(SrsCommonMessage* msg, SrsPacket** ppacket); diff --git a/trunk/src/app/srs_app_rtsp.cpp b/trunk/src/app/srs_app_rtsp.cpp index 41bb46762..c7ef8ed41 100644 --- a/trunk/src/app/srs_app_rtsp.cpp +++ b/trunk/src/app/srs_app_rtsp.cpp @@ -43,6 +43,7 @@ using namespace std; #include #include #include +#include #ifdef SRS_AUTO_STREAM_CASTER @@ -624,7 +625,7 @@ int SrsRtspConn::rtmp_write_packet(char type, u_int32_t timestamp, char* data, i SrsSharedPtrMessage* msg = NULL; - if ((ret = sdk->rtmp_create_msg(type, timestamp, data, size, &msg)) != ERROR_SUCCESS) { + if ((ret = srs_rtmp_create_msg(type, timestamp, data, size, sdk->sid(), &msg)) != ERROR_SUCCESS) { srs_error("rtsp: create shared ptr msg failed. ret=%d", ret); return ret; } diff --git a/trunk/src/main/srs_main_ingest_hls.cpp b/trunk/src/main/srs_main_ingest_hls.cpp index 5b1e6ace9..822429bd2 100644 --- a/trunk/src/main/srs_main_ingest_hls.cpp +++ b/trunk/src/main/srs_main_ingest_hls.cpp @@ -48,6 +48,7 @@ using namespace std; #include #include #include +#include // pre-declare int proxy_hls2rtmp(std::string hls, std::string rtmp); @@ -1185,7 +1186,7 @@ int SrsIngestSrsOutput::rtmp_write_packet(char type, u_int32_t timestamp, char* SrsSharedPtrMessage* msg = NULL; - if ((ret = sdk->rtmp_create_msg(type, timestamp, data, size, &msg)) != ERROR_SUCCESS) { + if ((ret = srs_rtmp_create_msg(type, timestamp, data, size, sdk->sid(), &msg)) != ERROR_SUCCESS) { srs_error("mpegts: create shared ptr msg failed. ret=%d", ret); return ret; }