admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove deprecated TransformableAudioFrameInterface::getHeader() method

Browse Source 
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}
This commit is contained in:
Tony Herre 2023-08-14 16:22:50 +02:00 committed by WebRTC LUCI CQ
parent d43af9172b
commit 392e4714e7
5 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/frame_transformer_interface.h
View File

@ -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<const uint32_t> GetContributingSources() const = 0;
// TODO(crbug.com/1453226): Change this to pure virtual after it

1
api/test/mock_transformable_audio_frame.h
View File

@ -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<const uint32_t>,
GetContributingSources,
(),

1
audio/channel_receive_frame_transformer_delegate.cc
View File

@ -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<const uint32_t> GetContributingSources() const override {
return rtc::ArrayView<const uint32_t>(header_.arrOfCSRCs, header_.numCSRCs);
}

8
audio/channel_send_frame_transformer_delegate.cc
View File

@ -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<const uint32_t> 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

2
modules/rtp_rtcp/source/frame_transformer_factory_unittest.cc
View File

@ -41,8 +41,6 @@ TEST(FrameTransformerFactory, CloneAudioFrame) {
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));