06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
67 lines
3.3 KiB
Diff
67 lines
3.3 KiB
Diff
From: Byron Campen <docfaraday@gmail.com>
|
|
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 | 3 +--
|
|
.../rtp_video_stream_receiver_frame_transformer_delegate.h | 5 ++---
|
|
video/rtp_video_stream_receiver2.cc | 2 +-
|
|
3 files changed, 4 insertions(+), 6 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 918143bc43..c736cc647d 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
|
|
@@ -123,8 +123,7 @@ RtpVideoStreamReceiverFrameTransformerDelegate::
|
|
RtpVideoFrameReceiver* receiver,
|
|
Clock* clock,
|
|
rtc::scoped_refptr<FrameTransformerInterface> frame_transformer,
|
|
- rtc::Thread* network_thread,
|
|
- uint32_t ssrc)
|
|
+ TaskQueueBase* network_thread, uint32_t ssrc)
|
|
: receiver_(receiver),
|
|
frame_transformer_(std::move(frame_transformer)),
|
|
network_thread_(network_thread),
|
|
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 f08fc692dd..02f2e53923 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
|
|
@@ -41,8 +41,7 @@ class RtpVideoStreamReceiverFrameTransformerDelegate
|
|
RtpVideoFrameReceiver* receiver,
|
|
Clock* clock,
|
|
rtc::scoped_refptr<FrameTransformerInterface> frame_transformer,
|
|
- rtc::Thread* network_thread,
|
|
- uint32_t ssrc);
|
|
+ TaskQueueBase* network_thread, uint32_t ssrc);
|
|
|
|
void Init();
|
|
void Reset();
|
|
@@ -71,7 +70,7 @@ class RtpVideoStreamReceiverFrameTransformerDelegate
|
|
RtpVideoFrameReceiver* receiver_ RTC_GUARDED_BY(network_sequence_checker_);
|
|
rtc::scoped_refptr<FrameTransformerInterface> frame_transformer_
|
|
RTC_GUARDED_BY(network_sequence_checker_);
|
|
- rtc::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 f99e0d4b45..13bdba2583 100644
|
|
--- a/video/rtp_video_stream_receiver2.cc
|
|
+++ b/video/rtp_video_stream_receiver2.cc
|
|
@@ -341,7 +341,7 @@ RtpVideoStreamReceiver2::RtpVideoStreamReceiver2(
|
|
frame_transformer_delegate_ =
|
|
rtc::make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
|
|
this, &env_.clock(), std::move(frame_transformer),
|
|
- rtc::Thread::Current(), config_.rtp.remote_ssrc);
|
|
+ TaskQueueBase::Current(), config_.rtp.remote_ssrc);
|
|
frame_transformer_delegate_->Init();
|
|
}
|
|
}
|