commit d4b00c50c4c436125e3bbd3f8c1ba666d0892768 parent c34ecf68ba4696fb0f10ae257cfbbb5103882ff9 Author: Dan Baker <dbaker@mozilla.com> Date: Thu, 23 Oct 2025 15:26:44 -0600 Bug 1995393 - Vendor libwebrtc from 9ebd1ce74d Upstream commit: https://webrtc.googlesource.com/src/+/9ebd1ce74dcc53cfa36856149d26212e4b21c69d Guard PSNR stats with rtc_video_psnr build flag which is enabled by default when built with Chromium Bug: webrtc:388070060 Change-Id: Ic9c05029f944a43929ea3fa3aa91bcb549f44eb6 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/403841 Reviewed-by: Erik Språng <sprang@webrtc.org> Commit-Queue: Philipp Hancke <phancke@meta.com> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#45342} Diffstat:
27 files changed, 75 insertions(+), 61 deletions(-)
diff --git a/third_party/libwebrtc/BUILD.gn b/third_party/libwebrtc/BUILD.gn @@ -381,6 +381,10 @@ config("common_config") { defines += [ "WEBRTC_EXCLUDE_AUDIO_PROCESSING_MODULE" ] } + if (rtc_video_psnr) { + defines += [ "WEBRTC_ENCODER_PSNR_STATS" ] + } + if (is_clang) { cflags += [ "-Wshadow", 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 /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc -libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-23T21:24:32.724423+00:00. +libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-23T21:26:32.804291+00:00. # base of lastest vendoring -c8abb0469d +9ebd1ce74d diff --git a/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder.cc b/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder.cc @@ -287,7 +287,7 @@ int LibaomAv1Encoder::InitEncode(const VideoCodec* codec_settings, frame_for_encode_ = nullptr; } - // Flag options: AOM_CODEC_USE_PSNR and AOM_CODEC_USE_HIGHBITDEPTH + // Flag options: AOM_EFLAG_CALCULATE_PSNR and AOM_CODEC_USE_HIGHBITDEPTH aom_codec_flags_t flags = 0; // Initialize an encoder instance. @@ -755,7 +755,7 @@ int32_t LibaomAv1Encoder::Encode( aom_enc_frame_flags_t flags = layer_frame->IsKeyframe() ? AOM_EFLAG_FORCE_KF : 0; -#ifdef AOM_EFLAG_CALCULATE_PSNR +#if defined(WEBRTC_ENCODER_PSNR_STATS) && defined(AOM_EFLAG_CALCULATE_PSNR) if (calculate_psnr_ && psnr_frame_sampler_.ShouldBeSampled(frame)) { flags |= AOM_EFLAG_CALCULATE_PSNR; } diff --git a/third_party/libwebrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/third_party/libwebrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc @@ -466,8 +466,11 @@ int32_t H264EncoderImpl::Encode( RTC_DCHECK_EQ(configurations_[0].width, frame_buffer->width()); RTC_DCHECK_EQ(configurations_[0].height, frame_buffer->height()); +#ifdef WEBRTC_ENCODER_PSNR_STATS bool calculate_psnr = calculate_psnr_ && psnr_frame_sampler_.ShouldBeSampled(input_frame); +#endif + // Encode image for each layer. for (size_t i = 0; i < encoders_.size(); ++i) { // EncodeFrame input. @@ -476,9 +479,11 @@ int32_t H264EncoderImpl::Encode( pictures_[i].iPicHeight = configurations_[i].height; pictures_[i].iColorFormat = EVideoFormatType::videoFormatI420; pictures_[i].uiTimeStamp = input_frame.ntp_time_ms(); +#ifdef WEBRTC_ENCODER_PSNR_STATS pictures_[i].bPsnrY = calculate_psnr; pictures_[i].bPsnrU = calculate_psnr; pictures_[i].bPsnrV = calculate_psnr; +#endif // Downscale images on second and ongoing layers. if (i == 0) { pictures_[i].iStride[0] = frame_buffer->StrideY(); @@ -571,6 +576,7 @@ int32_t H264EncoderImpl::Encode( h264_bitstream_parser_.ParseBitstream(encoded_images_[i]); encoded_images_[i].qp_ = h264_bitstream_parser_.GetLastSliceQp().value_or(-1); +#ifdef WEBRTC_ENCODER_PSNR_STATS if (calculate_psnr) { encoded_images_[i].set_psnr(EncodedImage::Psnr({ .y = info.sLayerInfo[info.iLayerNum - 1].rPsnr[0], @@ -580,6 +586,7 @@ int32_t H264EncoderImpl::Encode( } else { encoded_images_[i].set_psnr(std::nullopt); } +#endif // Deliver encoded image. CodecSpecificInfo codec_specific; diff --git a/third_party/libwebrtc/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc b/third_party/libwebrtc/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc @@ -1097,7 +1097,7 @@ int LibvpxVp8Encoder::Encode(const VideoFrame& frame, flags[i] = send_key_frame ? VPX_EFLAG_FORCE_KF : EncodeFlags(tl_configs[i]); } -#ifdef VPX_EFLAG_CALCULATE_PSNR +#if defined(WEBRTC_ENCODER_PSNR_STATS) && defined(VPX_EFLAG_CALCULATE_PSNR) if (calculate_psnr_ && psnr_frame_sampler_.ShouldBeSampled(frame)) { for (size_t i = 0; i < encoders_.size(); ++i) { flags[i] |= VPX_EFLAG_CALCULATE_PSNR; diff --git a/third_party/libwebrtc/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc b/third_party/libwebrtc/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc @@ -1247,7 +1247,7 @@ int LibvpxVp9Encoder::Encode(const VideoFrame& input_image, if (force_key_frame_) { flags = VPX_EFLAG_FORCE_KF; } -#ifdef VPX_EFLAG_CALCULATE_PSNR +#if defined(WEBRTC_ENCODER_PSNR_STATS) && defined(VPX_EFLAG_CALCULATE_PSNR) if (calculate_psnr_ && psnr_frame_sampler_.ShouldBeSampled(input_image)) { flags |= VPX_EFLAG_CALCULATE_PSNR; } diff --git a/third_party/libwebrtc/moz-patch-stack/s0001.patch b/third_party/libwebrtc/moz-patch-stack/s0001.patch @@ -1277,7 +1277,7 @@ index 8c0f592e94..502a152902 100644 int64_t _lastProcessFrameTimeNanos RTC_GUARDED_BY(capture_checker_); diff --git a/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc b/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc -index b07e5235cc..f0f2e3b853 100644 +index cecb34a303..9b6336a327 100644 --- a/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc +++ b/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc @@ -284,6 +284,7 @@ LibvpxVp9Encoder::LibvpxVp9Encoder(const Environment& env, @@ -1501,7 +1501,7 @@ index b7933130bd..428fc9615d 100644 vcm_ = nullptr; } diff --git a/webrtc.gni b/webrtc.gni -index 57aa114622..488eb3bb68 100644 +index 3cf3cc5c06..1ba954a5fb 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -114,7 +114,7 @@ declare_args() { diff --git a/third_party/libwebrtc/moz-patch-stack/s0018.patch b/third_party/libwebrtc/moz-patch-stack/s0018.patch @@ -23,7 +23,7 @@ index 5e51c316cc..3578e2651a 100644 #else constexpr bool kIsArm = false; diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc -index 7ff38e2d5b..5c734e5eaa 100644 +index c9925b1875..8a4c1aa2b7 100644 --- a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc +++ b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc @@ -794,7 +794,7 @@ int LibvpxVp8Encoder::InitEncode(const VideoCodec* inst, diff --git a/third_party/libwebrtc/moz-patch-stack/s0027.patch b/third_party/libwebrtc/moz-patch-stack/s0027.patch @@ -116,7 +116,7 @@ index e8484bfad5..ffafaf0a4a 100644 # TODO(https://bugs.webrtc.org/14437): Remove this section if general # Chromium fix resolves the problem. diff --git a/BUILD.gn b/BUILD.gn -index 3357c2dcdf..7131daa82c 100644 +index ef07265bf3..348be89bb9 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -33,7 +33,7 @@ if (is_android) { @@ -139,7 +139,7 @@ index 3357c2dcdf..7131daa82c 100644 if (!rtc_builtin_ssl_root_certificates) { defines += [ "WEBRTC_EXCLUDE_BUILT_IN_SSL_ROOT_CERTS" ] } -@@ -497,9 +501,11 @@ config("common_config") { +@@ -501,9 +505,11 @@ config("common_config") { } } @@ -151,7 +151,7 @@ index 3357c2dcdf..7131daa82c 100644 if (!rtc_build_ssl) { config("external_ssl_library") { -@@ -563,6 +569,33 @@ if (!build_with_chromium) { +@@ -567,6 +573,33 @@ if (!build_with_chromium) { "sdk", "video", ] @@ -185,7 +185,7 @@ index 3357c2dcdf..7131daa82c 100644 if (rtc_include_builtin_audio_codecs) { deps += [ -@@ -575,6 +608,16 @@ if (!build_with_chromium) { +@@ -579,6 +612,16 @@ if (!build_with_chromium) { deps += [ "api/video:video_frame", "api/video:video_rtp_headers", @@ -1280,7 +1280,7 @@ index e3122cbc18..b58bef6ad6 100644 "../api:sequence_checker", "../api/adaptation:resource_adaptation_api", diff --git a/webrtc.gni b/webrtc.gni -index 488eb3bb68..d4249602a7 100644 +index 1ba954a5fb..2032395308 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -35,6 +35,11 @@ if (is_mac) { @@ -1370,7 +1370,7 @@ index 488eb3bb68..d4249602a7 100644 # Set this to true to enable the avx2 support in webrtc. # TODO: Make sure that AVX2 works also for non-clang compilers. -@@ -333,6 +340,9 @@ declare_args() { +@@ -336,6 +343,9 @@ declare_args() { rtc_enable_grpc = rtc_enable_protobuf && (is_linux || is_mac) } @@ -1380,7 +1380,7 @@ index 488eb3bb68..d4249602a7 100644 # Make it possible to provide custom locations for some libraries (move these # up into declare_args should we need to actually use them for the GN build). rtc_libvpx_dir = "//third_party/libvpx" -@@ -1205,7 +1215,7 @@ if (is_mac || is_ios) { +@@ -1208,7 +1218,7 @@ if (is_mac || is_ios) { } } diff --git a/third_party/libwebrtc/moz-patch-stack/s0034.patch b/third_party/libwebrtc/moz-patch-stack/s0034.patch @@ -20,10 +20,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/58f47eacaf10d12e2 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/BUILD.gn b/BUILD.gn -index 7131daa82c..8ad64af5c8 100644 +index 348be89bb9..19ff7e3f98 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -440,12 +440,12 @@ config("common_config") { +@@ -444,12 +444,12 @@ config("common_config") { } } @@ -38,7 +38,7 @@ index 7131daa82c..8ad64af5c8 100644 defines += [ "WEBRTC_ARCH_ARM" ] if (arm_version >= 7) { defines += [ "WEBRTC_ARCH_ARM_V7" ] -@@ -455,7 +455,7 @@ config("common_config") { +@@ -459,7 +459,7 @@ config("common_config") { } } @@ -276,7 +276,7 @@ index d41f2ccb2b..9ea19a8b48 100644 config("x11_config") { if (rtc_use_x11_extensions) { diff --git a/webrtc.gni b/webrtc.gni -index d4249602a7..28d531bf4f 100644 +index 2032395308..c6f12efec0 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -160,13 +160,13 @@ declare_args() { diff --git a/third_party/libwebrtc/moz-patch-stack/s0045.patch b/third_party/libwebrtc/moz-patch-stack/s0045.patch @@ -18,7 +18,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/0300b32b7de70fb89 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/BUILD.gn b/BUILD.gn -index 8ad64af5c8..1896ed1d07 100644 +index 19ff7e3f98..ff01d30f95 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -224,6 +224,9 @@ config("common_inherited_config") { @@ -74,10 +74,10 @@ index 20bf4afc44..697bedadb9 100644 #endif // defined(WEBRTC_POSIX) } diff --git a/webrtc.gni b/webrtc.gni -index 28d531bf4f..e1d0b935b5 100644 +index c6f12efec0..840b752953 100644 --- a/webrtc.gni +++ b/webrtc.gni -@@ -350,7 +350,7 @@ rtc_opus_dir = "//third_party/opus" +@@ -353,7 +353,7 @@ rtc_opus_dir = "//third_party/opus" # Desktop capturer is supported only on Windows, OSX and Linux. rtc_desktop_capture_supported = diff --git a/third_party/libwebrtc/moz-patch-stack/s0055.patch b/third_party/libwebrtc/moz-patch-stack/s0055.patch @@ -11,10 +11,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/b0658888969395dca 2 files changed, 10 insertions(+) diff --git a/BUILD.gn b/BUILD.gn -index 1896ed1d07..8704f0f34a 100644 +index ff01d30f95..2a5381ec09 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -624,6 +624,10 @@ if (!build_with_chromium) { +@@ -628,6 +628,10 @@ if (!build_with_chromium) { ] } diff --git a/third_party/libwebrtc/moz-patch-stack/s0069.patch b/third_party/libwebrtc/moz-patch-stack/s0069.patch @@ -10,7 +10,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/46fb51c90709be64c 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc.gni b/webrtc.gni -index e1d0b935b5..ea13d49957 100644 +index 840b752953..93d4a8e55f 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -301,7 +301,7 @@ declare_args() { diff --git a/third_party/libwebrtc/moz-patch-stack/s0084.patch b/third_party/libwebrtc/moz-patch-stack/s0084.patch @@ -11,10 +11,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/2185cab977988fd4a 3 files changed, 16 insertions(+) diff --git a/BUILD.gn b/BUILD.gn -index 8704f0f34a..3eab1126bf 100644 +index 2a5381ec09..82aede5e28 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -609,6 +609,7 @@ if (!build_with_chromium) { +@@ -613,6 +613,7 @@ if (!build_with_chromium) { if (build_with_mozilla) { deps += [ diff --git a/third_party/libwebrtc/moz-patch-stack/s0093.patch b/third_party/libwebrtc/moz-patch-stack/s0093.patch @@ -10,7 +10,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/b050c455caa1d24a0 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/BUILD.gn b/BUILD.gn -index 3eab1126bf..550c75bafb 100644 +index 82aede5e28..b602b8d2ce 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -280,6 +280,7 @@ config("rtc_prod_config") { diff --git a/third_party/libwebrtc/moz-patch-stack/s0100.patch b/third_party/libwebrtc/moz-patch-stack/s0100.patch @@ -52,10 +52,10 @@ index ef3d60ee34..0d68cb4b29 100644 rtc_library("encoded_frame") { diff --git a/webrtc.gni b/webrtc.gni -index ea13d49957..f76b023285 100644 +index 93d4a8e55f..362ff142b5 100644 --- a/webrtc.gni +++ b/webrtc.gni -@@ -487,8 +487,8 @@ all_poison_types = [ +@@ -490,8 +490,8 @@ all_poison_types = [ "software_video_codecs", ] diff --git a/third_party/libwebrtc/moz-patch-stack/s0101.patch b/third_party/libwebrtc/moz-patch-stack/s0101.patch @@ -10,10 +10,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/45b99d1ba95b46896 1 file changed, 71 insertions(+) diff --git a/webrtc.gni b/webrtc.gni -index f76b023285..8882cb497e 100644 +index 362ff142b5..ebb66f048c 100644 --- a/webrtc.gni +++ b/webrtc.gni -@@ -691,6 +691,36 @@ template("rtc_source_set") { +@@ -694,6 +694,36 @@ template("rtc_source_set") { deps += [ "//third_party/abseil-cpp:absl" ] } } @@ -50,7 +50,7 @@ index f76b023285..8882cb497e 100644 } } -@@ -925,6 +955,47 @@ template("rtc_library") { +@@ -928,6 +958,47 @@ template("rtc_library") { deps += [ "//third_party/abseil-cpp:absl" ] } } diff --git a/third_party/libwebrtc/moz-patch-stack/s0102.patch b/third_party/libwebrtc/moz-patch-stack/s0102.patch @@ -75,7 +75,7 @@ index 4df8681a9b..269ca2f5a7 100644 # The python interpreter to use by default. On Windows, this will look # for vpython3.exe and vpython3.bat. diff --git a/BUILD.gn b/BUILD.gn -index 550c75bafb..28fb57a248 100644 +index b602b8d2ce..4603ed3cfd 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -21,15 +21,15 @@ @@ -98,7 +98,7 @@ index 550c75bafb..28fb57a248 100644 import("//third_party/jni_zero/jni_zero.gni") } -@@ -536,7 +536,7 @@ if (!build_with_chromium) { +@@ -540,7 +540,7 @@ if (!build_with_chromium) { sources = [] complete_static_lib = true @@ -107,7 +107,7 @@ index 550c75bafb..28fb57a248 100644 defines = [] deps = [ -@@ -852,7 +852,7 @@ rtc_static_library("dcsctp") { +@@ -856,7 +856,7 @@ rtc_static_library("dcsctp") { visibility = [ "//:default" ] sources = [] complete_static_lib = true @@ -116,7 +116,7 @@ index 550c75bafb..28fb57a248 100644 defines = [] deps = [ "net/dcsctp/public:factory", -@@ -887,7 +887,7 @@ group("poison_software_video_codecs") { +@@ -891,7 +891,7 @@ group("poison_software_video_codecs") { if (!build_with_chromium) { # Write debug logs to gn_logs.txt. # This is also required for Siso builds. @@ -804,7 +804,7 @@ index ae891d22bd..4f2e3cc266 100644 } } diff --git a/webrtc.gni b/webrtc.gni -index 8882cb497e..3aef398fa3 100644 +index ebb66f048c..4e6c39fdbb 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -5,12 +5,12 @@ @@ -852,7 +852,7 @@ index 8882cb497e..3aef398fa3 100644 } if (build_with_chromium) { -@@ -373,8 +373,8 @@ rtc_common_configs = [ webrtc_root + ":common_config" ] +@@ -376,8 +376,8 @@ rtc_common_configs = [ webrtc_root + ":common_config" ] if (is_mac || is_ios) { if (filter_include(default_compiler_configs, @@ -863,7 +863,7 @@ index 8882cb497e..3aef398fa3 100644 } } -@@ -392,7 +392,7 @@ rtc_common_inherited_config = webrtc_root + ":common_inherited_config" +@@ -395,7 +395,7 @@ rtc_common_inherited_config = webrtc_root + ":common_inherited_config" # Common configs to remove or add in all rtc targets. rtc_remove_configs = [] if (!build_with_chromium && is_clang) { diff --git a/third_party/libwebrtc/moz-patch-stack/s0103.patch b/third_party/libwebrtc/moz-patch-stack/s0103.patch @@ -10,10 +10,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/f18c05287ce831369 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/webrtc.gni b/webrtc.gni -index 3aef398fa3..0be93a7531 100644 +index 4e6c39fdbb..bbb68a82d1 100644 --- a/webrtc.gni +++ b/webrtc.gni -@@ -536,7 +536,7 @@ template("rtc_test") { +@@ -539,7 +539,7 @@ template("rtc_test") { min_sdk_version = 23 target_sdk_version = 24 deps += [ @@ -22,7 +22,7 @@ index 3aef398fa3..0be93a7531 100644 webrtc_root + "sdk/android:native_test_jni_onload", webrtc_root + "sdk/android:base_java", webrtc_root + "test:native_test_java", -@@ -991,11 +991,21 @@ template("rtc_library") { +@@ -994,11 +994,21 @@ template("rtc_library") { modified_deps = [] foreach (dep, deps) { newdep = string_replace(dep, "//third_party/", "//libwebrtc/third_party/") @@ -44,7 +44,7 @@ index 3aef398fa3..0be93a7531 100644 } } -@@ -1033,7 +1043,7 @@ template("rtc_executable") { +@@ -1036,7 +1046,7 @@ template("rtc_executable") { if (is_win) { deps += [ # Give executables the default manifest on Windows (a no-op elsewhere). diff --git a/third_party/libwebrtc/moz-patch-stack/s0104.patch b/third_party/libwebrtc/moz-patch-stack/s0104.patch @@ -9,7 +9,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/fadad7695efe0d9cc 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc b/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc -index f0f2e3b853..34f50ee61a 100644 +index 9b6336a327..dc09fb42f0 100644 --- a/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc +++ b/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc @@ -1338,7 +1338,7 @@ int LibvpxVp9Encoder::UpdateCodecFrameSize( diff --git a/third_party/libwebrtc/moz-patch-stack/s0105.patch b/third_party/libwebrtc/moz-patch-stack/s0105.patch @@ -9,10 +9,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/90a33b06e51017d25 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn -index 28fb57a248..2e315c79c4 100644 +index 4603ed3cfd..6bfae033a3 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -565,6 +565,7 @@ if (!build_with_chromium) { +@@ -569,6 +569,7 @@ if (!build_with_chromium) { "call", "common_audio", "common_video", @@ -20,7 +20,7 @@ index 28fb57a248..2e315c79c4 100644 "logging:rtc_event_log_api", "media", "modules", -@@ -849,7 +850,7 @@ if (rtc_include_tests && !build_with_chromium) { +@@ -853,7 +854,7 @@ if (rtc_include_tests && !build_with_chromium) { # Build target for standalone dcsctp rtc_static_library("dcsctp") { # Only the root target should depend on this. diff --git a/third_party/libwebrtc/moz-patch-stack/s0107.patch b/third_party/libwebrtc/moz-patch-stack/s0107.patch @@ -16,10 +16,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/4527c41ef71d7683c 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/BUILD.gn b/BUILD.gn -index 2e315c79c4..174ce0d2f4 100644 +index 6bfae033a3..2a6c14f35b 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -521,6 +521,9 @@ if (!rtc_build_ssl) { +@@ -525,6 +525,9 @@ if (!rtc_build_ssl) { "crypto", "ssl", ] @@ -29,7 +29,7 @@ index 2e315c79c4..174ce0d2f4 100644 } } -@@ -615,6 +618,7 @@ if (!build_with_chromium) { +@@ -619,6 +622,7 @@ if (!build_with_chromium) { "api/environment:environment_factory", "api/video:video_frame", "api/video:video_rtp_headers", @@ -147,7 +147,7 @@ index 9653fd651f..82b050a559 100644 rtc_library("ssl") { if (!build_with_mozilla) { diff --git a/webrtc.gni b/webrtc.gni -index 0be93a7531..bbf1ce11ca 100644 +index bbb68a82d1..fddcdabae7 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -116,7 +116,7 @@ declare_args() { @@ -159,7 +159,7 @@ index 0be93a7531..bbf1ce11ca 100644 # Enable when an external authentication mechanism is used for performing # packet authentication for RTP packets instead of libsrtp. -@@ -341,7 +341,7 @@ declare_args() { +@@ -344,7 +344,7 @@ declare_args() { } # Enable liboam only on non-mozilla builds. diff --git a/third_party/libwebrtc/moz-patch-stack/s0111.patch b/third_party/libwebrtc/moz-patch-stack/s0111.patch @@ -10,10 +10,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/27c29807e6f46562d 1 file changed, 1 insertion(+) diff --git a/BUILD.gn b/BUILD.gn -index 174ce0d2f4..600993950b 100644 +index 2a6c14f35b..8fb557c9fc 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -615,6 +615,7 @@ if (!build_with_chromium) { +@@ -619,6 +619,7 @@ if (!build_with_chromium) { if (build_with_mozilla) { deps += [ diff --git a/third_party/libwebrtc/moz-patch-stack/s0116.patch b/third_party/libwebrtc/moz-patch-stack/s0116.patch @@ -18,7 +18,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/c8cf67108972d5cae 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc.gni b/webrtc.gni -index bbf1ce11ca..acd687567a 100644 +index fddcdabae7..09e3f58634 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -136,7 +136,7 @@ declare_args() { diff --git a/third_party/libwebrtc/moz-patch-stack/s0128.patch b/third_party/libwebrtc/moz-patch-stack/s0128.patch @@ -9,7 +9,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/43de54a6e52daf0a0 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn -index 600993950b..3ba008076e 100644 +index 8fb557c9fc..9674052831 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -315,6 +315,16 @@ config("common_config") { @@ -29,7 +29,7 @@ index 600993950b..3ba008076e 100644 if (rtc_enable_protobuf) { defines += [ "WEBRTC_ENABLE_PROTOBUF=1" ] } else { -@@ -416,7 +426,7 @@ config("common_config") { +@@ -420,7 +430,7 @@ config("common_config") { # "-Wnested-externs", (C/Obj-C only) ] cflags_objc += [ "-Wstrict-prototypes" ] diff --git a/third_party/libwebrtc/moz-patch-stack/s0130.patch b/third_party/libwebrtc/moz-patch-stack/s0130.patch @@ -9,10 +9,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/8e7778c59894c284b 1 file changed, 1 insertion(+) diff --git a/BUILD.gn b/BUILD.gn -index 3ba008076e..da75caaed6 100644 +index 9674052831..058f756169 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -625,6 +625,7 @@ if (!build_with_chromium) { +@@ -629,6 +629,7 @@ if (!build_with_chromium) { if (build_with_mozilla) { deps += [ diff --git a/third_party/libwebrtc/webrtc.gni b/third_party/libwebrtc/webrtc.gni @@ -330,6 +330,9 @@ declare_args() { # Enables an experimental rust version of base64 for building and testing. rtc_rusty_base64 = false + + # Enables PSNR calculation for video getStats. + rtc_video_psnr = build_with_chromium } declare_args() {