Update to M138

.gitignore

@@ -74,3 +74,4 @@
 /.vscode
 !webrtc/*
 out_ios_libs
+rust-project.json

.gn

@@ -55,8 +55,7 @@ default_args = {
   ios_deployment_target = "14.0"
 
   # The SDK API level, in contrast, is set by build/android/AndroidManifest.xml.
-  android32_ndk_api_level = 21
-  android64_ndk_api_level = 21
+  android_ndk_api_level = 21
 
   # WebRTC does not provide the gflags dependency. Because libyuv uses it only
   # for unittests, it can be disabled (see third_party/libyuv/BUILD.gn)
@@ -90,4 +89,7 @@ default_args = {
   enable_rust = true
   enable_rust_cxx = true
   enable_chromium_prelude = true
+
+  # See context on https://issues.chromium.org/issues/415076048.
+  enable_js_protobuf = false
 }

.vpython3

@@ -80,7 +80,7 @@ wheel: <
 >
 wheel: <
   name: "infra/python/wheels/protobuf-py3"
-  version: "version:6.30.2"
+  version: "version:6.31.0"
 >
 wheel: <
   name: "infra/python/wheels/requests-py3"

AUTHORS

@@ -122,6 +122,7 @@ Robert Mader <robert.mader@collabora.com>
 Robert Mader <robert.mader@posteo.de>
 Robert Nagy <robert.nagy@gmail.com>
 Ryan Yoakum <ryoakum@skobalt.com>
+Saming Lin <santoin351@gmail.com>
 Samuel Attard <samuel.r.attard@gmail.com>
 Sarah Thompson <sarah@telergy.com>
 Satender Saroha <ssaroha@yahoo.com>

BUILD.gn

@@ -377,8 +377,7 @@ config("common_config") {
 
   if (is_clang) {
     cflags += [
-      # TODO(webrtc:13219): Fix -Wshadow instances and enable.
-      "-Wno-shadow",
+      "-Wshadow",
 
       # See https://reviews.llvm.org/D56731 for details about this
       # warning.
@@ -537,6 +536,7 @@ if (!build_with_chromium) {
       "api:libjingle_peerconnection_api",
       "api:rtc_error",
       "api:transport_api",
+      "api/audio:create_audio_device_module",
       "api/audio_codecs:opus_audio_decoder_factory",
       "api/crypto",
       "api/rtc_event_log:rtc_event_log_factory",
@@ -632,6 +632,8 @@ if (rtc_include_tests && !build_with_chromium) {
       "api:rtc_api_unittests",
       "api/audio:audio_api_unittests",
       "api/audio_codecs/test:audio_codecs_api_unittests",
+      "api/crypto:crypto_options_unittest",
+      "api/crypto:options",
       "api/numerics:numerics_unittests",
       "api/task_queue:pending_task_safety_flag_unittests",
       "api/test/metrics:metrics_unittests",
@@ -823,3 +825,14 @@ group("poison_environment_construction") {
 
 group("poison_software_video_codecs") {
 }
+
+if (!build_with_chromium) {
+  # Write debug logs to gn_logs.txt.
+  # This is also required for Siso builds.
+  import("//build/gn_logs.gni")
+  lines = [
+            "Generated during 'gn gen' by //BUILD.gn.",
+            "",
+          ] + build_gn_logs
+  write_file("$root_build_dir/gn_logs.txt", lines)
+}

api/BUILD.gn

@@ -26,7 +26,7 @@ rtc_source_set("call_api") {
   sources = [ "call/audio_sink.h" ]
 }
 
-rtc_source_set("enable_media") {
+rtc_library("enable_media") {
   visibility = [ "*" ]
   sources = [
     "enable_media.cc",
@@ -46,7 +46,7 @@ rtc_source_set("enable_media") {
   ]
 }
 
-rtc_source_set("enable_media_with_defaults") {
+rtc_library("enable_media_with_defaults") {
   visibility = [ "*" ]
   allow_poison = [
     "audio_codecs",
@@ -65,7 +65,6 @@ rtc_source_set("enable_media_with_defaults") {
     "audio:builtin_audio_processing_builder",
     "audio_codecs:builtin_audio_decoder_factory",
     "audio_codecs:builtin_audio_encoder_factory",
-    "task_queue:default_task_queue_factory",
     "video_codecs:builtin_video_decoder_factory",
     "video_codecs:builtin_video_encoder_factory",
   ]
@@ -84,10 +83,7 @@ if (!build_with_chromium) {
       ":field_trials_view",
       ":libjingle_peerconnection_api",
       ":scoped_refptr",
-      "../api/rtc_event_log:rtc_event_log_factory",
       "../pc:peer_connection_factory",
-      "../pc:webrtc_sdp",
-      "../rtc_base:socket_server",
       "../rtc_base:threading",
       "../rtc_base/system:rtc_export",
       "../stats:rtc_stats",
@@ -96,6 +92,8 @@ if (!build_with_chromium) {
       "audio:audio_processing",
       "audio:builtin_audio_processing_builder",
       "audio_codecs:audio_codecs_api",
+      "environment:environment_factory",
+      "rtc_event_log:rtc_event_log_factory",
       "video_codecs:video_codecs_api",
     ]
   }
@@ -321,7 +319,6 @@ rtc_library("libjingle_peerconnection_api") {
     ":data_channel_event_observer_interface",
     ":dtls_transport_interface",
     ":fec_controller_api",
-    ":field_trials",
     ":field_trials_view",
     ":frame_transformer_interface",
     ":ice_transport_interface",
@@ -366,6 +363,7 @@ rtc_library("libjingle_peerconnection_api") {
     "crypto:frame_decryptor_interface",
     "crypto:frame_encryptor_interface",
     "crypto:options",
+    "environment",
     "metronome",
     "neteq:neteq_api",
     "rtc_event_log:rtc_event_log_factory_interface",
@@ -403,7 +401,7 @@ rtc_library("libjingle_peerconnection_api") {
   ]
 }
 
-rtc_source_set("frame_transformer_interface") {
+rtc_library("frame_transformer_interface") {
   visibility = [ "*" ]
   sources = [
     "frame_transformer_interface.cc",
@@ -432,7 +430,6 @@ rtc_library("rtc_error") {
   deps = [
     "../rtc_base:checks",
     "../rtc_base:logging",
-    "../rtc_base:macromagic",
     "../rtc_base/system:rtc_export",
     "//third_party/abseil-cpp/absl/meta:type_traits",
     "//third_party/abseil-cpp/absl/strings",
@@ -526,12 +523,16 @@ rtc_source_set("rtp_transceiver_direction") {
   sources = [ "rtp_transceiver_direction.h" ]
 }
 
-rtc_source_set("priority") {
+rtc_library("priority") {
   visibility = [ "*" ]
-  sources = [ "priority.h" ]
+  sources = [
+    "priority.cc",
+    "priority.h",
+  ]
   deps = [
     "../rtc_base:checks",
     "../rtc_base:strong_alias",
+    "../rtc_base/system:rtc_export",
   ]
 }
 
@@ -651,7 +652,7 @@ rtc_source_set("peer_connection_quality_test_fixture_api") {
   ]
 }
 
-rtc_source_set("frame_generator_api") {
+rtc_library("frame_generator_api") {
   visibility = [ "*" ]
   sources = [
     "test/frame_generator_interface.cc",
@@ -886,7 +887,6 @@ rtc_source_set("simulated_network_api") {
   visibility = [ "*" ]
   sources = [ "test/simulated_network.h" ]
   deps = [
-    "../rtc_base:macromagic",
     "../rtc_base:random",
     "transport:ecn_marking",
     "units:data_rate",
@@ -895,7 +895,7 @@ rtc_source_set("simulated_network_api") {
 }
 
 # TODO(srte): Move to network_emulation sub directory.
-rtc_source_set("network_emulation_manager_api") {
+rtc_library("network_emulation_manager_api") {
   visibility = [ "*" ]
   sources = [
     "test/network_emulation_manager.cc",
@@ -921,7 +921,7 @@ rtc_source_set("network_emulation_manager_api") {
   ]
 }
 
-rtc_source_set("time_controller") {
+rtc_library("time_controller") {
   visibility = [ "*" ]
   sources = [
     "test/time_controller.cc",
@@ -974,7 +974,6 @@ rtc_source_set("refcountedbase") {
   sources = [ "ref_counted_base.h" ]
   deps = [
     ":ref_count",
-    "../rtc_base:macromagic",
     "../rtc_base:refcount",
   ]
 }
@@ -1547,20 +1546,9 @@ if (rtc_include_tests) {
     ]
 
     deps = [
-      ":enable_media_with_defaults",
-      ":libjingle_peerconnection_api",
       ":time_controller",
-      "../call",
-      "../call:call_interfaces",
-      "../media:media_engine",
-      "../pc:media_factory",
-      "../rtc_base:checks",
-      "../system_wrappers",
       "../test/time_controller",
-      "environment",
-      "environment:environment_factory",
       "units:timestamp",
-      "//third_party/abseil-cpp/absl/base:nullability",
     ]
   }
 
@@ -1626,7 +1614,6 @@ if (rtc_include_tests) {
       "task_queue:task_queue_default_factory_unittests",
       "test/pclf:media_configuration",
       "test/video:video_frame_writer",
-      "transport:field_trial_based_config",
       "units:time_delta",
       "units:timestamp",
       "units:units_unittests",
@@ -1681,7 +1668,7 @@ if (rtc_include_tests) {
   }
 }
 
-rtc_source_set("field_trials_registry") {
+rtc_library("field_trials_registry") {
   visibility = [ "*" ]
   sources = [
     "field_trials_registry.cc",
@@ -1725,7 +1712,8 @@ rtc_library("field_trials") {
     ":field_trials_registry",
     "../rtc_base:checks",
     "../rtc_base/containers:flat_map",
-    "../system_wrappers:field_trial",
+    "//third_party/abseil-cpp/absl/base:nullability",
+    "//third_party/abseil-cpp/absl/memory",
     "//third_party/abseil-cpp/absl/strings:string_view",
   ]
 }

api/DEPS

@@ -49,7 +49,6 @@ specific_include_rules = {
   ],
 
   ".*\.h": [
-    "+rtc_base/arraysize.h",
     "+rtc_base/checks.h",
     "+rtc_base/system/rtc_export.h",
     "+rtc_base/system/rtc_export_template.h",

api/adaptation/BUILD.gn

@@ -8,7 +8,7 @@
 
 import("../../webrtc.gni")
 
-rtc_source_set("resource_adaptation_api") {
+rtc_library("resource_adaptation_api") {
   visibility = [ "*" ]
   sources = [
     "resource.cc",

api/array_view.h

@@ -40,7 +40,7 @@ namespace webrtc {
 // std::vector, webrtc::Buffer, ...), but it's error-prone because the caller
 // has to correctly specify the array length:
 //
-//   Contains17(arr, arraysize(arr));     // C array
+//   Contains17(arr, std::size(arr));     // C array
 //   Contains17(arr.data(), arr.size());  // std::vector
 //   Contains17(arr, size);               // pointer + size
 //   ...

api/audio/BUILD.gn

@@ -16,13 +16,27 @@ rtc_source_set("audio_device") {
   ]
   deps = [
     "..:ref_count",
-    "..:scoped_refptr",
-    "../../rtc_base:checks",
     "../../rtc_base:stringutils",
-    "../task_queue",
   ]
 }
 
+if (rtc_include_internal_audio_device) {
+  rtc_library("create_audio_device_module") {
+    visibility = [ "*" ]
+    sources = [
+      "create_audio_device_module.cc",
+      "create_audio_device_module.h",
+    ]
+    deps = [
+      ":audio_device",
+      "..:scoped_refptr",
+      "../../modules/audio_device:audio_device_impl",
+      "../environment",
+      "//third_party/abseil-cpp/absl/base:nullability",
+    ]
+  }
+}
+
 rtc_library("audio_frame_api") {
   visibility = [ "*" ]
   sources = [
@@ -38,7 +52,6 @@ rtc_library("audio_frame_api") {
     "..:rtp_packet_info",
     "../../rtc_base:checks",
     "../../rtc_base:logging",
-    "../../rtc_base:macromagic",
     "../../rtc_base:timeutils",
   ]
 }
@@ -60,7 +73,7 @@ rtc_source_set("audio_mixer_api") {
   ]
 }
 
-rtc_source_set("audio_processing") {
+rtc_library("audio_processing") {
   visibility = [ "*" ]
   sources = [
     "audio_processing.cc",
@@ -74,7 +87,6 @@ rtc_source_set("audio_processing") {
     "..:ref_count",
     "..:scoped_refptr",
     "../../rtc_base:checks",
-    "../../rtc_base:macromagic",
     "../../rtc_base:stringutils",
     "../../rtc_base/system:arch",
     "../../rtc_base/system:file_wrapper",
@@ -106,7 +118,7 @@ rtc_library("builtin_audio_processing_builder") {
   ]
 }
 
-rtc_source_set("audio_processing_statistics") {
+rtc_library("audio_processing_statistics") {
   visibility = [ "*" ]
   sources = [
     "audio_processing_statistics.cc",
@@ -156,7 +168,7 @@ rtc_source_set("echo_control") {
   ]
 }
 
-rtc_source_set("echo_detector_creator") {
+rtc_library("echo_detector_creator") {
   visibility = [ "*" ]
   allow_poison = [ "default_echo_detector" ]
   sources = [

api/audio/audio_device.h

@@ -13,10 +13,9 @@
 
 #include <cstdint>
 #include <optional>
+
 #include "api/audio/audio_device_defines.h"
 #include "api/ref_count.h"
-#include "api/scoped_refptr.h"
-#include "api/task_queue/task_queue_factory.h"
 
 namespace webrtc {
 
@@ -60,14 +59,6 @@ class AudioDeviceModule : public webrtc::RefCountInterface {
   };
 
  public:
-  // Creates a default ADM for usage in production code.
-  static scoped_refptr<AudioDeviceModule> Create(
-      AudioLayer audio_layer, TaskQueueFactory* task_queue_factory);
-  // Creates an ADM with support for extra test methods. Don't use this factory
-  // in production code.
-  static scoped_refptr<AudioDeviceModuleForTest> CreateForTest(
-      AudioLayer audio_layer, TaskQueueFactory* task_queue_factory);
-
   // Retrieve the currently utilized audio layer
   virtual int32_t ActiveAudioLayer(AudioLayer* audioLayer) const = 0;