diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 3b34ef160..44cf8785d 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -469,7 +469,7 @@ srs_error_t SrsRtcDtls::unprotect_rtcp(char* out_buf, const char* in_buf, int& n return srs_error_new(ERROR_RTC_SRTP_UNPROTECT, "rtcp unprotect failed"); } -SrsRtcOutgoingPackets::SrsRtcOutgoingPackets() +SrsRtcOutgoingInfo::SrsRtcOutgoingInfo() { #if defined(SRS_DEBUG) debug_id = 0; @@ -484,7 +484,7 @@ SrsRtcOutgoingPackets::SrsRtcOutgoingPackets() nn_dropped = 0; } -SrsRtcOutgoingPackets::~SrsRtcOutgoingPackets() +SrsRtcOutgoingInfo::~SrsRtcOutgoingInfo() { } @@ -650,7 +650,7 @@ srs_error_t SrsRtcPlayer::cycle() // TODO: FIXME: Use cache for performance? vector pkts; - SrsRtcOutgoingPackets info; + SrsRtcOutgoingInfo info; while (true) { if ((err = trd->pull()) != srs_success) { @@ -707,7 +707,7 @@ srs_error_t SrsRtcPlayer::cycle() } } -srs_error_t SrsRtcPlayer::send_messages(SrsRtcSource* source, vector& pkts, SrsRtcOutgoingPackets& info) +srs_error_t SrsRtcPlayer::send_messages(SrsRtcSource* source, vector& pkts, SrsRtcOutgoingInfo& info) { srs_error_t err = srs_success; @@ -741,7 +741,7 @@ srs_error_t SrsRtcPlayer::send_messages(SrsRtcSource* source, vector& pkts, SrsRtcOutgoingPackets& info) +srs_error_t SrsRtcPlayer::messages_to_packets(SrsRtcSource* source, vector& pkts, SrsRtcOutgoingInfo& info) { srs_error_t err = srs_success; @@ -811,7 +811,7 @@ srs_error_t SrsRtcPlayer::package_video(SrsRtpPacket2* pkt) return err; } -srs_error_t SrsRtcPlayer::send_packets(std::vector& pkts, SrsRtcOutgoingPackets& info) +srs_error_t SrsRtcPlayer::send_packets(std::vector& pkts, SrsRtcOutgoingInfo& info) { srs_error_t err = srs_success; @@ -906,7 +906,7 @@ srs_error_t SrsRtcPlayer::send_packets(std::vector& pkts, SrsRtc } // TODO: FIXME: We can gather and pad audios, because they have similar size. -srs_error_t SrsRtcPlayer::send_packets_gso(vector& pkts, SrsRtcOutgoingPackets& info) +srs_error_t SrsRtcPlayer::send_packets_gso(vector& pkts, SrsRtcOutgoingInfo& info) { srs_error_t err = srs_success; diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 7235ec691..f598a5e14 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -150,7 +150,7 @@ private: // A group of RTP packets for outgoing(send to players). // TODO: FIXME: Rename to stat for RTP packets. -class SrsRtcOutgoingPackets +class SrsRtcOutgoingInfo { public: bool use_gso; @@ -186,8 +186,8 @@ public: // The number of dropped messages. int nn_dropped; public: - SrsRtcOutgoingPackets(); - virtual ~SrsRtcOutgoingPackets(); + SrsRtcOutgoingInfo(); + virtual ~SrsRtcOutgoingInfo(); }; class SrsRtcPlayer : virtual public ISrsCoroutineHandler, virtual public ISrsReloadHandler @@ -240,12 +240,12 @@ public: public: virtual srs_error_t cycle(); private: - srs_error_t send_messages(SrsRtcSource* source, std::vector& pkts, SrsRtcOutgoingPackets& info); - srs_error_t messages_to_packets(SrsRtcSource* source, std::vector& pkts, SrsRtcOutgoingPackets& info); + srs_error_t send_messages(SrsRtcSource* source, std::vector& pkts, SrsRtcOutgoingInfo& info); + srs_error_t messages_to_packets(SrsRtcSource* source, std::vector& pkts, SrsRtcOutgoingInfo& info); srs_error_t package_opus(SrsRtpPacket2* pkt); srs_error_t package_video(SrsRtpPacket2* pkt); - srs_error_t send_packets(std::vector& pkts, SrsRtcOutgoingPackets& info); - srs_error_t send_packets_gso(std::vector& pkts, SrsRtcOutgoingPackets& info); + srs_error_t send_packets(std::vector& pkts, SrsRtcOutgoingInfo& info); + srs_error_t send_packets_gso(std::vector& pkts, SrsRtcOutgoingInfo& info); public: void nack_fetch(std::vector& pkts, uint32_t ssrc, uint16_t seq); void simulate_nack_drop(int nn);