commit 89525bae9247bcde1591b54b99f73913cd4640ea parent f99eb9f28f0035d80bcbe22e6cf661ba52cd0f44 Author: Michael Froman <mfroman@mozilla.com> Date: Mon, 5 Jan 2026 17:07:46 +0000 Bug 2007457 - revert rid changes to make way for libwebrtc upstream commit e51c178a37. r=bwc Differential Revision: https://phabricator.services.mozilla.com/D277389 Diffstat:
6 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/third_party/libwebrtc/api/frame_transformer_interface.h b/third_party/libwebrtc/api/frame_transformer_interface.h @@ -114,7 +114,6 @@ class TransformableVideoFrameInterface : public TransformableFrameInterface { RTC_EXPORT explicit TransformableVideoFrameInterface(Passkey passkey); virtual ~TransformableVideoFrameInterface() = default; virtual bool IsKeyFrame() const = 0; - virtual const std::string& GetRid() const = 0; virtual VideoFrameMetadata Metadata() const = 0; diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.h b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.h @@ -140,10 +140,6 @@ class RTPSender { uint32_t SSRC() const RTC_LOCKS_EXCLUDED(send_mutex_) { return ssrc_; } - const std::string& Rid() const RTC_LOCKS_EXCLUDED(send_mutex_) { - return rid_; - } - std::optional<uint32_t> FlexfecSsrc() const RTC_LOCKS_EXCLUDED(send_mutex_) { return flexfec_ssrc_; } diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_video.cc b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_video.cc @@ -185,7 +185,6 @@ RTPSenderVideo::RTPSenderVideo(const Config& config) this, config.frame_transformer, rtp_sender_->SSRC(), - rtp_sender_->Rid(), config.task_queue_factory) : nullptr) { if (frame_transformer_delegate_) diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc @@ -56,8 +56,7 @@ class TransformableVideoSenderFrame : public TransformableVideoFrameInterface { uint32_t rtp_timestamp, TimeDelta expected_retransmission_time, uint32_t ssrc, - std::vector<uint32_t> csrcs, - const std::string& rid) + std::vector<uint32_t> csrcs) : TransformableVideoFrameInterface(Passkey()), encoded_data_(encoded_image.GetEncodedData()), pre_transform_payload_size_(encoded_image.size()), @@ -70,8 +69,7 @@ class TransformableVideoSenderFrame : public TransformableVideoFrameInterface { presentation_timestamp_(encoded_image.PresentationTimestamp()), expected_retransmission_time_(expected_retransmission_time), ssrc_(ssrc), - csrcs_(csrcs), - rid_(rid) { + csrcs_(csrcs) { RTC_DCHECK_GE(payload_type_, 0); RTC_DCHECK_LE(payload_type_, 127); } @@ -144,8 +142,6 @@ class TransformableVideoSenderFrame : public TransformableVideoFrameInterface { return std::nullopt; } - const std::string& GetRid() const override { return rid_; } - private: scoped_refptr<EncodedImageBufferInterface> encoded_data_; const size_t pre_transform_payload_size_; @@ -160,19 +156,16 @@ class TransformableVideoSenderFrame : public TransformableVideoFrameInterface { uint32_t ssrc_; std::vector<uint32_t> csrcs_; - const std::string rid_; }; RTPSenderVideoFrameTransformerDelegate::RTPSenderVideoFrameTransformerDelegate( RTPVideoFrameSenderInterface* sender, scoped_refptr<FrameTransformerInterface> frame_transformer, uint32_t ssrc, - const std::string& rid, TaskQueueFactory* task_queue_factory) : sender_(sender), frame_transformer_(std::move(frame_transformer)), ssrc_(ssrc), - rid_(rid), transformation_queue_(task_queue_factory->CreateTaskQueue( "video_frame_transformer", TaskQueueFactory::Priority::NORMAL)) {} @@ -202,7 +195,7 @@ bool RTPSenderVideoFrameTransformerDelegate::TransformFrame( } frame_transformer_->Transform(std::make_unique<TransformableVideoSenderFrame>( encoded_image, video_header, payload_type, codec_type, rtp_timestamp, - expected_retransmission_time, ssrc_, csrcs, rid_)); + expected_retransmission_time, ssrc_, csrcs)); return true; } @@ -313,7 +306,7 @@ std::unique_ptr<TransformableVideoFrameInterface> CloneSenderVideoFrame( return std::make_unique<TransformableVideoSenderFrame>( encoded_image, new_header, original->GetPayloadType(), new_header.codec, original->GetTimestamp(), kDefaultRetransmissionsTime, - original->GetSsrc(), metadata.GetCsrcs(), original->GetRid()); + original->GetSsrc(), metadata.GetCsrcs()); } } // namespace webrtc diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.h b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.h @@ -67,7 +67,6 @@ class RTPSenderVideoFrameTransformerDelegate : public TransformedFrameCallback { RTPVideoFrameSenderInterface* sender, scoped_refptr<FrameTransformerInterface> frame_transformer, uint32_t ssrc, - const std::string& rid, TaskQueueFactory* send_transport_queue); void Init(); @@ -117,7 +116,6 @@ class RTPSenderVideoFrameTransformerDelegate : public TransformedFrameCallback { RTPVideoFrameSenderInterface* sender_ RTC_GUARDED_BY(sender_lock_); scoped_refptr<FrameTransformerInterface> frame_transformer_; const uint32_t ssrc_; - const std::string rid_; // Used when the encoded frames arrives without a current task queue. This can // happen if a hardware encoder was used. std::unique_ptr<TaskQueueBase, TaskQueueDeleter> transformation_queue_; diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.cc b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.cc @@ -75,11 +75,6 @@ class TransformableVideoReceiverFrame return frame_->FrameType() == VideoFrameType::kVideoFrameKey; } - const std::string& GetRid() const override { - static const std::string empty; - return empty; - } - VideoFrameMetadata Metadata() const override { return metadata_; } void SetMetadata(const VideoFrameMetadata& metadata) override {