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
25 lines
1.2 KiB
Diff
25 lines
1.2 KiB
Diff
From: Byron Campen <docfaraday@gmail.com>
|
|
Date: Fri, 7 Apr 2023 20:28:00 +0000
|
|
Subject: Bug 1819048: Remove this bad assertion. r=webrtc-reviewers,jib
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D174978
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/5a52e1b0c808edfda82f0abea668699eb68098dc
|
|
---
|
|
video/task_queue_frame_decode_scheduler.cc | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/video/task_queue_frame_decode_scheduler.cc b/video/task_queue_frame_decode_scheduler.cc
|
|
index 624f8abf4a..dcc83d4a8b 100644
|
|
--- a/video/task_queue_frame_decode_scheduler.cc
|
|
+++ b/video/task_queue_frame_decode_scheduler.cc
|
|
@@ -37,7 +37,8 @@ void TaskQueueFrameDecodeScheduler::ScheduleFrame(
|
|
uint32_t rtp,
|
|
FrameDecodeTiming::FrameSchedule schedule,
|
|
FrameReleaseCallback cb) {
|
|
- RTC_DCHECK(!stopped_) << "Can not schedule frames after stopped.";
|
|
+ // Mozilla modification, until https://bugs.webrtc.org/14944 is fixed
|
|
+ //RTC_DCHECK(!stopped_) << "Can not schedule frames after stopped.";
|
|
RTC_DCHECK(!scheduled_rtp_.has_value())
|
|
<< "Can not schedule two frames for release at the same time.";
|
|
RTC_DCHECK(cb);
|