commit ffe9c92e95c411a3647c0e3dc598280ec890f208 parent 900f7d6897e213e0d6a5f78da41154867860079f Author: Michael Froman <mfroman@mozilla.com> Date: Thu, 9 Oct 2025 09:34:08 -0500 Bug 1993083 - Vendor libwebrtc from cb4d3d4f3f Upstream commit: https://webrtc.googlesource.com/src/+/cb4d3d4f3fcadee4a74892e0394f4c57a13ee8a6 Delete deprecated variant of TestAudioDeviceModule::Create All known users were updated to provide at construction Environment instead of just a TaskQueueFactory Bug: webrtc:413413572 Change-Id: I28f589be1ab1e4768a6aa44d5b9527b6b9120bae Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/399640 Auto-Submit: Danil Chapovalov <danilchap@webrtc.org> Commit-Queue: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#45126} Diffstat:
6 files changed, 9 insertions(+), 33 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor @@ -1,4 +1,4 @@ # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc -libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-09T14:32:41.911048+00:00. +libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-09T14:33:58.948608+00:00. # base of lastest vendoring -dc159bf639 +cb4d3d4f3f diff --git a/third_party/libwebrtc/modules/audio_device/BUILD.gn b/third_party/libwebrtc/modules/audio_device/BUILD.gn @@ -182,10 +182,6 @@ if (!build_with_chromium) { "test_audio_device_impl.h", ] - # TODO: bugs.webrtc.org/413413572 - Mark this build target as testonly or - # or update downstream not to use deprecated function. Explicit poison - # can be removed then. - allow_poison = [ "environment_construction" ] deps = [ ":audio_device_buffer", ":audio_device_default", @@ -196,7 +192,6 @@ if (!build_with_chromium) { "../../api:scoped_refptr", "../../api/audio:audio_device", "../../api/environment", - "../../api/environment:environment_factory", "../../api/task_queue", "../../api/units:time_delta", "../../common_audio", diff --git a/third_party/libwebrtc/modules/audio_device/include/test_audio_device.cc b/third_party/libwebrtc/modules/audio_device/include/test_audio_device.cc @@ -22,10 +22,8 @@ #include "api/array_view.h" #include "api/audio/audio_device.h" #include "api/environment/environment.h" -#include "api/environment/environment_factory.h" #include "api/make_ref_counted.h" #include "api/scoped_refptr.h" -#include "api/task_queue/task_queue_factory.h" #include "common_audio/wav_file.h" #include "modules/audio_device/audio_device_impl.h" #include "modules/audio_device/test_audio_device_impl.h" @@ -426,15 +424,6 @@ size_t TestAudioDeviceModule::SamplesPerFrame(int sampling_frequency_in_hz) { } scoped_refptr<AudioDeviceModule> TestAudioDeviceModule::Create( - TaskQueueFactory* task_queue_factory, - std::unique_ptr<TestAudioDeviceModule::Capturer> capturer, - std::unique_ptr<TestAudioDeviceModule::Renderer> renderer, - float speed) { - return Create(CreateEnvironment(task_queue_factory), std::move(capturer), - std::move(renderer), speed); -} - -scoped_refptr<AudioDeviceModule> TestAudioDeviceModule::Create( const Environment& env, std::unique_ptr<TestAudioDeviceModule::Capturer> capturer, std::unique_ptr<TestAudioDeviceModule::Renderer> renderer, diff --git a/third_party/libwebrtc/modules/audio_device/include/test_audio_device.h b/third_party/libwebrtc/modules/audio_device/include/test_audio_device.h @@ -19,7 +19,6 @@ #include "api/audio/audio_device.h" #include "api/environment/environment.h" #include "api/scoped_refptr.h" -#include "api/task_queue/task_queue_factory.h" #include "rtc_base/buffer.h" namespace webrtc { @@ -85,13 +84,6 @@ class TestAudioDeviceModule { std::unique_ptr<Renderer> renderer, float speed = 1); - [[deprecated("bugs.webrtc.org/413413572")]] - static scoped_refptr<AudioDeviceModule> Create( - TaskQueueFactory* task_queue_factory, - std::unique_ptr<Capturer> capturer, - std::unique_ptr<Renderer> renderer, - float speed = 1); - // Returns a Capturer instance that generates a signal of `num_channels` // channels where every second frame is zero and every second frame is evenly // distributed random noise with max amplitude `max_amplitude`. diff --git a/third_party/libwebrtc/moz-patch-stack/s0027.patch b/third_party/libwebrtc/moz-patch-stack/s0027.patch @@ -736,7 +736,7 @@ index a24282bee8..f09ff0301a 100644 } diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn -index a920be33f7..8d53cdfa0a 100644 +index 8a8235fb16..8bb0e958ee 100644 --- a/modules/audio_device/BUILD.gn +++ b/modules/audio_device/BUILD.gn @@ -30,6 +30,7 @@ rtc_source_set("audio_device_default") { @@ -771,7 +771,7 @@ index a920be33f7..8d53cdfa0a 100644 rtc_library("audio_device_generic") { sources = [ -@@ -259,6 +263,7 @@ if (!build_with_chromium) { +@@ -254,6 +258,7 @@ if (!build_with_chromium) { # Contains default implementations of webrtc::AudioDeviceModule for Windows, # Linux, Mac, iOS and Android. rtc_library("audio_device_impl") { @@ -779,7 +779,7 @@ index a920be33f7..8d53cdfa0a 100644 visibility = [ "*" ] deps = [ ":audio_device_buffer", -@@ -306,9 +311,9 @@ rtc_library("audio_device_impl") { +@@ -301,9 +306,9 @@ rtc_library("audio_device_impl") { sources = [ "include/fake_audio_device.h" ] if (build_with_mozilla) { @@ -792,7 +792,7 @@ index a920be33f7..8d53cdfa0a 100644 ] } -@@ -411,6 +416,7 @@ rtc_library("audio_device_impl") { +@@ -406,6 +411,7 @@ rtc_library("audio_device_impl") { sources += [ "dummy/file_audio_device_factory.h" ] } } @@ -800,7 +800,7 @@ index a920be33f7..8d53cdfa0a 100644 if (is_mac) { rtc_source_set("audio_device_impl_frameworks") { -@@ -428,6 +434,7 @@ if (is_mac) { +@@ -423,6 +429,7 @@ if (is_mac) { } } @@ -808,7 +808,7 @@ index a920be33f7..8d53cdfa0a 100644 rtc_source_set("mock_audio_device") { visibility = [ "*" ] testonly = true -@@ -446,8 +453,10 @@ rtc_source_set("mock_audio_device") { +@@ -441,8 +448,10 @@ rtc_source_set("mock_audio_device") { "../../test:test_support", ] } diff --git a/third_party/libwebrtc/moz-patch-stack/s0103.patch b/third_party/libwebrtc/moz-patch-stack/s0103.patch @@ -440,7 +440,7 @@ index a992a032c5..6f2dc22e00 100644 import("../webrtc.gni") diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn -index 8d53cdfa0a..181623546d 100644 +index 8bb0e958ee..9da415eeda 100644 --- a/modules/audio_device/BUILD.gn +++ b/modules/audio_device/BUILD.gn @@ -9,8 +9,8 @@