From 392e4714e763da9fecb0d93ee30821bef8ee8597 Mon Sep 17 00:00:00 2001 From: Tony Herre Date: Mon, 14 Aug 2023 16:22:50 +0200 Subject: [PATCH] Remove deprecated TransformableAudioFrameInterface::getHeader() method Fixed: chromium:1456628 Change-Id: I12ea08070578de846f042c64f2808b55de1603a8 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/315960 Auto-Submit: Tony Herre Commit-Queue: Harald Alvestrand Reviewed-by: Harald Alvestrand Cr-Commit-Position: refs/heads/main@{#40555} --- api/frame_transformer_interface.h | 4 ---- api/test/mock_transformable_audio_frame.h | 1 - audio/channel_receive_frame_transformer_delegate.cc | 1 - audio/channel_send_frame_transformer_delegate.cc | 8 -------- .../rtp_rtcp/source/frame_transformer_factory_unittest.cc | 2 -- 5 files changed, 16 deletions(-) diff --git a/api/frame_transformer_interface.h b/api/frame_transformer_interface.h index 8effdcf26d..bd9ea2d67a 100644 --- a/api/frame_transformer_interface.h +++ b/api/frame_transformer_interface.h @@ -70,10 +70,6 @@ class TransformableAudioFrameInterface : public TransformableFrameInterface { public: virtual ~TransformableAudioFrameInterface() = default; - // TODO(crbug.com/1453226): Remove after a few weeks. - [[deprecated("Use specific getters instead.")]] virtual const RTPHeader& - GetHeader() const = 0; - virtual rtc::ArrayView GetContributingSources() const = 0; // TODO(crbug.com/1453226): Change this to pure virtual after it diff --git a/api/test/mock_transformable_audio_frame.h b/api/test/mock_transformable_audio_frame.h index 680d7a0fdc..be703006ea 100644 --- a/api/test/mock_transformable_audio_frame.h +++ b/api/test/mock_transformable_audio_frame.h @@ -24,7 +24,6 @@ class MockTransformableAudioFrame : public TransformableAudioFrameInterface { MOCK_METHOD(uint8_t, GetPayloadType, (), (const, override)); MOCK_METHOD(uint32_t, GetSsrc, (), (const, override)); MOCK_METHOD(uint32_t, GetTimestamp, (), (const, override)); - MOCK_METHOD(RTPHeader&, GetHeader, (), (const override)); MOCK_METHOD(rtc::ArrayView, GetContributingSources, (), diff --git a/audio/channel_receive_frame_transformer_delegate.cc b/audio/channel_receive_frame_transformer_delegate.cc index 3cc9a01204..54e08f7dea 100644 --- a/audio/channel_receive_frame_transformer_delegate.cc +++ b/audio/channel_receive_frame_transformer_delegate.cc @@ -40,7 +40,6 @@ class TransformableIncomingAudioFrame uint8_t GetPayloadType() const override { return header_.payloadType; } uint32_t GetSsrc() const override { return ssrc_; } uint32_t GetTimestamp() const override { return header_.timestamp; } - const RTPHeader& GetHeader() const override { return header_; } rtc::ArrayView GetContributingSources() const override { return rtc::ArrayView(header_.arrOfCSRCs, header_.numCSRCs); } diff --git a/audio/channel_send_frame_transformer_delegate.cc b/audio/channel_send_frame_transformer_delegate.cc index 8c9725681b..a63f5706ba 100644 --- a/audio/channel_send_frame_transformer_delegate.cc +++ b/audio/channel_send_frame_transformer_delegate.cc @@ -81,10 +81,6 @@ class TransformableOutgoingAudioFrame uint8_t GetPayloadType() const override { return payload_type_; } Direction GetDirection() const override { return Direction::kSender; } - // TODO(crbug.com/1453226): Remove once GetHeader() is removed from - // TransformableAudioFrameInterface. - const RTPHeader& GetHeader() const override { return empty_header_; } - rtc::ArrayView GetContributingSources() const override { return {}; } @@ -109,10 +105,6 @@ class TransformableOutgoingAudioFrame rtc::Buffer payload_; int64_t absolute_capture_timestamp_ms_; uint32_t ssrc_; - - // TODO(crbug.com/1453226): Remove once GetHeader() is removed from - // TransformableAudioFrameInterface. - RTPHeader empty_header_; }; } // namespace diff --git a/modules/rtp_rtcp/source/frame_transformer_factory_unittest.cc b/modules/rtp_rtcp/source/frame_transformer_factory_unittest.cc index 4ecc5a379f..a61179e9d3 100644 --- a/modules/rtp_rtcp/source/frame_transformer_factory_unittest.cc +++ b/modules/rtp_rtcp/source/frame_transformer_factory_unittest.cc @@ -41,8 +41,6 @@ TEST(FrameTransformerFactory, CloneAudioFrame) { std::fill_n(data, 10, 5); rtc::ArrayView data_view(data); ON_CALL(original_frame, GetData()).WillByDefault(Return(data_view)); - RTPHeader rtp_header; - ON_CALL(original_frame, GetHeader()).WillByDefault(ReturnRef(rtp_header)); auto cloned_frame = CloneAudioFrame(&original_frame); EXPECT_THAT(cloned_frame->GetData(), ElementsAreArray(data));