commit b51bc6539af9973e34f4580e31e6ada4b06c66fc
parent 66777df72f35b9c6b701c0c8b5b46821f2da6909
Author: Michael Froman <mfroman@mozilla.com>
Date: Thu, 9 Oct 2025 14:47:39 -0500
Bug 1993083 - Vendor libwebrtc from b7ff21cbb3
Upstream commit: https://webrtc.googlesource.com/src/+/b7ff21cbb310f447bbbe812264127d27e22cda8f
Delete deprecated variants of ios CreateAudioDeviceModule
Bug: webrtc:413413572
Change-Id: I713a76a696db9834e62836c0031d3f89fad369db
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/400502
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Auto-Submit: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#45159}
Diffstat:
7 files changed, 13 insertions(+), 50 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-09T19:46:25.799725+00:00.
+libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-09T19:47:29.463881+00:00.
# base of lastest vendoring
-e70359716b
+b7ff21cbb3
diff --git a/third_party/libwebrtc/moz-patch-stack/s0055.patch b/third_party/libwebrtc/moz-patch-stack/s0055.patch
@@ -26,10 +26,10 @@ index dc859f91c3..dfff7bf799 100644
deps += [ "logging:rtc_event_log_proto" ]
}
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
-index be38095b73..895b2f0373 100644
+index 878aeb2dd9..2c278341c7 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
-@@ -576,6 +576,7 @@ if (is_ios || is_mac) {
+@@ -571,6 +571,7 @@ if (is_ios || is_mac) {
}
}
@@ -37,7 +37,7 @@ index be38095b73..895b2f0373 100644
rtc_library("videosource_objc") {
sources = [
"objc/api/peerconnection/RTCVideoSource+Private.h",
-@@ -605,6 +606,7 @@ if (is_ios || is_mac) {
+@@ -600,6 +601,7 @@ if (is_ios || is_mac) {
":used_from_extension",
]
}
@@ -45,7 +45,7 @@ index be38095b73..895b2f0373 100644
rtc_library("videoframebuffer_objc") {
visibility = [ "*" ]
-@@ -637,6 +639,7 @@ if (is_ios || is_mac) {
+@@ -632,6 +634,7 @@ if (is_ios || is_mac) {
]
}
@@ -53,7 +53,7 @@ index be38095b73..895b2f0373 100644
rtc_library("metal_objc") {
visibility = [ "*" ]
allow_poison = [
-@@ -698,6 +701,7 @@ if (is_ios || is_mac) {
+@@ -693,6 +696,7 @@ if (is_ios || is_mac) {
":videoframebuffer_objc",
]
}
@@ -61,7 +61,7 @@ index be38095b73..895b2f0373 100644
rtc_library("videocapture_objc") {
visibility = [ "*" ]
-@@ -726,6 +730,7 @@ if (is_ios || is_mac) {
+@@ -721,6 +725,7 @@ if (is_ios || is_mac) {
]
}
@@ -69,7 +69,7 @@ index be38095b73..895b2f0373 100644
rtc_library("videocodec_objc") {
visibility = [ "*" ]
configs += [ "..:no_global_constructors" ]
-@@ -1825,5 +1830,6 @@ if (is_ios || is_mac) {
+@@ -1820,5 +1825,6 @@ if (is_ios || is_mac) {
"VideoToolbox.framework",
]
}
diff --git a/third_party/libwebrtc/moz-patch-stack/s0099.patch b/third_party/libwebrtc/moz-patch-stack/s0099.patch
@@ -61,10 +61,10 @@ index 0aec2d94c7..83c1b21260 100644
}
}
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
-index 895b2f0373..9dba6ef5e0 100644
+index 2c278341c7..27410af8a8 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
-@@ -637,6 +637,20 @@ if (is_ios || is_mac) {
+@@ -632,6 +632,20 @@ if (is_ios || is_mac) {
"CoreGraphics.framework",
"CoreVideo.framework",
]
diff --git a/third_party/libwebrtc/moz-patch-stack/s0103.patch b/third_party/libwebrtc/moz-patch-stack/s0103.patch
@@ -702,7 +702,7 @@ index 4fa98d73a2..72c01d50ab 100644
output_extension = "so"
}
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
-index 9dba6ef5e0..a161a158b3 100644
+index 27410af8a8..d0b13e2305 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -9,12 +9,12 @@
@@ -731,7 +731,7 @@ index 9dba6ef5e0..a161a158b3 100644
}
}
-@@ -1286,7 +1286,7 @@ if (is_ios || is_mac) {
+@@ -1281,7 +1281,7 @@ if (is_ios || is_mac) {
}
public_deps = [
diff --git a/third_party/libwebrtc/sdk/BUILD.gn b/third_party/libwebrtc/sdk/BUILD.gn
@@ -253,10 +253,6 @@ if (is_ios || is_mac) {
rtc_library("native_api_audio_device_module") {
visibility = [ "*" ]
- # TODO: bugs.webrtc.org/413413572 - Remove the poison when users of this
- # api provide Environment explicitly.
- allow_poison = [ "environment_construction" ]
-
sources = [
"objc/native/api/audio_device_module.h",
"objc/native/api/audio_device_module.mm",
@@ -269,7 +265,6 @@ if (is_ios || is_mac) {
"../api:scoped_refptr",
"../api/audio:audio_device",
"../api/environment",
- "../api/environment:environment_factory",
"../modules/audio_device:audio_device_generic",
"../rtc_base:checks",
"../rtc_base:logging",
diff --git a/third_party/libwebrtc/sdk/objc/native/api/audio_device_module.h b/third_party/libwebrtc/sdk/objc/native/api/audio_device_module.h
@@ -29,10 +29,6 @@ scoped_refptr<AudioDeviceModule> CreateAudioDeviceModule(
const Environment& env,
bool bypass_voice_processing = false);
-[[deprecated("Pass `env` explicitly instead of relying on the default")]]
-scoped_refptr<AudioDeviceModule> CreateAudioDeviceModule(
- bool bypass_voice_processing = false);
-
// If `muted_speech_event_handler` is exist, audio unit will catch speech
// activity while muted.
// Provide `error_handler` to receive callbacks on errors such as microphone
@@ -43,12 +39,6 @@ scoped_refptr<AudioDeviceModule> CreateMutedDetectAudioDeviceModule(
ADMErrorHandler error_handler,
bool bypass_voice_processing = false);
-[[deprecated("Pass `env` explicitly instead of relying on the default")]]
-scoped_refptr<AudioDeviceModule> CreateMutedDetectAudioDeviceModule(
- AudioDeviceModule::MutedSpeechEventHandler muted_speech_event_handler,
- ADMErrorHandler error_handler,
- bool bypass_voice_processing = false);
-
} // namespace webrtc
#endif // SDK_OBJC_NATIVE_API_AUDIO_DEVICE_MODULE_H_
diff --git a/third_party/libwebrtc/sdk/objc/native/api/audio_device_module.mm b/third_party/libwebrtc/sdk/objc/native/api/audio_device_module.mm
@@ -11,7 +11,6 @@
#include "audio_device_module.h"
#include "api/environment/environment.h"
-#include "api/environment/environment_factory.h"
#include "api/make_ref_counted.h"
#include "rtc_base/logging.h"
#include "sdk/objc/native/src/audio/audio_device_module_ios.h"
@@ -32,16 +31,6 @@ scoped_refptr<AudioDeviceModule> CreateAudioDeviceModule(
/*error_handler=*/nullptr);
}
-scoped_refptr<AudioDeviceModule> CreateAudioDeviceModule(
- bool bypass_voice_processing) {
- RTC_DLOG(LS_INFO) << __FUNCTION__;
- return make_ref_counted<ios_adm::AudioDeviceModuleIOS>(
- CreateEnvironment(),
- bypass_voice_processing,
- /*muted_speech_event_handler=*/nullptr,
- /*error_handler=*/nullptr);
-}
-
scoped_refptr<AudioDeviceModule> CreateMutedDetectAudioDeviceModule(
const Environment& env,
AudioDeviceModule::MutedSpeechEventHandler muted_speech_event_handler,
@@ -52,15 +41,4 @@ scoped_refptr<AudioDeviceModule> CreateMutedDetectAudioDeviceModule(
env, bypass_voice_processing, muted_speech_event_handler, error_handler);
}
-scoped_refptr<AudioDeviceModule> CreateMutedDetectAudioDeviceModule(
- AudioDeviceModule::MutedSpeechEventHandler muted_speech_event_handler,
- ADMErrorHandler error_handler,
- bool bypass_voice_processing) {
- RTC_DLOG(LS_INFO) << __FUNCTION__;
- return make_ref_counted<ios_adm::AudioDeviceModuleIOS>(
- CreateEnvironment(),
- bypass_voice_processing,
- muted_speech_event_handler,
- error_handler);
-}
} // namespace webrtc
