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
24 lines
1.1 KiB
Diff
24 lines
1.1 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Thu, 19 Sep 2024 13:23:00 -0500
|
|
Subject: Bug 1918268 - (fix-2bc77cebf2) our base-toolchains builds need the
|
|
struct name to build
|
|
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/1055b3892393f16136a29d12e616f29b010ab2c9
|
|
---
|
|
modules/audio_coding/neteq/neteq_impl.cc | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/modules/audio_coding/neteq/neteq_impl.cc b/modules/audio_coding/neteq/neteq_impl.cc
|
|
index b327c9b788..3998335d8a 100644
|
|
--- a/modules/audio_coding/neteq/neteq_impl.cc
|
|
+++ b/modules/audio_coding/neteq/neteq_impl.cc
|
|
@@ -119,7 +119,7 @@ NetEqImpl::Dependencies::Dependencies(
|
|
stats.get())),
|
|
neteq_controller(controller_factory.Create(
|
|
env,
|
|
- {.allow_time_stretching = !config.for_test_no_time_stretching,
|
|
+ NetEqController::Config{.allow_time_stretching = !config.for_test_no_time_stretching,
|
|
.max_packets_in_buffer =
|
|
static_cast<int>(config.max_packets_in_buffer),
|
|
.base_min_delay_ms = config.min_delay_ms,
|