mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-14 22:30:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove deprecated TransformableVideoFrameInterface::GetMetadata

Browse source 
Bug: chromium:1420245
Change-Id: I4cc008bf8a4af2404f33589aededa8a16b774764
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/299263
Commit-Queue: Tony Herre <herre@google.com>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39712}
This commit is contained in:
Tony Herre 2023-03-28 14:38:15 +02:00 committed by WebRTC LUCI CQ
parent 2b742f7eaa
commit e7482b403d
4 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
api/frame_transformer_interface.h
View file

@ -58,11 +58,6 @@ class TransformableVideoFrameInterface : public TransformableFrameInterface {
virtual ~TransformableVideoFrameInterface() = default; virtual ~TransformableVideoFrameInterface() = default;
virtual bool IsKeyFrame() const = 0; virtual bool IsKeyFrame() const = 0;
// The returned const ref may become invalid due to later SetMetadata calls,
// or other modifications. Use Metadata() instead.
[[deprecated("Use Metadata() instead")]] virtual const VideoFrameMetadata&
GetMetadata() const = 0;
virtual VideoFrameMetadata Metadata() const = 0; virtual VideoFrameMetadata Metadata() const = 0;
// TODO(https://crbug.com/webrtc/14709): Make pure virtual when Chromium MOCK // TODO(https://crbug.com/webrtc/14709): Make pure virtual when Chromium MOCK

4
api/test/mock_transformable_video_frame.h
View file

@ -26,10 +26,6 @@ class MockTransformableVideoFrame
MOCK_METHOD(uint32_t, GetTimestamp, (), (const, override)); MOCK_METHOD(uint32_t, GetTimestamp, (), (const, override));
MOCK_METHOD(uint32_t, GetSsrc, (), (const, override)); MOCK_METHOD(uint32_t, GetSsrc, (), (const, override));
MOCK_METHOD(bool, IsKeyFrame, (), (const, override)); MOCK_METHOD(bool, IsKeyFrame, (), (const, override));
MOCK_METHOD(const webrtc::VideoFrameMetadata&,
GetMetadata,
(),
(const, override));
MOCK_METHOD(void, MOCK_METHOD(void,
SetMetadata, SetMetadata,
(const webrtc::VideoFrameMetadata&), (const webrtc::VideoFrameMetadata&),

16
modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc
View file

@ -42,8 +42,7 @@ class TransformableVideoSenderFrame : public TransformableVideoFrameInterface {
capture_time_identifier_(encoded_image.CaptureTimeIdentifier()), capture_time_identifier_(encoded_image.CaptureTimeIdentifier()),
expected_retransmission_time_ms_(expected_retransmission_time_ms), expected_retransmission_time_ms_(expected_retransmission_time_ms),
ssrc_(ssrc), ssrc_(ssrc),
csrcs_(csrcs), csrcs_(csrcs) {
metadata_(Metadata()) {
RTC_DCHECK_GE(payload_type_, 0); RTC_DCHECK_GE(payload_type_, 0);
RTC_DCHECK_LE(payload_type_, 127); RTC_DCHECK_LE(payload_type_, 127);
} }
@ -66,8 +65,6 @@ class TransformableVideoSenderFrame : public TransformableVideoFrameInterface {
return frame_type_ == VideoFrameType::kVideoFrameKey; return frame_type_ == VideoFrameType::kVideoFrameKey;
} }
const VideoFrameMetadata& GetMetadata() const override { return metadata_; }
VideoFrameMetadata Metadata() const override { VideoFrameMetadata Metadata() const override {
VideoFrameMetadata metadata = header_.GetAsMetadata(); VideoFrameMetadata metadata = header_.GetAsMetadata();
metadata.SetSsrc(ssrc_); metadata.SetSsrc(ssrc_);
@ -79,9 +76,6 @@ class TransformableVideoSenderFrame : public TransformableVideoFrameInterface {
header_.SetFromMetadata(metadata); header_.SetFromMetadata(metadata);
ssrc_ = metadata.GetSsrc(); ssrc_ = metadata.GetSsrc();
csrcs_ = metadata.GetCsrcs(); csrcs_ = metadata.GetCsrcs();
// Cache a copy to allow GetMetadata() to return references.
// TODO(crbug.com/webrtc/14709): Remove once GetMetadata() is removed.
metadata_ = Metadata();
} }
const RTPVideoHeader& GetHeader() const { return header_; } const RTPVideoHeader& GetHeader() const { return header_; }
@ -111,12 +105,6 @@ class TransformableVideoSenderFrame : public TransformableVideoFrameInterface {
uint32_t ssrc_; uint32_t ssrc_;
std::vector<uint32_t> csrcs_; std::vector<uint32_t> csrcs_;
// This is a copy of the value returned by `Metadata()`, only needed because
// the interface says GetMetadata() must return a const ref rather than a
// value.
// TODO(crbug.com/webrtc/14709): Delete once GetMetdata() is removed.
VideoFrameMetadata metadata_;
}; };
} // namespace } // namespace
@ -184,7 +172,7 @@ void RTPSenderVideoFrameTransformerDelegate::SendVideo(
transformed_video_frame->GetData(), transformed_video_frame->GetData(),
transformed_video_frame->GetHeader(), transformed_video_frame->GetHeader(),
transformed_video_frame->GetExpectedRetransmissionTimeMs(), transformed_video_frame->GetExpectedRetransmissionTimeMs(),
transformed_video_frame->GetMetadata().GetCsrcs()); transformed_video_frame->Metadata().GetCsrcs());
} }
void RTPSenderVideoFrameTransformerDelegate::SetVideoStructureUnderLock( void RTPSenderVideoFrameTransformerDelegate::SetVideoStructureUnderLock(

2
modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.cc
View file

@ -51,8 +51,6 @@ class TransformableVideoReceiverFrame
return frame_->FrameType() == VideoFrameType::kVideoFrameKey; return frame_->FrameType() == VideoFrameType::kVideoFrameKey;
} }
const VideoFrameMetadata& GetMetadata() const override { return metadata_; }
VideoFrameMetadata Metadata() const override { return metadata_; } VideoFrameMetadata Metadata() const override { return metadata_; }
void SetMetadata(const VideoFrameMetadata&) override { void SetMetadata(const VideoFrameMetadata&) override {