From 4aabbd74dce704f9cca15ef05c5cc35507213a61 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 3 Aug 2020 13:12:39 +0800 Subject: [PATCH] RTC: Cover default status of track --- trunk/src/app/srs_app_rtc_conn.cpp | 6 +++--- trunk/src/app/srs_app_rtc_conn.hpp | 4 ++-- trunk/src/app/srs_app_rtc_server.cpp | 2 +- trunk/src/utest/srs_utest_rtc.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 03eddcdea..6fb1f3e30 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -525,7 +525,7 @@ void SrsRtcPlayStream::nack_fetch(vector& pkts, uint32_t ssrc, u } } -void SrsRtcPlayStream::set_track_status(bool status) +void SrsRtcPlayStream::set_all_tracks_status(bool status) { std::ostringstream merged_log; @@ -2305,7 +2305,7 @@ srs_error_t SrsRtcConnection::do_send_packets(const std::vector& return err; } -srs_error_t SrsRtcConnection::set_play_track_status(bool status) +srs_error_t SrsRtcConnection::set_all_tracks_status_for_play(bool status) { srs_error_t err = srs_success; @@ -2313,7 +2313,7 @@ srs_error_t SrsRtcConnection::set_play_track_status(bool status) return srs_error_new(ERROR_RTC_NO_PLAYER, "set play track status"); } - player_->set_track_status(status); + player_->set_all_tracks_status(status); return err; } diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 240da89d6..59814ab73 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -209,7 +209,7 @@ private: public: void nack_fetch(std::vector& pkts, uint32_t ssrc, uint16_t seq); // Directly set the status of track, generally for init to set the default value. - void set_track_status(bool status); + void set_all_tracks_status(bool status); // interface ISrsHourGlass public: virtual srs_error_t notify(int type, srs_utime_t interval, srs_utime_t tick); @@ -412,7 +412,7 @@ public: void simulate_player_drop_packet(SrsRtpHeader* h, int nn_bytes); srs_error_t do_send_packets(const std::vector& pkts, SrsRtcPlayStreamStatistic& info); // Directly set the status of play track, generally for init to set the default value. - srs_error_t set_play_track_status(bool status); + srs_error_t set_all_tracks_status_for_play(bool status); private: srs_error_t on_binding_request(SrsStunPacket* r); // publish media capabilitiy negotiate diff --git a/trunk/src/app/srs_app_rtc_server.cpp b/trunk/src/app/srs_app_rtc_server.cpp index 8991f1b9d..da19ccab0 100644 --- a/trunk/src/app/srs_app_rtc_server.cpp +++ b/trunk/src/app/srs_app_rtc_server.cpp @@ -416,7 +416,7 @@ srs_error_t SrsRtcServer::do_create_session( // TODO: FIXME: Handle error. // All tracks default as inactive, so we must enable them. - session->set_play_track_status(true); + session->set_all_tracks_status_for_play(true); } std::string local_pwd = srs_random_str(32); diff --git a/trunk/src/utest/srs_utest_rtc.cpp b/trunk/src/utest/srs_utest_rtc.cpp index 5cde08cc3..f88ae78bc 100644 --- a/trunk/src/utest/srs_utest_rtc.cpp +++ b/trunk/src/utest/srs_utest_rtc.cpp @@ -151,7 +151,7 @@ VOID TEST(KernelRTCTest, DefaultTrackStatus) EXPECT_FALSE(audio->get_track_status()); EXPECT_FALSE(video->get_track_status()); - play.set_track_status(true); + play.set_all_tracks_status(true); EXPECT_TRUE(audio->get_track_status()); EXPECT_TRUE(video->get_track_status()); }