Remove only-for-test interface method GetLocalSsrc(). Bug: none Change-Id: I88f0b0ca7c7146ec1a2ac2e7130925287c0344b3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/385981 Auto-Submit: Fredrik Solenberg <solenberg@webrtc.org> Commit-Queue: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#44366}
diff --git a/audio/audio_receive_stream.cc b/audio/audio_receive_stream.cc index 7be1580..06d37f3 100644 --- a/audio/audio_receive_stream.cc +++ b/audio/audio_receive_stream.cc
@@ -448,7 +448,6 @@ uint32_t AudioReceiveStreamImpl::local_ssrc() const { RTC_DCHECK_RUN_ON(&packet_sequence_checker_); - RTC_DCHECK_EQ(config_.rtp.local_ssrc, channel_receive_->GetLocalSsrc()); return config_.rtp.local_ssrc; }
diff --git a/audio/audio_receive_stream_unittest.cc b/audio/audio_receive_stream_unittest.cc index d6301b1..a60f503 100644 --- a/audio/audio_receive_stream_unittest.cc +++ b/audio/audio_receive_stream_unittest.cc
@@ -37,6 +37,7 @@ #include "modules/pacing/packet_router.h" #include "modules/rtp_rtcp/source/byte_io.h" #include "rtc_base/time_utils.h" +#include "test/gmock.h" #include "test/gtest.h" #include "test/mock_audio_decoder_factory.h" #include "test/mock_transport.h" @@ -142,8 +143,6 @@ .WillRepeatedly(Invoke([](const std::map<int, SdpAudioFormat>& codecs) { EXPECT_THAT(codecs, ::testing::IsEmpty()); })); - EXPECT_CALL(*channel_receive_, GetLocalSsrc()) - .WillRepeatedly(Return(kLocalSsrc)); stream_config_.rtp.local_ssrc = kLocalSsrc; stream_config_.rtp.remote_ssrc = kRemoteSsrc;
diff --git a/audio/channel_receive.cc b/audio/channel_receive.cc index 6d32265..36363b1 100644 --- a/audio/channel_receive.cc +++ b/audio/channel_receive.cc
@@ -212,7 +212,6 @@ frame_decryptor) override; void OnLocalSsrcChange(uint32_t local_ssrc) override; - uint32_t GetLocalSsrc() const override; void RtcpPacketTypesCounterUpdated( uint32_t ssrc, @@ -967,11 +966,6 @@ rtp_rtcp_->SetLocalSsrc(local_ssrc); } -uint32_t ChannelReceive::GetLocalSsrc() const { - RTC_DCHECK_RUN_ON(&worker_thread_checker_); - return rtp_rtcp_->local_media_ssrc(); -} - NetworkStatistics ChannelReceive::GetNetworkStatistics( bool get_and_clear_legacy_stats) const { RTC_DCHECK_RUN_ON(&worker_thread_checker_);
diff --git a/audio/channel_receive.h b/audio/channel_receive.h index 8a5481b..6b9d816 100644 --- a/audio/channel_receive.h +++ b/audio/channel_receive.h
@@ -163,7 +163,6 @@ rtc::scoped_refptr<webrtc::FrameDecryptorInterface> frame_decryptor) = 0; virtual void OnLocalSsrcChange(uint32_t local_ssrc) = 0; - virtual uint32_t GetLocalSsrc() const = 0; }; std::unique_ptr<ChannelReceiveInterface> CreateChannelReceive(
diff --git a/audio/mock_voe_channel_proxy.h b/audio/mock_voe_channel_proxy.h index da55650..2fd0850 100644 --- a/audio/mock_voe_channel_proxy.h +++ b/audio/mock_voe_channel_proxy.h
@@ -122,7 +122,6 @@ (rtc::scoped_refptr<webrtc::FrameDecryptorInterface> frame_decryptor), (override)); MOCK_METHOD(void, OnLocalSsrcChange, (uint32_t local_ssrc), (override)); - MOCK_METHOD(uint32_t, GetLocalSsrc, (), (const, override)); }; class MockChannelSend : public voe::ChannelSendInterface {