commit 3166d69c4b8e5789eca69f73f615aa5838e488d5 parent 2934deafa4c6134f6790fb76ae1ccdf9ca90cd1a Author: Michael Froman <mfroman@mozilla.com> Date: Wed, 8 Oct 2025 17:23:08 -0500 Bug 1993083 - Vendor libwebrtc from 60556b4b73 Upstream commit: https://webrtc.googlesource.com/src/+/60556b4b73398adb4fcf6824e6b7658899505bec IWYU modules/audio_devices (on linux) adding suppressions for ALSA and Pulseaudio includes. Done using the usual find command piped into IWYU followed by replacing C style includes with C++ style includes where applicable. As usual followed by running tools_webrtc/gn_check_autofix.py and git cl format followed by some manual changes. Bug: webrtc:42226242 Change-Id: I12ad46de34b757bd02bbda0be83e1fe16d93f6ba Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/397901 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Commit-Queue: Philipp Hancke <phancke@meta.com> Cr-Commit-Position: refs/heads/main@{#45040} Diffstat:
41 files changed, 157 insertions(+), 63 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-08T22:21:53.121540+00:00. +libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-08T22:22:58.369722+00:00. # base of lastest vendoring -452f02cd3f +60556b4b73 diff --git a/third_party/libwebrtc/modules/audio_device/BUILD.gn b/third_party/libwebrtc/modules/audio_device/BUILD.gn @@ -69,6 +69,7 @@ if (!build_with_mozilla) { # See Bug 1820869. "../../api:sequence_checker", "../../api/audio:audio_device", "../../api/task_queue", + "../../api/units:time_delta", "../../common_audio:common_audio_c", "../../rtc_base:buffer", "../../rtc_base:checks", @@ -243,7 +244,9 @@ if (!build_with_chromium) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } deps = [ + ":audio_device_buffer", ":audio_device_generic", + "../../api/audio:audio_device", "../../rtc_base:checks", "../../rtc_base:logging", "../../rtc_base:platform_thread", @@ -270,6 +273,7 @@ if (!build_with_mozilla) { # See Bug 1820869. ":audio_device_generic", "../../api:array_view", "../../api:make_ref_counted", + "../../api:ref_count", "../../api:refcountedbase", "../../api:scoped_refptr", "../../api:sequence_checker", @@ -444,6 +448,7 @@ rtc_source_set("mock_audio_device") { ":audio_device_buffer", ":audio_device_impl", "../../api:make_ref_counted", + "../../api:scoped_refptr", "../../api/audio:audio_device", "../../test:test_support", ] diff --git a/third_party/libwebrtc/modules/audio_device/audio_device_buffer.cc b/third_party/libwebrtc/modules/audio_device/audio_device_buffer.cc @@ -10,16 +10,22 @@ #include "modules/audio_device/audio_device_buffer.h" -#include <string.h> - #include <cmath> #include <cstddef> #include <cstdint> +#include <cstring> +#include <optional> +#include "api/audio/audio_device_defines.h" +#include "api/sequence_checker.h" +#include "api/task_queue/task_queue_factory.h" +#include "api/units/time_delta.h" #include "common_audio/signal_processing/include/signal_processing_library.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "rtc_base/synchronization/mutex.h" #include "rtc_base/time_utils.h" +#include "rtc_base/timestamp_aligner.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/metrics.h" diff --git a/third_party/libwebrtc/modules/audio_device/audio_device_buffer.h b/third_party/libwebrtc/modules/audio_device/audio_device_buffer.h @@ -11,11 +11,11 @@ #ifndef MODULES_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H_ #define MODULES_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H_ -#include <stddef.h> -#include <stdint.h> - #include <atomic> +#include <cstddef> +#include <cstdint> #include <memory> +#include <optional> #include "api/audio/audio_device_defines.h" #include "api/sequence_checker.h" diff --git a/third_party/libwebrtc/modules/audio_device/audio_device_generic.cc b/third_party/libwebrtc/modules/audio_device/audio_device_generic.cc @@ -10,7 +10,7 @@ #include "modules/audio_device/audio_device_generic.h" -#include "rtc_base/logging.h" +#include <cstdint> namespace webrtc { diff --git a/third_party/libwebrtc/modules/audio_device/audio_device_generic.h b/third_party/libwebrtc/modules/audio_device/audio_device_generic.h @@ -11,7 +11,7 @@ #ifndef AUDIO_DEVICE_AUDIO_DEVICE_GENERIC_H_ #define AUDIO_DEVICE_AUDIO_DEVICE_GENERIC_H_ -#include <stdint.h> +#include <cstdint> #include "api/audio/audio_device.h" #include "api/audio/audio_device_defines.h" diff --git a/third_party/libwebrtc/modules/audio_device/audio_device_impl.cc b/third_party/libwebrtc/modules/audio_device/audio_device_impl.cc @@ -10,8 +10,6 @@ #include "modules/audio_device/audio_device_impl.h" -#include <stddef.h> - #include <cstdint> #include <memory> #include <utility> diff --git a/third_party/libwebrtc/modules/audio_device/audio_device_impl.h b/third_party/libwebrtc/modules/audio_device/audio_device_impl.h @@ -13,8 +13,7 @@ #if defined(WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE) -#include <stdint.h> - +#include <cstdint> #include <memory> #include "absl/base/nullability.h" diff --git a/third_party/libwebrtc/modules/audio_device/dummy/audio_device_dummy.cc b/third_party/libwebrtc/modules/audio_device/dummy/audio_device_dummy.cc @@ -10,6 +10,13 @@ #include "modules/audio_device/dummy/audio_device_dummy.h" +#include <cstdint> + +#include "api/audio/audio_device.h" +#include "api/audio/audio_device_defines.h" +#include "modules/audio_device/audio_device_buffer.h" +#include "modules/audio_device/audio_device_generic.h" + namespace webrtc { int32_t AudioDeviceDummy::ActiveAudioLayer( diff --git a/third_party/libwebrtc/modules/audio_device/dummy/audio_device_dummy.h b/third_party/libwebrtc/modules/audio_device/dummy/audio_device_dummy.h @@ -11,7 +11,7 @@ #ifndef AUDIO_DEVICE_AUDIO_DEVICE_DUMMY_H_ #define AUDIO_DEVICE_AUDIO_DEVICE_DUMMY_H_ -#include <stdint.h> +#include <cstdint> #include "api/audio/audio_device.h" #include "api/audio/audio_device_defines.h" diff --git a/third_party/libwebrtc/modules/audio_device/dummy/file_audio_device.cc b/third_party/libwebrtc/modules/audio_device/dummy/file_audio_device.cc @@ -10,12 +10,20 @@ #include "modules/audio_device/dummy/file_audio_device.h" -#include <string.h> +#include <cstddef> +#include <cstdint> +#include <cstring> #include "absl/strings/string_view.h" +#include "api/audio/audio_device.h" +#include "api/audio/audio_device_defines.h" +#include "modules/audio_device/audio_device_buffer.h" +#include "modules/audio_device/audio_device_generic.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/platform_thread.h" +#include "rtc_base/synchronization/mutex.h" +#include "rtc_base/system/file_wrapper.h" #include "rtc_base/thread.h" #include "rtc_base/time_utils.h" diff --git a/third_party/libwebrtc/modules/audio_device/dummy/file_audio_device.h b/third_party/libwebrtc/modules/audio_device/dummy/file_audio_device.h @@ -11,17 +11,18 @@ #ifndef AUDIO_DEVICE_FILE_AUDIO_DEVICE_H_ #define AUDIO_DEVICE_FILE_AUDIO_DEVICE_H_ -#include <stdio.h> - -#include <memory> +#include <cstddef> +#include <cstdint> #include <string> #include "absl/strings/string_view.h" +#include "api/audio/audio_device.h" +#include "api/audio/audio_device_defines.h" +#include "modules/audio_device/audio_device_buffer.h" #include "modules/audio_device/audio_device_generic.h" #include "rtc_base/platform_thread.h" #include "rtc_base/synchronization/mutex.h" #include "rtc_base/system/file_wrapper.h" -#include "rtc_base/time_utils.h" namespace webrtc { diff --git a/third_party/libwebrtc/modules/audio_device/dummy/file_audio_device_factory.cc b/third_party/libwebrtc/modules/audio_device/dummy/file_audio_device_factory.cc @@ -10,8 +10,7 @@ #include "modules/audio_device/dummy/file_audio_device_factory.h" -#include <stdio.h> - +#include <cstdio> #include <cstdlib> #include "absl/strings/string_view.h" diff --git a/third_party/libwebrtc/modules/audio_device/dummy/file_audio_device_factory.h b/third_party/libwebrtc/modules/audio_device/dummy/file_audio_device_factory.h @@ -11,7 +11,7 @@ #ifndef AUDIO_DEVICE_FILE_AUDIO_DEVICE_FACTORY_H_ #define AUDIO_DEVICE_FILE_AUDIO_DEVICE_FACTORY_H_ -#include <stdint.h> +#include <cstdint> #include "absl/strings/string_view.h" diff --git a/third_party/libwebrtc/modules/audio_device/fine_audio_buffer.cc b/third_party/libwebrtc/modules/audio_device/fine_audio_buffer.cc @@ -12,6 +12,7 @@ #include <cstdint> #include <cstring> +#include <optional> #include "api/array_view.h" #include "modules/audio_device/audio_device_buffer.h" diff --git a/third_party/libwebrtc/modules/audio_device/fine_audio_buffer_unittest.cc b/third_party/libwebrtc/modules/audio_device/fine_audio_buffer_unittest.cc @@ -12,6 +12,7 @@ #include <limits.h> +#include <cstdint> #include <memory> #include "api/array_view.h" diff --git a/third_party/libwebrtc/modules/audio_device/include/audio_device_data_observer.h b/third_party/libwebrtc/modules/audio_device/include/audio_device_data_observer.h @@ -11,9 +11,8 @@ #ifndef MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DATA_OBSERVER_H_ #define MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DATA_OBSERVER_H_ -#include <stddef.h> -#include <stdint.h> - +#include <cstddef> +#include <cstdint> #include <memory> #include "api/audio/audio_device.h" diff --git a/third_party/libwebrtc/modules/audio_device/include/audio_device_default.h b/third_party/libwebrtc/modules/audio_device/include/audio_device_default.h @@ -11,7 +11,10 @@ #ifndef MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DEFAULT_H_ #define MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DEFAULT_H_ +#include <cstdint> + #include "api/audio/audio_device.h" +#include "api/audio/audio_device_defines.h" namespace webrtc { namespace webrtc_impl { diff --git a/third_party/libwebrtc/modules/audio_device/include/fake_audio_device.h b/third_party/libwebrtc/modules/audio_device/include/fake_audio_device.h @@ -12,6 +12,7 @@ #define MODULES_AUDIO_DEVICE_INCLUDE_FAKE_AUDIO_DEVICE_H_ #include "api/audio/audio_device.h" +#include "api/ref_count.h" #include "modules/audio_device/include/audio_device_default.h" namespace webrtc { diff --git a/third_party/libwebrtc/modules/audio_device/include/mock_audio_device.h b/third_party/libwebrtc/modules/audio_device/include/mock_audio_device.h @@ -11,10 +11,12 @@ #ifndef MODULES_AUDIO_DEVICE_INCLUDE_MOCK_AUDIO_DEVICE_H_ #define MODULES_AUDIO_DEVICE_INCLUDE_MOCK_AUDIO_DEVICE_H_ -#include <string> +#include <cstdint> #include "api/audio/audio_device.h" +#include "api/audio/audio_device_defines.h" #include "api/make_ref_counted.h" +#include "api/scoped_refptr.h" #include "test/gmock.h" namespace webrtc { diff --git a/third_party/libwebrtc/modules/audio_device/include/mock_audio_transport.h b/third_party/libwebrtc/modules/audio_device/include/mock_audio_transport.h @@ -11,6 +11,10 @@ #ifndef MODULES_AUDIO_DEVICE_INCLUDE_MOCK_AUDIO_TRANSPORT_H_ #define MODULES_AUDIO_DEVICE_INCLUDE_MOCK_AUDIO_TRANSPORT_H_ +#include <cstddef> +#include <cstdint> +#include <optional> + #include "api/audio/audio_device_defines.h" #include "test/gmock.h" 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 @@ -10,9 +10,8 @@ #ifndef MODULES_AUDIO_DEVICE_INCLUDE_TEST_AUDIO_DEVICE_H_ #define MODULES_AUDIO_DEVICE_INCLUDE_TEST_AUDIO_DEVICE_H_ -#include <stddef.h> -#include <stdint.h> - +#include <cstddef> +#include <cstdint> #include <memory> #include "absl/strings/string_view.h" diff --git a/third_party/libwebrtc/modules/audio_device/linux/alsasymboltable_linux.cc b/third_party/libwebrtc/modules/audio_device/linux/alsasymboltable_linux.cc @@ -27,6 +27,8 @@ #include "modules/audio_device/linux/alsasymboltable_linux.h" +#include "modules/audio_device/linux/latebindingsymboltable_linux.h" + namespace webrtc { namespace adm_linux_alsa { diff --git a/third_party/libwebrtc/modules/audio_device/linux/audio_device_alsa_linux.cc b/third_party/libwebrtc/modules/audio_device/linux/audio_device_alsa_linux.cc @@ -10,11 +10,29 @@ #include "modules/audio_device/linux/audio_device_alsa_linux.h" -#include "modules/audio_device/audio_device_config.h" +#include <asm-generic/errno.h> + +#include <cerrno> +#include <cstdint> +#include <cstdlib> +#include <cstring> +#include <vector> + +#include "api/audio/audio_device.h" +#include "api/audio/audio_device_defines.h" +#include "modules/audio_device/audio_device_buffer.h" +#include "modules/audio_device/audio_device_generic.h" +#include "modules/audio_device/linux/latebindingsymboltable_linux.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/system/arch.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/synchronization/mutex.h" #include "rtc_base/thread.h" +#if defined(WEBRTC_USE_X11) +#include <X11/Xlib.h> +#endif + WebRTCAlsaSymbolTable* GetAlsaSymbolTable() { static WebRTCAlsaSymbolTable* alsa_symbol_table = new WebRTCAlsaSymbolTable(); return alsa_symbol_table; diff --git a/third_party/libwebrtc/modules/audio_device/linux/audio_device_alsa_linux.h b/third_party/libwebrtc/modules/audio_device/linux/audio_device_alsa_linux.h @@ -11,19 +11,27 @@ #ifndef AUDIO_DEVICE_AUDIO_DEVICE_ALSA_LINUX_H_ #define AUDIO_DEVICE_AUDIO_DEVICE_ALSA_LINUX_H_ -#include <memory> +#include <alsa/asoundlib.h> +#include <sys/soundcard.h> +#include <unistd.h> + +#include <cstddef> +#include <cstdint> +#include <cstdio> +#include "api/audio/audio_device.h" +#include "api/audio/audio_device_defines.h" +#include "modules/audio_device/audio_device_buffer.h" #include "modules/audio_device/audio_device_generic.h" +#include "modules/audio_device/linux/alsasymboltable_linux.h" #include "modules/audio_device/linux/audio_mixer_manager_alsa_linux.h" #include "rtc_base/platform_thread.h" #include "rtc_base/synchronization/mutex.h" +#include "rtc_base/thread_annotations.h" #if defined(WEBRTC_USE_X11) #include <X11/Xlib.h> #endif -#include <alsa/asoundlib.h> -#include <sys/ioctl.h> -#include <sys/soundcard.h> typedef webrtc::adm_linux_alsa::AlsaSymbolTable WebRTCAlsaSymbolTable; WebRTCAlsaSymbolTable* GetAlsaSymbolTable(); diff --git a/third_party/libwebrtc/modules/audio_device/linux/audio_device_pulse_linux.cc b/third_party/libwebrtc/modules/audio_device/linux/audio_device_pulse_linux.cc @@ -10,12 +10,25 @@ #include "modules/audio_device/linux/audio_device_pulse_linux.h" -#include <string.h> - +#include <cstddef> +#include <cstdint> +#include <cstring> + +#include "api/audio/audio_device.h" +#include "api/audio/audio_device_defines.h" +#include "api/units/time_delta.h" +#include "modules/audio_device/audio_device_buffer.h" +#include "modules/audio_device/audio_device_generic.h" #include "modules/audio_device/linux/latebindingsymboltable_linux.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/platform_thread.h" +#include "rtc_base/synchronization/mutex.h" +#include "rtc_base/thread_annotations.h" + +#if defined(WEBRTC_USE_X11) +#include <X11/Xlib.h> +#endif WebRTCPulseSymbolTable* GetPulseSymbolTable() { static WebRTCPulseSymbolTable* pulse_symbol_table = diff --git a/third_party/libwebrtc/modules/audio_device/linux/audio_device_pulse_linux.h b/third_party/libwebrtc/modules/audio_device/linux/audio_device_pulse_linux.h @@ -11,7 +11,10 @@ #ifndef AUDIO_DEVICE_AUDIO_DEVICE_PULSE_LINUX_H_ #define AUDIO_DEVICE_AUDIO_DEVICE_PULSE_LINUX_H_ -#include <memory> +#include <pulse/pulseaudio.h> + +#include <cstddef> +#include <cstdint> #include "api/audio/audio_device.h" #include "api/audio/audio_device_defines.h" @@ -29,10 +32,6 @@ #include <X11/Xlib.h> #endif -#include <pulse/pulseaudio.h> -#include <stddef.h> -#include <stdint.h> - // We define this flag if it's missing from our headers, because we want to be // able to compile against old headers but still use PA_STREAM_ADJUST_LATENCY // if run against a recent version of the library. diff --git a/third_party/libwebrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc b/third_party/libwebrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc @@ -10,8 +10,14 @@ #include "modules/audio_device/linux/audio_mixer_manager_alsa_linux.h" +#include <cstdint> +#include <cstring> + +#include "api/audio/audio_device_defines.h" #include "modules/audio_device/linux/audio_device_alsa_linux.h" +#include "modules/audio_device/linux/latebindingsymboltable_linux.h" #include "rtc_base/logging.h" +#include "rtc_base/synchronization/mutex.h" // Accesses ALSA functions through our late-binding symbol table instead of // directly. This way we don't have to link to libasound, which means our binary diff --git a/third_party/libwebrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h b/third_party/libwebrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h @@ -13,9 +13,11 @@ #include <alsa/asoundlib.h> -#include "api/audio/audio_device.h" -#include "modules/audio_device/linux/alsasymboltable_linux.h" +#include <cstdint> + +#include "api/audio/audio_device_defines.h" #include "rtc_base/synchronization/mutex.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/third_party/libwebrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc b/third_party/libwebrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc @@ -10,11 +10,10 @@ #include "modules/audio_device/linux/audio_mixer_manager_pulse_linux.h" -#include <stddef.h> +#include <cstdint> #include "modules/audio_device/linux/audio_device_pulse_linux.h" #include "modules/audio_device/linux/latebindingsymboltable_linux.h" -#include "modules/audio_device/linux/pulseaudiosymboltable_linux.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/third_party/libwebrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h b/third_party/libwebrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h @@ -12,13 +12,10 @@ #define AUDIO_DEVICE_AUDIO_MIXER_MANAGER_PULSE_LINUX_H_ #include <pulse/pulseaudio.h> -#include <stdint.h> -#include "api/sequence_checker.h" +#include <cstdint> -#ifndef UINT32_MAX -#define UINT32_MAX ((uint32_t)-1) -#endif +#include "api/sequence_checker.h" namespace webrtc { diff --git a/third_party/libwebrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc b/third_party/libwebrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc @@ -10,6 +10,8 @@ #include "modules/audio_device/linux/latebindingsymboltable_linux.h" +#include <string> + #include "absl/strings/string_view.h" #include "rtc_base/logging.h" diff --git a/third_party/libwebrtc/modules/audio_device/linux/latebindingsymboltable_linux.h b/third_party/libwebrtc/modules/audio_device/linux/latebindingsymboltable_linux.h @@ -11,8 +11,7 @@ #ifndef AUDIO_DEVICE_LATEBINDINGSYMBOLTABLE_LINUX_H_ #define AUDIO_DEVICE_LATEBINDINGSYMBOLTABLE_LINUX_H_ -#include <stddef.h> // for NULL -#include <string.h> +#include <cstddef> #include "absl/strings/string_view.h" #include "rtc_base/checks.h" diff --git a/third_party/libwebrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc b/third_party/libwebrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc @@ -27,6 +27,8 @@ #include "modules/audio_device/linux/pulseaudiosymboltable_linux.h" +#include "modules/audio_device/linux/latebindingsymboltable_linux.h" + namespace webrtc { namespace adm_linux_pulse { diff --git a/third_party/libwebrtc/modules/audio_device/mock_audio_device_buffer.h b/third_party/libwebrtc/modules/audio_device/mock_audio_device_buffer.h @@ -11,6 +11,8 @@ #ifndef MODULES_AUDIO_DEVICE_MOCK_AUDIO_DEVICE_BUFFER_H_ #define MODULES_AUDIO_DEVICE_MOCK_AUDIO_DEVICE_BUFFER_H_ +#include <cstddef> +#include <cstdint> #include <optional> #include "modules/audio_device/audio_device_buffer.h" diff --git a/third_party/libwebrtc/modules/audio_device/test_audio_device_impl.cc b/third_party/libwebrtc/modules/audio_device/test_audio_device_impl.cc @@ -9,6 +9,8 @@ */ #include "modules/audio_device/test_audio_device_impl.h" +#include <cstddef> +#include <cstdint> #include <memory> #include <optional> #include <utility> @@ -16,10 +18,13 @@ #include "api/array_view.h" #include "api/task_queue/task_queue_factory.h" #include "api/units/time_delta.h" +#include "modules/audio_device/audio_device_buffer.h" +#include "modules/audio_device/audio_device_generic.h" #include "modules/audio_device/include/test_audio_device.h" #include "rtc_base/checks.h" #include "rtc_base/synchronization/mutex.h" #include "rtc_base/task_utils/repeating_task.h" +#include "rtc_base/time_utils.h" namespace webrtc { namespace { diff --git a/third_party/libwebrtc/modules/audio_device/test_audio_device_impl.h b/third_party/libwebrtc/modules/audio_device/test_audio_device_impl.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_DEVICE_TEST_AUDIO_DEVICE_IMPL_H_ #define MODULES_AUDIO_DEVICE_TEST_AUDIO_DEVICE_IMPL_H_ +#include <cstdint> #include <memory> #include <vector> @@ -23,6 +24,7 @@ #include "modules/audio_device/include/test_audio_device.h" #include "rtc_base/buffer.h" #include "rtc_base/synchronization/mutex.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/third_party/libwebrtc/modules/audio_device/test_audio_device_impl_test.cc b/third_party/libwebrtc/modules/audio_device/test_audio_device_impl_test.cc @@ -9,13 +9,15 @@ */ #include "modules/audio_device/test_audio_device_impl.h" +#include <cstddef> +#include <cstdint> +#include <cstring> #include <memory> #include <optional> #include <utility> +#include <vector> -#include "api/audio/audio_device.h" #include "api/audio/audio_device_defines.h" -#include "api/task_queue/task_queue_factory.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" #include "modules/audio_device/audio_device_buffer.h" @@ -23,6 +25,7 @@ #include "modules/audio_device/include/test_audio_device.h" #include "rtc_base/checks.h" #include "rtc_base/synchronization/mutex.h" +#include "rtc_base/thread_annotations.h" #include "test/gmock.h" #include "test/gtest.h" #include "test/time_controller/simulated_time_controller.h" diff --git a/third_party/libwebrtc/moz-patch-stack/s0027.patch b/third_party/libwebrtc/moz-patch-stack/s0027.patch @@ -731,7 +731,7 @@ index 77b22dc5bd..3d11071e89 100644 } diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn -index b879e4f571..037813066f 100644 +index a920be33f7..8d53cdfa0a 100644 --- a/modules/audio_device/BUILD.gn +++ b/modules/audio_device/BUILD.gn @@ -30,6 +30,7 @@ rtc_source_set("audio_device_default") { @@ -758,7 +758,7 @@ index b879e4f571..037813066f 100644 sources = [ "audio_device_buffer.cc", "audio_device_buffer.h", -@@ -80,6 +83,7 @@ rtc_library("audio_device_buffer") { +@@ -81,6 +84,7 @@ rtc_library("audio_device_buffer") { "../../system_wrappers:metrics", ] } @@ -766,7 +766,7 @@ index b879e4f571..037813066f 100644 rtc_library("audio_device_generic") { sources = [ -@@ -256,6 +260,7 @@ if (!build_with_chromium) { +@@ -259,6 +263,7 @@ if (!build_with_chromium) { # Contains default implementations of webrtc::AudioDeviceModule for Windows, # Linux, Mac, iOS and Android. rtc_library("audio_device_impl") { @@ -774,7 +774,7 @@ index b879e4f571..037813066f 100644 visibility = [ "*" ] deps = [ ":audio_device_buffer", -@@ -302,9 +307,9 @@ rtc_library("audio_device_impl") { +@@ -306,9 +311,9 @@ rtc_library("audio_device_impl") { sources = [ "include/fake_audio_device.h" ] if (build_with_mozilla) { @@ -787,7 +787,7 @@ index b879e4f571..037813066f 100644 ] } -@@ -407,6 +412,7 @@ rtc_library("audio_device_impl") { +@@ -411,6 +416,7 @@ rtc_library("audio_device_impl") { sources += [ "dummy/file_audio_device_factory.h" ] } } @@ -795,7 +795,7 @@ index b879e4f571..037813066f 100644 if (is_mac) { rtc_source_set("audio_device_impl_frameworks") { -@@ -424,6 +430,7 @@ if (is_mac) { +@@ -428,6 +434,7 @@ if (is_mac) { } } @@ -803,7 +803,7 @@ index b879e4f571..037813066f 100644 rtc_source_set("mock_audio_device") { visibility = [ "*" ] testonly = true -@@ -441,8 +448,10 @@ rtc_source_set("mock_audio_device") { +@@ -446,8 +453,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 037813066f..711b3bbcb8 100644 +index 8d53cdfa0a..181623546d 100644 --- a/modules/audio_device/BUILD.gn +++ b/modules/audio_device/BUILD.gn @@ -9,8 +9,8 @@ diff --git a/third_party/libwebrtc/tools_webrtc/iwyu/apply_include_cleaner.py b/third_party/libwebrtc/tools_webrtc/iwyu/apply_include_cleaner.py @@ -74,6 +74,8 @@ _IGNORED_HEADERS = [ "pipewire/.*.h", # pipewire. "spa/.*.h", # pipewire. "openssl/.*.h", # openssl/boringssl. + "alsa/.*.h", # ALSA. + "pulse/.*.h", # PulseAudio. ] _SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))