From: Byron Campen Date: Thu, 20 Jul 2023 14:24:00 +0000 Subject: Bug 1838080: Use the current TaskQueue, instead of the current thread, to init this. r=pehrsons,webrtc-reviewers There are situations where the current thread is not set, but the current TaskQueue is (but not vice versa). Differential Revision: https://phabricator.services.mozilla.com/D180736 Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/62e71a2f745c4b98d5ee7ce9e6386aa1b657be9b --- .../rtp_video_stream_receiver_frame_transformer_delegate.cc | 2 +- .../rtp_video_stream_receiver_frame_transformer_delegate.h | 4 ++-- video/rtp_video_stream_receiver2.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.cc b/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.cc index 7b5f480aa1..b3a77c197f 100644 --- a/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.cc +++ b/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.cc @@ -138,7 +138,7 @@ RtpVideoStreamReceiverFrameTransformerDelegate:: RtpVideoFrameReceiver* receiver, Clock* clock, scoped_refptr frame_transformer, - Thread* network_thread, + TaskQueueBase* network_thread, uint32_t ssrc) : receiver_(receiver), frame_transformer_(std::move(frame_transformer)), diff --git a/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.h b/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.h index 1e6678b4ee..1ed48c08d7 100644 --- a/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.h +++ b/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.h @@ -44,7 +44,7 @@ class RtpVideoStreamReceiverFrameTransformerDelegate RtpVideoFrameReceiver* receiver, Clock* clock, scoped_refptr frame_transformer, - Thread* network_thread, + TaskQueueBase* network_thread, uint32_t ssrc); void Init(); @@ -74,7 +74,7 @@ class RtpVideoStreamReceiverFrameTransformerDelegate RtpVideoFrameReceiver* receiver_ RTC_GUARDED_BY(network_sequence_checker_); scoped_refptr frame_transformer_ RTC_GUARDED_BY(network_sequence_checker_); - Thread* const network_thread_; + TaskQueueBase* const network_thread_; const uint32_t ssrc_; Clock* const clock_; bool short_circuit_ RTC_GUARDED_BY(network_sequence_checker_) = false; diff --git a/video/rtp_video_stream_receiver2.cc b/video/rtp_video_stream_receiver2.cc index 4136ae943f..ad9d51c47a 100644 --- a/video/rtp_video_stream_receiver2.cc +++ b/video/rtp_video_stream_receiver2.cc @@ -383,7 +383,7 @@ RtpVideoStreamReceiver2::RtpVideoStreamReceiver2( frame_transformer_delegate_ = make_ref_counted( this, &env_.clock(), std::move(frame_transformer), - Thread::Current(), config_.rtp.remote_ssrc); + TaskQueueBase::Current(), config_.rtp.remote_ssrc); frame_transformer_delegate_->Init(); } }