commit 392e4714e763da9fecb0d93ee30821bef8ee8597
author Tony Herre <herre@google.com> Mon Aug 14 14:22:50 2023
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Aug 15 16:31:02 2023
tree 882dde750ddee18b2b971fdb7794f4fbed3f5cde
parent d43af9172b4f43c068fc34db3fc7ab4382751723

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 <herre@google.com>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40555}

api/frame_transformer_interface.h

diff --git a/api/frame_transformer_interface.h b/api/frame_transformer_interface.h
index 8effdcf..bd9ea2d 100644
--- a/api/frame_transformer_interface.h
+++ b/api/frame_transformer_interface.h
@@ -70,10 +70,6 @@
  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<const uint32_t> GetContributingSources() const = 0;
 
   // TODO(crbug.com/1453226): Change this to pure virtual after it

api/test/mock_transformable_audio_frame.h

diff --git a/api/test/mock_transformable_audio_frame.h b/api/test/mock_transformable_audio_frame.h
index 680d7a0..be70300 100644
--- a/api/test/mock_transformable_audio_frame.h
+++ b/api/test/mock_transformable_audio_frame.h
@@ -24,7 +24,6 @@
   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<const uint32_t>,
               GetContributingSources,
               (),

audio/channel_receive_frame_transformer_delegate.cc

diff --git a/audio/channel_receive_frame_transformer_delegate.cc b/audio/channel_receive_frame_transformer_delegate.cc
index 3cc9a01..54e08f7 100644
--- a/audio/channel_receive_frame_transformer_delegate.cc
+++ b/audio/channel_receive_frame_transformer_delegate.cc
@@ -40,7 +40,6 @@
   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<const uint32_t> GetContributingSources() const override {
     return rtc::ArrayView<const uint32_t>(header_.arrOfCSRCs, header_.numCSRCs);
   }

audio/channel_send_frame_transformer_delegate.cc

diff --git a/audio/channel_send_frame_transformer_delegate.cc b/audio/channel_send_frame_transformer_delegate.cc
index 8c97256..a63f570 100644
--- a/audio/channel_send_frame_transformer_delegate.cc
+++ b/audio/channel_send_frame_transformer_delegate.cc
@@ -81,10 +81,6 @@
   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<const uint32_t> GetContributingSources() const override {
     return {};
   }
@@ -109,10 +105,6 @@
   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
 

modules/rtp_rtcp/source/frame_transformer_factory_unittest.cc

diff --git a/modules/rtp_rtcp/source/frame_transformer_factory_unittest.cc b/modules/rtp_rtcp/source/frame_transformer_factory_unittest.cc
index 4ecc5a3..a61179e 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 @@
   std::fill_n(data, 10, 5);
   rtc::ArrayView<uint8_t> 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));