mail/thunderbird: update to 147.0 (rc1)

Release Notes: https://www.thunderbird.net/en-US/thunderbird/147.0/releasenotes/ (cherry picked from commit 552102d732e30337b965dacac75ebc8432b04f10)
author: Christoph Moench-Tegeder <cmt@FreeBSD.org> 2026-01-09 20:06:48 +0100
committer: Christoph Moench-Tegeder <cmt@FreeBSD.org> 2026-01-09 20:09:56 +0100
commit: 7e3548213205448b0f7a6a4a7cd935695a96ed86 (patch)
tree: 4d5f94de875148172ed64b7fd5ae9ee1f6ec58c1
parent: e056c1fc5fbfac0d7cca5f93e92a9dfe72e5484e (diff)
7 files changed, 5717 insertions, 15504 deletions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index acf80c2b57c3..e021cbdb53cb 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	thunderbird
-DISTVERSION=	146.0.1
+DISTVERSION=	147.0
 
 CATEGORIES=	mail news net-im wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 31840763fc1a..a9611ea1bf7f 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1765982493
-SHA256 (thunderbird-146.0.1.source.tar.xz) = 816c7add658c208ef6057ef86643ed9ecc0f4daafcae592a1ffe38d1a2108b38
-SIZE (thunderbird-146.0.1.source.tar.xz) = 781793608
+TIMESTAMP = 1767911566
+SHA256 (thunderbird-147.0.source.tar.xz) = 6de1b024123e16b2c3d62c5677b2843e7163c6f2358fe3d7e60b845104458121
+SIZE (thunderbird-147.0.source.tar.xz) = 780223936
diff --git a/mail/thunderbird/files/patch-bug1269654 b/mail/thunderbird/files/patch-bug1269654
new file mode 100644
index 000000000000..9f9265f86bfe
--- /dev/null
+++ b/mail/thunderbird/files/patch-bug1269654
@@ -0,0 +1,34 @@
+commit ff13efe458e7786d8c810342d25a6ba8e90a422b
+Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
+
+    based on BMO 1269654
+    
+    : https://bugzilla.mozilla.org/show_bug.cgi?id=1269654#c5
+    : https://bug1269654.bmoattachments.org/attachment.cgi?id=8749234
+    : handle big-endian formats in Cairo format conversions
+    :
+    : HG changeset patch
+    : User Lee Salzman <lsalzman@mozilla.com>
+    : Date 1462463631 14400
+    :      Thu May 05 11:53:51 2016 -0400
+    : Node ID 8da374804a09977c8f89af5e6e0cb37cb074595d
+    : Parent  29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5
+    : handle big-endian formats in Cairo format conversions
+
+diff --git gfx/2d/HelpersCairo.h gfx/2d/HelpersCairo.h
+index a10e01bdd62b..f2007ee189fc 100644
+--- gfx/2d/HelpersCairo.h
++++ gfx/2d/HelpersCairo.h
+@@ -185,7 +185,11 @@ static inline cairo_content_t GfxFormatToCairoContent(SurfaceFormat format) {
+     case SurfaceFormat::A8:
+       return CAIRO_CONTENT_ALPHA;
+     default:
+-      gfxCriticalError() << "Unknown image content format " << (int)format;
++      if (format == SurfaceFormat::B8G8R8X8) {
++        return CAIRO_CONTENT_COLOR;
++      } else if (format != SurfaceFormat::B8G8R8A8) {
++        gfxCriticalError() << "Unknown image content format " << (int)format;
++      }
+       return CAIRO_CONTENT_COLOR_ALPHA;
+   }
+ }
diff --git a/mail/thunderbird/files/patch-bug1269654_comment5 b/mail/thunderbird/files/patch-bug1269654_comment5
deleted file mode 100644
index 0aa2d639d352..000000000000
--- a/mail/thunderbird/files/patch-bug1269654_comment5
+++ /dev/null
@@ -1,43 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=1269654#c5
-https://bug1269654.bmoattachments.org/attachment.cgi?id=8749234
-handle big-endian formats in Cairo format conversions
-
-# HG changeset patch
-# User Lee Salzman <lsalzman@mozilla.com>
-# Date 1462463631 14400
-#      Thu May 05 11:53:51 2016 -0400
-# Node ID 8da374804a09977c8f89af5e6e0cb37cb074595d
-# Parent  29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5
-handle big-endian formats in Cairo format conversions
-
---- gfx/2d/HelpersCairo.h.orig	2019-12-02 17:51:16.633474000 +0100
-+++ gfx/2d/HelpersCairo.h	2019-12-02 17:52:44.939998000 +0100
-@@ -147,7 +147,14 @@ static inline cairo_format_t GfxFormatToCairoFormat(Su
-     case SurfaceFormat::R5G6B5_UINT16:
-       return CAIRO_FORMAT_RGB16_565;
-     default:
--      gfxCriticalError() << "Unknown image format " << (int)format;
-+      // _UINT32 formats don't match B8G8R8[AX]8 on big-endian platforms,
-+      // and Moz2d uses B8G8R8[AX]8 as if it was _UINT32.
-+      // See bug 1269654
-+      if (format == SurfaceFormat::B8G8R8X8) {
-+        return CAIRO_FORMAT_RGB24;
-+      } else if (format != SurfaceFormat::B8G8R8A8) {
-+        gfxCriticalError() << "Unknown image format " << (int)format;
-+      }
-       return CAIRO_FORMAT_ARGB32;
-   }
- }
-@@ -177,7 +184,11 @@ static inline cairo_content_t GfxFormatToCairoContent(
-     case SurfaceFormat::A8:
-       return CAIRO_CONTENT_ALPHA;
-     default:
--      gfxCriticalError() << "Unknown image content format " << (int)format;
-+      if (format == SurfaceFormat::B8G8R8X8) {
-+        return CAIRO_CONTENT_COLOR;
-+      } else if (format != SurfaceFormat::B8G8R8A8) {
-+        gfxCriticalError() << "Unknown image content format " << (int)format;
-+      }
-       return CAIRO_CONTENT_COLOR_ALPHA;
-   }
- }
diff --git a/mail/thunderbird/files/patch-cargo-checksums b/mail/thunderbird/files/patch-cargo-checksums
new file mode 100644
index 000000000000..2108d8b24e8b
--- /dev/null
+++ b/mail/thunderbird/files/patch-cargo-checksums
@@ -0,0 +1,61 @@
+commit 8af7a1568a6d4b28ec22aecb917d6d7dc59f1a18
+Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
+
+    Remove several .gitmodules from cargo-checksum files
+    
+    these .gitmodules do not exist in the tar ball, but their
+    mention in the checkksum files will make the build unhappy
+
+diff --git comm/third_party/rust/cubeb-sys/.cargo-checksum.json comm/third_party/rust/cubeb-sys/.cargo-checksum.json
+index b98304358fd..83bcc25c0d8 100644
+--- comm/third_party/rust/cubeb-sys/.cargo-checksum.json
++++ comm/third_party/rust/cubeb-sys/.cargo-checksum.json
+@@ -1 +1 @@
+-{"files":{".cargo_vcs_info.json":"21c314647aed58ae4288dbae8dfe62a2c0617680e4e6f592cb72dafda7364d80","Cargo.lock":"78da21219e75ef238bf1df34221cf8cbe37ea0289ff0d750d776d544fdc9fb75","Cargo.toml":"f90fb04b9e0d54ef9e1529753b946689a5151b8fc25f29e26f1b435972858fb5","LICENSE":"8c044baa5d883274736eeece0b955249076c2697b826e576fce59496235b2cf5","build.rs":"188f2371401406862eadcdf7d2b5fbcc395c77a1a8ca5e29c3c7f6273734b52c","libcubeb/.clang-format":"9897a643853cadfb2d771b525a6e54832a8aaa6e1c589efffc6369c125764110","libcubeb/.github/workflows/build.yml":"8e228609cc41d02fc1777e046eaf53f577f2e8741013736c497d6f82acfd9e16","libcubeb/.github/workflows/docs.yml":"11afbc5de737985e73177123f7844095cf849b8916c3463deeaf7417193443a0","libcubeb/.gitignore":"30e326935b8d1ca90f4b6c7a021313cd7cd20b274e6558de4081c0840adb5846","libcubeb/.gitmodules":"65c86aa240aea1d6cb8559a0db73839f9a2f0d7a93d143c5fba0c485396874a0","libcubeb/AUTHORS":"829e45d138c7c8827799f302806fa4be8cd8bd4bad70a2fe26c3a27a5cf36948","libcubeb/CMakeLists.txt":"c14fe691bd5f7fb40fd4bd8caf95f6713a169268baba09e3875bced85028da2b","libcubeb/Config.cmake.in":"a156fb5cd30208aedcb9ef025d94187df82142fd4442e3a7d0e2a688668a3da9","libcubeb/INSTALL.md":"1fa77e15423e6f583c30861528cd2732d52a028982020cd3a7a9da4a452d7311","libcubeb/LICENSE":"44c6b5ae5ec3fe2fbc608b00e6f4896f4d2d5c7e525fcbaa3eaa3cf2f3d5a983","libcubeb/README.md":"1445df3577d2664f4baee1bb5a993cd41fc046f490eb15ba9da5aa6316d8916c","libcubeb/cmake/compile_tests/oss_is_v4.c":"482bcd4c569e8a26f4ab0fe3a3bed25e9d4b296bf678896a2cc1dc8abbad492d","libcubeb/cmake/sanitizers-cmake/.gitignore":"0ecc0e025e47a2c0d21866a6759177523f973b4232c747a283b9b1f2b572e037","libcubeb/cmake/sanitizers-cmake/CMakeLists.txt":"89b282c19b3897ff666f7847d5e679ae928ca7e76ffd0d23f7c58c9464048b61","libcubeb/cmake/sanitizers-cmake/LICENSE":"4b67e7ae8c91e68e1a929eb1cbaa4c773c6d19aa91aaa12c390cf9560d1c9799","libcubeb/cmake/sanitizers-cmake/README.md":"f3b85a594e1601ae65bb09393c56fbc8a98e3f3f49234e56f86bd78803c3544e","libcubeb/cmake/sanitizers-cmake/cmake/FindASan.cmake":"bd30b1c3cb0682b8a2b0b599f6c51fbf99ef4908b00eba8826f0d484c623b01b","libcubeb/cmake/sanitizers-cmake/cmake/FindMSan.cmake":"55e40f0994b47f8e779622af2007c69252d9456be99f4aa4fba7dd49c23d5580","libcubeb/cmake/sanitizers-cmake/cmake/FindSanitizers.cmake":"2ffd9717a49e3e9de848ec0d91097bdbab3f75a7866211d902f9659f59271ffc","libcubeb/cmake/sanitizers-cmake/cmake/FindTSan.cmake":"ceace234abd5a463ad1b8134ad06c4c8004895b2e8fc9edb67e64620ea97ca47","libcubeb/cmake/sanitizers-cmake/cmake/FindUBSan.cmake":"4720ec96ea42a2a9c07d887c1fc5562ed3e8c222f5778a18b78c46678b23f156","libcubeb/cmake/sanitizers-cmake/cmake/asan-wrapper":"4e543936e6374e24b80a0f92135c07c2e2101c0d110e51bddaf0e70ae8ec391e","libcubeb/cmake/sanitizers-cmake/cmake/sanitize-helpers.cmake":"c0c225f22bebd27eb68b807b2a61962d28afc61609735fe652c2fde6aa6a005b","libcubeb/cmake/sanitizers-cmake/tests/CMakeLists.txt":"64b7aea469a043f27414e3d652aaa89a03a11843d152c4cd42f30561e6ef51bc","libcubeb/cmake/sanitizers-cmake/tests/asan_test.cpp":"a25de95282aaee22d977d0b474468b946c1422b80b15424c04266dba038eba2e","libcubeb/cmake/sanitizers-cmake/tests/shortest.ext.test.cpp":"a25de95282aaee22d977d0b474468b946c1422b80b15424c04266dba038eba2e","libcubeb/cmake/toolchain-cross-mingw.cmake":"1c26749465364061ddf37aaa00f363eaf057c4b6a70181086e13b0a4d09bd376","libcubeb/cubeb.supp":"19f33e59f8dc91a327c923e44c2c3f9af0a043ce1d6a8cac275ba094b4bfe0da","libcubeb/docs/Doxyfile.in":"e721a50ccf3a010b9b5169b97f93a24f66bd4b88cade17b5b5088de19fa89716","libcubeb/include/cubeb/cubeb.h":"9d89beed6b79a1f3e0db052fa82fe4f8ce1f6939d0aed75f98d99c77dad90628","libcubeb/libcubeb.pc.in":"ad777cd17ee95516109555153541578692de40c719de22744f816c7dde863e67","libcubeb/scan-build-install.sh":"1ecf22aca367a4d02f810c4cb78db8636e08a12787e94e30c441ce439cf4a265","libcubeb/scripts/run-clang-format.sh":"f8cf4840b56f4b4a1732188eda36a3562a5fca79d353e38fd3eeaf2de2fb2ffe","libcubeb/src/android/audiotrack_definitions.h":"7cbb2a68924d20ec651cead5a923f63eb20192f109b597a3fa1594a79196693b","libcubeb/src/android/cubeb-output-latency.h":"a3862d9caf60d5c805a61e94bd696f6687ee30d2daa4acc25bd686be38497670","libcubeb/src/android/cubeb_media_library.h":"fa2a26a31adc727f35e9f746c287734ecbc7e15ceb52baf821429919a06c2e52","libcubeb/src/android/sles_definitions.h":"4c9c3cedfc06c8df479cc675fbadb1f158b8219223a96b9cffbcbfac738d7f28","libcubeb/src/cubeb-coreaudio-rs/.circleci/config.yml":"7f3dc865105ca8f33965a7958b1fe2e627ae2d5a703f3b2a4ab6e2e796018597","libcubeb/src/cubeb-coreaudio-rs/.editorconfig":"4e53b182bcc78b83d7e1b5c03efa14d22d4955c4ed2514d1ba4e99c1eb1a50ba","libcubeb/src/cubeb-coreaudio-rs/.githooks/pre-push":"8b8b26544cd56f54c0c33812551f786bb25cb08c86dbfeb6bf3daad881c826a1","libcubeb/src/cubeb-coreaudio-rs/.github/workflows/test.yml":"0184de4ad18c405b0b3c8145592e3f1c39ff916ade02749b44fe3b823f443c77","libcubeb/src/cubeb-coreaudio-rs/.gitignore":"9fe0b70e2daf21ec657a9abe5cf30d0cb91fb79eb84b1f205655f13aca9dbfac","libcubeb/src/cubeb-coreaudio-rs/.travis.yml":"dc07bac53f70f16c9bdf52264bdc58500ae6018c1b4c567bc7642f6b4ca3cc35","libcubeb/src/cubeb-coreaudio-rs/Cargo.lock":"422a0fa0cbefa12940bfaed0dd17548ee1462348c12b0e8b2c907c230a736486","libcubeb/src/cubeb-coreaudio-rs/Cargo.toml.in":"87a351640edc60ef0ce84868defa78c2527237ee1cc49c5e90c55c808a483f54","libcubeb/src/cubeb-coreaudio-rs/LICENSE":"6e6f56aff5bbf3cbc60747e152fb1a719bd0716aaf6d711c554f57d92e96297c","libcubeb/src/cubeb-coreaudio-rs/README.md":"0007782a05a5330f739ad789c19c82562c82e32386b0447000fc72c0d48405bc","libcubeb/src/cubeb-coreaudio-rs/build-audiounit-rust-in-cubeb.sh":"d228a05985dcd02ec1ecac66a2b64dae5a530804a25a7054ccc95905aedfb7ef","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/Cargo.lock":"5c95f50ac83e532b19d99c64eb5def6c508000d028e33a40d8b0bec653bea0e3","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/Cargo.toml.in":"9d8afec2aa957db8c47ca09340a47e5d9913549bdc226fb5fe88f7f707b0e22e","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/aggregate_device.rs":"7d2bd5f5fd7f3d008ebb69ad81f522ca0cb73db6d7b3e50ed1a63ea26ff721f4","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/audio_device_extensions.rs":"1b49e566d87bcd0b33e9402fb52f407f5b78902657c6c322b6964600eae24cc9","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/audio_object.rs":"cb527a92a3ee291cad55a6e44411d133e7e815e6904f9829f294b1234ef438c4","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/audio_unit.rs":"fe4198926bed493abe85c99ce31028520d7c768a4095cd3495817739330afa33","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/cf_mutable_dict.rs":"fc42edd270c6dfb02f123214d2d8e487bbd62b5bd923b71eec13190fd0104d2a","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/dispatch.rs":"1da419c7b79dd62544dd2a985350a6fde4ab0b4f92567b77b18ea493410fcbc6","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/lib.rs":"c93ed1411dd6cc39db44f57e0d7683bbc54745f84a3c9f9533a088895ec97abe","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/string.rs":"1ada92eef1c7f4e77495e21ee1efb0c9f90fb395a886f3687159b12a88a9f4d4","libcubeb/src/cubeb-coreaudio-rs/install_git_hook.sh":"d38c8e51e636f6b90b489621ac34ccd1d1b1f40dccce3d178ed1da1c5068f16d","libcubeb/src/cubeb-coreaudio-rs/install_rustfmt_clippy.sh":"4ae90d8dcb9757cb3ae4ae142ef80e5377c0dde61c63f4a3c32418646e80ca7b","libcubeb/src/cubeb-coreaudio-rs/run_device_tests.sh":"01f4c965443e0cd2d8a55df3a41fcc38aede5c8a0081ddf3101507a68a05dca5","libcubeb/src/cubeb-coreaudio-rs/run_sanitizers.sh":"84e93a0da137803018f37403511e8c92760be730426bf6cea34419d93d1a7ff8","libcubeb/src/cubeb-coreaudio-rs/run_tests.sh":"42444e9003905a44add6b7c165dbf87c2dbee290a964651fcf362ae9d894cf90","libcubeb/src/cubeb-coreaudio-rs/src/backend/aggregate_device.rs":"37a8f19af165a4413c512669ea4538b20adb128de0a490a13d5f54c2558c8327","libcubeb/src/cubeb-coreaudio-rs/src/backend/auto_release.rs":"050fdcee74cf46b9a8a85a877e166d72a853d33220f59cf734cbb6ea09daa441","libcubeb/src/cubeb-coreaudio-rs/src/backend/buffer_manager.rs":"0d1f9af94271ed4042e8cf0bb9658604c9f2e1ff9d931f50c1904d5ee372cb72","libcubeb/src/cubeb-coreaudio-rs/src/backend/device_property.rs":"4afd8961b4f722791f5c35a0934352a0a452f9d610e49c53820492788c9a77c1","libcubeb/src/cubeb-coreaudio-rs/src/backend/intern.rs":"11ca424e4eb77f8eb9fd5a6717d1e791facf9743156a8534f0016fcf64d57b0f","libcubeb/src/cubeb-coreaudio-rs/src/backend/mixer.rs":"c4d09291598cbffb2217b551770ec590f34b6dd6b461dd99b019d5bb70f0eef3","libcubeb/src/cubeb-coreaudio-rs/src/backend/mod.rs":"fe60523a82b31df4db41f1fc5fdd33464f3fea224e8b8974f3890cec26c225a4","libcubeb/src/cubeb-coreaudio-rs/src/backend/resampler.rs":"48bf8f56ae8d60dbabca6417b768000619abee8731ac3902164b45651ac08a4d","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/aggregate_device.rs":"22c28c48fc5f5aa760858ebe7311bdbcf07569a11d687590eb05002d97d70204","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/api.rs":"fd9eec01014e7f42e2c86ec098fe025f9f9cd9a8caff3abfc46559ddf96b6168","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/backlog.rs":"3b189a7e036543c467cc242af0ed3332721179ee2b1c8847a6db563546f1ac52","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/device_change.rs":"e09e75a5e654b1ac8359d086e6d28002fa4519debbedb8e1e7d091eba50e33f9","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/device_property.rs":"3a25dc22ef3e3dfee884538ad1be5a5789540a10da3915850b41680a0a3b1f07","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/interfaces.rs":"caa4383895aba2570d260432aa37018d8ddd6e3dca896b607bc27f82d91fc19d","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/manual.rs":"f5c3b54aea2af17f0f74fdd730852bf49bfeba8acd86fac3c69779a10b87a015","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/mod.rs":"8dba770023d7f9c4228f0e11915347f0e07da5fd818e3ee4478c4b197af9aa2a","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/parallel.rs":"a7ebd579339c40ca64c0757cc9da6baec641e670f226e1b2ec5049894700bd7a","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/tone.rs":"b028c67777b6453a26190b6a49785dfe28556adcbe179cb10862ce0d47ee8509","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/utils.rs":"33568e881e9e944949a2d58ebbb18b1e5e23dc097cbf7706fa2dd60d7730c500","libcubeb/src/cubeb-coreaudio-rs/src/backend/utils.rs":"6c3ffbcd602e6cc9f56deb9ecb07b2eef2e6f074ef924178e466f380aae5c595","libcubeb/src/cubeb-coreaudio-rs/src/capi.rs":"21b66b70545bf04ec719928004d1d9adb45b24ced51288f5b2993d79aaf78f5f","libcubeb/src/cubeb-coreaudio-rs/src/lib.rs":"a2c8a665cae5e26e6eee4c93b480f7ed708eeb6ba9ccf6f82b41c262f4b60015","libcubeb/src/cubeb-coreaudio-rs/todo.md":"efc1f012eb9a331a040cad4ac03aa79307f25885f71b6fb38f3ad7af8d7d515c","libcubeb/src/cubeb-internal.h":"50d2c0be2945136ff66666dbd8fcedc338f8f1d66eb2d9b09e09399193683ae8","libcubeb/src/cubeb-jni-instances.h":"8195554372bf60dea569873c9e5fb1106a2cf5dedc66a13d2bc967da0ff48a12","libcubeb/src/cubeb-jni.cpp":"cee58136cde7ef82045b59eee032e6eaf9bb677db12e053d8805ad9d67ee304e","libcubeb/src/cubeb-jni.h":"8f95cb6bc410bb62adae84f5e9d28fb8b57610107ed66941db0b4e4124548a72","libcubeb/src/cubeb-pulse-rs/.editorconfig":"bf047bd1da10cabb99eea666d1e57c321eba4716dccb3e4ed0e2c5fe3ca53858","libcubeb/src/cubeb-pulse-rs/.github/workflows/build.yml":"c91e5b2eeb7a70d9a03164c47e7e143a6eecb0f2b8cca65ae7c9a045e04f5933","libcubeb/src/cubeb-pulse-rs/.gitignore":"c97ecfda4d205190b973232dcfdb0c29748521c2534dd866bcc782f30b086738","libcubeb/src/cubeb-pulse-rs/AUTHORS":"0e0ac930a68ce2f6b876126b195add177f0d3886facb9260f4d9b69f1988f0cc","libcubeb/src/cubeb-pulse-rs/Cargo.lock":"35b7a4cfdc483e44bff4ada19c1afa44beac1904d19bab7ddc64a94adb257aab","libcubeb/src/cubeb-pulse-rs/Cargo.toml.in":"bac38dfc218f8eb3d11aefa4ab4ec598751385e95d5f54716becf587257c88a9","libcubeb/src/cubeb-pulse-rs/LICENSE":"44c6b5ae5ec3fe2fbc608b00e6f4896f4d2d5c7e525fcbaa3eaa3cf2f3d5a983","libcubeb/src/cubeb-pulse-rs/README.md":"0079450bb4b013bac065ed1750851e461a3710ebad1f323817da1cb82db0bc4f","libcubeb/src/cubeb-pulse-rs/pulse-ffi/Cargo.toml.in":"86bb1c8ebc438416c3a1f71b41494f19a85f698860b8c12d4875c8247f9c3664","libcubeb/src/cubeb-pulse-rs/pulse-ffi/src/ffi_funcs.rs":"a16646c5e7c49e94b907a7a404cfcadf3007688005c689cca936f0c2ee2e28e6","libcubeb/src/cubeb-pulse-rs/pulse-ffi/src/ffi_types.rs":"2ca56bc3638a40d331e53117a5dd175d0a6e102b1e0eccb9c2adc565c6861a33","libcubeb/src/cubeb-pulse-rs/pulse-ffi/src/lib.rs":"6aff308de11954a067d0f6ef95bf3126aabb6d928a5191e91d9a38ebadba91c2","libcubeb/src/cubeb-pulse-rs/pulse-rs/Cargo.toml.in":"16016702e7ceebb068a6222f4ba42978f5c570a1dbaf7dc159aada8fd4e9d3d8","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/context.rs":"49893b6b5190f228797b8d8c1b23830a8627176e6d73a1d856f5139ebb09774b","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/error.rs":"cbbdbae9aa614743a9dd70ac304605f24ad0256a640982dd4217b1894aa96b8d","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/lib.rs":"1fd45911e927782381dff20a848609cf6b777edd6b8e9321bcb31fc25a88e84d","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/mainloop_api.rs":"e1ed99071fb106d997df1f2889c49d967f51c9e290be023619ce7ab6795b2feb","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/operation.rs":"ae0a57a654d5d6d98e68036cea179322e936ee8e7878a9cc006471b9517e703d","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/proplist.rs":"47fc0b327db76a4e76f4c3bce28c522ef358cf0df273ffb62389939cc5ab1429","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/stream.rs":"2e93f480a3ba115a942182bfb06d2a01249d9ecb924f4c61545790fc02d99fa0","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/threaded_mainloop.rs":"2399e67a1c0c5fb0793e36c7a03edce58bffccb54fbf8a1c36bdd60c8fe364bf","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/util.rs":"5e6179f397604520bb3fad6899c9aebf1605802dee008f1e1ccab55be74705dd","libcubeb/src/cubeb-pulse-rs/src/backend/context.rs":"e8d10bfc619738c34ebea18a06b23ffc7ab4a4f18f079b5535f50316648ab567","libcubeb/src/cubeb-pulse-rs/src/backend/cork_state.rs":"4a0f1afc7d9f333dac89218cc56d7d32fbffb487cd48c1c9a4e03d79cb3b5e28","libcubeb/src/cubeb-pulse-rs/src/backend/intern.rs":"11ca424e4eb77f8eb9fd5a6717d1e791facf9743156a8534f0016fcf64d57b0f","libcubeb/src/cubeb-pulse-rs/src/backend/mod.rs":"dfb30ec497d6215e4535e936fea8fe3a407ef24dc1cec43b52c0ffa923d9229c","libcubeb/src/cubeb-pulse-rs/src/backend/stream.rs":"8cc1afdbe9187d33a944c2289c18d83698db37549c0a03f7c198b817c662d8c5","libcubeb/src/cubeb-pulse-rs/src/capi.rs":"fa0fa020f0d0efe55aa0fc3596405e8407bbe2cbe6c7a558345304e6da87994e","libcubeb/src/cubeb-pulse-rs/src/lib.rs":"b41bbdc562cbfb130ed7c1e53fe69944774f515705341d8ce48a2f82c8c0c2c5","libcubeb/src/cubeb-speex-resampler.h":"dbf543eee4cc6e40ba3531a39d327e2cec884c19e26c570aa7eae0647e5f7420","libcubeb/src/cubeb.c":"01bde1830c8957e88eaf824c0fe2d65cf2e691ad9dde9f65aee558ef7bcc5852","libcubeb/src/cubeb_aaudio.cpp":"a7cf6835fc0b4d5c301f06b0271da5a03037082b78bbb924339560d389011954","libcubeb/src/cubeb_alsa.c":"0f061750afa89f0054a4655bbb23dd35f77124c53a90fcce1eccdb32e23937a9","libcubeb/src/cubeb_android.h":"396922d2bb994c39acb745f7449a78e8dee00ad5146583f647545a3e0a9dd010","libcubeb/src/cubeb_array_queue.h":"86ab9c32eef5f4427413091d5932843ee870144475cddb1f0e18cd39d49f6115","libcubeb/src/cubeb_assert.h":"07841be6cca09999a913d0c1e61ab0a5de02200efed5b66fbf7c481b1d0489b0","libcubeb/src/cubeb_audio_dump.cpp":"28f8b302a786fad6221d97ad4c06f6317657881f2521b67a490f28596efe3442","libcubeb/src/cubeb_audio_dump.h":"93da746cff7326ce904bd2ef1aef400d8fd36e8ab2fceb372d459127003a5dae","libcubeb/src/cubeb_audiotrack.c":"18382213f4b3a9808f3dd6b8c18173d21c7230718ecb3771762850ce6420e602","libcubeb/src/cubeb_audiounit.cpp":"4285a1ec1bb65e502443b82e1f988ed7af9eb2957c985fe2168574e17ffe8b06","libcubeb/src/cubeb_jack.cpp":"9493ca3f274cd9a5dba4b5023783747bf186c4fed0dc14ff34f841dc94c988ee","libcubeb/src/cubeb_kai.c":"3b6d52e4b0eaf2db34bcf902baf4784f72805bfb6349ebe769764d09195186c5","libcubeb/src/cubeb_log.cpp":"387f3f8989b260a1ca6067c25a0fd868e38c3d5bb81263924fad5341415a96fe","libcubeb/src/cubeb_log.h":"8511c7640f2856d107900f6c40775c5dfe711187204fb5b2557562b1a855399f","libcubeb/src/cubeb_mixer.cpp":"6779938a7fd70b0ad23fdf1194dab27b57e9afb8f03ff45885601796f76a1dfe","libcubeb/src/cubeb_mixer.h":"64425dcefad3632acf68d6ae9fbdf59ff7b7b0e92487c34d18cd67f52431dc23","libcubeb/src/cubeb_opensl.cpp":"617ba1316e4a31cafb08d9c26e3c6c66690563741748b6131a22b5e02d170e3b","libcubeb/src/cubeb_oss.c":"743dfe68354963e4a8553eb57fe36af6a639a7769da0b767afda5294edf865b9","libcubeb/src/cubeb_osx_run_loop.cpp":"e5c9ef5591eced85310af94575f84ea5d3051c7aaef4e41cfd221f8f8b7c4331","libcubeb/src/cubeb_osx_run_loop.h":"aa10dd0d6111973b37488d83403d204ecf6001a3530aac6bffab00c6bb31df15","libcubeb/src/cubeb_pulse.c":"034b4ad4eb072573ff2b97ed33c53622be4ff12523fb21d470d6106ca520a5e7","libcubeb/src/cubeb_resampler.cpp":"8d05ffd13a273300e5faa28d2306d14cad14e5192f1ceb4eed020fd272c85355","libcubeb/src/cubeb_resampler.h":"9e768ae9045de82cf2cdd8d1c6f5f20020c5a83ef06a0e7fc4f372e280e5a739","libcubeb/src/cubeb_resampler_internal.h":"7422c8d06cb2da8439568d7c37a98eae725e190ba428eff3763cf696584dd16b","libcubeb/src/cubeb_ring_array.h":"cd5b7d807c229e925fe61416d70b6ecfe41c735c361bfc01593ed10a6dad5849","libcubeb/src/cubeb_ringbuffer.h":"8f5dc7a58d8b7ad265ff3bbcac80ae160ff22243d869a5b502bf413fa58fd9b0","libcubeb/src/cubeb_sndio.c":"07b47b0993c4c37f45cef8df08bc555d7915354792edf4ee57b3e026ccf23a14","libcubeb/src/cubeb_strings.c":"6004618393cf4dc3e06cd4f44cb53589459dad21384de3695f8b3d16774edf26","libcubeb/src/cubeb_strings.h":"312f5c2230d9a02e369be1d991ec44a1793373046f208529b3cc54cb9a5b0610","libcubeb/src/cubeb_sun.c":"c9aaf34c2163dde73be4c98a4cf1059c00ca66954a78a9680384c9cb5a8927ed","libcubeb/src/cubeb_tracing.h":"def71a9c9659383ea3cf7e12ff0ba2f2c51a0ead03fef6d418eafde6e70c8f39","libcubeb/src/cubeb_triple_buffer.h":"f1d9b68a83c2463af6bce4e475f3a638705241cce920dceaeefb6b864f44f62d","libcubeb/src/cubeb_utils.cpp":"8f41899df2f5f82541f816dadcee3d18baab7a1aecf2bc6d0b382567209351aa","libcubeb/src/cubeb_utils.h":"7a3b1e2a97752e96ff11badc19149e1582d4289e4e200817a9ed3f905bf8ab10","libcubeb/src/cubeb_utils_unix.h":"2e67e39daed8ec17092a2d1a9b660a3d4e153fc351698d9e1f3d51ef974979c5","libcubeb/src/cubeb_utils_win.h":"4d7a397f475e08dd7af47fdc4003e9f78cf9058e095348eeb554135ea3c3c454","libcubeb/src/cubeb_wasapi.cpp":"e249d54458a5af823f88c0ee35950991494dac3f736ec847143462a8acbc002e","libcubeb/src/cubeb_winmm.c":"089987489bea20690e825b3107e31446b89270f316fa8219b2c501941c3bc98d","libcubeb/subprojects/speex/arch.h":"2300bce68c588270cdc684dc7f01377e5e251529f4545d93771e111c56d51b0f","libcubeb/subprojects/speex/fixed_generic.h":"306ee7453677fa6067f16c79d358c6c90a9d3d008850b493cdaa59c07e6375c1","libcubeb/subprojects/speex/resample.c":"9c3a1c64ecf3750af82c980d01ea73d3682f73c332a580465d1e787e5c54cd00","libcubeb/subprojects/speex/resample_neon.h":"7d3fd7af9a1ddde22518b9c7b4419073b72b2dfa5be4c3bc8796992bc87b3da0","libcubeb/subprojects/speex/resample_sse.h":"5a196d8e2d8ab5c956f5252f09f5ddc55aee1f99b1341af3fa54a1f4c2157924","libcubeb/subprojects/speex/speex_config_types.h":"24e3ffbf29e5519611a48e5acb959645b01d166dcb4369380d5f776c3f53d4cd","libcubeb/subprojects/speex/speex_resampler.h":"7e439ec0dd30c32216b3ced17135f8992e5aaf53389d3f5996a7d900c453e65f","libcubeb/subprojects/speex/stack_alloc.h":"e8a2fc0874942d2c7177475fcc141fdd0c0156200b8a4e7656d4a20313e2e569","libcubeb/test/README.md":"1c11b038f87daf10ea78abc17bdbdd157940c241df548c24d5872d142a98c1af","libcubeb/test/common.h":"9ef928375c3cea4345f09e8f75678f35a8866a10a29fb7d93cf02259653cdd97","libcubeb/test/test_audio.cpp":"cf094d11993c9d7602cc0a7f2dcf92d47ffd6142fdd5813c3010143fa08db080","libcubeb/test/test_audio_dump.cpp":"5716fd3ea828a26dd80252cafa2334404003639663334b9a96c87df2831b5553","libcubeb/test/test_callback_ret.cpp":"4f004b79476c44e059136478e2368c030920c9137180637e548eb2e6db7e5f6e","libcubeb/test/test_device_changed_callback.cpp":"9e02dd526602d7abfc5485c80c8b86ffa27c0a8c87e587a850f77eff9bfd14aa","libcubeb/test/test_devices.cpp":"1ea25e6ae19940d224011cd8c255d1038a858d1d9be0e7c32ea0455a0e8163f9","libcubeb/test/test_duplex.cpp":"2297abf827e21fe8695cae63c7e8076bc59e6ab4350aa8dbbd821e0f079732c4","libcubeb/test/test_latency.cpp":"a1d75355e49895ea105eb814d20c6e1a37e8cf98be01f73832f4768eb7e1176f","libcubeb/test/test_logging.cpp":"72522cf7794212dceb2f26a98f5c9297a6366f2eab90128066f59422a6edb7c5","libcubeb/test/test_loopback.cpp":"92dbdebd71aa2e844694100818ac11e5145bccb01aa3e6d7ce3bc990931dda3d","libcubeb/test/test_overload_callback.cpp":"593c36fc78ea2fccd4dc2b6e565cb3bf53503f402522737e9005d9eab7fc4732","libcubeb/test/test_record.cpp":"90484423d4e5c4ffb8e6f65c9bae1f7384cac7eeeb4f42c0fcca768ee0e5c8e6","libcubeb/test/test_resampler.cpp":"57d6c0754a13ba6062868029b3daf59db591c69d1d0c8662c5d750a2a031f63f","libcubeb/test/test_ring_array.cpp":"c0420d04c914b0f61bdc81b9c4511c1b535518b2f87f32a5539f9ca6310dd5b1","libcubeb/test/test_ring_buffer.cpp":"cf247fda806f976d2b8dd2790e5a25bda68943423d7b0bcd4ac69a57f94e2f88","libcubeb/test/test_sanity.cpp":"b1b474be02e90fa310c265d4abdc712e5637bc5420c670f26d79be98b092804f","libcubeb/test/test_tone.cpp":"75e32348aa18583130bc3f2849862a4153729f19f7e5b1bcc9e91cc6ab7bcbe7","libcubeb/test/test_triple_buffer.cpp":"b1024e57581ec066d81e2a4749c71a8392ec81fa9a22e0e0c1d124f7ca86427d","libcubeb/test/test_utils.cpp":"ec18e3c14519d053cfd544ae59b2ba39716500cd7da72b5b50366eefff0a0481","libcubeb/tools/cubeb-test.cpp":"e1a29a10ba824a49dad4d0d6c9f495786148f0dc942558ae990786dba6065f4e","src/audio_dump.rs":"2491741d58a609e93de1a46d003fd4e26e4cd88cd89d4c9584635141964e0274","src/callbacks.rs":"a83d9a16ee66b3cd7100dd06e1f409698a727d642df0dfa797c067b5cf1def66","src/channel.rs":"02fd91384195180a56663aba87f00660c20e71fe7654c7b68d8f470173f40d5f","src/context.rs":"23b9326f58494b0860d080ec5f0e76be2325172da7f0274ebba152dc35182f3b","src/device.rs":"bd20afac637ea964df950ae6df30ddbc9ea7a865c7b471ba4c58d632b8f72708","src/error.rs":"406e3b843ed2d263fe677c4b34fb96a6d780a68bcb56a6f85f041d20d70227bd","src/format.rs":"d4d27790c20eab0b16592f60d5e487425a45a268cf4c74cf843c10ac91bbff4c","src/internal.rs":"c3af5f53dc7957860bf3bc0cd9737d094fb8ac000e7b40c569304cfa76a43145","src/lib.rs":"0fa0602859889c4f608ca4178c45f43d7e4b258ea0185a64341fab4532ebcd0e","src/log.rs":"8ac402b6c4d20db651cbddb87b27b3aa5ab0c3c50dac08a6c09fb1b7f9a3a391","src/macros.rs":"caef13f5d23f7a3ec1a54ec3ca2390ac4ad89d521893f1d0864daf70d57a20aa","src/mixer.rs":"e72e92855614da187da6419ed0a115062a05670cb73443b2ea4313d8f5108a68","src/resampler.rs":"b16bd6a4b1179b25f2a5391133fcd4410467e6a68c0a46cf15a12d280c1862e0","src/stream.rs":"e736794dea181be0cde83ff78079efa3bb1c64e38b8c57615590fa4c6aadf2ac"},"package":"cd2114801cd652119ace9e050a16d6641475fe3341ef45c58c9377fa45cbe3bf"}
+\ No newline at end of file
++{"files":{".cargo_vcs_info.json":"21c314647aed58ae4288dbae8dfe62a2c0617680e4e6f592cb72dafda7364d80","Cargo.lock":"78da21219e75ef238bf1df34221cf8cbe37ea0289ff0d750d776d544fdc9fb75","Cargo.toml":"f90fb04b9e0d54ef9e1529753b946689a5151b8fc25f29e26f1b435972858fb5","LICENSE":"8c044baa5d883274736eeece0b955249076c2697b826e576fce59496235b2cf5","build.rs":"188f2371401406862eadcdf7d2b5fbcc395c77a1a8ca5e29c3c7f6273734b52c","libcubeb/.clang-format":"9897a643853cadfb2d771b525a6e54832a8aaa6e1c589efffc6369c125764110","libcubeb/.github/workflows/build.yml":"8e228609cc41d02fc1777e046eaf53f577f2e8741013736c497d6f82acfd9e16","libcubeb/.github/workflows/docs.yml":"11afbc5de737985e73177123f7844095cf849b8916c3463deeaf7417193443a0","libcubeb/.gitignore":"30e326935b8d1ca90f4b6c7a021313cd7cd20b274e6558de4081c0840adb5846","libcubeb/AUTHORS":"829e45d138c7c8827799f302806fa4be8cd8bd4bad70a2fe26c3a27a5cf36948","libcubeb/CMakeLists.txt":"c14fe691bd5f7fb40fd4bd8caf95f6713a169268baba09e3875bced85028da2b","libcubeb/Config.cmake.in":"a156fb5cd30208aedcb9ef025d94187df82142fd4442e3a7d0e2a688668a3da9","libcubeb/INSTALL.md":"1fa77e15423e6f583c30861528cd2732d52a028982020cd3a7a9da4a452d7311","libcubeb/LICENSE":"44c6b5ae5ec3fe2fbc608b00e6f4896f4d2d5c7e525fcbaa3eaa3cf2f3d5a983","libcubeb/README.md":"1445df3577d2664f4baee1bb5a993cd41fc046f490eb15ba9da5aa6316d8916c","libcubeb/cmake/compile_tests/oss_is_v4.c":"482bcd4c569e8a26f4ab0fe3a3bed25e9d4b296bf678896a2cc1dc8abbad492d","libcubeb/cmake/sanitizers-cmake/.gitignore":"0ecc0e025e47a2c0d21866a6759177523f973b4232c747a283b9b1f2b572e037","libcubeb/cmake/sanitizers-cmake/CMakeLists.txt":"89b282c19b3897ff666f7847d5e679ae928ca7e76ffd0d23f7c58c9464048b61","libcubeb/cmake/sanitizers-cmake/LICENSE":"4b67e7ae8c91e68e1a929eb1cbaa4c773c6d19aa91aaa12c390cf9560d1c9799","libcubeb/cmake/sanitizers-cmake/README.md":"f3b85a594e1601ae65bb09393c56fbc8a98e3f3f49234e56f86bd78803c3544e","libcubeb/cmake/sanitizers-cmake/cmake/FindASan.cmake":"bd30b1c3cb0682b8a2b0b599f6c51fbf99ef4908b00eba8826f0d484c623b01b","libcubeb/cmake/sanitizers-cmake/cmake/FindMSan.cmake":"55e40f0994b47f8e779622af2007c69252d9456be99f4aa4fba7dd49c23d5580","libcubeb/cmake/sanitizers-cmake/cmake/FindSanitizers.cmake":"2ffd9717a49e3e9de848ec0d91097bdbab3f75a7866211d902f9659f59271ffc","libcubeb/cmake/sanitizers-cmake/cmake/FindTSan.cmake":"ceace234abd5a463ad1b8134ad06c4c8004895b2e8fc9edb67e64620ea97ca47","libcubeb/cmake/sanitizers-cmake/cmake/FindUBSan.cmake":"4720ec96ea42a2a9c07d887c1fc5562ed3e8c222f5778a18b78c46678b23f156","libcubeb/cmake/sanitizers-cmake/cmake/asan-wrapper":"4e543936e6374e24b80a0f92135c07c2e2101c0d110e51bddaf0e70ae8ec391e","libcubeb/cmake/sanitizers-cmake/cmake/sanitize-helpers.cmake":"c0c225f22bebd27eb68b807b2a61962d28afc61609735fe652c2fde6aa6a005b","libcubeb/cmake/sanitizers-cmake/tests/CMakeLists.txt":"64b7aea469a043f27414e3d652aaa89a03a11843d152c4cd42f30561e6ef51bc","libcubeb/cmake/sanitizers-cmake/tests/asan_test.cpp":"a25de95282aaee22d977d0b474468b946c1422b80b15424c04266dba038eba2e","libcubeb/cmake/sanitizers-cmake/tests/shortest.ext.test.cpp":"a25de95282aaee22d977d0b474468b946c1422b80b15424c04266dba038eba2e","libcubeb/cmake/toolchain-cross-mingw.cmake":"1c26749465364061ddf37aaa00f363eaf057c4b6a70181086e13b0a4d09bd376","libcubeb/cubeb.supp":"19f33e59f8dc91a327c923e44c2c3f9af0a043ce1d6a8cac275ba094b4bfe0da","libcubeb/docs/Doxyfile.in":"e721a50ccf3a010b9b5169b97f93a24f66bd4b88cade17b5b5088de19fa89716","libcubeb/include/cubeb/cubeb.h":"9d89beed6b79a1f3e0db052fa82fe4f8ce1f6939d0aed75f98d99c77dad90628","libcubeb/libcubeb.pc.in":"ad777cd17ee95516109555153541578692de40c719de22744f816c7dde863e67","libcubeb/scan-build-install.sh":"1ecf22aca367a4d02f810c4cb78db8636e08a12787e94e30c441ce439cf4a265","libcubeb/scripts/run-clang-format.sh":"f8cf4840b56f4b4a1732188eda36a3562a5fca79d353e38fd3eeaf2de2fb2ffe","libcubeb/src/android/audiotrack_definitions.h":"7cbb2a68924d20ec651cead5a923f63eb20192f109b597a3fa1594a79196693b","libcubeb/src/android/cubeb-output-latency.h":"a3862d9caf60d5c805a61e94bd696f6687ee30d2daa4acc25bd686be38497670","libcubeb/src/android/cubeb_media_library.h":"fa2a26a31adc727f35e9f746c287734ecbc7e15ceb52baf821429919a06c2e52","libcubeb/src/android/sles_definitions.h":"4c9c3cedfc06c8df479cc675fbadb1f158b8219223a96b9cffbcbfac738d7f28","libcubeb/src/cubeb-coreaudio-rs/.circleci/config.yml":"7f3dc865105ca8f33965a7958b1fe2e627ae2d5a703f3b2a4ab6e2e796018597","libcubeb/src/cubeb-coreaudio-rs/.editorconfig":"4e53b182bcc78b83d7e1b5c03efa14d22d4955c4ed2514d1ba4e99c1eb1a50ba","libcubeb/src/cubeb-coreaudio-rs/.githooks/pre-push":"8b8b26544cd56f54c0c33812551f786bb25cb08c86dbfeb6bf3daad881c826a1","libcubeb/src/cubeb-coreaudio-rs/.github/workflows/test.yml":"0184de4ad18c405b0b3c8145592e3f1c39ff916ade02749b44fe3b823f443c77","libcubeb/src/cubeb-coreaudio-rs/.gitignore":"9fe0b70e2daf21ec657a9abe5cf30d0cb91fb79eb84b1f205655f13aca9dbfac","libcubeb/src/cubeb-coreaudio-rs/.travis.yml":"dc07bac53f70f16c9bdf52264bdc58500ae6018c1b4c567bc7642f6b4ca3cc35","libcubeb/src/cubeb-coreaudio-rs/Cargo.lock":"422a0fa0cbefa12940bfaed0dd17548ee1462348c12b0e8b2c907c230a736486","libcubeb/src/cubeb-coreaudio-rs/Cargo.toml.in":"87a351640edc60ef0ce84868defa78c2527237ee1cc49c5e90c55c808a483f54","libcubeb/src/cubeb-coreaudio-rs/LICENSE":"6e6f56aff5bbf3cbc60747e152fb1a719bd0716aaf6d711c554f57d92e96297c","libcubeb/src/cubeb-coreaudio-rs/README.md":"0007782a05a5330f739ad789c19c82562c82e32386b0447000fc72c0d48405bc","libcubeb/src/cubeb-coreaudio-rs/build-audiounit-rust-in-cubeb.sh":"d228a05985dcd02ec1ecac66a2b64dae5a530804a25a7054ccc95905aedfb7ef","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/Cargo.lock":"5c95f50ac83e532b19d99c64eb5def6c508000d028e33a40d8b0bec653bea0e3","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/Cargo.toml.in":"9d8afec2aa957db8c47ca09340a47e5d9913549bdc226fb5fe88f7f707b0e22e","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/aggregate_device.rs":"7d2bd5f5fd7f3d008ebb69ad81f522ca0cb73db6d7b3e50ed1a63ea26ff721f4","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/audio_device_extensions.rs":"1b49e566d87bcd0b33e9402fb52f407f5b78902657c6c322b6964600eae24cc9","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/audio_object.rs":"cb527a92a3ee291cad55a6e44411d133e7e815e6904f9829f294b1234ef438c4","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/audio_unit.rs":"fe4198926bed493abe85c99ce31028520d7c768a4095cd3495817739330afa33","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/cf_mutable_dict.rs":"fc42edd270c6dfb02f123214d2d8e487bbd62b5bd923b71eec13190fd0104d2a","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/dispatch.rs":"1da419c7b79dd62544dd2a985350a6fde4ab0b4f92567b77b18ea493410fcbc6","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/lib.rs":"c93ed1411dd6cc39db44f57e0d7683bbc54745f84a3c9f9533a088895ec97abe","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/string.rs":"1ada92eef1c7f4e77495e21ee1efb0c9f90fb395a886f3687159b12a88a9f4d4","libcubeb/src/cubeb-coreaudio-rs/install_git_hook.sh":"d38c8e51e636f6b90b489621ac34ccd1d1b1f40dccce3d178ed1da1c5068f16d","libcubeb/src/cubeb-coreaudio-rs/install_rustfmt_clippy.sh":"4ae90d8dcb9757cb3ae4ae142ef80e5377c0dde61c63f4a3c32418646e80ca7b","libcubeb/src/cubeb-coreaudio-rs/run_device_tests.sh":"01f4c965443e0cd2d8a55df3a41fcc38aede5c8a0081ddf3101507a68a05dca5","libcubeb/src/cubeb-coreaudio-rs/run_sanitizers.sh":"84e93a0da137803018f37403511e8c92760be730426bf6cea34419d93d1a7ff8","libcubeb/src/cubeb-coreaudio-rs/run_tests.sh":"42444e9003905a44add6b7c165dbf87c2dbee290a964651fcf362ae9d894cf90","libcubeb/src/cubeb-coreaudio-rs/src/backend/aggregate_device.rs":"37a8f19af165a4413c512669ea4538b20adb128de0a490a13d5f54c2558c8327","libcubeb/src/cubeb-coreaudio-rs/src/backend/auto_release.rs":"050fdcee74cf46b9a8a85a877e166d72a853d33220f59cf734cbb6ea09daa441","libcubeb/src/cubeb-coreaudio-rs/src/backend/buffer_manager.rs":"0d1f9af94271ed4042e8cf0bb9658604c9f2e1ff9d931f50c1904d5ee372cb72","libcubeb/src/cubeb-coreaudio-rs/src/backend/device_property.rs":"4afd8961b4f722791f5c35a0934352a0a452f9d610e49c53820492788c9a77c1","libcubeb/src/cubeb-coreaudio-rs/src/backend/intern.rs":"11ca424e4eb77f8eb9fd5a6717d1e791facf9743156a8534f0016fcf64d57b0f","libcubeb/src/cubeb-coreaudio-rs/src/backend/mixer.rs":"c4d09291598cbffb2217b551770ec590f34b6dd6b461dd99b019d5bb70f0eef3","libcubeb/src/cubeb-coreaudio-rs/src/backend/mod.rs":"fe60523a82b31df4db41f1fc5fdd33464f3fea224e8b8974f3890cec26c225a4","libcubeb/src/cubeb-coreaudio-rs/src/backend/resampler.rs":"48bf8f56ae8d60dbabca6417b768000619abee8731ac3902164b45651ac08a4d","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/aggregate_device.rs":"22c28c48fc5f5aa760858ebe7311bdbcf07569a11d687590eb05002d97d70204","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/api.rs":"fd9eec01014e7f42e2c86ec098fe025f9f9cd9a8caff3abfc46559ddf96b6168","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/backlog.rs":"3b189a7e036543c467cc242af0ed3332721179ee2b1c8847a6db563546f1ac52","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/device_change.rs":"e09e75a5e654b1ac8359d086e6d28002fa4519debbedb8e1e7d091eba50e33f9","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/device_property.rs":"3a25dc22ef3e3dfee884538ad1be5a5789540a10da3915850b41680a0a3b1f07","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/interfaces.rs":"caa4383895aba2570d260432aa37018d8ddd6e3dca896b607bc27f82d91fc19d","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/manual.rs":"f5c3b54aea2af17f0f74fdd730852bf49bfeba8acd86fac3c69779a10b87a015","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/mod.rs":"8dba770023d7f9c4228f0e11915347f0e07da5fd818e3ee4478c4b197af9aa2a","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/parallel.rs":"a7ebd579339c40ca64c0757cc9da6baec641e670f226e1b2ec5049894700bd7a","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/tone.rs":"b028c67777b6453a26190b6a49785dfe28556adcbe179cb10862ce0d47ee8509","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/utils.rs":"33568e881e9e944949a2d58ebbb18b1e5e23dc097cbf7706fa2dd60d7730c500","libcubeb/src/cubeb-coreaudio-rs/src/backend/utils.rs":"6c3ffbcd602e6cc9f56deb9ecb07b2eef2e6f074ef924178e466f380aae5c595","libcubeb/src/cubeb-coreaudio-rs/src/capi.rs":"21b66b70545bf04ec719928004d1d9adb45b24ced51288f5b2993d79aaf78f5f","libcubeb/src/cubeb-coreaudio-rs/src/lib.rs":"a2c8a665cae5e26e6eee4c93b480f7ed708eeb6ba9ccf6f82b41c262f4b60015","libcubeb/src/cubeb-coreaudio-rs/todo.md":"efc1f012eb9a331a040cad4ac03aa79307f25885f71b6fb38f3ad7af8d7d515c","libcubeb/src/cubeb-internal.h":"50d2c0be2945136ff66666dbd8fcedc338f8f1d66eb2d9b09e09399193683ae8","libcubeb/src/cubeb-jni-instances.h":"8195554372bf60dea569873c9e5fb1106a2cf5dedc66a13d2bc967da0ff48a12","libcubeb/src/cubeb-jni.cpp":"cee58136cde7ef82045b59eee032e6eaf9bb677db12e053d8805ad9d67ee304e","libcubeb/src/cubeb-jni.h":"8f95cb6bc410bb62adae84f5e9d28fb8b57610107ed66941db0b4e4124548a72","libcubeb/src/cubeb-pulse-rs/.editorconfig":"bf047bd1da10cabb99eea666d1e57c321eba4716dccb3e4ed0e2c5fe3ca53858","libcubeb/src/cubeb-pulse-rs/.github/workflows/build.yml":"c91e5b2eeb7a70d9a03164c47e7e143a6eecb0f2b8cca65ae7c9a045e04f5933","libcubeb/src/cubeb-pulse-rs/.gitignore":"c97ecfda4d205190b973232dcfdb0c29748521c2534dd866bcc782f30b086738","libcubeb/src/cubeb-pulse-rs/AUTHORS":"0e0ac930a68ce2f6b876126b195add177f0d3886facb9260f4d9b69f1988f0cc","libcubeb/src/cubeb-pulse-rs/Cargo.lock":"35b7a4cfdc483e44bff4ada19c1afa44beac1904d19bab7ddc64a94adb257aab","libcubeb/src/cubeb-pulse-rs/Cargo.toml.in":"bac38dfc218f8eb3d11aefa4ab4ec598751385e95d5f54716becf587257c88a9","libcubeb/src/cubeb-pulse-rs/LICENSE":"44c6b5ae5ec3fe2fbc608b00e6f4896f4d2d5c7e525fcbaa3eaa3cf2f3d5a983","libcubeb/src/cubeb-pulse-rs/README.md":"0079450bb4b013bac065ed1750851e461a3710ebad1f323817da1cb82db0bc4f","libcubeb/src/cubeb-pulse-rs/pulse-ffi/Cargo.toml.in":"86bb1c8ebc438416c3a1f71b41494f19a85f698860b8c12d4875c8247f9c3664","libcubeb/src/cubeb-pulse-rs/pulse-ffi/src/ffi_funcs.rs":"a16646c5e7c49e94b907a7a404cfcadf3007688005c689cca936f0c2ee2e28e6","libcubeb/src/cubeb-pulse-rs/pulse-ffi/src/ffi_types.rs":"2ca56bc3638a40d331e53117a5dd175d0a6e102b1e0eccb9c2adc565c6861a33","libcubeb/src/cubeb-pulse-rs/pulse-ffi/src/lib.rs":"6aff308de11954a067d0f6ef95bf3126aabb6d928a5191e91d9a38ebadba91c2","libcubeb/src/cubeb-pulse-rs/pulse-rs/Cargo.toml.in":"16016702e7ceebb068a6222f4ba42978f5c570a1dbaf7dc159aada8fd4e9d3d8","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/context.rs":"49893b6b5190f228797b8d8c1b23830a8627176e6d73a1d856f5139ebb09774b","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/error.rs":"cbbdbae9aa614743a9dd70ac304605f24ad0256a640982dd4217b1894aa96b8d","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/lib.rs":"1fd45911e927782381dff20a848609cf6b777edd6b8e9321bcb31fc25a88e84d","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/mainloop_api.rs":"e1ed99071fb106d997df1f2889c49d967f51c9e290be023619ce7ab6795b2feb","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/operation.rs":"ae0a57a654d5d6d98e68036cea179322e936ee8e7878a9cc006471b9517e703d","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/proplist.rs":"47fc0b327db76a4e76f4c3bce28c522ef358cf0df273ffb62389939cc5ab1429","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/stream.rs":"2e93f480a3ba115a942182bfb06d2a01249d9ecb924f4c61545790fc02d99fa0","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/threaded_mainloop.rs":"2399e67a1c0c5fb0793e36c7a03edce58bffccb54fbf8a1c36bdd60c8fe364bf","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/util.rs":"5e6179f397604520bb3fad6899c9aebf1605802dee008f1e1ccab55be74705dd","libcubeb/src/cubeb-pulse-rs/src/backend/context.rs":"e8d10bfc619738c34ebea18a06b23ffc7ab4a4f18f079b5535f50316648ab567","libcubeb/src/cubeb-pulse-rs/src/backend/cork_state.rs":"4a0f1afc7d9f333dac89218cc56d7d32fbffb487cd48c1c9a4e03d79cb3b5e28","libcubeb/src/cubeb-pulse-rs/src/backend/intern.rs":"11ca424e4eb77f8eb9fd5a6717d1e791facf9743156a8534f0016fcf64d57b0f","libcubeb/src/cubeb-pulse-rs/src/backend/mod.rs":"dfb30ec497d6215e4535e936fea8fe3a407ef24dc1cec43b52c0ffa923d9229c","libcubeb/src/cubeb-pulse-rs/src/backend/stream.rs":"8cc1afdbe9187d33a944c2289c18d83698db37549c0a03f7c198b817c662d8c5","libcubeb/src/cubeb-pulse-rs/src/capi.rs":"fa0fa020f0d0efe55aa0fc3596405e8407bbe2cbe6c7a558345304e6da87994e","libcubeb/src/cubeb-pulse-rs/src/lib.rs":"b41bbdc562cbfb130ed7c1e53fe69944774f515705341d8ce48a2f82c8c0c2c5","libcubeb/src/cubeb-speex-resampler.h":"dbf543eee4cc6e40ba3531a39d327e2cec884c19e26c570aa7eae0647e5f7420","libcubeb/src/cubeb.c":"01bde1830c8957e88eaf824c0fe2d65cf2e691ad9dde9f65aee558ef7bcc5852","libcubeb/src/cubeb_aaudio.cpp":"a7cf6835fc0b4d5c301f06b0271da5a03037082b78bbb924339560d389011954","libcubeb/src/cubeb_alsa.c":"0f061750afa89f0054a4655bbb23dd35f77124c53a90fcce1eccdb32e23937a9","libcubeb/src/cubeb_android.h":"396922d2bb994c39acb745f7449a78e8dee00ad5146583f647545a3e0a9dd010","libcubeb/src/cubeb_array_queue.h":"86ab9c32eef5f4427413091d5932843ee870144475cddb1f0e18cd39d49f6115","libcubeb/src/cubeb_assert.h":"07841be6cca09999a913d0c1e61ab0a5de02200efed5b66fbf7c481b1d0489b0","libcubeb/src/cubeb_audio_dump.cpp":"28f8b302a786fad6221d97ad4c06f6317657881f2521b67a490f28596efe3442","libcubeb/src/cubeb_audio_dump.h":"93da746cff7326ce904bd2ef1aef400d8fd36e8ab2fceb372d459127003a5dae","libcubeb/src/cubeb_audiotrack.c":"18382213f4b3a9808f3dd6b8c18173d21c7230718ecb3771762850ce6420e602","libcubeb/src/cubeb_audiounit.cpp":"4285a1ec1bb65e502443b82e1f988ed7af9eb2957c985fe2168574e17ffe8b06","libcubeb/src/cubeb_jack.cpp":"9493ca3f274cd9a5dba4b5023783747bf186c4fed0dc14ff34f841dc94c988ee","libcubeb/src/cubeb_kai.c":"3b6d52e4b0eaf2db34bcf902baf4784f72805bfb6349ebe769764d09195186c5","libcubeb/src/cubeb_log.cpp":"387f3f8989b260a1ca6067c25a0fd868e38c3d5bb81263924fad5341415a96fe","libcubeb/src/cubeb_log.h":"8511c7640f2856d107900f6c40775c5dfe711187204fb5b2557562b1a855399f","libcubeb/src/cubeb_mixer.cpp":"6779938a7fd70b0ad23fdf1194dab27b57e9afb8f03ff45885601796f76a1dfe","libcubeb/src/cubeb_mixer.h":"64425dcefad3632acf68d6ae9fbdf59ff7b7b0e92487c34d18cd67f52431dc23","libcubeb/src/cubeb_opensl.cpp":"617ba1316e4a31cafb08d9c26e3c6c66690563741748b6131a22b5e02d170e3b","libcubeb/src/cubeb_oss.c":"743dfe68354963e4a8553eb57fe36af6a639a7769da0b767afda5294edf865b9","libcubeb/src/cubeb_osx_run_loop.cpp":"e5c9ef5591eced85310af94575f84ea5d3051c7aaef4e41cfd221f8f8b7c4331","libcubeb/src/cubeb_osx_run_loop.h":"aa10dd0d6111973b37488d83403d204ecf6001a3530aac6bffab00c6bb31df15","libcubeb/src/cubeb_pulse.c":"034b4ad4eb072573ff2b97ed33c53622be4ff12523fb21d470d6106ca520a5e7","libcubeb/src/cubeb_resampler.cpp":"8d05ffd13a273300e5faa28d2306d14cad14e5192f1ceb4eed020fd272c85355","libcubeb/src/cubeb_resampler.h":"9e768ae9045de82cf2cdd8d1c6f5f20020c5a83ef06a0e7fc4f372e280e5a739","libcubeb/src/cubeb_resampler_internal.h":"7422c8d06cb2da8439568d7c37a98eae725e190ba428eff3763cf696584dd16b","libcubeb/src/cubeb_ring_array.h":"cd5b7d807c229e925fe61416d70b6ecfe41c735c361bfc01593ed10a6dad5849","libcubeb/src/cubeb_ringbuffer.h":"8f5dc7a58d8b7ad265ff3bbcac80ae160ff22243d869a5b502bf413fa58fd9b0","libcubeb/src/cubeb_sndio.c":"07b47b0993c4c37f45cef8df08bc555d7915354792edf4ee57b3e026ccf23a14","libcubeb/src/cubeb_strings.c":"6004618393cf4dc3e06cd4f44cb53589459dad21384de3695f8b3d16774edf26","libcubeb/src/cubeb_strings.h":"312f5c2230d9a02e369be1d991ec44a1793373046f208529b3cc54cb9a5b0610","libcubeb/src/cubeb_sun.c":"c9aaf34c2163dde73be4c98a4cf1059c00ca66954a78a9680384c9cb5a8927ed","libcubeb/src/cubeb_tracing.h":"def71a9c9659383ea3cf7e12ff0ba2f2c51a0ead03fef6d418eafde6e70c8f39","libcubeb/src/cubeb_triple_buffer.h":"f1d9b68a83c2463af6bce4e475f3a638705241cce920dceaeefb6b864f44f62d","libcubeb/src/cubeb_utils.cpp":"8f41899df2f5f82541f816dadcee3d18baab7a1aecf2bc6d0b382567209351aa","libcubeb/src/cubeb_utils.h":"7a3b1e2a97752e96ff11badc19149e1582d4289e4e200817a9ed3f905bf8ab10","libcubeb/src/cubeb_utils_unix.h":"2e67e39daed8ec17092a2d1a9b660a3d4e153fc351698d9e1f3d51ef974979c5","libcubeb/src/cubeb_utils_win.h":"4d7a397f475e08dd7af47fdc4003e9f78cf9058e095348eeb554135ea3c3c454","libcubeb/src/cubeb_wasapi.cpp":"e249d54458a5af823f88c0ee35950991494dac3f736ec847143462a8acbc002e","libcubeb/src/cubeb_winmm.c":"089987489bea20690e825b3107e31446b89270f316fa8219b2c501941c3bc98d","libcubeb/subprojects/speex/arch.h":"2300bce68c588270cdc684dc7f01377e5e251529f4545d93771e111c56d51b0f","libcubeb/subprojects/speex/fixed_generic.h":"306ee7453677fa6067f16c79d358c6c90a9d3d008850b493cdaa59c07e6375c1","libcubeb/subprojects/speex/resample.c":"9c3a1c64ecf3750af82c980d01ea73d3682f73c332a580465d1e787e5c54cd00","libcubeb/subprojects/speex/resample_neon.h":"7d3fd7af9a1ddde22518b9c7b4419073b72b2dfa5be4c3bc8796992bc87b3da0","libcubeb/subprojects/speex/resample_sse.h":"5a196d8e2d8ab5c956f5252f09f5ddc55aee1f99b1341af3fa54a1f4c2157924","libcubeb/subprojects/speex/speex_config_types.h":"24e3ffbf29e5519611a48e5acb959645b01d166dcb4369380d5f776c3f53d4cd","libcubeb/subprojects/speex/speex_resampler.h":"7e439ec0dd30c32216b3ced17135f8992e5aaf53389d3f5996a7d900c453e65f","libcubeb/subprojects/speex/stack_alloc.h":"e8a2fc0874942d2c7177475fcc141fdd0c0156200b8a4e7656d4a20313e2e569","libcubeb/test/README.md":"1c11b038f87daf10ea78abc17bdbdd157940c241df548c24d5872d142a98c1af","libcubeb/test/common.h":"9ef928375c3cea4345f09e8f75678f35a8866a10a29fb7d93cf02259653cdd97","libcubeb/test/test_audio.cpp":"cf094d11993c9d7602cc0a7f2dcf92d47ffd6142fdd5813c3010143fa08db080","libcubeb/test/test_audio_dump.cpp":"5716fd3ea828a26dd80252cafa2334404003639663334b9a96c87df2831b5553","libcubeb/test/test_callback_ret.cpp":"4f004b79476c44e059136478e2368c030920c9137180637e548eb2e6db7e5f6e","libcubeb/test/test_device_changed_callback.cpp":"9e02dd526602d7abfc5485c80c8b86ffa27c0a8c87e587a850f77eff9bfd14aa","libcubeb/test/test_devices.cpp":"1ea25e6ae19940d224011cd8c255d1038a858d1d9be0e7c32ea0455a0e8163f9","libcubeb/test/test_duplex.cpp":"2297abf827e21fe8695cae63c7e8076bc59e6ab4350aa8dbbd821e0f079732c4","libcubeb/test/test_latency.cpp":"a1d75355e49895ea105eb814d20c6e1a37e8cf98be01f73832f4768eb7e1176f","libcubeb/test/test_logging.cpp":"72522cf7794212dceb2f26a98f5c9297a6366f2eab90128066f59422a6edb7c5","libcubeb/test/test_loopback.cpp":"92dbdebd71aa2e844694100818ac11e5145bccb01aa3e6d7ce3bc990931dda3d","libcubeb/test/test_overload_callback.cpp":"593c36fc78ea2fccd4dc2b6e565cb3bf53503f402522737e9005d9eab7fc4732","libcubeb/test/test_record.cpp":"90484423d4e5c4ffb8e6f65c9bae1f7384cac7eeeb4f42c0fcca768ee0e5c8e6","libcubeb/test/test_resampler.cpp":"57d6c0754a13ba6062868029b3daf59db591c69d1d0c8662c5d750a2a031f63f","libcubeb/test/test_ring_array.cpp":"c0420d04c914b0f61bdc81b9c4511c1b535518b2f87f32a5539f9ca6310dd5b1","libcubeb/test/test_ring_buffer.cpp":"cf247fda806f976d2b8dd2790e5a25bda68943423d7b0bcd4ac69a57f94e2f88","libcubeb/test/test_sanity.cpp":"b1b474be02e90fa310c265d4abdc712e5637bc5420c670f26d79be98b092804f","libcubeb/test/test_tone.cpp":"75e32348aa18583130bc3f2849862a4153729f19f7e5b1bcc9e91cc6ab7bcbe7","libcubeb/test/test_triple_buffer.cpp":"b1024e57581ec066d81e2a4749c71a8392ec81fa9a22e0e0c1d124f7ca86427d","libcubeb/test/test_utils.cpp":"ec18e3c14519d053cfd544ae59b2ba39716500cd7da72b5b50366eefff0a0481","libcubeb/tools/cubeb-test.cpp":"e1a29a10ba824a49dad4d0d6c9f495786148f0dc942558ae990786dba6065f4e","src/audio_dump.rs":"2491741d58a609e93de1a46d003fd4e26e4cd88cd89d4c9584635141964e0274","src/callbacks.rs":"a83d9a16ee66b3cd7100dd06e1f409698a727d642df0dfa797c067b5cf1def66","src/channel.rs":"02fd91384195180a56663aba87f00660c20e71fe7654c7b68d8f470173f40d5f","src/context.rs":"23b9326f58494b0860d080ec5f0e76be2325172da7f0274ebba152dc35182f3b","src/device.rs":"bd20afac637ea964df950ae6df30ddbc9ea7a865c7b471ba4c58d632b8f72708","src/error.rs":"406e3b843ed2d263fe677c4b34fb96a6d780a68bcb56a6f85f041d20d70227bd","src/format.rs":"d4d27790c20eab0b16592f60d5e487425a45a268cf4c74cf843c10ac91bbff4c","src/internal.rs":"c3af5f53dc7957860bf3bc0cd9737d094fb8ac000e7b40c569304cfa76a43145","src/lib.rs":"0fa0602859889c4f608ca4178c45f43d7e4b258ea0185a64341fab4532ebcd0e","src/log.rs":"8ac402b6c4d20db651cbddb87b27b3aa5ab0c3c50dac08a6c09fb1b7f9a3a391","src/macros.rs":"caef13f5d23f7a3ec1a54ec3ca2390ac4ad89d521893f1d0864daf70d57a20aa","src/mixer.rs":"e72e92855614da187da6419ed0a115062a05670cb73443b2ea4313d8f5108a68","src/resampler.rs":"b16bd6a4b1179b25f2a5391133fcd4410467e6a68c0a46cf15a12d280c1862e0","src/stream.rs":"e736794dea181be0cde83ff78079efa3bb1c64e38b8c57615590fa4c6aadf2ac"},"package":"cd2114801cd652119ace9e050a16d6641475fe3341ef45c58c9377fa45cbe3bf"}
+diff --git comm/third_party/rust/glslopt/.cargo-checksum.json comm/third_party/rust/glslopt/.cargo-checksum.json
+index e31d0acbebb..ae0d9751c95 100644
+--- comm/third_party/rust/glslopt/.cargo-checksum.json
++++ comm/third_party/rust/glslopt/.cargo-checksum.json
+@@ -1 +1 @@
+-{"files":{".cargo_vcs_info.json":"7075d1c5c5e19288cefb431f16462eaa23229d02791120f4885ab1d20470cb7e",".gitmodules":"ffc0cce90e856d4f4bdb3bd3c950c9e59501a45ebd5022b91cfe8c07c79ef1ac","Cargo.lock":"f7970552595dc803ace9ef19b5f5d7b1fc784aac30cb27b2ebc3002d97122b9d","Cargo.toml":"7c53ee20d848f9913cacbfcb3ab2e89e30deee8d619d173c95130c7c5d065827","README.md":"4468e08c64c19977707d792bfab0080e35ff927b64990eab77873f8ba056ba1c","build.rs":"92e29699487c21389fc823c50b410cfbfc74cc774265d24958489909ee48a076","glsl-optimizer/.editorconfig":"dca7ff05a95f608849c4dc640af7f83a0f415618e327a2ecb6a0afa0d9d2bacb","glsl-optimizer/.gitignore":"8ba554a4ca510ea7d9684475aa043edbeba7d15a5c9c4a04d8b1379a04ec6270","glsl-optimizer/CMakeLists.txt":"42ce94744e82ffa000da8b64d81fc140e293b9f5da7dd4cf6b49e7404a2448d9","glsl-optimizer/README.md":"b18eef11a92d267d88a937b1154f7670ee433c730b102fdf7e2da0b02722b146","glsl-optimizer/contrib/glslopt/Main.cpp":"14ba213210c62e234b8d9b0052105fed28eedd83d535ebe85acc10bda7322dd4","glsl-optimizer/contrib/glslopt/Readme":"65d2a6f1aa1dc61e903e090cdade027abad33e02e7c9c81e07dc80508acadec4","glsl-optimizer/generateParsers.sh":"878a97db5d3b69eb3b4c3a95780763b373cfcc0c02e0b28894f162dbbd1b8848","glsl-optimizer/include/GL/gl.h":"1989b51365b6d7d0c48ff6e8b181ef75e2cdf71bfb1626b1cc4362e2f54854a3","glsl-optimizer/include/GL/glext.h":"2ac3681045a35a2194a81a960cad395c04bef1c8a20ef46b799fb24af3ec5f70","glsl-optimizer/include/KHR/khrplatform.h":"1448141a0c054d7f46edfb63f4fe6c203acf9591974049481c32442fb03fd6ed","glsl-optimizer/include/c11/.editorconfig":"f96a2354e5f2b90367d643e6d9e980ce76278d4d47afd8b2713b595753aa8b4b","glsl-optimizer/include/c11/threads.h":"56e9e592b28df19f0db432125223cb3eb5c0c1f960c22db96a15692e14776337","glsl-optimizer/include/c11/threads_posix.h":"f8ad2b69fa472e332b50572c1b2dcc1c8a0fa783a1199aad245398d3df421b4b","glsl-optimizer/include/c11/threads_win32.h":"95bf19d7fc14d328a016889afd583e4c49c050a93bcfb114bd2e9130a4532488","glsl-optimizer/include/c11_compat.h":"103fedb48f658d36cb416c9c9e5ea4d70dff181aab551fcb1028107d098ffa3e","glsl-optimizer/include/c99_compat.h":"aafad02f1ea90a7857636913ea21617a0fcd6197256dcfc6dd97bb3410ba892e","glsl-optimizer/include/no_extern_c.h":"40069dbb6dd2843658d442f926e609c7799b9c296046a90b62b570774fd618f5","glsl-optimizer/license.txt":"e26a745226f4a46b3ca00ffbe8be18507362189a2863d04b4f563ba176a9a836","glsl-optimizer/src/compiler/builtin_type_macros.h":"5b4fc4d4da7b07f997b6eb569e37db79fa0735286575ef1fab08d419e76776ff","glsl-optimizer/src/compiler/glsl/README":"e7d408b621c1b605857c4cab63902f615edb06b530142b91ac040808df6e22f7","glsl-optimizer/src/compiler/glsl/TODO":"dd3b7a098e6f9c85ca8c99ce6dea49d65bb75d4cea243b917f29e4ad2c974603","glsl-optimizer/src/compiler/glsl/ast.h":"3e68ff374350c49211a9931f7f55a485d8d89fc4b21caaffbf6655009ad95bf8","glsl-optimizer/src/compiler/glsl/ast_array_index.cpp":"92b4d501f33e0544c00d14e4f8837753afd916c2b42e076ccc95c9e8fc37ba94","glsl-optimizer/src/compiler/glsl/ast_expr.cpp":"afd712a7b1beb2b633888f4a0911b0a8e4ae5eb5ab9c1e3f247d518cdaaa56d6","glsl-optimizer/src/compiler/glsl/ast_function.cpp":"74f4fbd490e366b37f4715168bb3465ecd9334d4130942f75dcc8e80e8e7f027","glsl-optimizer/src/compiler/glsl/ast_to_hir.cpp":"d0f798eb09271d41d068b9e7b18220d37f1ed0083300ab51eba30989698fe23d","glsl-optimizer/src/compiler/glsl/ast_type.cpp":"8eb790b24b26dfb72bdc333744b566c26d8464c5d47d20eae659461f5c4899f7","glsl-optimizer/src/compiler/glsl/builtin_functions.cpp":"454189d643c220fcb49116ee5c8a34f7b349aa67564040deb8607f6a41a15e70","glsl-optimizer/src/compiler/glsl/builtin_functions.h":"a37cad7ed09b522c5b8bec7b80115a36846e7ba6e0874a2a858e32f7f202c665","glsl-optimizer/src/compiler/glsl/builtin_int64.h":"619def6f3aebf180da3944ef08f159ab12a58b24767e41d8b985ac37ded54d62","glsl-optimizer/src/compiler/glsl/builtin_types.cpp":"afec060b62d6f3b00bfbf94e9fa5f96341ce096c128d1eef322791e6ed9cea4d","glsl-optimizer/src/compiler/glsl/builtin_variables.cpp":"6563bfb1345cbca4c77e00eef09ad152f3e1dc271d246a08c5ce9e1f4ce4250a","glsl-optimizer/src/compiler/glsl/float64.glsl":"1072fd888be48c2a7a5117cd2d92a65f034965a66375f598bb856bff5d7be766","glsl-optimizer/src/compiler/glsl/generate_ir.cpp":"e5f0175370a0d07f93c48d3f0f1b8233d12c64a7b02de02dcc753ef7b398ef0f","glsl-optimizer/src/compiler/glsl/glcpp/README":"a0332a1b221d047e9cce5181a64d4ac4056046fd878360ec8ae3a7b1e062bcff","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-lex.c":"2d179879b1ffe84f58875eee5b0c19b6bae9c973b0c48e6bcd99978f2f501c80","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-lex.l":"e4c5744c837200dafd7c15a912d13f650308ea552454d4fa67271bc0a5bde118","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-parse.c":"03494f9ce1cb82260506e2559e73a3eeb622c4bd51b65eaa0a2c3351862bd4c8","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-parse.h":"264d9a18421cde255ce34a0a62b3d8e73465359f0d167e64aa3973062aae5bdd","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-parse.y":"fafb66e3a8f149d19e085f18a4273ba6d4c11af9e9a01d665cc784dddf97b79f","glsl-optimizer/src/compiler/glsl/glcpp/glcpp.c":"37ed294403c2abfd17fd999d1ae8d11b170e5e9c878979fefac74a31195c96b0","glsl-optimizer/src/compiler/glsl/glcpp/glcpp.h":"85ac8b444bcbd0822b66448a1da407b6ae5467b649f5afaf5c58325bd7569468","glsl-optimizer/src/compiler/glsl/glcpp/pp.c":"a52d94f1bcb3fb2747a95709c4a77c25de7eea8354d2b83bb18efd96976a4473","glsl-optimizer/src/compiler/glsl/glcpp/pp_standalone_scaffolding.c":"d11aeb3acfe966d1b78f1ee49804093f2434214c41391d139ffcb67b69dc9862","glsl-optimizer/src/compiler/glsl/glcpp/pp_standalone_scaffolding.h":"abbf1f36ec5a92d035bfbb841b9452287d147616e56373cdbee1c0e55af46406","glsl-optimizer/src/compiler/glsl/glsl_lexer.cpp":"272b9fc1383d72b81bfc03fa11fdf82270ed91a294e523f9ce2b4554bd3effa9","glsl-optimizer/src/compiler/glsl/glsl_lexer.ll":"2b57d9f9eb830c3d7961d4533048a158ee6f458c8d05c65bea7b7cfbc36e4458","glsl-optimizer/src/compiler/glsl/glsl_optimizer.cpp":"f8095d20629d0af70be930b0612e169edb274551a1d25a3cd1bf9995a11ce2e8","glsl-optimizer/src/compiler/glsl/glsl_optimizer.h":"22e843b4ec53ba5f6cd85ca5f7bad33922dca8061b19fb512d46f1caca8d4757","glsl-optimizer/src/compiler/glsl/glsl_parser.cpp":"126baf368d525aba301854e3d91ba60b5aee32e1102376af71416f32cb95ec48","glsl-optimizer/src/compiler/glsl/glsl_parser.h":"2ea9a50716098a8f7bef782d2a030d757b68da73afb01b4d4940d3e8381d44e8","glsl-optimizer/src/compiler/glsl/glsl_parser.yy":"6b1fd1576b29fce005dff744a6dbd0219e4c695c361d61864e1f3a8d6fa6b764","glsl-optimizer/src/compiler/glsl/glsl_parser_extras.cpp":"aad64b5b66467da650091430681e8c6a820cf3cadc4db3c160bf2f15875390ae","glsl-optimizer/src/compiler/glsl/glsl_parser_extras.h":"71fd0e92bbdb193dfb067d7bfdb1200d77392be2fbd0cbfc9ca89d1bb4c7e741","glsl-optimizer/src/compiler/glsl/glsl_symbol_table.cpp":"6660fb83c0ddddbbd64581d46ccfdb9c84bfaa99d13348c289e6442ab00df046","glsl-optimizer/src/compiler/glsl/glsl_symbol_table.h":"24682b8304e0ea3f6318ddb8c859686bd1faee23cd0511d1760977ae975d41bf","glsl-optimizer/src/compiler/glsl/hir_field_selection.cpp":"72a039b0fcab4161788def9e4bedac7ac06a20d8e13146529c6d246bd5202afd","glsl-optimizer/src/compiler/glsl/int64.glsl":"303dbe95dde44b91aee3e38b115b92028400d6a92f9268975d607471984e13eb","glsl-optimizer/src/compiler/glsl/ir.cpp":"2b4741cce90b5d4abff5d719c7324e2693c67294d4d99736cb241554adb281bc","glsl-optimizer/src/compiler/glsl/ir.h":"990b1c74447c4eb4835353ccb0ed9aea644f97fc1129ef1739cd935075d85d2e","glsl-optimizer/src/compiler/glsl/ir_array_refcount.cpp":"8cdc1cffe01e42e0566fa2193a75f789628e8025ad1b82f0ee6f204451b7f9f7","glsl-optimizer/src/compiler/glsl/ir_array_refcount.h":"75f06ec81342b379096ca52e1dc0fd5f19a11ff8e9b58203c20628179d644c12","glsl-optimizer/src/compiler/glsl/ir_basic_block.cpp":"1e2920b1c0ecb08424c745c558f84d0d7e44b74585cf2cc2265dc4dfede3fa2f","glsl-optimizer/src/compiler/glsl/ir_basic_block.h":"81be7da0fc0ee547cd13ec60c1fcd7d3ce3d70d7e5e988f01a3b43a827acdf05","glsl-optimizer/src/compiler/glsl/ir_builder.cpp":"daba29c5a1efdd5a9754f420eb3e2ebdf73485273497f40d4863dadeddb23c0d","glsl-optimizer/src/compiler/glsl/ir_builder.h":"2822e74dd3f6e3df8b300af27d5b11ea2dd99d0e5e7ca809b7bbcce9833c483c","glsl-optimizer/src/compiler/glsl/ir_builder_print_visitor.cpp":"8c6df5abf2fe313363f285f171c19ca6c8ee4f3bc2ed79d33c0c88cc8be45c48","glsl-optimizer/src/compiler/glsl/ir_builder_print_visitor.h":"799852adc3a0e54d04080655e7cebfa0d3bf5b6ffed5d8414f141380665d4db7","glsl-optimizer/src/compiler/glsl/ir_clone.cpp":"d897a4e1f5bbec4a6a2f15044c1be9a4d13899c73be77335b041049a4589aa5d","glsl-optimizer/src/compiler/glsl/ir_constant_expression.cpp":"78bd87ddb09db67f6c499067728d72aef4f16aa02721a99a4b769d1e0cfa9010","glsl-optimizer/src/compiler/glsl/ir_equals.cpp":"bca28533a6310b0fc152b56d80872368f1510dc62ed6e8ac199b9ffa7fac02e7","glsl-optimizer/src/compiler/glsl/ir_expression_flattening.cpp":"7e918d4e1f237eca01396004015865ce345afe32a876c9dbc6728576a1a7eae4","glsl-optimizer/src/compiler/glsl/ir_expression_flattening.h":"f45b66aa9497520e7e08e612d24b308477c34477fbd963ee9320eac664957f16","glsl-optimizer/src/compiler/glsl/ir_expression_operation.h":"cc9f10727dbd26cac506804f51456302c702650f9eeb59054a7e1575d5cf6687","glsl-optimizer/src/compiler/glsl/ir_expression_operation.py":"7b86c96021b9fbe165957f4ecb0b612fefcde1c2cf3c6d75e3cdb22e369216ba","glsl-optimizer/src/compiler/glsl/ir_expression_operation_constant.h":"9ad3346416392e3efa11e12ecf2feca7453c5253d241eb96c91dfb85d4f2b971","glsl-optimizer/src/compiler/glsl/ir_expression_operation_strings.h":"a6826daf496a8b9e89885bc2a161ac3445d501b23c6e0ac33e2c01b506b273c8","glsl-optimizer/src/compiler/glsl/ir_function.cpp":"7537365fc0fbe4b37a26b9a2146cc64d3e9a774d60eab63b65002ad165ae8fc7","glsl-optimizer/src/compiler/glsl/ir_function_can_inline.cpp":"faddbf112187a048d502716a3fb82570a322299ba2a3abd79388382c82040bfc","glsl-optimizer/src/compiler/glsl/ir_function_detect_recursion.cpp":"9176973eaf5c0a984701f953bb7a80f37dca43d59b5bce50fc69b3f02f2902d7","glsl-optimizer/src/compiler/glsl/ir_function_inlining.h":"9739493f99c489987d650762fccdd3fb3d432f6481d67f6c799176685bd59632","glsl-optimizer/src/compiler/glsl/ir_hierarchical_visitor.cpp":"3725861fbe2b98e0617f52d3b14cf6d3b25fb5ec00f5ef5d308b03642f592767","glsl-optimizer/src/compiler/glsl/ir_hierarchical_visitor.h":"e0560210e966c0c31e4ca843e80ea154e64db5a444b8c2df845b6ba5b3a43fc1","glsl-optimizer/src/compiler/glsl/ir_hv_accept.cpp":"caf7ce2cd9494aadd3c58bcf77f29de58368dc9e347a362bbf37f8bda9509b80","glsl-optimizer/src/compiler/glsl/ir_optimization.h":"8b3dcfc7f9e96b21a8dd47a0040d90be483a9e67a2cdce3a697188fb758d4630","glsl-optimizer/src/compiler/glsl/ir_print_glsl_visitor.cpp":"f8e34a983452be0dcb5a695e9c8e895eead24f9e540992a8afe510ae85da4c4c","glsl-optimizer/src/compiler/glsl/ir_print_glsl_visitor.h":"1ad1bd3efd1ace39051c13f904c05fd80425d329444f9a8d47fd6d948faf46e0","glsl-optimizer/src/compiler/glsl/ir_print_visitor.cpp":"643f5a68aae3fb37267fd793f1216d1cfdeb2c09338c26b1f30e4c6deaef4de5","glsl-optimizer/src/compiler/glsl/ir_print_visitor.h":"4573eb93268a2654c14b505253dd651e2695d43dc745904d824da18305269b95","glsl-optimizer/src/compiler/glsl/ir_reader.cpp":"06bfba802c8354e5a8b2334b6d78d6297de18235bedd3f8fbb382c89870b02f2","glsl-optimizer/src/compiler/glsl/ir_reader.h":"63e3f7f1597936a7011d5b520e171b197bf82bee6c1560d822c3edf5aaa6f9e9","glsl-optimizer/src/compiler/glsl/ir_rvalue_visitor.cpp":"84b5c5d746555adca85759c2912fe48010232b7c1c0bd2cf03bd04067a85e66f","glsl-optimizer/src/compiler/glsl/ir_rvalue_visitor.h":"fd8c561b71085d3211fff85ed514fecb299d8ce19a04bc063419a55b6d840525","glsl-optimizer/src/compiler/glsl/ir_set_program_inouts.cpp":"ab9f115ce9e7f312d9c7978340ced0dc4ae6d13a80e08442ba9709d11d50cae5","glsl-optimizer/src/compiler/glsl/ir_uniform.h":"683ae6896b1a08470c090be5f822fc31cd434eab9216e954b9bba24a46975109","glsl-optimizer/src/compiler/glsl/ir_unused_structs.cpp":"9c1620c45f2fc071fe5ed828472040b14c5f42effe06aa0e3b8352c95ef78786","glsl-optimizer/src/compiler/glsl/ir_unused_structs.h":"13387b49c23093575276b25b9dfd31fedd8f131c5c4f3128ab04cf03e15b5295","glsl-optimizer/src/compiler/glsl/ir_validate.cpp":"6b232be5999a86ea278f4f15b2832d76843246509118d924243055a3b9b0299f","glsl-optimizer/src/compiler/glsl/ir_variable_refcount.cpp":"2764a3cad937d53f36db7447c3a5b98b04bf153acf81074d971857fc5bca460d","glsl-optimizer/src/compiler/glsl/ir_variable_refcount.h":"b0668e3eb1501ef65e38fe12830742ecb3d28e6039f30e366c8924efc29b4a39","glsl-optimizer/src/compiler/glsl/ir_visitor.h":"f21b3534c3d66d5fb707d1581fece7e1eb043523afbaedf89918cfb031c6df94","glsl-optimizer/src/compiler/glsl/link_atomics.cpp":"360f0209e11f367ba358223597b0a118bae095bff16337cf03f1fb89c5b80ca6","glsl-optimizer/src/compiler/glsl/link_functions.cpp":"de7895da8aa33a1e3c2c1eb2fdaf267ab5d1fbfdb79ae2e67f95211e946e294c","glsl-optimizer/src/compiler/glsl/link_interface_blocks.cpp":"1926cfa73810704eb19b916c1b2cdb9321155e2f98b2a0a57c7c3c6e960540cd","glsl-optimizer/src/compiler/glsl/link_uniform_block_active_visitor.cpp":"1e14e06ca3b2c1089cfba2e8eaf0c1f373d9d6374b6082f320962dd71ae09611","glsl-optimizer/src/compiler/glsl/link_uniform_block_active_visitor.h":"fd58c155af645295bb6aec08797889de586f4d919731de2bce57e8dce59bb048","glsl-optimizer/src/compiler/glsl/link_uniform_blocks.cpp":"09589f49776dce32e6c4044937de7e0c839a9754ad31960148f8f9e010658997","glsl-optimizer/src/compiler/glsl/link_uniform_initializers.cpp":"bf98e08c12db466acf9623cbeb8fa8e3b4002512722e7a6521287f558a099f37","glsl-optimizer/src/compiler/glsl/link_uniforms.cpp":"84bad5b1377362cecf259b05124239be5220b03ce1c0c61b59bd9a47e4379af2","glsl-optimizer/src/compiler/glsl/link_varyings.cpp":"a5f1a53e7c80d635515fe808ff223d89fef1767abb0f2b7aa28fa6773dca353f","glsl-optimizer/src/compiler/glsl/link_varyings.h":"b9dbe018f038df69763df2e928742ce81bbc6e3aaba26f50621e30a6d9aa6220","glsl-optimizer/src/compiler/glsl/linker.cpp":"40b1ecd5d4f6c7f13d5a87ce390561a51fdf6f3fcd9b2197b9c88b03a773ba94","glsl-optimizer/src/compiler/glsl/linker.h":"ecf94b4ad75ef461c27c557fda4bd25f34c91930822b8e1d729ec84520d4a049","glsl-optimizer/src/compiler/glsl/linker_util.cpp":"1663ad88e2a369305659aeeffaedb5bd752cf76340a2ba5797fc0bf600633cf9","glsl-optimizer/src/compiler/glsl/linker_util.h":"6db788daf9c8e87ae2764b61a8b37ebe419e69c1b82ddee01986e37c978c6993","glsl-optimizer/src/compiler/glsl/list.h":"b1f46ce0e552fe7c45b2a19408a9d97662e23e4b182ab335491c26f8cf25886f","glsl-optimizer/src/compiler/glsl/loop_analysis.cpp":"57ecd573477c68091c7cc99537faa7139a8f395935e3d4f10144cefdefb5a611","glsl-optimizer/src/compiler/glsl/loop_analysis.h":"a85f045a038ee5b5176063e85d7988865862c44ab0580f771b993a042d0b69cc","glsl-optimizer/src/compiler/glsl/loop_unroll.cpp":"bd4292ea2809f5a669bcb76ceaa1ac365772dcd638c579c3ed10275214901a54","glsl-optimizer/src/compiler/glsl/lower_blend_equation_advanced.cpp":"8cfbef140d9c4b4d2f57bfa05c9c374d31a121d0f87afce94333f049023b654a","glsl-optimizer/src/compiler/glsl/lower_buffer_access.cpp":"1ae221c3c7a95aeb867207e7a742be635f91b406c157747bfd6ddf10274d97fb","glsl-optimizer/src/compiler/glsl/lower_buffer_access.h":"807886953a576a323591798cbca5e2df24295ea893b28affd8ffb5926cebaa04","glsl-optimizer/src/compiler/glsl/lower_builtins.cpp":"4d81afc32cf58e1481fcb5e42888ab93dbe6820310a20ff7a9982b77b2152d9b","glsl-optimizer/src/compiler/glsl/lower_const_arrays_to_uniforms.cpp":"608403f0eeeedf21cfcd3014116e0f44e28cbdf6c4c32aac7e613e64e30205e1","glsl-optimizer/src/compiler/glsl/lower_cs_derived.cpp":"179905cd47a294122adeb5b0abfed6f2f67782dcde21b544d1ee2c1985154e66","glsl-optimizer/src/compiler/glsl/lower_discard.cpp":"3b361b2db0004d544d64611cb50d5a6e364cf6c5f2e60c449085d7d753dd7fb0","glsl-optimizer/src/compiler/glsl/lower_discard_flow.cpp":"f5c29b6a27690bb5c91f196d1a1cf9f6be4f1025292311fe2dac561ce6774dee","glsl-optimizer/src/compiler/glsl/lower_distance.cpp":"a118c85493d5d22b2c059a930c51a5854896d4b1dade76598eaa985e5a3dff8c","glsl-optimizer/src/compiler/glsl/lower_if_to_cond_assign.cpp":"469e617757fd1728709cce021aac5c8da05ee503bf5366977bdc4ef7a6d83950","glsl-optimizer/src/compiler/glsl/lower_instructions.cpp":"6ff5c396abe40d8a2145d571e99e2bbe9143393e15aafc28adc2803a01d821b6","glsl-optimizer/src/compiler/glsl/lower_int64.cpp":"d1ed41196880dd53c7b13e2782f9423f8442bf1d46186e8be92b1b66218a83ee","glsl-optimizer/src/compiler/glsl/lower_jumps.cpp":"34de7b493f281589fb0c2c0f6e885d0a0fabbe7a4e97a73de374dd714777a58c","glsl-optimizer/src/compiler/glsl/lower_mat_op_to_vec.cpp":"dff7a308edc4846c348ed4225c6699a9c75abac68d88f41f85954276552779f4","glsl-optimizer/src/compiler/glsl/lower_named_interface_blocks.cpp":"16063ac127bff75a68272070ab11c21c25101edbff62b4c68f4983b4cd941af0","glsl-optimizer/src/compiler/glsl/lower_offset_array.cpp":"3b00773399135aea85746a5a68b96ef000bc6841be1a2c8e6f25c516628b0949","glsl-optimizer/src/compiler/glsl/lower_output_reads.cpp":"a0fc9975d5aa1617e21fc6c353659a9802da9e83779a3eef4ec584f74b4dadc5","glsl-optimizer/src/compiler/glsl/lower_packed_varyings.cpp":"7550099d4ae123d71541c2fc88bc04fbfe9271ec75d7e210987d1c8cac3cf3ea","glsl-optimizer/src/compiler/glsl/lower_packing_builtins.cpp":"79a13d161fe505a410ab948d92769395708693ec888153630fa240e5b97e356f","glsl-optimizer/src/compiler/glsl/lower_precision.cpp":"f82a185b879872b977a1787d8061b9a80bc4cf8db1b970db6efba2ad9cc20fa2","glsl-optimizer/src/compiler/glsl/lower_shared_reference.cpp":"ea2dccf50a83bc19391bf6b7ab6aa53c0005f427af4066d25140340af9a4beef","glsl-optimizer/src/compiler/glsl/lower_subroutine.cpp":"f69fa53650eeb6f2944fce4d36a6e0a423e6705f3a3bd3389c7fadb83cfc8802","glsl-optimizer/src/compiler/glsl/lower_tess_level.cpp":"b196c9d424c0569f3e85d75c2d125af21566cb113d69036db87c0990703e0fa7","glsl-optimizer/src/compiler/glsl/lower_texture_projection.cpp":"4d247f244272adc8250fd888d8d932a140dd5de4d1efc7a58492c3c2b8291527","glsl-optimizer/src/compiler/glsl/lower_ubo_reference.cpp":"89bdbc6c1669230c644c0857db1ce2781ec61d349ecd08c7914146e1f4750a4a","glsl-optimizer/src/compiler/glsl/lower_variable_index_to_cond_assign.cpp":"fce930f29ac9405b297d1f749d68f59506b89c70b4ee1b1ab8cf49a34cc71ecf","glsl-optimizer/src/compiler/glsl/lower_vec_index_to_cond_assign.cpp":"3c67d851a11a55fad1c49a550f3a0cfe50892d33a3f238ce266cd829eba510a8","glsl-optimizer/src/compiler/glsl/lower_vec_index_to_swizzle.cpp":"f5ec666b73e1415cbab32519a53605ed385f3b03e889560373dbce69dda5000e","glsl-optimizer/src/compiler/glsl/lower_vector.cpp":"f7c13f5572ebe09b6a71553133b2cf003cd4b77b9657600672ee3b21bf890725","glsl-optimizer/src/compiler/glsl/lower_vector_derefs.cpp":"b05793da6dd620a531b43df5af8b2ecbc37b9db0c88910f5724ea10bcd057e19","glsl-optimizer/src/compiler/glsl/lower_vector_insert.cpp":"fee772ec17eea5e86a529bf9c5fa2ee0d29a5982bb75ebc6d68ed36cd19aa299","glsl-optimizer/src/compiler/glsl/lower_vertex_id.cpp":"690e8715182e03fead5cc5a35251fb4f41b357e4c71a1dfbc4bd7be19862b56d","glsl-optimizer/src/compiler/glsl/lower_xfb_varying.cpp":"58c0e8b270e4bbde54250be03cdb2f36966bcafb785372ad2e2b786835df7f9f","glsl-optimizer/src/compiler/glsl/main.cpp":"ae5e88abbbc8a12f769e1296bad938b9d7398cc6da0d3d0caeceeeb876536850","glsl-optimizer/src/compiler/glsl/opt_add_neg_to_sub.h":"f5054944bfd068810629080d0ea11df78b3f57a8f86df75e13ca50157ad1964d","glsl-optimizer/src/compiler/glsl/opt_algebraic.cpp":"25f45b20e1972ee8c789177a1aeda6e4286c25db2eae3a43ff83029ae64969c0","glsl-optimizer/src/compiler/glsl/opt_array_splitting.cpp":"19d3ce0e815438f4df9ab2890e767b03a4f3f191b53bb30c0217cf2ae6a95430","glsl-optimizer/src/compiler/glsl/opt_conditional_discard.cpp":"0e44e0e126711a3725c1f3a2aa65ff03c381fed08680ffc30101aae60f716c4e","glsl-optimizer/src/compiler/glsl/opt_constant_folding.cpp":"a088d04d9b45f9e55e235835648f614c89b7803c03a6d4f6a6d1a6bc1f0228bd","glsl-optimizer/src/compiler/glsl/opt_constant_propagation.cpp":"8a9440d77ecd6dcf13e683cbb99943aab6311c8fd4b5f6a9189a8d4f270746f4","glsl-optimizer/src/compiler/glsl/opt_constant_variable.cpp":"63d3ccd4dd09f19c9cf1a2f51592111bed41284504f29f3c0de4cadebc439a37","glsl-optimizer/src/compiler/glsl/opt_copy_propagation_elements.cpp":"ffa0f50863995e0d2e31f55a52e82319edc71e520987bebd7f7e561ea331c64b","glsl-optimizer/src/compiler/glsl/opt_dead_builtin_variables.cpp":"84e8747b948232f01dd56b428b9315f96f9511f605f240119fc446fae28981a9","glsl-optimizer/src/compiler/glsl/opt_dead_builtin_varyings.cpp":"761523e88f5b3ba785170f4d7205e94fa99acb7e74d29efbe40e1c010e1dbdb3","glsl-optimizer/src/compiler/glsl/opt_dead_code.cpp":"fd1ba2da7337d4e5dad17f5c2d73d9cc8880305f423e85d64cf94553588fa401","glsl-optimizer/src/compiler/glsl/opt_dead_code_local.cpp":"969a598b4df322baf222258a66cd64a326ea20e5b3125be9d8d1771f522c69e0","glsl-optimizer/src/compiler/glsl/opt_dead_functions.cpp":"774cae6536d02edf26e996a2a895e1f62d5098f16dc96b44798b4fc731a9a95f","glsl-optimizer/src/compiler/glsl/opt_flatten_nested_if_blocks.cpp":"3696a5c55f02e20056e085bc2714f73ac992f221b6f3387d655068e86b512046","glsl-optimizer/src/compiler/glsl/opt_flip_matrices.cpp":"44f0fe05b49329667671f88c96dc86ab3fe1459ff7b87f2b2d88de2d49829f9f","glsl-optimizer/src/compiler/glsl/opt_function_inlining.cpp":"fb56a33c90419a01676b57cbd91d0674a54cca40e6defaacc88dd33facebc131","glsl-optimizer/src/compiler/glsl/opt_if_simplification.cpp":"ac406eb35e379c357641d6c5749f50c65961455924d3dc884e2b90046fa92c5c","glsl-optimizer/src/compiler/glsl/opt_minmax.cpp":"8abd59d3b14ef60ff14a9c69660e6945f5cf10b97edb4afebe56be3f81d96316","glsl-optimizer/src/compiler/glsl/opt_rebalance_tree.cpp":"8bb6329dc0f299042368fc81934c2df019b45ab9f7aa0415d4e57b8d1ff98c9f","glsl-optimizer/src/compiler/glsl/opt_redundant_jumps.cpp":"222c73e2ac7a938ebb6428cc6c780c908ff6156d8ff935b04fed93a48fc10496","glsl-optimizer/src/compiler/glsl/opt_structure_splitting.cpp":"2edc79cc13f3177934e0443ad62f5976a1991f01f86ea303a803434849b13a47","glsl-optimizer/src/compiler/glsl/opt_swizzle.cpp":"015d0abddfe507f67c4b96c82988d861d018ededf7bf055e2bcbe9ea92da694e","glsl-optimizer/src/compiler/glsl/opt_tree_grafting.cpp":"46d28ac983ea244a4315bdc0e8892979ec4d1f9b9a96ac8a8a08006d9bc5e878","glsl-optimizer/src/compiler/glsl/opt_vectorize.cpp":"d80ee43bb97d9f016fb9c5e1e06f5b2afa569811f368ba067be794ec11d085fb","glsl-optimizer/src/compiler/glsl/program.h":"2982447e2abd35371e273ad87951722782a8b21c08294f67c39d987da1e1c55f","glsl-optimizer/src/compiler/glsl/propagate_invariance.cpp":"080943e21baa32494723a2eefb185915d2daae1f46d6df420145c5ad6857e119","glsl-optimizer/src/compiler/glsl/s_expression.cpp":"1ced972bc6ecc8eab4116ea71fb0212ab9ae5bcc0be3b47aa5d9d903566b3af1","glsl-optimizer/src/compiler/glsl/s_expression.h":"65b847e30e22a809b57d0bc70243049c99d9c6318803c5b8d0826aba55dc217e","glsl-optimizer/src/compiler/glsl/serialize.cpp":"be0eb4251348a9d921acb839a5c48c6023a2e9d116d602bb0432787ab623655d","glsl-optimizer/src/compiler/glsl/serialize.h":"57425732eba1233d928e5f07f88b623ce65af46b3bb034bf147f0a4b7f94f9a1","glsl-optimizer/src/compiler/glsl/shader_cache.cpp":"e0c5c433f2df3fccdf1d61281bfcb0ee5633433339b97c697d64db99611cbaaf","glsl-optimizer/src/compiler/glsl/shader_cache.h":"9217164d8d7f54aca0fe5922c7187095a6ae0cb703b196b79805aeef07a7e697","glsl-optimizer/src/compiler/glsl/standalone.cpp":"8e6c416a14d631261917a5fe4cc91880c287b22b2dfd70eb22028289a8fa5364","glsl-optimizer/src/compiler/glsl/standalone.h":"a7c397d1dfdd1e7fb2cfe99db35cd9df93251e642059208533202b7f20497f83","glsl-optimizer/src/compiler/glsl/standalone_scaffolding.cpp":"970d14b7a9d58e5270321f97bf5d57795558b1c570a56678e04a65b26c60bf4f","glsl-optimizer/src/compiler/glsl/standalone_scaffolding.h":"d921a617ea82b9e49413314492a645c44356de503581b1be3f1b57de236e480d","glsl-optimizer/src/compiler/glsl/string_to_uint_map.cpp":"d824bf5b839bd39498dc9e457103cdbe3e5289ddf7564107c27b1505948dd31f","glsl-optimizer/src/compiler/glsl/string_to_uint_map.h":"e2f18e66359c9d620e085de7f4a334a47df9c66e65a5bfe8b734c627bec04104","glsl-optimizer/src/compiler/glsl/test_optpass.h":"b27b8f35f5387e7ce4982bb51c7b63ccf14f91757f3108a5d02ed006925bb8a0","glsl-optimizer/src/compiler/glsl/xxd.py":"376484142f27f45090ea8203ae2621abf73f06175cb0ee8d96f44a3b9327f4bd","glsl-optimizer/src/compiler/glsl_types.cpp":"044bb6754f45419a3151e7a25c39202a82009ae3c6bc54ff7f0bb4258a5deefe","glsl-optimizer/src/compiler/glsl_types.h":"fd899a42f34ddeb8601bc3cd6c5e3aed82fc8aef4042dde1b39b3c01e1dcc219","glsl-optimizer/src/compiler/shader_enums.c":"436bff5216b11b0980bdfada5885fc6ac9afa2037a3027fcd6eea2a8635597ac","glsl-optimizer/src/compiler/shader_enums.h":"13220442a5c02e83540cf2c0ad4f8417b2fbda5f2586dec4e92082544c937cdd","glsl-optimizer/src/compiler/shader_info.h":"4c5453e81197ca83593ee4f365074b23530f2ab21c78e1733b63dec6f344c12a","glsl-optimizer/src/gallium/auxiliary/util/u_half.h":"3c2b37bda3ccb64387e44b723d29cf9046decab1a893bf42d842e9603398bdee","glsl-optimizer/src/gallium/include/pipe/p_compiler.h":"c75620096ce8523dae90599e50aa2ef6468d3b0e368a77795edeb20dd1abfc0c","glsl-optimizer/src/gallium/include/pipe/p_config.h":"a27692fc35f9e55df3224b7529e66b3001e911e94e6bc5f8f569e493e1ee3fb7","glsl-optimizer/src/gallium/include/pipe/p_defines.h":"be26d68c0acc67c5e44788c6299716a9eee415fd81d7d747e3738a829e3b6b38","glsl-optimizer/src/gallium/include/pipe/p_format.h":"5674215fc41d27496f037cf837717daefbf23ebb38d40ace7c0c414bc08182b0","glsl-optimizer/src/gallium/include/pipe/p_state.h":"d600593aba5f5a17072a6c38f6baa81e01c7994b0174250f7e433bb41684b702","glsl-optimizer/src/mapi/glapi/glapi.h":"73632a625c0ddabc401205e8b5a81eb8af8506868efe4b170d7979ec3619e9c5","glsl-optimizer/src/mesa/main/config.h":"5800259373099e5405de2eb52619f9de242552a479902a3a642a333c8cb3c1e7","glsl-optimizer/src/mesa/main/context.c":"2f3208473d99c94f734b1137ba91889d4a1babb9e7534bf1dc85d851ee98274e","glsl-optimizer/src/mesa/main/context.h":"cc7e4194797db9d007f01884e23d786c453b3860821f7f2ddcdf0f1bf3f8ffb1","glsl-optimizer/src/mesa/main/dd.h":"6a964acd06b6c2d88700e69fb75fe3c6b3b3d45bbc41db24f3f897a29695fe0c","glsl-optimizer/src/mesa/main/debug_output.h":"7312422e90b8c0e34028ac27280e438139b5cba525c99deb3ac883cd3d87e452","glsl-optimizer/src/mesa/main/draw.h":"7eaef3a9e27a60ea6f7937109bf3a6190b831162fde0479abb12077ce27c353d","glsl-optimizer/src/mesa/main/enums.h":"87d562a6764f51c014a2274fa7c3aca17c04441537ddd56b2554f13c6fffea92","glsl-optimizer/src/mesa/main/errors.h":"c79444b5df289c90fbb22a33b2d0c23917d9fc4510960088f0b79e53bb56b1b2","glsl-optimizer/src/mesa/main/extensions.h":"a38b2f87cc93c513994281350d69e06c84ff8eded5313ec0a1be33f375e0ebbd","glsl-optimizer/src/mesa/main/extensions_table.c":"17642d1a8c9a0bf2bd61060052d33ff14a005d2b962e6cf91465797a50851e85","glsl-optimizer/src/mesa/main/extensions_table.h":"2c879571c238d2e14461031ac740372fd0f9ac3a34c0d5541bb9b7ed4c0376c8","glsl-optimizer/src/mesa/main/formats.h":"02e2f7ec3e39286cf9f27e2641043e6df8ecb1dfde9e643313210e214af2a929","glsl-optimizer/src/mesa/main/glheader.h":"58217b33eead6aa6b23cd4a291cefeaa6cb84e465f4960daffca97c44d6d1c35","glsl-optimizer/src/mesa/main/glthread.h":"51fb2711f77e7eafcfc52d29d5b844978832b24c930d88accd48d143a6eb9c6f","glsl-optimizer/src/mesa/main/hash.h":"7e7f782034c16a8e693de48e00c31d4a90b0129f4029fd074033d7d16ccbe718","glsl-optimizer/src/mesa/main/macros.h":"73d15ddfd64f2b57b9b2ffeeb993b9c2c0899a80563e9d6ff337b11ccbe6eee5","glsl-optimizer/src/mesa/main/menums.h":"5dfac0e2279d60b0cd0c7b9fc2a5021620d0f6282ed2e738c420214e3af152d3","glsl-optimizer/src/mesa/main/mesa_private.h":"edda678b93438944279a551f663b8858ad84814a9fc88ba9672ef195599c24ae","glsl-optimizer/src/mesa/main/mtypes.h":"6efddefa099e4d2e3fdd97f0055644f47aba21711385edfeabc2d9b0676f2eec","glsl-optimizer/src/mesa/main/shaderobj.h":"9f0dfe96d0c2154201adef942bd36053533ac7b2492fb3786acda5bea514c75e","glsl-optimizer/src/mesa/main/uniforms.h":"4e331e6ad6e9cbded978b4082dbe0a57c1f8f01327446bb6892bfc179976c38b","glsl-optimizer/src/mesa/main/version.h":"9d0a13a758099302dc55cf7d045791834a89b0f9d4cf17b2692259b369a8a9a1","glsl-optimizer/src/mesa/math/m_matrix.h":"a37b19f182e070db3df93b0ede43c22fb8be8c2906504133ee6dbd7db1185d8b","glsl-optimizer/src/mesa/program/dummy_errors.c":"1820e305515b4c5e041f5e1623266a48ec8f076a155310be7d60637101f593e4","glsl-optimizer/src/mesa/program/ir_to_mesa.h":"b47f58d22e3ca2ae42d52501ea769d15c4476834944fa97eeccd3a3439211d00","glsl-optimizer/src/mesa/program/prog_instruction.h":"ab3832152a7e144b59e5a2264b2c29db56d93be31e76bbd958527a56771b40eb","glsl-optimizer/src/mesa/program/prog_parameter.h":"ba18c743284eadbc837c2c364c73e5d372321a7637a76e589d8d39fe8b5de225","glsl-optimizer/src/mesa/program/prog_statevars.h":"fc413698f84bc52d45fdeae0471934ee9904bfb7eac1a2b5f70446e54bcbbdca","glsl-optimizer/src/mesa/program/program.h":"1f01026a4eff440a3f122fd9b519d03546fe7f7d8be60dca834e95a2f8fbbfd2","glsl-optimizer/src/mesa/program/symbol_table.c":"6611cb9f078035bf5ff8c9112093a6c7d99f8af99a3931d0c07f227cc72283ea","glsl-optimizer/src/mesa/program/symbol_table.h":"631dc35ac48d5e87962d45507461920f6575610960ffcc42a08cefeb43300cda","glsl-optimizer/src/mesa/vbo/vbo.h":"6eb1dcd9a08c92f276c5fe08da184ff9d455d1be421913b8ad732a7b65e858fb","glsl-optimizer/src/util/bitscan.h":"9e49e694e6b34fe035bc685f32588827eb8cbe7d82878963c7ab52843e1c16aa","glsl-optimizer/src/util/bitset.h":"c40f78515c6230fed18345c6751ce33833a49da7a27901c7e6d7340cbdcbc5e7","glsl-optimizer/src/util/blob.c":"8f729846f66efc9c15485cc5fc24c6ec861fc1fecb2f652573f2a237d481b791","glsl-optimizer/src/util/blob.h":"93e1eaac866b9a7cd6fc03b533c18fb2edf0e97f03395eff4f3a605c4fc14d0c","glsl-optimizer/src/util/compiler.h":"79e3bf40a5bab704e6c949f23a1352759607bb57d80e5d8df2ef159755f10b68","glsl-optimizer/src/util/crc32.c":"2f3467a046b3a76784ecb9aa55d527698c8607fd0b12c622f6691aaa77b58505","glsl-optimizer/src/util/crc32.h":"59bd81865e51042b73a86f8fb117c312418df095fed2d828c5c1d1c8b6fc6cd4","glsl-optimizer/src/util/debug.c":"c3d68e9752ccc19e66c669562cd113cf1d0ac83cbb30174789e7fb8d1df58f9c","glsl-optimizer/src/util/debug.h":"50068d745c4199ccbd33d68dd4c8a36d2b5179c7869a21e75906ddd0718ca456","glsl-optimizer/src/util/detect_os.h":"343a8790d17a3710c6dd015ee367f84e3902ff3f2e36faca2bf93f9d725d3574","glsl-optimizer/src/util/disk_cache.c":"f533937e5a4fffe76e2739ef4b6b1e1da097d96d63eb808e68ebbc7027641c23","glsl-optimizer/src/util/disk_cache.h":"e83314fb14134a8e079b15e470a6376ba5a8253701f048c890a62b7e55d64bc8","glsl-optimizer/src/util/fast_urem_by_const.h":"e108fce804616c47d071dfe4a04163eec1126e448ed1aa89abb6b3a6d772bd5b","glsl-optimizer/src/util/fnv1a.h":"ab2596f19c6adf431ae27618f62c5743e24ad23ef83bb359a4c4c218245ab459","glsl-optimizer/src/util/format/u_format.h":"4cdfc0c59cbc99a092e5ec5a396910f2d93b9643e5d8141050b011e66f11e45b","glsl-optimizer/src/util/futex.h":"26f7c9d86e9ffef4c0fa2761f1aaa1918337302e20bd6ca10e61dc3c47356deb","glsl-optimizer/src/util/half_float.c":"11bc2584493d5d9d46e8c8a619a0307cf150bf5ab5d0f96bb764b061dc37a00e","glsl-optimizer/src/util/half_float.h":"7f7c380f126da1400a91758cc0392f24bf967bce1672890b62be26fe9fbd922b","glsl-optimizer/src/util/hash_table.c":"0ca40352e35dedab0a84c64c903f1b16d47e950bb5f43b4d22bb57d499bfea6e","glsl-optimizer/src/util/hash_table.h":"217191bb360592e2232f187473c10287d2cda8ae6fa5c53d0ef74c8c206118b4","glsl-optimizer/src/util/list.h":"9fab03c6a78186bb5f173269f825f6ce976b409d931852e3d93bac632e07989a","glsl-optimizer/src/util/macros.h":"63faf65b51058c483b17f1f77da51d1c53c8beab52678cb6bd01f1228a63b6b0","glsl-optimizer/src/util/mesa-sha1.c":"00c692ec353ebc02c06c57c5a71de0ab7a119f86a4146f452e65ec87e4944417","glsl-optimizer/src/util/mesa-sha1.h":"bff4c29f4bf7cdbcefb30fa0c996a7604a380eba8976467c2a60e7cd328f7e26","glsl-optimizer/src/util/mesa-sha1_test.c":"25da89a59d51469f77b4c468ca23ffdce0a7a1166a70b6cc23026a6800b0143c","glsl-optimizer/src/util/os_memory.h":"64555faf1760ae6954f42c83727c38dfc4c278e9152115779ffaad58b42adacf","glsl-optimizer/src/util/os_memory_aligned.h":"12d86fa94be38c13f7eeebdf313795e1267dd5a7187d2f0072e0e896f41702f6","glsl-optimizer/src/util/os_memory_stdc.h":"07360363b88c927065e10df71bebf6c8a0cc3b9167c9dfce55f2d65f11e6f787","glsl-optimizer/src/util/os_misc.c":"a9936e613ec84803abd59ad47c192c8e3939993c950ac91973fdc4cec1801bb8","glsl-optimizer/src/util/os_misc.h":"cc68eb12e05b5e749c54298cb4a6f4cd20cc5af7db3403e70b3c27b56090c740","glsl-optimizer/src/util/os_time.h":"73e775f7335244ff5964c678c27eedf1aea6abea44c4169d327ea8c7ce4a3a88","glsl-optimizer/src/util/ralloc.c":"4b51189595ef67bcef52c40cbf654d969041dbd15e15d4a893ad494ac060aeca","glsl-optimizer/src/util/ralloc.h":"e573c45875ff1530f0dbee9a93ae55535fdac8d5cc88a79ebc327c688824bde5","glsl-optimizer/src/util/rounding.h":"0450722353caf83de07e67f335949dbe95fe53b534052d4ee9d28d2781387614","glsl-optimizer/src/util/set.c":"86f8c9a830bead5a5a79bc970b0ff97809312af07b3beb39ef9d90af04d40a1b","glsl-optimizer/src/util/set.h":"3e39ca161e7ed4ec7c436cc9c7919ed9a55ed1b71edbf2caf6f9bcfd9bc578ed","glsl-optimizer/src/util/sha1/README":"00af7419af05247081858acb2902efd99fcda2ce16e331079f701645bb3729c0","glsl-optimizer/src/util/sha1/sha1.c":"1403bbe0aad42ba3e6be7e09f7cad87a6a8c4ad5b63962f7b92b9f37d8133b04","glsl-optimizer/src/util/sha1/sha1.h":"68d9f240eab2918026ecdf22be36811abbd4f1389f6c36e31258041aeaedd247","glsl-optimizer/src/util/simple_mtx.h":"12c6c3c4b7db9168bc656d5b3c65912075084d2b388c415d5c3d3f5953a9d6c7","glsl-optimizer/src/util/softfloat.c":"a97e51a96fe5e6a052c02aa6bbec683fe73fb88a8c087d9c930503e2120d8a2e","glsl-optimizer/src/util/softfloat.h":"66664b0250e83bf5dd4cc743acd119d076efcea624a0eab3d6b60718e6ee8811","glsl-optimizer/src/util/string_buffer.c":"63a1d1b1e34926c88ea00159cafbcd56568b805c4f64d1e8c97169fe313921fc","glsl-optimizer/src/util/string_buffer.h":"7b88d1b1d9c6cfb8e93331813535c127289437c75f822029e9a3bca8ea6b52ee","glsl-optimizer/src/util/strndup.h":"0273c4fdb7482cd7746881a63d3998648c6d63415ba85af1d1860f0e0dc504c6","glsl-optimizer/src/util/strtod.c":"5cf610d8a37373cf37cfb7aae903525d943b2674b1f32594c70b0eb19a8c9697","glsl-optimizer/src/util/strtod.h":"237396def4e264d35ed4bedea00ef9a4ceab6d7a11a18c770d9747d22c69ed2d","glsl-optimizer/src/util/u_atomic.h":"c02e809526c6c09ba8fe51f50b2490d1b6c8e5c7f3c4031ae958250d098fc3bb","glsl-optimizer/src/util/u_debug.c":"8c060e379b816618f3dd22c9ea523c68b9425c76c36a7dfe5d6d375b337f5f4a","glsl-optimizer/src/util/u_debug.h":"e11e26edd9b9e4e6f8e6a435e69f4d9edda27e9a379f68f4c82ea2525aaaea68","glsl-optimizer/src/util/u_dynarray.h":"853d0fa6ff2261614488be624deb8a2b01e57c2c8eabc28578cbeed4ccc95694","glsl-optimizer/src/util/u_endian.h":"3ccea7e529740318d8a4b05c00db3adc9d1e292a52bdc56a05c9fae99209720f","glsl-optimizer/src/util/u_math.c":"c868a8c0886dc78f1b06b13404ba8b253090449045774dd56893ac9d75795184","glsl-optimizer/src/util/u_math.h":"a04e32e126db016413f9de0a2028a3e71737137463b1289eae576f884b06fcf1","glsl-optimizer/src/util/u_memory.h":"c5db17c724c70283ddbe04165722f6988d4e0eb9aa3602ae472feff016649af9","glsl-optimizer/src/util/u_queue.h":"92930ce236c0528a98b695f5cea8c5c6aa9683beaf71a2227bdc5d33d1b21506","glsl-optimizer/src/util/u_string.h":"c5a2f4ef576d1547bda12c4ea219179fefa54414977743ac094abcaf696ef6ca","glsl-optimizer/src/util/u_thread.h":"00b708459b27f9910d18db92c18cc65cfc618ac2b3cd144e45f8640057b10d58","glsl-optimizer/src/util/xxhash.h":"2f2aff2fc6c0c929f52cf6ae7314122124c5be026d41ad1c357608383c4a37ad","src/bindings.rs":"79993db2058bde39f99ef483d02560d33b1cb882f6a552319e8b86eb6f9021e1","src/lib.rs":"04be1554cd829eb40864b06d80b491dd48117a4e3a601c7d482117f7a0391e67","wrapper.hpp":"f3ea34cc496f7d90b9bfcada3250b37b314c3524dac693b2ece9517bc7d274ac"},"package":"8ba4741358604ca0848c27ecc069d68e62e11cde81e38aac1da3c54b79ab5adf"}
+\ No newline at end of file
++{"files":{".cargo_vcs_info.json":"7075d1c5c5e19288cefb431f16462eaa23229d02791120f4885ab1d20470cb7e","Cargo.lock":"f7970552595dc803ace9ef19b5f5d7b1fc784aac30cb27b2ebc3002d97122b9d","Cargo.toml":"7c53ee20d848f9913cacbfcb3ab2e89e30deee8d619d173c95130c7c5d065827","README.md":"4468e08c64c19977707d792bfab0080e35ff927b64990eab77873f8ba056ba1c","build.rs":"92e29699487c21389fc823c50b410cfbfc74cc774265d24958489909ee48a076","glsl-optimizer/.editorconfig":"dca7ff05a95f608849c4dc640af7f83a0f415618e327a2ecb6a0afa0d9d2bacb","glsl-optimizer/.gitignore":"8ba554a4ca510ea7d9684475aa043edbeba7d15a5c9c4a04d8b1379a04ec6270","glsl-optimizer/CMakeLists.txt":"42ce94744e82ffa000da8b64d81fc140e293b9f5da7dd4cf6b49e7404a2448d9","glsl-optimizer/README.md":"b18eef11a92d267d88a937b1154f7670ee433c730b102fdf7e2da0b02722b146","glsl-optimizer/contrib/glslopt/Main.cpp":"14ba213210c62e234b8d9b0052105fed28eedd83d535ebe85acc10bda7322dd4","glsl-optimizer/contrib/glslopt/Readme":"65d2a6f1aa1dc61e903e090cdade027abad33e02e7c9c81e07dc80508acadec4","glsl-optimizer/generateParsers.sh":"878a97db5d3b69eb3b4c3a95780763b373cfcc0c02e0b28894f162dbbd1b8848","glsl-optimizer/include/GL/gl.h":"1989b51365b6d7d0c48ff6e8b181ef75e2cdf71bfb1626b1cc4362e2f54854a3","glsl-optimizer/include/GL/glext.h":"2ac3681045a35a2194a81a960cad395c04bef1c8a20ef46b799fb24af3ec5f70","glsl-optimizer/include/KHR/khrplatform.h":"1448141a0c054d7f46edfb63f4fe6c203acf9591974049481c32442fb03fd6ed","glsl-optimizer/include/c11/.editorconfig":"f96a2354e5f2b90367d643e6d9e980ce76278d4d47afd8b2713b595753aa8b4b","glsl-optimizer/include/c11/threads.h":"56e9e592b28df19f0db432125223cb3eb5c0c1f960c22db96a15692e14776337","glsl-optimizer/include/c11/threads_posix.h":"f8ad2b69fa472e332b50572c1b2dcc1c8a0fa783a1199aad245398d3df421b4b","glsl-optimizer/include/c11/threads_win32.h":"95bf19d7fc14d328a016889afd583e4c49c050a93bcfb114bd2e9130a4532488","glsl-optimizer/include/c11_compat.h":"103fedb48f658d36cb416c9c9e5ea4d70dff181aab551fcb1028107d098ffa3e","glsl-optimizer/include/c99_compat.h":"aafad02f1ea90a7857636913ea21617a0fcd6197256dcfc6dd97bb3410ba892e","glsl-optimizer/include/no_extern_c.h":"40069dbb6dd2843658d442f926e609c7799b9c296046a90b62b570774fd618f5","glsl-optimizer/license.txt":"e26a745226f4a46b3ca00ffbe8be18507362189a2863d04b4f563ba176a9a836","glsl-optimizer/src/compiler/builtin_type_macros.h":"5b4fc4d4da7b07f997b6eb569e37db79fa0735286575ef1fab08d419e76776ff","glsl-optimizer/src/compiler/glsl/README":"e7d408b621c1b605857c4cab63902f615edb06b530142b91ac040808df6e22f7","glsl-optimizer/src/compiler/glsl/TODO":"dd3b7a098e6f9c85ca8c99ce6dea49d65bb75d4cea243b917f29e4ad2c974603","glsl-optimizer/src/compiler/glsl/ast.h":"3e68ff374350c49211a9931f7f55a485d8d89fc4b21caaffbf6655009ad95bf8","glsl-optimizer/src/compiler/glsl/ast_array_index.cpp":"92b4d501f33e0544c00d14e4f8837753afd916c2b42e076ccc95c9e8fc37ba94","glsl-optimizer/src/compiler/glsl/ast_expr.cpp":"afd712a7b1beb2b633888f4a0911b0a8e4ae5eb5ab9c1e3f247d518cdaaa56d6","glsl-optimizer/src/compiler/glsl/ast_function.cpp":"74f4fbd490e366b37f4715168bb3465ecd9334d4130942f75dcc8e80e8e7f027","glsl-optimizer/src/compiler/glsl/ast_to_hir.cpp":"d0f798eb09271d41d068b9e7b18220d37f1ed0083300ab51eba30989698fe23d","glsl-optimizer/src/compiler/glsl/ast_type.cpp":"8eb790b24b26dfb72bdc333744b566c26d8464c5d47d20eae659461f5c4899f7","glsl-optimizer/src/compiler/glsl/builtin_functions.cpp":"454189d643c220fcb49116ee5c8a34f7b349aa67564040deb8607f6a41a15e70","glsl-optimizer/src/compiler/glsl/builtin_functions.h":"a37cad7ed09b522c5b8bec7b80115a36846e7ba6e0874a2a858e32f7f202c665","glsl-optimizer/src/compiler/glsl/builtin_int64.h":"619def6f3aebf180da3944ef08f159ab12a58b24767e41d8b985ac37ded54d62","glsl-optimizer/src/compiler/glsl/builtin_types.cpp":"afec060b62d6f3b00bfbf94e9fa5f96341ce096c128d1eef322791e6ed9cea4d","glsl-optimizer/src/compiler/glsl/builtin_variables.cpp":"6563bfb1345cbca4c77e00eef09ad152f3e1dc271d246a08c5ce9e1f4ce4250a","glsl-optimizer/src/compiler/glsl/float64.glsl":"1072fd888be48c2a7a5117cd2d92a65f034965a66375f598bb856bff5d7be766","glsl-optimizer/src/compiler/glsl/generate_ir.cpp":"e5f0175370a0d07f93c48d3f0f1b8233d12c64a7b02de02dcc753ef7b398ef0f","glsl-optimizer/src/compiler/glsl/glcpp/README":"a0332a1b221d047e9cce5181a64d4ac4056046fd878360ec8ae3a7b1e062bcff","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-lex.c":"2d179879b1ffe84f58875eee5b0c19b6bae9c973b0c48e6bcd99978f2f501c80","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-lex.l":"e4c5744c837200dafd7c15a912d13f650308ea552454d4fa67271bc0a5bde118","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-parse.c":"03494f9ce1cb82260506e2559e73a3eeb622c4bd51b65eaa0a2c3351862bd4c8","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-parse.h":"264d9a18421cde255ce34a0a62b3d8e73465359f0d167e64aa3973062aae5bdd","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-parse.y":"fafb66e3a8f149d19e085f18a4273ba6d4c11af9e9a01d665cc784dddf97b79f","glsl-optimizer/src/compiler/glsl/glcpp/glcpp.c":"37ed294403c2abfd17fd999d1ae8d11b170e5e9c878979fefac74a31195c96b0","glsl-optimizer/src/compiler/glsl/glcpp/glcpp.h":"85ac8b444bcbd0822b66448a1da407b6ae5467b649f5afaf5c58325bd7569468","glsl-optimizer/src/compiler/glsl/glcpp/pp.c":"a52d94f1bcb3fb2747a95709c4a77c25de7eea8354d2b83bb18efd96976a4473","glsl-optimizer/src/compiler/glsl/glcpp/pp_standalone_scaffolding.c":"d11aeb3acfe966d1b78f1ee49804093f2434214c41391d139ffcb67b69dc9862","glsl-optimizer/src/compiler/glsl/glcpp/pp_standalone_scaffolding.h":"abbf1f36ec5a92d035bfbb841b9452287d147616e56373cdbee1c0e55af46406","glsl-optimizer/src/compiler/glsl/glsl_lexer.cpp":"272b9fc1383d72b81bfc03fa11fdf82270ed91a294e523f9ce2b4554bd3effa9","glsl-optimizer/src/compiler/glsl/glsl_lexer.ll":"2b57d9f9eb830c3d7961d4533048a158ee6f458c8d05c65bea7b7cfbc36e4458","glsl-optimizer/src/compiler/glsl/glsl_optimizer.cpp":"f8095d20629d0af70be930b0612e169edb274551a1d25a3cd1bf9995a11ce2e8","glsl-optimizer/src/compiler/glsl/glsl_optimizer.h":"22e843b4ec53ba5f6cd85ca5f7bad33922dca8061b19fb512d46f1caca8d4757","glsl-optimizer/src/compiler/glsl/glsl_parser.cpp":"126baf368d525aba301854e3d91ba60b5aee32e1102376af71416f32cb95ec48","glsl-optimizer/src/compiler/glsl/glsl_parser.h":"2ea9a50716098a8f7bef782d2a030d757b68da73afb01b4d4940d3e8381d44e8","glsl-optimizer/src/compiler/glsl/glsl_parser.yy":"6b1fd1576b29fce005dff744a6dbd0219e4c695c361d61864e1f3a8d6fa6b764","glsl-optimizer/src/compiler/glsl/glsl_parser_extras.cpp":"aad64b5b66467da650091430681e8c6a820cf3cadc4db3c160bf2f15875390ae","glsl-optimizer/src/compiler/glsl/glsl_parser_extras.h":"71fd0e92bbdb193dfb067d7bfdb1200d77392be2fbd0cbfc9ca89d1bb4c7e741","glsl-optimizer/src/compiler/glsl/glsl_symbol_table.cpp":"6660fb83c0ddddbbd64581d46ccfdb9c84bfaa99d13348c289e6442ab00df046","glsl-optimizer/src/compiler/glsl/glsl_symbol_table.h":"24682b8304e0ea3f6318ddb8c859686bd1faee23cd0511d1760977ae975d41bf","glsl-optimizer/src/compiler/glsl/hir_field_selection.cpp":"72a039b0fcab4161788def9e4bedac7ac06a20d8e13146529c6d246bd5202afd","glsl-optimizer/src/compiler/glsl/int64.glsl":"303dbe95dde44b91aee3e38b115b92028400d6a92f9268975d607471984e13eb","glsl-optimizer/src/compiler/glsl/ir.cpp":"2b4741cce90b5d4abff5d719c7324e2693c67294d4d99736cb241554adb281bc","glsl-optimizer/src/compiler/glsl/ir.h":"990b1c74447c4eb4835353ccb0ed9aea644f97fc1129ef1739cd935075d85d2e","glsl-optimizer/src/compiler/glsl/ir_array_refcount.cpp":"8cdc1cffe01e42e0566fa2193a75f789628e8025ad1b82f0ee6f204451b7f9f7","glsl-optimizer/src/compiler/glsl/ir_array_refcount.h":"75f06ec81342b379096ca52e1dc0fd5f19a11ff8e9b58203c20628179d644c12","glsl-optimizer/src/compiler/glsl/ir_basic_block.cpp":"1e2920b1c0ecb08424c745c558f84d0d7e44b74585cf2cc2265dc4dfede3fa2f","glsl-optimizer/src/compiler/glsl/ir_basic_block.h":"81be7da0fc0ee547cd13ec60c1fcd7d3ce3d70d7e5e988f01a3b43a827acdf05","glsl-optimizer/src/compiler/glsl/ir_builder.cpp":"daba29c5a1efdd5a9754f420eb3e2ebdf73485273497f40d4863dadeddb23c0d","glsl-optimizer/src/compiler/glsl/ir_builder.h":"2822e74dd3f6e3df8b300af27d5b11ea2dd99d0e5e7ca809b7bbcce9833c483c","glsl-optimizer/src/compiler/glsl/ir_builder_print_visitor.cpp":"8c6df5abf2fe313363f285f171c19ca6c8ee4f3bc2ed79d33c0c88cc8be45c48","glsl-optimizer/src/compiler/glsl/ir_builder_print_visitor.h":"799852adc3a0e54d04080655e7cebfa0d3bf5b6ffed5d8414f141380665d4db7","glsl-optimizer/src/compiler/glsl/ir_clone.cpp":"d897a4e1f5bbec4a6a2f15044c1be9a4d13899c73be77335b041049a4589aa5d","glsl-optimizer/src/compiler/glsl/ir_constant_expression.cpp":"78bd87ddb09db67f6c499067728d72aef4f16aa02721a99a4b769d1e0cfa9010","glsl-optimizer/src/compiler/glsl/ir_equals.cpp":"bca28533a6310b0fc152b56d80872368f1510dc62ed6e8ac199b9ffa7fac02e7","glsl-optimizer/src/compiler/glsl/ir_expression_flattening.cpp":"7e918d4e1f237eca01396004015865ce345afe32a876c9dbc6728576a1a7eae4","glsl-optimizer/src/compiler/glsl/ir_expression_flattening.h":"f45b66aa9497520e7e08e612d24b308477c34477fbd963ee9320eac664957f16","glsl-optimizer/src/compiler/glsl/ir_expression_operation.h":"cc9f10727dbd26cac506804f51456302c702650f9eeb59054a7e1575d5cf6687","glsl-optimizer/src/compiler/glsl/ir_expression_operation.py":"7b86c96021b9fbe165957f4ecb0b612fefcde1c2cf3c6d75e3cdb22e369216ba","glsl-optimizer/src/compiler/glsl/ir_expression_operation_constant.h":"9ad3346416392e3efa11e12ecf2feca7453c5253d241eb96c91dfb85d4f2b971","glsl-optimizer/src/compiler/glsl/ir_expression_operation_strings.h":"a6826daf496a8b9e89885bc2a161ac3445d501b23c6e0ac33e2c01b506b273c8","glsl-optimizer/src/compiler/glsl/ir_function.cpp":"7537365fc0fbe4b37a26b9a2146cc64d3e9a774d60eab63b65002ad165ae8fc7","glsl-optimizer/src/compiler/glsl/ir_function_can_inline.cpp":"faddbf112187a048d502716a3fb82570a322299ba2a3abd79388382c82040bfc","glsl-optimizer/src/compiler/glsl/ir_function_detect_recursion.cpp":"9176973eaf5c0a984701f953bb7a80f37dca43d59b5bce50fc69b3f02f2902d7","glsl-optimizer/src/compiler/glsl/ir_function_inlining.h":"9739493f99c489987d650762fccdd3fb3d432f6481d67f6c799176685bd59632","glsl-optimizer/src/compiler/glsl/ir_hierarchical_visitor.cpp":"3725861fbe2b98e0617f52d3b14cf6d3b25fb5ec00f5ef5d308b03642f592767","glsl-optimizer/src/compiler/glsl/ir_hierarchical_visitor.h":"e0560210e966c0c31e4ca843e80ea154e64db5a444b8c2df845b6ba5b3a43fc1","glsl-optimizer/src/compiler/glsl/ir_hv_accept.cpp":"caf7ce2cd9494aadd3c58bcf77f29de58368dc9e347a362bbf37f8bda9509b80","glsl-optimizer/src/compiler/glsl/ir_optimization.h":"8b3dcfc7f9e96b21a8dd47a0040d90be483a9e67a2cdce3a697188fb758d4630","glsl-optimizer/src/compiler/glsl/ir_print_glsl_visitor.cpp":"f8e34a983452be0dcb5a695e9c8e895eead24f9e540992a8afe510ae85da4c4c","glsl-optimizer/src/compiler/glsl/ir_print_glsl_visitor.h":"1ad1bd3efd1ace39051c13f904c05fd80425d329444f9a8d47fd6d948faf46e0","glsl-optimizer/src/compiler/glsl/ir_print_visitor.cpp":"643f5a68aae3fb37267fd793f1216d1cfdeb2c09338c26b1f30e4c6deaef4de5","glsl-optimizer/src/compiler/glsl/ir_print_visitor.h":"4573eb93268a2654c14b505253dd651e2695d43dc745904d824da18305269b95","glsl-optimizer/src/compiler/glsl/ir_reader.cpp":"06bfba802c8354e5a8b2334b6d78d6297de18235bedd3f8fbb382c89870b02f2","glsl-optimizer/src/compiler/glsl/ir_reader.h":"63e3f7f1597936a7011d5b520e171b197bf82bee6c1560d822c3edf5aaa6f9e9","glsl-optimizer/src/compiler/glsl/ir_rvalue_visitor.cpp":"84b5c5d746555adca85759c2912fe48010232b7c1c0bd2cf03bd04067a85e66f","glsl-optimizer/src/compiler/glsl/ir_rvalue_visitor.h":"fd8c561b71085d3211fff85ed514fecb299d8ce19a04bc063419a55b6d840525","glsl-optimizer/src/compiler/glsl/ir_set_program_inouts.cpp":"ab9f115ce9e7f312d9c7978340ced0dc4ae6d13a80e08442ba9709d11d50cae5","glsl-optimizer/src/compiler/glsl/ir_uniform.h":"683ae6896b1a08470c090be5f822fc31cd434eab9216e954b9bba24a46975109","glsl-optimizer/src/compiler/glsl/ir_unused_structs.cpp":"9c1620c45f2fc071fe5ed828472040b14c5f42effe06aa0e3b8352c95ef78786","glsl-optimizer/src/compiler/glsl/ir_unused_structs.h":"13387b49c23093575276b25b9dfd31fedd8f131c5c4f3128ab04cf03e15b5295","glsl-optimizer/src/compiler/glsl/ir_validate.cpp":"6b232be5999a86ea278f4f15b2832d76843246509118d924243055a3b9b0299f","glsl-optimizer/src/compiler/glsl/ir_variable_refcount.cpp":"2764a3cad937d53f36db7447c3a5b98b04bf153acf81074d971857fc5bca460d","glsl-optimizer/src/compiler/glsl/ir_variable_refcount.h":"b0668e3eb1501ef65e38fe12830742ecb3d28e6039f30e366c8924efc29b4a39","glsl-optimizer/src/compiler/glsl/ir_visitor.h":"f21b3534c3d66d5fb707d1581fece7e1eb043523afbaedf89918cfb031c6df94","glsl-optimizer/src/compiler/glsl/link_atomics.cpp":"360f0209e11f367ba358223597b0a118bae095bff16337cf03f1fb89c5b80ca6","glsl-optimizer/src/compiler/glsl/link_functions.cpp":"de7895da8aa33a1e3c2c1eb2fdaf267ab5d1fbfdb79ae2e67f95211e946e294c","glsl-optimizer/src/compiler/glsl/link_interface_blocks.cpp":"1926cfa73810704eb19b916c1b2cdb9321155e2f98b2a0a57c7c3c6e960540cd","glsl-optimizer/src/compiler/glsl/link_uniform_block_active_visitor.cpp":"1e14e06ca3b2c1089cfba2e8eaf0c1f373d9d6374b6082f320962dd71ae09611","glsl-optimizer/src/compiler/glsl/link_uniform_block_active_visitor.h":"fd58c155af645295bb6aec08797889de586f4d919731de2bce57e8dce59bb048","glsl-optimizer/src/compiler/glsl/link_uniform_blocks.cpp":"09589f49776dce32e6c4044937de7e0c839a9754ad31960148f8f9e010658997","glsl-optimizer/src/compiler/glsl/link_uniform_initializers.cpp":"bf98e08c12db466acf9623cbeb8fa8e3b4002512722e7a6521287f558a099f37","glsl-optimizer/src/compiler/glsl/link_uniforms.cpp":"84bad5b1377362cecf259b05124239be5220b03ce1c0c61b59bd9a47e4379af2","glsl-optimizer/src/compiler/glsl/link_varyings.cpp":"a5f1a53e7c80d635515fe808ff223d89fef1767abb0f2b7aa28fa6773dca353f","glsl-optimizer/src/compiler/glsl/link_varyings.h":"b9dbe018f038df69763df2e928742ce81bbc6e3aaba26f50621e30a6d9aa6220","glsl-optimizer/src/compiler/glsl/linker.cpp":"40b1ecd5d4f6c7f13d5a87ce390561a51fdf6f3fcd9b2197b9c88b03a773ba94","glsl-optimizer/src/compiler/glsl/linker.h":"ecf94b4ad75ef461c27c557fda4bd25f34c91930822b8e1d729ec84520d4a049","glsl-optimizer/src/compiler/glsl/linker_util.cpp":"1663ad88e2a369305659aeeffaedb5bd752cf76340a2ba5797fc0bf600633cf9","glsl-optimizer/src/compiler/glsl/linker_util.h":"6db788daf9c8e87ae2764b61a8b37ebe419e69c1b82ddee01986e37c978c6993","glsl-optimizer/src/compiler/glsl/list.h":"b1f46ce0e552fe7c45b2a19408a9d97662e23e4b182ab335491c26f8cf25886f","glsl-optimizer/src/compiler/glsl/loop_analysis.cpp":"57ecd573477c68091c7cc99537faa7139a8f395935e3d4f10144cefdefb5a611","glsl-optimizer/src/compiler/glsl/loop_analysis.h":"a85f045a038ee5b5176063e85d7988865862c44ab0580f771b993a042d0b69cc","glsl-optimizer/src/compiler/glsl/loop_unroll.cpp":"bd4292ea2809f5a669bcb76ceaa1ac365772dcd638c579c3ed10275214901a54","glsl-optimizer/src/compiler/glsl/lower_blend_equation_advanced.cpp":"8cfbef140d9c4b4d2f57bfa05c9c374d31a121d0f87afce94333f049023b654a","glsl-optimizer/src/compiler/glsl/lower_buffer_access.cpp":"1ae221c3c7a95aeb867207e7a742be635f91b406c157747bfd6ddf10274d97fb","glsl-optimizer/src/compiler/glsl/lower_buffer_access.h":"807886953a576a323591798cbca5e2df24295ea893b28affd8ffb5926cebaa04","glsl-optimizer/src/compiler/glsl/lower_builtins.cpp":"4d81afc32cf58e1481fcb5e42888ab93dbe6820310a20ff7a9982b77b2152d9b","glsl-optimizer/src/compiler/glsl/lower_const_arrays_to_uniforms.cpp":"608403f0eeeedf21cfcd3014116e0f44e28cbdf6c4c32aac7e613e64e30205e1","glsl-optimizer/src/compiler/glsl/lower_cs_derived.cpp":"179905cd47a294122adeb5b0abfed6f2f67782dcde21b544d1ee2c1985154e66","glsl-optimizer/src/compiler/glsl/lower_discard.cpp":"3b361b2db0004d544d64611cb50d5a6e364cf6c5f2e60c449085d7d753dd7fb0","glsl-optimizer/src/compiler/glsl/lower_discard_flow.cpp":"f5c29b6a27690bb5c91f196d1a1cf9f6be4f1025292311fe2dac561ce6774dee","glsl-optimizer/src/compiler/glsl/lower_distance.cpp":"a118c85493d5d22b2c059a930c51a5854896d4b1dade76598eaa985e5a3dff8c","glsl-optimizer/src/compiler/glsl/lower_if_to_cond_assign.cpp":"469e617757fd1728709cce021aac5c8da05ee503bf5366977bdc4ef7a6d83950","glsl-optimizer/src/compiler/glsl/lower_instructions.cpp":"6ff5c396abe40d8a2145d571e99e2bbe9143393e15aafc28adc2803a01d821b6","glsl-optimizer/src/compiler/glsl/lower_int64.cpp":"d1ed41196880dd53c7b13e2782f9423f8442bf1d46186e8be92b1b66218a83ee","glsl-optimizer/src/compiler/glsl/lower_jumps.cpp":"34de7b493f281589fb0c2c0f6e885d0a0fabbe7a4e97a73de374dd714777a58c","glsl-optimizer/src/compiler/glsl/lower_mat_op_to_vec.cpp":"dff7a308edc4846c348ed4225c6699a9c75abac68d88f41f85954276552779f4","glsl-optimizer/src/compiler/glsl/lower_named_interface_blocks.cpp":"16063ac127bff75a68272070ab11c21c25101edbff62b4c68f4983b4cd941af0","glsl-optimizer/src/compiler/glsl/lower_offset_array.cpp":"3b00773399135aea85746a5a68b96ef000bc6841be1a2c8e6f25c516628b0949","glsl-optimizer/src/compiler/glsl/lower_output_reads.cpp":"a0fc9975d5aa1617e21fc6c353659a9802da9e83779a3eef4ec584f74b4dadc5","glsl-optimizer/src/compiler/glsl/lower_packed_varyings.cpp":"7550099d4ae123d71541c2fc88bc04fbfe9271ec75d7e210987d1c8cac3cf3ea","glsl-optimizer/src/compiler/glsl/lower_packing_builtins.cpp":"79a13d161fe505a410ab948d92769395708693ec888153630fa240e5b97e356f","glsl-optimizer/src/compiler/glsl/lower_precision.cpp":"f82a185b879872b977a1787d8061b9a80bc4cf8db1b970db6efba2ad9cc20fa2","glsl-optimizer/src/compiler/glsl/lower_shared_reference.cpp":"ea2dccf50a83bc19391bf6b7ab6aa53c0005f427af4066d25140340af9a4beef","glsl-optimizer/src/compiler/glsl/lower_subroutine.cpp":"f69fa53650eeb6f2944fce4d36a6e0a423e6705f3a3bd3389c7fadb83cfc8802","glsl-optimizer/src/compiler/glsl/lower_tess_level.cpp":"b196c9d424c0569f3e85d75c2d125af21566cb113d69036db87c0990703e0fa7","glsl-optimizer/src/compiler/glsl/lower_texture_projection.cpp":"4d247f244272adc8250fd888d8d932a140dd5de4d1efc7a58492c3c2b8291527","glsl-optimizer/src/compiler/glsl/lower_ubo_reference.cpp":"89bdbc6c1669230c644c0857db1ce2781ec61d349ecd08c7914146e1f4750a4a","glsl-optimizer/src/compiler/glsl/lower_variable_index_to_cond_assign.cpp":"fce930f29ac9405b297d1f749d68f59506b89c70b4ee1b1ab8cf49a34cc71ecf","glsl-optimizer/src/compiler/glsl/lower_vec_index_to_cond_assign.cpp":"3c67d851a11a55fad1c49a550f3a0cfe50892d33a3f238ce266cd829eba510a8","glsl-optimizer/src/compiler/glsl/lower_vec_index_to_swizzle.cpp":"f5ec666b73e1415cbab32519a53605ed385f3b03e889560373dbce69dda5000e","glsl-optimizer/src/compiler/glsl/lower_vector.cpp":"f7c13f5572ebe09b6a71553133b2cf003cd4b77b9657600672ee3b21bf890725","glsl-optimizer/src/compiler/glsl/lower_vector_derefs.cpp":"b05793da6dd620a531b43df5af8b2ecbc37b9db0c88910f5724ea10bcd057e19","glsl-optimizer/src/compiler/glsl/lower_vector_insert.cpp":"fee772ec17eea5e86a529bf9c5fa2ee0d29a5982bb75ebc6d68ed36cd19aa299","glsl-optimizer/src/compiler/glsl/lower_vertex_id.cpp":"690e8715182e03fead5cc5a35251fb4f41b357e4c71a1dfbc4bd7be19862b56d","glsl-optimizer/src/compiler/glsl/lower_xfb_varying.cpp":"58c0e8b270e4bbde54250be03cdb2f36966bcafb785372ad2e2b786835df7f9f","glsl-optimizer/src/compiler/glsl/main.cpp":"ae5e88abbbc8a12f769e1296bad938b9d7398cc6da0d3d0caeceeeb876536850","glsl-optimizer/src/compiler/glsl/opt_add_neg_to_sub.h":"f5054944bfd068810629080d0ea11df78b3f57a8f86df75e13ca50157ad1964d","glsl-optimizer/src/compiler/glsl/opt_algebraic.cpp":"25f45b20e1972ee8c789177a1aeda6e4286c25db2eae3a43ff83029ae64969c0","glsl-optimizer/src/compiler/glsl/opt_array_splitting.cpp":"19d3ce0e815438f4df9ab2890e767b03a4f3f191b53bb30c0217cf2ae6a95430","glsl-optimizer/src/compiler/glsl/opt_conditional_discard.cpp":"0e44e0e126711a3725c1f3a2aa65ff03c381fed08680ffc30101aae60f716c4e","glsl-optimizer/src/compiler/glsl/opt_constant_folding.cpp":"a088d04d9b45f9e55e235835648f614c89b7803c03a6d4f6a6d1a6bc1f0228bd","glsl-optimizer/src/compiler/glsl/opt_constant_propagation.cpp":"8a9440d77ecd6dcf13e683cbb99943aab6311c8fd4b5f6a9189a8d4f270746f4","glsl-optimizer/src/compiler/glsl/opt_constant_variable.cpp":"63d3ccd4dd09f19c9cf1a2f51592111bed41284504f29f3c0de4cadebc439a37","glsl-optimizer/src/compiler/glsl/opt_copy_propagation_elements.cpp":"ffa0f50863995e0d2e31f55a52e82319edc71e520987bebd7f7e561ea331c64b","glsl-optimizer/src/compiler/glsl/opt_dead_builtin_variables.cpp":"84e8747b948232f01dd56b428b9315f96f9511f605f240119fc446fae28981a9","glsl-optimizer/src/compiler/glsl/opt_dead_builtin_varyings.cpp":"761523e88f5b3ba785170f4d7205e94fa99acb7e74d29efbe40e1c010e1dbdb3","glsl-optimizer/src/compiler/glsl/opt_dead_code.cpp":"fd1ba2da7337d4e5dad17f5c2d73d9cc8880305f423e85d64cf94553588fa401","glsl-optimizer/src/compiler/glsl/opt_dead_code_local.cpp":"969a598b4df322baf222258a66cd64a326ea20e5b3125be9d8d1771f522c69e0","glsl-optimizer/src/compiler/glsl/opt_dead_functions.cpp":"774cae6536d02edf26e996a2a895e1f62d5098f16dc96b44798b4fc731a9a95f","glsl-optimizer/src/compiler/glsl/opt_flatten_nested_if_blocks.cpp":"3696a5c55f02e20056e085bc2714f73ac992f221b6f3387d655068e86b512046","glsl-optimizer/src/compiler/glsl/opt_flip_matrices.cpp":"44f0fe05b49329667671f88c96dc86ab3fe1459ff7b87f2b2d88de2d49829f9f","glsl-optimizer/src/compiler/glsl/opt_function_inlining.cpp":"fb56a33c90419a01676b57cbd91d0674a54cca40e6defaacc88dd33facebc131","glsl-optimizer/src/compiler/glsl/opt_if_simplification.cpp":"ac406eb35e379c357641d6c5749f50c65961455924d3dc884e2b90046fa92c5c","glsl-optimizer/src/compiler/glsl/opt_minmax.cpp":"8abd59d3b14ef60ff14a9c69660e6945f5cf10b97edb4afebe56be3f81d96316","glsl-optimizer/src/compiler/glsl/opt_rebalance_tree.cpp":"8bb6329dc0f299042368fc81934c2df019b45ab9f7aa0415d4e57b8d1ff98c9f","glsl-optimizer/src/compiler/glsl/opt_redundant_jumps.cpp":"222c73e2ac7a938ebb6428cc6c780c908ff6156d8ff935b04fed93a48fc10496","glsl-optimizer/src/compiler/glsl/opt_structure_splitting.cpp":"2edc79cc13f3177934e0443ad62f5976a1991f01f86ea303a803434849b13a47","glsl-optimizer/src/compiler/glsl/opt_swizzle.cpp":"015d0abddfe507f67c4b96c82988d861d018ededf7bf055e2bcbe9ea92da694e","glsl-optimizer/src/compiler/glsl/opt_tree_grafting.cpp":"46d28ac983ea244a4315bdc0e8892979ec4d1f9b9a96ac8a8a08006d9bc5e878","glsl-optimizer/src/compiler/glsl/opt_vectorize.cpp":"d80ee43bb97d9f016fb9c5e1e06f5b2afa569811f368ba067be794ec11d085fb","glsl-optimizer/src/compiler/glsl/program.h":"2982447e2abd35371e273ad87951722782a8b21c08294f67c39d987da1e1c55f","glsl-optimizer/src/compiler/glsl/propagate_invariance.cpp":"080943e21baa32494723a2eefb185915d2daae1f46d6df420145c5ad6857e119","glsl-optimizer/src/compiler/glsl/s_expression.cpp":"1ced972bc6ecc8eab4116ea71fb0212ab9ae5bcc0be3b47aa5d9d903566b3af1","glsl-optimizer/src/compiler/glsl/s_expression.h":"65b847e30e22a809b57d0bc70243049c99d9c6318803c5b8d0826aba55dc217e","glsl-optimizer/src/compiler/glsl/serialize.cpp":"be0eb4251348a9d921acb839a5c48c6023a2e9d116d602bb0432787ab623655d","glsl-optimizer/src/compiler/glsl/serialize.h":"57425732eba1233d928e5f07f88b623ce65af46b3bb034bf147f0a4b7f94f9a1","glsl-optimizer/src/compiler/glsl/shader_cache.cpp":"e0c5c433f2df3fccdf1d61281bfcb0ee5633433339b97c697d64db99611cbaaf","glsl-optimizer/src/compiler/glsl/shader_cache.h":"9217164d8d7f54aca0fe5922c7187095a6ae0cb703b196b79805aeef07a7e697","glsl-optimizer/src/compiler/glsl/standalone.cpp":"8e6c416a14d631261917a5fe4cc91880c287b22b2dfd70eb22028289a8fa5364","glsl-optimizer/src/compiler/glsl/standalone.h":"a7c397d1dfdd1e7fb2cfe99db35cd9df93251e642059208533202b7f20497f83","glsl-optimizer/src/compiler/glsl/standalone_scaffolding.cpp":"970d14b7a9d58e5270321f97bf5d57795558b1c570a56678e04a65b26c60bf4f","glsl-optimizer/src/compiler/glsl/standalone_scaffolding.h":"d921a617ea82b9e49413314492a645c44356de503581b1be3f1b57de236e480d","glsl-optimizer/src/compiler/glsl/string_to_uint_map.cpp":"d824bf5b839bd39498dc9e457103cdbe3e5289ddf7564107c27b1505948dd31f","glsl-optimizer/src/compiler/glsl/string_to_uint_map.h":"e2f18e66359c9d620e085de7f4a334a47df9c66e65a5bfe8b734c627bec04104","glsl-optimizer/src/compiler/glsl/test_optpass.h":"b27b8f35f5387e7ce4982bb51c7b63ccf14f91757f3108a5d02ed006925bb8a0","glsl-optimizer/src/compiler/glsl/xxd.py":"376484142f27f45090ea8203ae2621abf73f06175cb0ee8d96f44a3b9327f4bd","glsl-optimizer/src/compiler/glsl_types.cpp":"044bb6754f45419a3151e7a25c39202a82009ae3c6bc54ff7f0bb4258a5deefe","glsl-optimizer/src/compiler/glsl_types.h":"fd899a42f34ddeb8601bc3cd6c5e3aed82fc8aef4042dde1b39b3c01e1dcc219","glsl-optimizer/src/compiler/shader_enums.c":"436bff5216b11b0980bdfada5885fc6ac9afa2037a3027fcd6eea2a8635597ac","glsl-optimizer/src/compiler/shader_enums.h":"13220442a5c02e83540cf2c0ad4f8417b2fbda5f2586dec4e92082544c937cdd","glsl-optimizer/src/compiler/shader_info.h":"4c5453e81197ca83593ee4f365074b23530f2ab21c78e1733b63dec6f344c12a","glsl-optimizer/src/gallium/auxiliary/util/u_half.h":"3c2b37bda3ccb64387e44b723d29cf9046decab1a893bf42d842e9603398bdee","glsl-optimizer/src/gallium/include/pipe/p_compiler.h":"c75620096ce8523dae90599e50aa2ef6468d3b0e368a77795edeb20dd1abfc0c","glsl-optimizer/src/gallium/include/pipe/p_config.h":"a27692fc35f9e55df3224b7529e66b3001e911e94e6bc5f8f569e493e1ee3fb7","glsl-optimizer/src/gallium/include/pipe/p_defines.h":"be26d68c0acc67c5e44788c6299716a9eee415fd81d7d747e3738a829e3b6b38","glsl-optimizer/src/gallium/include/pipe/p_format.h":"5674215fc41d27496f037cf837717daefbf23ebb38d40ace7c0c414bc08182b0","glsl-optimizer/src/gallium/include/pipe/p_state.h":"d600593aba5f5a17072a6c38f6baa81e01c7994b0174250f7e433bb41684b702","glsl-optimizer/src/mapi/glapi/glapi.h":"73632a625c0ddabc401205e8b5a81eb8af8506868efe4b170d7979ec3619e9c5","glsl-optimizer/src/mesa/main/config.h":"5800259373099e5405de2eb52619f9de242552a479902a3a642a333c8cb3c1e7","glsl-optimizer/src/mesa/main/context.c":"2f3208473d99c94f734b1137ba91889d4a1babb9e7534bf1dc85d851ee98274e","glsl-optimizer/src/mesa/main/context.h":"cc7e4194797db9d007f01884e23d786c453b3860821f7f2ddcdf0f1bf3f8ffb1","glsl-optimizer/src/mesa/main/dd.h":"6a964acd06b6c2d88700e69fb75fe3c6b3b3d45bbc41db24f3f897a29695fe0c","glsl-optimizer/src/mesa/main/debug_output.h":"7312422e90b8c0e34028ac27280e438139b5cba525c99deb3ac883cd3d87e452","glsl-optimizer/src/mesa/main/draw.h":"7eaef3a9e27a60ea6f7937109bf3a6190b831162fde0479abb12077ce27c353d","glsl-optimizer/src/mesa/main/enums.h":"87d562a6764f51c014a2274fa7c3aca17c04441537ddd56b2554f13c6fffea92","glsl-optimizer/src/mesa/main/errors.h":"c79444b5df289c90fbb22a33b2d0c23917d9fc4510960088f0b79e53bb56b1b2","glsl-optimizer/src/mesa/main/extensions.h":"a38b2f87cc93c513994281350d69e06c84ff8eded5313ec0a1be33f375e0ebbd","glsl-optimizer/src/mesa/main/extensions_table.c":"17642d1a8c9a0bf2bd61060052d33ff14a005d2b962e6cf91465797a50851e85","glsl-optimizer/src/mesa/main/extensions_table.h":"2c879571c238d2e14461031ac740372fd0f9ac3a34c0d5541bb9b7ed4c0376c8","glsl-optimizer/src/mesa/main/formats.h":"02e2f7ec3e39286cf9f27e2641043e6df8ecb1dfde9e643313210e214af2a929","glsl-optimizer/src/mesa/main/glheader.h":"58217b33eead6aa6b23cd4a291cefeaa6cb84e465f4960daffca97c44d6d1c35","glsl-optimizer/src/mesa/main/glthread.h":"51fb2711f77e7eafcfc52d29d5b844978832b24c930d88accd48d143a6eb9c6f","glsl-optimizer/src/mesa/main/hash.h":"7e7f782034c16a8e693de48e00c31d4a90b0129f4029fd074033d7d16ccbe718","glsl-optimizer/src/mesa/main/macros.h":"73d15ddfd64f2b57b9b2ffeeb993b9c2c0899a80563e9d6ff337b11ccbe6eee5","glsl-optimizer/src/mesa/main/menums.h":"5dfac0e2279d60b0cd0c7b9fc2a5021620d0f6282ed2e738c420214e3af152d3","glsl-optimizer/src/mesa/main/mesa_private.h":"edda678b93438944279a551f663b8858ad84814a9fc88ba9672ef195599c24ae","glsl-optimizer/src/mesa/main/mtypes.h":"6efddefa099e4d2e3fdd97f0055644f47aba21711385edfeabc2d9b0676f2eec","glsl-optimizer/src/mesa/main/shaderobj.h":"9f0dfe96d0c2154201adef942bd36053533ac7b2492fb3786acda5bea514c75e","glsl-optimizer/src/mesa/main/uniforms.h":"4e331e6ad6e9cbded978b4082dbe0a57c1f8f01327446bb6892bfc179976c38b","glsl-optimizer/src/mesa/main/version.h":"9d0a13a758099302dc55cf7d045791834a89b0f9d4cf17b2692259b369a8a9a1","glsl-optimizer/src/mesa/math/m_matrix.h":"a37b19f182e070db3df93b0ede43c22fb8be8c2906504133ee6dbd7db1185d8b","glsl-optimizer/src/mesa/program/dummy_errors.c":"1820e305515b4c5e041f5e1623266a48ec8f076a155310be7d60637101f593e4","glsl-optimizer/src/mesa/program/ir_to_mesa.h":"b47f58d22e3ca2ae42d52501ea769d15c4476834944fa97eeccd3a3439211d00","glsl-optimizer/src/mesa/program/prog_instruction.h":"ab3832152a7e144b59e5a2264b2c29db56d93be31e76bbd958527a56771b40eb","glsl-optimizer/src/mesa/program/prog_parameter.h":"ba18c743284eadbc837c2c364c73e5d372321a7637a76e589d8d39fe8b5de225","glsl-optimizer/src/mesa/program/prog_statevars.h":"fc413698f84bc52d45fdeae0471934ee9904bfb7eac1a2b5f70446e54bcbbdca","glsl-optimizer/src/mesa/program/program.h":"1f01026a4eff440a3f122fd9b519d03546fe7f7d8be60dca834e95a2f8fbbfd2","glsl-optimizer/src/mesa/program/symbol_table.c":"6611cb9f078035bf5ff8c9112093a6c7d99f8af99a3931d0c07f227cc72283ea","glsl-optimizer/src/mesa/program/symbol_table.h":"631dc35ac48d5e87962d45507461920f6575610960ffcc42a08cefeb43300cda","glsl-optimizer/src/mesa/vbo/vbo.h":"6eb1dcd9a08c92f276c5fe08da184ff9d455d1be421913b8ad732a7b65e858fb","glsl-optimizer/src/util/bitscan.h":"9e49e694e6b34fe035bc685f32588827eb8cbe7d82878963c7ab52843e1c16aa","glsl-optimizer/src/util/bitset.h":"c40f78515c6230fed18345c6751ce33833a49da7a27901c7e6d7340cbdcbc5e7","glsl-optimizer/src/util/blob.c":"8f729846f66efc9c15485cc5fc24c6ec861fc1fecb2f652573f2a237d481b791","glsl-optimizer/src/util/blob.h":"93e1eaac866b9a7cd6fc03b533c18fb2edf0e97f03395eff4f3a605c4fc14d0c","glsl-optimizer/src/util/compiler.h":"79e3bf40a5bab704e6c949f23a1352759607bb57d80e5d8df2ef159755f10b68","glsl-optimizer/src/util/crc32.c":"2f3467a046b3a76784ecb9aa55d527698c8607fd0b12c622f6691aaa77b58505","glsl-optimizer/src/util/crc32.h":"59bd81865e51042b73a86f8fb117c312418df095fed2d828c5c1d1c8b6fc6cd4","glsl-optimizer/src/util/debug.c":"c3d68e9752ccc19e66c669562cd113cf1d0ac83cbb30174789e7fb8d1df58f9c","glsl-optimizer/src/util/debug.h":"50068d745c4199ccbd33d68dd4c8a36d2b5179c7869a21e75906ddd0718ca456","glsl-optimizer/src/util/detect_os.h":"343a8790d17a3710c6dd015ee367f84e3902ff3f2e36faca2bf93f9d725d3574","glsl-optimizer/src/util/disk_cache.c":"f533937e5a4fffe76e2739ef4b6b1e1da097d96d63eb808e68ebbc7027641c23","glsl-optimizer/src/util/disk_cache.h":"e83314fb14134a8e079b15e470a6376ba5a8253701f048c890a62b7e55d64bc8","glsl-optimizer/src/util/fast_urem_by_const.h":"e108fce804616c47d071dfe4a04163eec1126e448ed1aa89abb6b3a6d772bd5b","glsl-optimizer/src/util/fnv1a.h":"ab2596f19c6adf431ae27618f62c5743e24ad23ef83bb359a4c4c218245ab459","glsl-optimizer/src/util/format/u_format.h":"4cdfc0c59cbc99a092e5ec5a396910f2d93b9643e5d8141050b011e66f11e45b","glsl-optimizer/src/util/futex.h":"26f7c9d86e9ffef4c0fa2761f1aaa1918337302e20bd6ca10e61dc3c47356deb","glsl-optimizer/src/util/half_float.c":"11bc2584493d5d9d46e8c8a619a0307cf150bf5ab5d0f96bb764b061dc37a00e","glsl-optimizer/src/util/half_float.h":"7f7c380f126da1400a91758cc0392f24bf967bce1672890b62be26fe9fbd922b","glsl-optimizer/src/util/hash_table.c":"0ca40352e35dedab0a84c64c903f1b16d47e950bb5f43b4d22bb57d499bfea6e","glsl-optimizer/src/util/hash_table.h":"217191bb360592e2232f187473c10287d2cda8ae6fa5c53d0ef74c8c206118b4","glsl-optimizer/src/util/list.h":"9fab03c6a78186bb5f173269f825f6ce976b409d931852e3d93bac632e07989a","glsl-optimizer/src/util/macros.h":"63faf65b51058c483b17f1f77da51d1c53c8beab52678cb6bd01f1228a63b6b0","glsl-optimizer/src/util/mesa-sha1.c":"00c692ec353ebc02c06c57c5a71de0ab7a119f86a4146f452e65ec87e4944417","glsl-optimizer/src/util/mesa-sha1.h":"bff4c29f4bf7cdbcefb30fa0c996a7604a380eba8976467c2a60e7cd328f7e26","glsl-optimizer/src/util/mesa-sha1_test.c":"25da89a59d51469f77b4c468ca23ffdce0a7a1166a70b6cc23026a6800b0143c","glsl-optimizer/src/util/os_memory.h":"64555faf1760ae6954f42c83727c38dfc4c278e9152115779ffaad58b42adacf","glsl-optimizer/src/util/os_memory_aligned.h":"12d86fa94be38c13f7eeebdf313795e1267dd5a7187d2f0072e0e896f41702f6","glsl-optimizer/src/util/os_memory_stdc.h":"07360363b88c927065e10df71bebf6c8a0cc3b9167c9dfce55f2d65f11e6f787","glsl-optimizer/src/util/os_misc.c":"a9936e613ec84803abd59ad47c192c8e3939993c950ac91973fdc4cec1801bb8","glsl-optimizer/src/util/os_misc.h":"cc68eb12e05b5e749c54298cb4a6f4cd20cc5af7db3403e70b3c27b56090c740","glsl-optimizer/src/util/os_time.h":"73e775f7335244ff5964c678c27eedf1aea6abea44c4169d327ea8c7ce4a3a88","glsl-optimizer/src/util/ralloc.c":"4b51189595ef67bcef52c40cbf654d969041dbd15e15d4a893ad494ac060aeca","glsl-optimizer/src/util/ralloc.h":"e573c45875ff1530f0dbee9a93ae55535fdac8d5cc88a79ebc327c688824bde5","glsl-optimizer/src/util/rounding.h":"0450722353caf83de07e67f335949dbe95fe53b534052d4ee9d28d2781387614","glsl-optimizer/src/util/set.c":"86f8c9a830bead5a5a79bc970b0ff97809312af07b3beb39ef9d90af04d40a1b","glsl-optimizer/src/util/set.h":"3e39ca161e7ed4ec7c436cc9c7919ed9a55ed1b71edbf2caf6f9bcfd9bc578ed","glsl-optimizer/src/util/sha1/README":"00af7419af05247081858acb2902efd99fcda2ce16e331079f701645bb3729c0","glsl-optimizer/src/util/sha1/sha1.c":"1403bbe0aad42ba3e6be7e09f7cad87a6a8c4ad5b63962f7b92b9f37d8133b04","glsl-optimizer/src/util/sha1/sha1.h":"68d9f240eab2918026ecdf22be36811abbd4f1389f6c36e31258041aeaedd247","glsl-optimizer/src/util/simple_mtx.h":"12c6c3c4b7db9168bc656d5b3c65912075084d2b388c415d5c3d3f5953a9d6c7","glsl-optimizer/src/util/softfloat.c":"a97e51a96fe5e6a052c02aa6bbec683fe73fb88a8c087d9c930503e2120d8a2e","glsl-optimizer/src/util/softfloat.h":"66664b0250e83bf5dd4cc743acd119d076efcea624a0eab3d6b60718e6ee8811","glsl-optimizer/src/util/string_buffer.c":"63a1d1b1e34926c88ea00159cafbcd56568b805c4f64d1e8c97169fe313921fc","glsl-optimizer/src/util/string_buffer.h":"7b88d1b1d9c6cfb8e93331813535c127289437c75f822029e9a3bca8ea6b52ee","glsl-optimizer/src/util/strndup.h":"0273c4fdb7482cd7746881a63d3998648c6d63415ba85af1d1860f0e0dc504c6","glsl-optimizer/src/util/strtod.c":"5cf610d8a37373cf37cfb7aae903525d943b2674b1f32594c70b0eb19a8c9697","glsl-optimizer/src/util/strtod.h":"237396def4e264d35ed4bedea00ef9a4ceab6d7a11a18c770d9747d22c69ed2d","glsl-optimizer/src/util/u_atomic.h":"c02e809526c6c09ba8fe51f50b2490d1b6c8e5c7f3c4031ae958250d098fc3bb","glsl-optimizer/src/util/u_debug.c":"8c060e379b816618f3dd22c9ea523c68b9425c76c36a7dfe5d6d375b337f5f4a","glsl-optimizer/src/util/u_debug.h":"e11e26edd9b9e4e6f8e6a435e69f4d9edda27e9a379f68f4c82ea2525aaaea68","glsl-optimizer/src/util/u_dynarray.h":"853d0fa6ff2261614488be624deb8a2b01e57c2c8eabc28578cbeed4ccc95694","glsl-optimizer/src/util/u_endian.h":"3ccea7e529740318d8a4b05c00db3adc9d1e292a52bdc56a05c9fae99209720f","glsl-optimizer/src/util/u_math.c":"c868a8c0886dc78f1b06b13404ba8b253090449045774dd56893ac9d75795184","glsl-optimizer/src/util/u_math.h":"a04e32e126db016413f9de0a2028a3e71737137463b1289eae576f884b06fcf1","glsl-optimizer/src/util/u_memory.h":"c5db17c724c70283ddbe04165722f6988d4e0eb9aa3602ae472feff016649af9","glsl-optimizer/src/util/u_queue.h":"92930ce236c0528a98b695f5cea8c5c6aa9683beaf71a2227bdc5d33d1b21506","glsl-optimizer/src/util/u_string.h":"c5a2f4ef576d1547bda12c4ea219179fefa54414977743ac094abcaf696ef6ca","glsl-optimizer/src/util/u_thread.h":"00b708459b27f9910d18db92c18cc65cfc618ac2b3cd144e45f8640057b10d58","glsl-optimizer/src/util/xxhash.h":"2f2aff2fc6c0c929f52cf6ae7314122124c5be026d41ad1c357608383c4a37ad","src/bindings.rs":"79993db2058bde39f99ef483d02560d33b1cb882f6a552319e8b86eb6f9021e1","src/lib.rs":"04be1554cd829eb40864b06d80b491dd48117a4e3a601c7d482117f7a0391e67","wrapper.hpp":"f3ea34cc496f7d90b9bfcada3250b37b314c3524dac693b2ece9517bc7d274ac"},"package":"8ba4741358604ca0848c27ecc069d68e62e11cde81e38aac1da3c54b79ab5adf"}
+\ No newline at end of file
+diff --git comm/third_party/rust/minimal-lexical/.cargo-checksum.json comm/third_party/rust/minimal-lexical/.cargo-checksum.json
+index bd057a45e60..66cba02bbad 100644
+--- comm/third_party/rust/minimal-lexical/.cargo-checksum.json
++++ comm/third_party/rust/minimal-lexical/.cargo-checksum.json
+@@ -1 +1 @@
+-{"files":{".cargo_vcs_info.json":"e819b814dde0c854395882e9f65856c3196961ceced92eeab6ade4d350e7cccc",".github/ISSUE_TEMPLATE/bug_report.md":"cce60fa26d7e6afb7aa84755d6bc6431afe1f390823033545ac3ac9d94740b19",".github/ISSUE_TEMPLATE/custom.md":"b52f73fd67ebd71d43f36d5d1a2f3a53d1f32e126f70ccf0126900ff9f2aec3c",".github/ISSUE_TEMPLATE/documentation.md":"986b9a1421dc15af628bdff8691eeb39d92e36bedb7742d2a4d8327f6cb921a3",".github/ISSUE_TEMPLATE/feature_request.md":"e7861c6047eb39fb4dead4198c141817215839fddb43d16cb6e679417428a73e",".github/ISSUE_TEMPLATE/question.md":"75d3de186382ff882e26e1aba65b4b207cbd3822b9491cd92886fa7987a6ba23",".github/PULL_REQUEST_TEMPLATE/bug_fix.md":"8d7bfb13212e583b9cb717ec39ac2d2070d85470bdf81a32f89e91796a14efcc",".github/PULL_REQUEST_TEMPLATE/custom.md":"88e332c54fe5a52842abdc33e129fa12b0b39c1aaa78da16bc3e1ccce0f3e643",".github/PULL_REQUEST_TEMPLATE/documentation.md":"ac8bae6001c6822dc6d2334c085018c38a8f121f0c580b33b770357170a59c76",".github/workflows/Cross.yml":"51cd10949a21f4aa734a45c06021b53f81cebddcde6723e69caf39d6b7a53cc7",".github/workflows/Features.yml":"4b7182995976d3872853555e989d49be03cfacf92a6807317c01623a1de59742",".github/workflows/OSX.yml":"1ffe8ad7703afb4bc67caf52550b53095861f7290e9b1cbd9f7f7e62de82b3b4",".github/workflows/Simple.yml":"6c681d49afdf74a85757fca4d6bfce076daebbb8816409f42345c2782ba5408d",".github/workflows/Valgrind.yml":"5beae6618e643ef75a6cdc6622bb64a586f3bc956401551920716564d4f3c1fe",".gitmodules":"6976207a02c7160a3a1d076c5fae10fe4b78f58cdc0aa66ae47f3855b3c392fb","CHANGELOG":"55ebcf7ee0fd10987829a98fb9757cbc6f68c62198bc70122384bedc08de9915","CODE_OF_CONDUCT.md":"0bd67c62d204ec67cb29969aaf5aac337a77c84b318937bc2d9dc7e3fcbcdcaa","Cargo.toml":"6c485fa605a0d3de6ec0af125b67c55224515354034f990334b1a1a86988c632","LICENSE-APACHE":"8173d5c29b4f956d532781d2b86e4e30f83e6b7878dce18c919451d6ba707c90","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","LICENSE.md":"dbe1fff0fb1314b6af94f161511406275cf01c5a32441fbf24528a57a051d599","README.md":"00d521d93124e88edf58d42b3114786c0daaf437e73118eed27b3c716b7514ad","clippy.toml":"8d3aafbcf358ccf45cc148cd705f5fe71e777dabc391ed9a2bae32af73291fe8","rustfmt.toml":"ae46c79a84842907e151ca5d07e36b8d1932b61c6989465500c0f706507f42cc","src/bellerophon.rs":"bbabeccfa7a70ec314a894d968b424d1162df1b9e5e659baa1fd3a37d985fe75","src/bigint.rs":"93d3332d01bb7745bc569bc6b242c6c71c75eb78835b6a05bad91952b989daf0","src/extended_float.rs":"6040bdd49c03f11f8607b2da1703e1b7b5f57ddac9b02322c6958f9c1684496f","src/fpu.rs":"72d63bac2bbfc545128aa59dc35cfad3c553bac64bf575880775b3c4ace415bc","src/heapvec.rs":"836a49d40e5da90d195508e963d869afd78aaf9adb9cd60a0cb8f92b4e105c4f","src/lemire.rs":"100f3cb293deed0b0d1e7ca6b23152ba160f92f887f8924620b28c9ab77326db","src/lib.rs":"626dfc61992c42d4996dddcbfff5775ff2ffae44d116d2d70f6564a3209c0a9a","src/libm.rs":"ed5a3856eaa44a8a05aa123e27c2048b92ff42e4af1ef3f9fa1aff2a50190f4a","src/mask.rs":"63bcda92d14169a55ac54798f45365cef64a1aecd9625c3c3bc3deae202b2a07","src/num.rs":"dbcab14a5fe8e40e381829426dd75a7db672882592b5c4a08897a2fb6d2ae7ea","src/number.rs":"49d0880a99816ecf904fb88f607a821d6770ec270825b96e800a297ab1a01d78","src/parse.rs":"19559db67eddd17d331274cf87d6c4beeb0724dcdf859de9b8ab5995c4b8e682","src/rounding.rs":"8ba42d31618db1e6a381f8b60ffe1f9d216aaccb931b8fac5f279d8465e35cb7","src/slow.rs":"f096e7f83e8372e71568ec1724bc1c9d2c67ca39b80290ba062e60ae94b1f8d1","src/stackvec.rs":"0c921eb3adbd42cbe7be0f363e08ac85b6d5f1dabd4a7b077becddeff731da16","src/table.rs":"e4288891e9b1d8ba60dcc73edc639754cc2351d3219df8c625e694f3f0e58c5a","src/table_bellerophon.rs":"a2102292b27223a81e60a8a6607c42587efde3424526156921167742a0d5937c","src/table_lemire.rs":"c101c353c38b594f5b8987263b759927095b5dcd72e65607cc1c6a7de0bfd0c8","src/table_small.rs":"61b00e13eb3945622bf8bed374c88e29c63dfedb7384b31b35dd4e543cbe62c1","tests/bellerophon.rs":"b17b87b8963ebcd71f684e4d48c1ce619964e4fb719a5875b0ce4514ed528674","tests/bellerophon_tests.rs":"76b71efa2f4cec56a79535e2d292788a5e1b443c901ec7a234800782f36ddb68","tests/integration_tests.rs":"ed1a1fc46fc239eb4ea718057ad6e9869f633797ef72fc6f05b1757ab80e1641","tests/lemire_tests.rs":"6213bcd9b44def655b44a6b760cee0c0ad82d3bb494f48c2ff100698da34625b","tests/libm_tests.rs":"6941e74d7d0adf021edc93b9919275e82810687ff33147a10361613073b22669","tests/mask_tests.rs":"8c2a3daf434815389b6bf88837e3f382d74d97250104b925d70779366bd3d537","tests/number_tests.rs":"df4b4f0c65478f2f6193bd918fa4aad7163e40598c58df44547c4559e4a8b0c7","tests/parse_tests.rs":"bc0066b9257368f0365276fcffa2662c4699a033eaf9a4a7d6faa0e9b915094a","tests/rounding_tests.rs":"99f38b768ad15e726559c446825f9f1bad67935cdd28ffcc1cbcd3e031a901ea","tests/slow_tests.rs":"36c4c2538d2f5a1c1af5deb26ec4eba47f19f9a3c280a13d10704267a16d3b3f","tests/stackvec.rs":"f040611995bcd1bd2cb47694e74aa02ff4fabdffe007f712c9bb788d82dfb8a7","tests/vec_tests.rs":"09b561160df3b1385876db452bb5a67ef2c9fd2cc36b5687e1dfaf8c58947782"},"package":"68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"}
+\ No newline at end of file
++{"files":{".cargo_vcs_info.json":"e819b814dde0c854395882e9f65856c3196961ceced92eeab6ade4d350e7cccc",".github/ISSUE_TEMPLATE/bug_report.md":"cce60fa26d7e6afb7aa84755d6bc6431afe1f390823033545ac3ac9d94740b19",".github/ISSUE_TEMPLATE/custom.md":"b52f73fd67ebd71d43f36d5d1a2f3a53d1f32e126f70ccf0126900ff9f2aec3c",".github/ISSUE_TEMPLATE/documentation.md":"986b9a1421dc15af628bdff8691eeb39d92e36bedb7742d2a4d8327f6cb921a3",".github/ISSUE_TEMPLATE/feature_request.md":"e7861c6047eb39fb4dead4198c141817215839fddb43d16cb6e679417428a73e",".github/ISSUE_TEMPLATE/question.md":"75d3de186382ff882e26e1aba65b4b207cbd3822b9491cd92886fa7987a6ba23",".github/PULL_REQUEST_TEMPLATE/bug_fix.md":"8d7bfb13212e583b9cb717ec39ac2d2070d85470bdf81a32f89e91796a14efcc",".github/PULL_REQUEST_TEMPLATE/custom.md":"88e332c54fe5a52842abdc33e129fa12b0b39c1aaa78da16bc3e1ccce0f3e643",".github/PULL_REQUEST_TEMPLATE/documentation.md":"ac8bae6001c6822dc6d2334c085018c38a8f121f0c580b33b770357170a59c76",".github/workflows/Cross.yml":"51cd10949a21f4aa734a45c06021b53f81cebddcde6723e69caf39d6b7a53cc7",".github/workflows/Features.yml":"4b7182995976d3872853555e989d49be03cfacf92a6807317c01623a1de59742",".github/workflows/OSX.yml":"1ffe8ad7703afb4bc67caf52550b53095861f7290e9b1cbd9f7f7e62de82b3b4",".github/workflows/Simple.yml":"6c681d49afdf74a85757fca4d6bfce076daebbb8816409f42345c2782ba5408d",".github/workflows/Valgrind.yml":"5beae6618e643ef75a6cdc6622bb64a586f3bc956401551920716564d4f3c1fe","CHANGELOG":"55ebcf7ee0fd10987829a98fb9757cbc6f68c62198bc70122384bedc08de9915","CODE_OF_CONDUCT.md":"0bd67c62d204ec67cb29969aaf5aac337a77c84b318937bc2d9dc7e3fcbcdcaa","Cargo.toml":"6c485fa605a0d3de6ec0af125b67c55224515354034f990334b1a1a86988c632","LICENSE-APACHE":"8173d5c29b4f956d532781d2b86e4e30f83e6b7878dce18c919451d6ba707c90","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","LICENSE.md":"dbe1fff0fb1314b6af94f161511406275cf01c5a32441fbf24528a57a051d599","README.md":"00d521d93124e88edf58d42b3114786c0daaf437e73118eed27b3c716b7514ad","clippy.toml":"8d3aafbcf358ccf45cc148cd705f5fe71e777dabc391ed9a2bae32af73291fe8","rustfmt.toml":"ae46c79a84842907e151ca5d07e36b8d1932b61c6989465500c0f706507f42cc","src/bellerophon.rs":"bbabeccfa7a70ec314a894d968b424d1162df1b9e5e659baa1fd3a37d985fe75","src/bigint.rs":"93d3332d01bb7745bc569bc6b242c6c71c75eb78835b6a05bad91952b989daf0","src/extended_float.rs":"6040bdd49c03f11f8607b2da1703e1b7b5f57ddac9b02322c6958f9c1684496f","src/fpu.rs":"72d63bac2bbfc545128aa59dc35cfad3c553bac64bf575880775b3c4ace415bc","src/heapvec.rs":"836a49d40e5da90d195508e963d869afd78aaf9adb9cd60a0cb8f92b4e105c4f","src/lemire.rs":"100f3cb293deed0b0d1e7ca6b23152ba160f92f887f8924620b28c9ab77326db","src/lib.rs":"626dfc61992c42d4996dddcbfff5775ff2ffae44d116d2d70f6564a3209c0a9a","src/libm.rs":"ed5a3856eaa44a8a05aa123e27c2048b92ff42e4af1ef3f9fa1aff2a50190f4a","src/mask.rs":"63bcda92d14169a55ac54798f45365cef64a1aecd9625c3c3bc3deae202b2a07","src/num.rs":"dbcab14a5fe8e40e381829426dd75a7db672882592b5c4a08897a2fb6d2ae7ea","src/number.rs":"49d0880a99816ecf904fb88f607a821d6770ec270825b96e800a297ab1a01d78","src/parse.rs":"19559db67eddd17d331274cf87d6c4beeb0724dcdf859de9b8ab5995c4b8e682","src/rounding.rs":"8ba42d31618db1e6a381f8b60ffe1f9d216aaccb931b8fac5f279d8465e35cb7","src/slow.rs":"f096e7f83e8372e71568ec1724bc1c9d2c67ca39b80290ba062e60ae94b1f8d1","src/stackvec.rs":"0c921eb3adbd42cbe7be0f363e08ac85b6d5f1dabd4a7b077becddeff731da16","src/table.rs":"e4288891e9b1d8ba60dcc73edc639754cc2351d3219df8c625e694f3f0e58c5a","src/table_bellerophon.rs":"a2102292b27223a81e60a8a6607c42587efde3424526156921167742a0d5937c","src/table_lemire.rs":"c101c353c38b594f5b8987263b759927095b5dcd72e65607cc1c6a7de0bfd0c8","src/table_small.rs":"61b00e13eb3945622bf8bed374c88e29c63dfedb7384b31b35dd4e543cbe62c1","tests/bellerophon.rs":"b17b87b8963ebcd71f684e4d48c1ce619964e4fb719a5875b0ce4514ed528674","tests/bellerophon_tests.rs":"76b71efa2f4cec56a79535e2d292788a5e1b443c901ec7a234800782f36ddb68","tests/integration_tests.rs":"ed1a1fc46fc239eb4ea718057ad6e9869f633797ef72fc6f05b1757ab80e1641","tests/lemire_tests.rs":"6213bcd9b44def655b44a6b760cee0c0ad82d3bb494f48c2ff100698da34625b","tests/libm_tests.rs":"6941e74d7d0adf021edc93b9919275e82810687ff33147a10361613073b22669","tests/mask_tests.rs":"8c2a3daf434815389b6bf88837e3f382d74d97250104b925d70779366bd3d537","tests/number_tests.rs":"df4b4f0c65478f2f6193bd918fa4aad7163e40598c58df44547c4559e4a8b0c7","tests/parse_tests.rs":"bc0066b9257368f0365276fcffa2662c4699a033eaf9a4a7d6faa0e9b915094a","tests/rounding_tests.rs":"99f38b768ad15e726559c446825f9f1bad67935cdd28ffcc1cbcd3e031a901ea","tests/slow_tests.rs":"36c4c2538d2f5a1c1af5deb26ec4eba47f19f9a3c280a13d10704267a16d3b3f","tests/stackvec.rs":"f040611995bcd1bd2cb47694e74aa02ff4fabdffe007f712c9bb788d82dfb8a7","tests/vec_tests.rs":"09b561160df3b1385876db452bb5a67ef2c9fd2cc36b5687e1dfaf8c58947782"},"package":"68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"}
+\ No newline at end of file
+diff --git comm/third_party/rust/sfv/.cargo-checksum.json comm/third_party/rust/sfv/.cargo-checksum.json
+index 4ee8844eeff..b6ce2f8a232 100644
+--- comm/third_party/rust/sfv/.cargo-checksum.json
++++ comm/third_party/rust/sfv/.cargo-checksum.json
+@@ -1 +1 @@
+-{"files":{".cargo_vcs_info.json":"b9684495aca1266d529c68c734a6d522edfac6963a375cc8e83ead6cba32cdd2",".gitmodules":"caa4f75b6a87c4a0f2e7d8d0d5fa2ef3f726fb0ae7797af09bfa3d57c4721148","Cargo.lock":"c2f5099c842414259cd42c41aad1625b6d8bb3448ea9005d0029b1ba473cf8df","Cargo.toml":"27657a45f07f7f9251288569bdc650aea15b875cccdd68f6add9e7a9f24cb2aa","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5318787a14e32720b1652f08a24408aaea67fdb5154ceda0f46a6069a0c5e5e3","README.md":"ce7479ab0666eeba0a0ce519e892bc9a028fbac8ea2c476ee84a486a2517f209","examples/priority.rs":"444fcbd3f3178c51c53c5c41c966e847f9cba27935508444be8fc104b1d56b8c","rustfmt.toml":"9886f841ea5c4467bb451643df62c2e95974f7c903870faa7d211b8f7b75cfc8","src/date.rs":"eeb9959d4d667ace02e3f56c97762aad5a3b86c64bd3efb75990fbc3de503847","src/decimal.rs":"478e5d3be92be19834656c34204b9e98a181179678b7ec42cbd6fa331047c442","src/error.rs":"ce11936be379aa4d487f0200675798f3c17fff556730d879050e4bc7180a4d89","src/integer.rs":"d60c007557a15e7d62862bdfb4c806472dd2fa799b1fdda46dfdf329b52dbb25","src/key.rs":"1568c93a03fdcee53c73447b998cd7c11bc3b8ab6ec981ad783855d45e2c3c86","src/lib.rs":"4543a40b4c6b3da629028f46bf5fab87845f0d52953392565b31d904c3db4985","src/parsed.rs":"4b0b2e7f6809f9c1f1ab08aa77dd9ebaf036815d4d2aa521f5bb9547ae56fb23","src/parser.rs":"8071dbccb02565cbe574b652d10c19bf59672b55dc2fc009bd658bcf1ff49e05","src/ref_serializer.rs":"37e826559f97ae232c4c6431249821803934201c43709f07e9b7a9c0cca0abea","src/serializer.rs":"3e19248a01a024f1bfafac35ee57a4d4d49a728f02a8a1ec4f836057abd1e574","src/string.rs":"7309666153042191347941d2fbcc203af3405b394e9d772520bae4434b783e48","src/test_decimal.rs":"f0b51f0b29f4aaf9d0630bb7e60655ba1678b0fa99f40513cb47c09180d642d1","src/test_integer.rs":"4976524a4dc865c4b5dbba2b897a413fdb0ecdd0e31db84e99f5076f59b07515","src/test_key.rs":"836b2b8b450366857690e4ade99888174665494e7bb953ccad5d5d2d707fb870","src/test_parser.rs":"2aedb05d9a7a7867ca0a095a8c5b431835ddac7dca358ac988779d6157b89ae5","src/test_ref_serializer.rs":"a304442ecbba16f1e55660d773c1c1efbb34115dec23619e2e23f870800d263a","src/test_serializer.rs":"f375cbed5b1048844d12d97cc06a21c0f2a7e31bf0537d670c43422bcc3269ea","src/test_string.rs":"4c8c428dabee2c205397b874e279203b11daebe6b506ce69bad75e06c304a044","src/test_token.rs":"8a0be15b72debbe14e02c93366f738f826619fd19b0a7281ac0e86c81eb7963b","src/token.rs":"a73f6b89a6e9e60c30b6d43e8a0d7b0412adb6d77c9f5ce0481e8eb7ad846b43","src/utils.rs":"b42aeaccc1221510b3943aa3145eaaff4841afc1a16ded54d8bae4fd86a8a1db","src/visitor.rs":"9f725c8d659374691c7edb6652de14789637965c1db776b5e668226dba5cd3e8"},"package":"0d471eaefb14f4b30032525bdb124b36e55ba9cb1292080e06f1a236cd10fe87"}
+\ No newline at end of file
++{"files":{".cargo_vcs_info.json":"b9684495aca1266d529c68c734a6d522edfac6963a375cc8e83ead6cba32cdd2","Cargo.lock":"c2f5099c842414259cd42c41aad1625b6d8bb3448ea9005d0029b1ba473cf8df","Cargo.toml":"27657a45f07f7f9251288569bdc650aea15b875cccdd68f6add9e7a9f24cb2aa","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5318787a14e32720b1652f08a24408aaea67fdb5154ceda0f46a6069a0c5e5e3","README.md":"ce7479ab0666eeba0a0ce519e892bc9a028fbac8ea2c476ee84a486a2517f209","examples/priority.rs":"444fcbd3f3178c51c53c5c41c966e847f9cba27935508444be8fc104b1d56b8c","rustfmt.toml":"9886f841ea5c4467bb451643df62c2e95974f7c903870faa7d211b8f7b75cfc8","src/date.rs":"eeb9959d4d667ace02e3f56c97762aad5a3b86c64bd3efb75990fbc3de503847","src/decimal.rs":"478e5d3be92be19834656c34204b9e98a181179678b7ec42cbd6fa331047c442","src/error.rs":"ce11936be379aa4d487f0200675798f3c17fff556730d879050e4bc7180a4d89","src/integer.rs":"d60c007557a15e7d62862bdfb4c806472dd2fa799b1fdda46dfdf329b52dbb25","src/key.rs":"1568c93a03fdcee53c73447b998cd7c11bc3b8ab6ec981ad783855d45e2c3c86","src/lib.rs":"4543a40b4c6b3da629028f46bf5fab87845f0d52953392565b31d904c3db4985","src/parsed.rs":"4b0b2e7f6809f9c1f1ab08aa77dd9ebaf036815d4d2aa521f5bb9547ae56fb23","src/parser.rs":"8071dbccb02565cbe574b652d10c19bf59672b55dc2fc009bd658bcf1ff49e05","src/ref_serializer.rs":"37e826559f97ae232c4c6431249821803934201c43709f07e9b7a9c0cca0abea","src/serializer.rs":"3e19248a01a024f1bfafac35ee57a4d4d49a728f02a8a1ec4f836057abd1e574","src/string.rs":"7309666153042191347941d2fbcc203af3405b394e9d772520bae4434b783e48","src/test_decimal.rs":"f0b51f0b29f4aaf9d0630bb7e60655ba1678b0fa99f40513cb47c09180d642d1","src/test_integer.rs":"4976524a4dc865c4b5dbba2b897a413fdb0ecdd0e31db84e99f5076f59b07515","src/test_key.rs":"836b2b8b450366857690e4ade99888174665494e7bb953ccad5d5d2d707fb870","src/test_parser.rs":"2aedb05d9a7a7867ca0a095a8c5b431835ddac7dca358ac988779d6157b89ae5","src/test_ref_serializer.rs":"a304442ecbba16f1e55660d773c1c1efbb34115dec23619e2e23f870800d263a","src/test_serializer.rs":"f375cbed5b1048844d12d97cc06a21c0f2a7e31bf0537d670c43422bcc3269ea","src/test_string.rs":"4c8c428dabee2c205397b874e279203b11daebe6b506ce69bad75e06c304a044","src/test_token.rs":"8a0be15b72debbe14e02c93366f738f826619fd19b0a7281ac0e86c81eb7963b","src/token.rs":"a73f6b89a6e9e60c30b6d43e8a0d7b0412adb6d77c9f5ce0481e8eb7ad846b43","src/utils.rs":"b42aeaccc1221510b3943aa3145eaaff4841afc1a16ded54d8bae4fd86a8a1db","src/visitor.rs":"9f725c8d659374691c7edb6652de14789637965c1db776b5e668226dba5cd3e8"},"package":"0d471eaefb14f4b30032525bdb124b36e55ba9cb1292080e06f1a236cd10fe87"}
+\ No newline at end of file
+diff --git comm/third_party/rust/wasi/.cargo-checksum.json comm/third_party/rust/wasi/.cargo-checksum.json
+index 283fa57969e..a912a647b90 100644
+--- comm/third_party/rust/wasi/.cargo-checksum.json
++++ comm/third_party/rust/wasi/.cargo-checksum.json
+@@ -1 +1 @@
+-{"files":{".cargo_vcs_info.json":"def0d209896816fde9013e069a564dd3c1a1a46c5ce465d755b878de811f9881",".github/workflows/main.yml":"d38da3f640abbc358cb77a3c27344e9644d472adf7f8e265d00ff49d89226068",".gitmodules":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","CODE_OF_CONDUCT.md":"a13aaaf393818bd91207c618724d3fb74944ca5161201822a84af951bcf655ef","CONTRIBUTING.md":"2c908a3e263dc35dfed131c02ff907cd72fafb2c2096e4ba9b1e0cbb7a1b76df","Cargo.lock":"8cc81d2623344bdc9223c5e4a0530ae94dfa0930d465193719e6d300e2243225","Cargo.toml":"f43ee004589d9330d76d998fe7d9dd88ffd2a3daf5872b60fcaa495f47b02583","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-Apache-2.0_WITH_LLVM-exception":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","ORG_CODE_OF_CONDUCT.md":"a62b69bf86e605ee1bcbb2f0a12ba79e4cebb6983a7b6491949750aecc4f2178","README.md":"aab21c6fad2ca7e2b487764f49018ac8f6f0bf0236dabf5aa947e134952a1c69","SECURITY.md":"4d75afb09dd28eb5982e3a1f768ee398d90204669ceef3240a16b31dcf04148a","ci/regenerate.sh":"2af2cc4f41022d09ce3132013b6a0de7d5ed6fecdb44ad98b1bbd7125643cec8","ci/vendor-wit.sh":"6ea63164316554fa60fc32243595dc79629953cfb63d973678dc715b3b3cd61e","examples/cli-command-no_std.rs":"f03689380e305e5fe32e2582cb10af43d03244c1b343b90ec03936108d67f084","examples/cli-command.rs":"ac21e564ac6fe77c10ebaae774a7ebedeb8b6779826ae86834546cbe28eb8140","examples/hello-world-no_std.rs":"48251e32311e7bda9bc852bf48b8925912ae11d2534f4f7401e0d7dd3c5aeb16","examples/hello-world.rs":"4f9e5cdd74914fb82c6a20dd2544260b8d7dac921f1e0d933ca272c1ffca5163","examples/http-proxy-no_std.rs":"4ec8e31010526ffb68d2b18fd7c31a32de4d58229604efd391d4a296fee22da0","examples/http-proxy.rs":"c52c07f36d3e856bbe4e72bdd484c4129d55f26436cf0631003e451f5322d678","src/bindings.rs":"9db6b925a72119137dbc306687aa6dc61f402ed0b726db7fdb1d7fe9bf893909","src/command.rs":"8e5475c6d4a41ea3b3ec98a918a61bce9dd58cf50a2a27c764bf9796b9cbf299","src/ext/mod.rs":"4bc79c71442ac6c55dc4f8a0632b6d6805c0c9c74b22b56791a483ae447dac0c","src/ext/std.rs":"c35fd8bdafd24a6adef4f5a27e8e4bb421b0e50cebfe350868ded43980b1a06e","src/lib.rs":"044e0df592d1159ce711f17bc27edc87f876951bd3ec1ce72ebabf20e011e84a","src/proxy.rs":"3a05d33e98936642a84c755e8f4db7c5b8de27ed0416614cf4fad8b48c519cdf","wit/deps/cli/command.wit":"f729a20e99a4601f90677e31a16e63f24ee32eef062b9305e94419428c8ff70b","wit/deps/cli/environment.wit":"5e58cd47b162e9f004bc9224a29c2ec3cf9e1a3d4c910154ce53742f828af91f","wit/deps/cli/exit.wit":"a0fae6014751dc95f45b1dbe530b7f4db99d5bd607ed8bbf879b22a906f4514c","wit/deps/cli/imports.wit":"a576c17e15ece40fe29eaeb73f416d6f46ac639f512d51ad20bb915b4686a4dd","wit/deps/cli/run.wit":"a7df5376da8230e0509fffbb8355641af0765cc5cff8064bbe58fef1cbbe63c1","wit/deps/cli/stdio.wit":"bc6e5e55963d9c49b91d9880d8e50e44a718c5a7b7211bb8cb5d4fcd552b13a8","wit/deps/cli/terminal.wit":"fc87cd0bc3f76ff7181d3666617a38ee10239f8e0344db2a52cb79f46c6b2d31","wit/deps/clocks/monotonic-clock.wit":"ab12521f4522c7bae48fb272fc90f7bf21f83bc3e6b86e400075826628fdcf23","wit/deps/clocks/timezone.wit":"aaabf8145758aa75222a5e18de29a912d5ebb5babc348884fd81b1fa90225adc","wit/deps/clocks/wall-clock.wit":"b7b63d7bbb6631bcc8ce7d25910d47308e6345104dc146513b76ff1d82e1d7a0","wit/deps/clocks/world.wit":"5f066526b320973195e083bc946874b36fc488f8ae5004119c9b5dcd83430660","wit/deps/filesystem/preopens.wit":"1c53bbc639e87efc67440332e186bcc617f1ab0f2a9789c339a69ed0da424358","wit/deps/filesystem/types.wit":"24413900954e7ca1438f3c9b326a6f799b748beab51a297ab687003578f66765","wit/deps/filesystem/world.wit":"70f31a63ada7aeb6be29380aae712406baf91dad72e73de39025e38f41a32cae","wit/deps/http/handler.wit":"1f66174b4058b102367e69ce8aa657b3e9dbc767f6ade960108faaa1731f0945","wit/deps/http/proxy.wit":"c8756768c033db884734f98858b0d448a3a2cb98d9e4584c705f1fc0418422f1","wit/deps/http/types.wit":"82ac209d799643a39309c40d108a9594bebb79312f383ffcf284f23011041e7e","wit/deps/io/error.wit":"ea8a48ed6aa970947f65e378a2e72b878b421d0594b5425349d1c033a138533f","wit/deps/io/poll.wit":"d6eafcf78f220dfc07c4f055019732cc30c526d6d0d0b24150325c5eeef5d041","wit/deps/io/streams.wit":"d4b8980637de85e47459a0144dc1a9b999bfcbfb6ab344f0eceadc5face6135b","wit/deps/io/world.wit":"5572ef45d90cd766282c171a6cc403b3b9567b73e63a413c4eba1b4ad05caf25","wit/deps/random/insecure-seed.wit":"466da73f3aa1065083dd15ffd1d55c8e69b6ec4dfc6c9c149e651a126f60f33c","wit/deps/random/insecure.wit":"0a132cde99268a502973ca112db9da45c0c32870c67d6b92bd3110636c1cd871","wit/deps/random/random.wit":"cebb42f292bada460ab424bb56caf392ad14d4d7dfae1b85dfbc55253c1b751f","wit/deps/random/world.wit":"7d825a7a1624f4a165f6c7abc9aaa77e25618a9fed0c56461df8826965920dc2","wit/deps/sockets/instance-network.wit":"1e4a5d97df44421503a169e1d514eca2cf160f545c44d320ce8a82f726a40cf8","wit/deps/sockets/ip-name-lookup.wit":"c87cc003ff2b92a0d74294418e0d62d12f42f913b94617f73cc09738a46e8fac","wit/deps/sockets/network.wit":"077f76c2f266b3211b0e3fbddf4fbfd9060be050954d44aad9b331419fbe3caf","wit/deps/sockets/tcp-create-socket.wit":"96a6a1a93b859127ee60273f0a77cda8d60930f7952174fb22469293b5da6a3a","wit/deps/sockets/tcp.wit":"ad16e21cae8b67e09f6541fafaf57c88242722871aced8e53aaf018ee63be086","wit/deps/sockets/udp-create-socket.wit":"c52b9bf91ef4e30e7ec08ad1fc9e77ef005a0a87648c5d2e416dd6e35369f08c","wit/deps/sockets/udp.wit":"b8cd7720349cf11278dd30c77799b0255bfc8cbfb2dc2a8dd333f658a88d147e","wit/deps/sockets/world.wit":"84e8071d91f63484a326b5a745728e1964edc55cc90796df7ba042b508325103","wit/wasi-crate.wit":"87b72c92cc7561d7fbedc1c268f310b476f36803890c76257ebe13c0a1c06a5d"},"package":"9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"}
+\ No newline at end of file
++{"files":{".cargo_vcs_info.json":"def0d209896816fde9013e069a564dd3c1a1a46c5ce465d755b878de811f9881",".github/workflows/main.yml":"d38da3f640abbc358cb77a3c27344e9644d472adf7f8e265d00ff49d89226068","CODE_OF_CONDUCT.md":"a13aaaf393818bd91207c618724d3fb74944ca5161201822a84af951bcf655ef","CONTRIBUTING.md":"2c908a3e263dc35dfed131c02ff907cd72fafb2c2096e4ba9b1e0cbb7a1b76df","Cargo.lock":"8cc81d2623344bdc9223c5e4a0530ae94dfa0930d465193719e6d300e2243225","Cargo.toml":"f43ee004589d9330d76d998fe7d9dd88ffd2a3daf5872b60fcaa495f47b02583","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-Apache-2.0_WITH_LLVM-exception":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","ORG_CODE_OF_CONDUCT.md":"a62b69bf86e605ee1bcbb2f0a12ba79e4cebb6983a7b6491949750aecc4f2178","README.md":"aab21c6fad2ca7e2b487764f49018ac8f6f0bf0236dabf5aa947e134952a1c69","SECURITY.md":"4d75afb09dd28eb5982e3a1f768ee398d90204669ceef3240a16b31dcf04148a","ci/regenerate.sh":"2af2cc4f41022d09ce3132013b6a0de7d5ed6fecdb44ad98b1bbd7125643cec8","ci/vendor-wit.sh":"6ea63164316554fa60fc32243595dc79629953cfb63d973678dc715b3b3cd61e","examples/cli-command-no_std.rs":"f03689380e305e5fe32e2582cb10af43d03244c1b343b90ec03936108d67f084","examples/cli-command.rs":"ac21e564ac6fe77c10ebaae774a7ebedeb8b6779826ae86834546cbe28eb8140","examples/hello-world-no_std.rs":"48251e32311e7bda9bc852bf48b8925912ae11d2534f4f7401e0d7dd3c5aeb16","examples/hello-world.rs":"4f9e5cdd74914fb82c6a20dd2544260b8d7dac921f1e0d933ca272c1ffca5163","examples/http-proxy-no_std.rs":"4ec8e31010526ffb68d2b18fd7c31a32de4d58229604efd391d4a296fee22da0","examples/http-proxy.rs":"c52c07f36d3e856bbe4e72bdd484c4129d55f26436cf0631003e451f5322d678","src/bindings.rs":"9db6b925a72119137dbc306687aa6dc61f402ed0b726db7fdb1d7fe9bf893909","src/command.rs":"8e5475c6d4a41ea3b3ec98a918a61bce9dd58cf50a2a27c764bf9796b9cbf299","src/ext/mod.rs":"4bc79c71442ac6c55dc4f8a0632b6d6805c0c9c74b22b56791a483ae447dac0c","src/ext/std.rs":"c35fd8bdafd24a6adef4f5a27e8e4bb421b0e50cebfe350868ded43980b1a06e","src/lib.rs":"044e0df592d1159ce711f17bc27edc87f876951bd3ec1ce72ebabf20e011e84a","src/proxy.rs":"3a05d33e98936642a84c755e8f4db7c5b8de27ed0416614cf4fad8b48c519cdf","wit/deps/cli/command.wit":"f729a20e99a4601f90677e31a16e63f24ee32eef062b9305e94419428c8ff70b","wit/deps/cli/environment.wit":"5e58cd47b162e9f004bc9224a29c2ec3cf9e1a3d4c910154ce53742f828af91f","wit/deps/cli/exit.wit":"a0fae6014751dc95f45b1dbe530b7f4db99d5bd607ed8bbf879b22a906f4514c","wit/deps/cli/imports.wit":"a576c17e15ece40fe29eaeb73f416d6f46ac639f512d51ad20bb915b4686a4dd","wit/deps/cli/run.wit":"a7df5376da8230e0509fffbb8355641af0765cc5cff8064bbe58fef1cbbe63c1","wit/deps/cli/stdio.wit":"bc6e5e55963d9c49b91d9880d8e50e44a718c5a7b7211bb8cb5d4fcd552b13a8","wit/deps/cli/terminal.wit":"fc87cd0bc3f76ff7181d3666617a38ee10239f8e0344db2a52cb79f46c6b2d31","wit/deps/clocks/monotonic-clock.wit":"ab12521f4522c7bae48fb272fc90f7bf21f83bc3e6b86e400075826628fdcf23","wit/deps/clocks/timezone.wit":"aaabf8145758aa75222a5e18de29a912d5ebb5babc348884fd81b1fa90225adc","wit/deps/clocks/wall-clock.wit":"b7b63d7bbb6631bcc8ce7d25910d47308e6345104dc146513b76ff1d82e1d7a0","wit/deps/clocks/world.wit":"5f066526b320973195e083bc946874b36fc488f8ae5004119c9b5dcd83430660","wit/deps/filesystem/preopens.wit":"1c53bbc639e87efc67440332e186bcc617f1ab0f2a9789c339a69ed0da424358","wit/deps/filesystem/types.wit":"24413900954e7ca1438f3c9b326a6f799b748beab51a297ab687003578f66765","wit/deps/filesystem/world.wit":"70f31a63ada7aeb6be29380aae712406baf91dad72e73de39025e38f41a32cae","wit/deps/http/handler.wit":"1f66174b4058b102367e69ce8aa657b3e9dbc767f6ade960108faaa1731f0945","wit/deps/http/proxy.wit":"c8756768c033db884734f98858b0d448a3a2cb98d9e4584c705f1fc0418422f1","wit/deps/http/types.wit":"82ac209d799643a39309c40d108a9594bebb79312f383ffcf284f23011041e7e","wit/deps/io/error.wit":"ea8a48ed6aa970947f65e378a2e72b878b421d0594b5425349d1c033a138533f","wit/deps/io/poll.wit":"d6eafcf78f220dfc07c4f055019732cc30c526d6d0d0b24150325c5eeef5d041","wit/deps/io/streams.wit":"d4b8980637de85e47459a0144dc1a9b999bfcbfb6ab344f0eceadc5face6135b","wit/deps/io/world.wit":"5572ef45d90cd766282c171a6cc403b3b9567b73e63a413c4eba1b4ad05caf25","wit/deps/random/insecure-seed.wit":"466da73f3aa1065083dd15ffd1d55c8e69b6ec4dfc6c9c149e651a126f60f33c","wit/deps/random/insecure.wit":"0a132cde99268a502973ca112db9da45c0c32870c67d6b92bd3110636c1cd871","wit/deps/random/random.wit":"cebb42f292bada460ab424bb56caf392ad14d4d7dfae1b85dfbc55253c1b751f","wit/deps/random/world.wit":"7d825a7a1624f4a165f6c7abc9aaa77e25618a9fed0c56461df8826965920dc2","wit/deps/sockets/instance-network.wit":"1e4a5d97df44421503a169e1d514eca2cf160f545c44d320ce8a82f726a40cf8","wit/deps/sockets/ip-name-lookup.wit":"c87cc003ff2b92a0d74294418e0d62d12f42f913b94617f73cc09738a46e8fac","wit/deps/sockets/network.wit":"077f76c2f266b3211b0e3fbddf4fbfd9060be050954d44aad9b331419fbe3caf","wit/deps/sockets/tcp-create-socket.wit":"96a6a1a93b859127ee60273f0a77cda8d60930f7952174fb22469293b5da6a3a","wit/deps/sockets/tcp.wit":"ad16e21cae8b67e09f6541fafaf57c88242722871aced8e53aaf018ee63be086","wit/deps/sockets/udp-create-socket.wit":"c52b9bf91ef4e30e7ec08ad1fc9e77ef005a0a87648c5d2e416dd6e35369f08c","wit/deps/sockets/udp.wit":"b8cd7720349cf11278dd30c77799b0255bfc8cbfb2dc2a8dd333f658a88d147e","wit/deps/sockets/world.wit":"84e8071d91f63484a326b5a745728e1964edc55cc90796df7ba042b508325103","wit/wasi-crate.wit":"87b72c92cc7561d7fbedc1c268f310b476f36803890c76257ebe13c0a1c06a5d"},"package":"9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"}
+\ No newline at end of file
+diff --git comm/third_party/rust/yaml-rust2/.cargo-checksum.json comm/third_party/rust/yaml-rust2/.cargo-checksum.json
+index bc11e9c2284..d71f6a0eb51 100644
+--- comm/third_party/rust/yaml-rust2/.cargo-checksum.json
++++ comm/third_party/rust/yaml-rust2/.cargo-checksum.json
+@@ -1 +1 @@
+-{"files":{".cargo/config.toml":"0561dd764201cb870fb7e7a5c69462e06662b165bd5c9ef3cb249f9f1ba3d5a3",".cargo_vcs_info.json":"3dd9da8d0fa45015e7340b66aff753bbc9c7d2775e80ee528e3f4de035cee7a7",".github/renovate.json5":"d90937d0ff478041a7f0365d0ba3df4995b9fc04d415749672609f3cb8a413b9",".github/workflows/ci.yml":"36bb96e71c33ac40d135611e32354816adbeaac593c603366fb69f302ba93fae",".gitmodules":"b0a5c754159a9ef66c8cf0d8d6ee9141edf49823fe5281b0a41d09e20b504d9a",".licenses/Apache-LICENSE":"278f0e5c23f023a2f1af8d528dd5c29dc3a5ea2dd63558aa8d4f077c09e037c7",".licenses/MIT-LICENSE":"3dd30063cdb4a378736348c215cb84b78b0711ba7e39903162cae5ce71dc9757","CHANGELOG.md":"ecc8eaf37df1427c7c6c30895e8c21c348e41b3b3401d2946c1fa6ebbf36417c","Cargo.lock":"98e5cd23c6340002c2bcb1cbfacedc4280214a6b33e70e9942dcfe8e608f77ad","Cargo.toml":"695cb71a87a478964b29d8be16181ecca82275bbd0277344b18f621d4eb46d02","Cargo.toml.orig":"400d33c1955e188c38ee8be5a37ed0b600f3ab97c01bdcfe002ff285bbd75394","LICENSE":"73b58b558451168be8f0dc8e4ff2abdeb1b63ec005ad6cfe8df403558208be05","README.md":"b9a94cb458e10d087392ff9fc70ec051e1ef5db081189d7540b431eaa7ee6057","appveyor.yml":"becabe3922fd9bc72331ea1314a691898bb196b6555b4d32d20a67820c122687","examples/dump_yaml.rs":"d336e0249ad1b8237bdd8276c4cd09630c7655c95fec4f16b8e893daf93e8a51","garden.yaml":"e5b31835307c1d11bd9add455771a9ada697a7833f9cbb32c141fe181e8a4ce8","justfile":"0c58141a987e2d4f5d516e90955a371014f34d0501828878c9792079b6aaed9e","src/char_traits.rs":"fad4a25ac9a57e2865efa4e4539f290d91245aaf31cf5f7a7b0e8ae2070a1c58","src/debug.rs":"3147dd79c1ec80fd0c87b072fc0b522ef75b97b2f2339bdc1b58750aed28a294","src/emitter.rs":"22b3eff5e1f9c2db3d172e2faa15fbc021b95f5e33df2c0093f63733b385636f","src/lib.rs":"7084563aeba95f703d08b33ae84788d7eb2e78500709dd3a1975b7ab55ec7393","src/parser.rs":"d6258b26d27641163f07d83bc31aa94436f23006307909835e8d4b4f8d390cd3","src/scanner.rs":"bed2602e7db02d7cf893d1d2d2eae1bf0cb690fb832a0be905dd375304151f2e","src/yaml.rs":"62e90b190b19f524e814933fd6669ebb3c4f90268d056dca2e99d9df263d3941","tests/basic.rs":"4e0be69e4d59804bdf68cdf220f6b832422f8b15cf343712c270c7f80e94e7f3","tests/emitter.rs":"3d8bcbe894c2991b6527ae64cbd73c8cb3df910515dc543e4781c0f2f56a1b47","tests/quickcheck.rs":"e59756f7bdc57689428edce2bafdc65738545f2ff1c69799064ea72c2eea0d86","tests/scanner.rs":"489aae78ce85672f0a56d8cb48344342b4af025fea17ccde7de0315a8869fbc0","tests/spec_test.rs":"6eb3ea4469c6b4966f22884beebe08f6d253b78dc854166e4694c0fb4d4072f6","tests/spec_test.rs.inc":"544c4d483bbde2401d869c6bf3f2246d3b79fbd13686186acf008f1e19cc86f6","tests/specexamples.rs.inc":"3bec1a152b4597b0d8f4d87450bc7901a1f999ab695b3516c746a2156ab6c0a5","tests/test_round_trip.rs":"57a53f3a86d3666a3d4d172df91ccbd636f0f57c97549d773b81f9503db46473","tests/yaml-test-suite.rs":"bd3dc0bcc427ea4221e926ce0801222e24d30f628cb8dafd4163c19a1e259b36","tools/README.md":"7877161257563c0cd8ea9c959d4e254dc32c66bcf04bf1c2afa95c4ffe0c9371","tools/dump_events.rs":"c41346af2b0344e7cf793031717167ba1ebfb5f3e5710097601bd4d8e51f95d9","tools/run_bench.rs":"055a6b8271406df6ef74f7395e55320107da97dd14a7a2b4be5a762df084d811","tools/time_parse.rs":"f5d82eb29ba7ee17ed272cd61ee97b395a18c8f2ed2cd90b3c599cb2eef17935"},"package":"4ce2a4ff45552406d02501cea6c18d8a7e50228e7736a872951fe2fe75c91be7"}
+\ No newline at end of file
++{"files":{".cargo/config.toml":"0561dd764201cb870fb7e7a5c69462e06662b165bd5c9ef3cb249f9f1ba3d5a3",".cargo_vcs_info.json":"3dd9da8d0fa45015e7340b66aff753bbc9c7d2775e80ee528e3f4de035cee7a7",".github/renovate.json5":"d90937d0ff478041a7f0365d0ba3df4995b9fc04d415749672609f3cb8a413b9",".github/workflows/ci.yml":"36bb96e71c33ac40d135611e32354816adbeaac593c603366fb69f302ba93fae",".licenses/Apache-LICENSE":"278f0e5c23f023a2f1af8d528dd5c29dc3a5ea2dd63558aa8d4f077c09e037c7",".licenses/MIT-LICENSE":"3dd30063cdb4a378736348c215cb84b78b0711ba7e39903162cae5ce71dc9757","CHANGELOG.md":"ecc8eaf37df1427c7c6c30895e8c21c348e41b3b3401d2946c1fa6ebbf36417c","Cargo.lock":"98e5cd23c6340002c2bcb1cbfacedc4280214a6b33e70e9942dcfe8e608f77ad","Cargo.toml":"695cb71a87a478964b29d8be16181ecca82275bbd0277344b18f621d4eb46d02","Cargo.toml.orig":"400d33c1955e188c38ee8be5a37ed0b600f3ab97c01bdcfe002ff285bbd75394","LICENSE":"73b58b558451168be8f0dc8e4ff2abdeb1b63ec005ad6cfe8df403558208be05","README.md":"b9a94cb458e10d087392ff9fc70ec051e1ef5db081189d7540b431eaa7ee6057","appveyor.yml":"becabe3922fd9bc72331ea1314a691898bb196b6555b4d32d20a67820c122687","examples/dump_yaml.rs":"d336e0249ad1b8237bdd8276c4cd09630c7655c95fec4f16b8e893daf93e8a51","garden.yaml":"e5b31835307c1d11bd9add455771a9ada697a7833f9cbb32c141fe181e8a4ce8","justfile":"0c58141a987e2d4f5d516e90955a371014f34d0501828878c9792079b6aaed9e","src/char_traits.rs":"fad4a25ac9a57e2865efa4e4539f290d91245aaf31cf5f7a7b0e8ae2070a1c58","src/debug.rs":"3147dd79c1ec80fd0c87b072fc0b522ef75b97b2f2339bdc1b58750aed28a294","src/emitter.rs":"22b3eff5e1f9c2db3d172e2faa15fbc021b95f5e33df2c0093f63733b385636f","src/lib.rs":"7084563aeba95f703d08b33ae84788d7eb2e78500709dd3a1975b7ab55ec7393","src/parser.rs":"d6258b26d27641163f07d83bc31aa94436f23006307909835e8d4b4f8d390cd3","src/scanner.rs":"bed2602e7db02d7cf893d1d2d2eae1bf0cb690fb832a0be905dd375304151f2e","src/yaml.rs":"62e90b190b19f524e814933fd6669ebb3c4f90268d056dca2e99d9df263d3941","tests/basic.rs":"4e0be69e4d59804bdf68cdf220f6b832422f8b15cf343712c270c7f80e94e7f3","tests/emitter.rs":"3d8bcbe894c2991b6527ae64cbd73c8cb3df910515dc543e4781c0f2f56a1b47","tests/quickcheck.rs":"e59756f7bdc57689428edce2bafdc65738545f2ff1c69799064ea72c2eea0d86","tests/scanner.rs":"489aae78ce85672f0a56d8cb48344342b4af025fea17ccde7de0315a8869fbc0","tests/spec_test.rs":"6eb3ea4469c6b4966f22884beebe08f6d253b78dc854166e4694c0fb4d4072f6","tests/spec_test.rs.inc":"544c4d483bbde2401d869c6bf3f2246d3b79fbd13686186acf008f1e19cc86f6","tests/specexamples.rs.inc":"3bec1a152b4597b0d8f4d87450bc7901a1f999ab695b3516c746a2156ab6c0a5","tests/test_round_trip.rs":"57a53f3a86d3666a3d4d172df91ccbd636f0f57c97549d773b81f9503db46473","tests/yaml-test-suite.rs":"bd3dc0bcc427ea4221e926ce0801222e24d30f628cb8dafd4163c19a1e259b36","tools/README.md":"7877161257563c0cd8ea9c959d4e254dc32c66bcf04bf1c2afa95c4ffe0c9371","tools/dump_events.rs":"c41346af2b0344e7cf793031717167ba1ebfb5f3e5710097601bd4d8e51f95d9","tools/run_bench.rs":"055a6b8271406df6ef74f7395e55320107da97dd14a7a2b4be5a762df084d811","tools/time_parse.rs":"f5d82eb29ba7ee17ed272cd61ee97b395a18c8f2ed2cd90b3c599cb2eef17935"},"package":"4ce2a4ff45552406d02501cea6c18d8a7e50228e7736a872951fe2fe75c91be7"}
+\ No newline at end of file
diff --git a/mail/thunderbird/files/patch-libwebrtc-generated b/mail/thunderbird/files/patch-libwebrtc-generated
index 870dbd0fc349..78aafcf7ed70 100644
--- a/mail/thunderbird/files/patch-libwebrtc-generated
+++ b/mail/thunderbird/files/patch-libwebrtc-generated
@@ -1,22 +1,13 @@
-commit 91d5feee32ac273c405d11b7533478e125ba1b28
+commit 462d04e65b861f39087a21d6124fde12a17f17e3
 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
-Date:   Tue Nov 25 22:46:47 2025 +0000
 
-    regenerate FreeBSD libwebrtc patch for gecko 146
+    regenerate FreeBSD libwebrtc patch for gecko 147
 
 diff --git third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
-index aee79e4f8762..53fb767b2713 100644
+index a4922c66929f..210a9a828897 100644
 --- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
 +++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -24,6 +15,7 @@ index aee79e4f8762..53fb767b2713 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -32,23 +24,18 @@ index aee79e4f8762..53fb767b2713 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -67,10 +54,6 @@ index aee79e4f8762..53fb767b2713 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -78,10 +61,6 @@ index aee79e4f8762..53fb767b2713 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -89,7 +68,6 @@ index aee79e4f8762..53fb767b2713 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -97,10 +75,6 @@ index aee79e4f8762..53fb767b2713 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -113,10 +87,6 @@ index aee79e4f8762..53fb767b2713 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -147,7 +117,7 @@ index aee79e4f8762..53fb767b2713 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -234,7 +204,7 @@ index aee79e4f8762..53fb767b2713 100644
  
  Library("resource_adaptation_api_gn")
 diff --git third_party/libwebrtc/api/array_view_gn/moz.build third_party/libwebrtc/api/array_view_gn/moz.build
-index bd1db8d43c59..b9b8f890ae52 100644
+index f1102c30059a..d2ebee0ec710 100644
 --- third_party/libwebrtc/api/array_view_gn/moz.build
 +++ third_party/libwebrtc/api/array_view_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -245,6 +215,7 @@ index bd1db8d43c59..b9b8f890ae52 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -253,13 +224,12 @@ index bd1db8d43c59..b9b8f890ae52 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -298,7 +268,6 @@ index bd1db8d43c59..b9b8f890ae52 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -348,7 +317,7 @@ index bd1db8d43c59..b9b8f890ae52 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -374,7 +343,7 @@ index bd1db8d43c59..b9b8f890ae52 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -416,7 +385,7 @@ index bd1db8d43c59..b9b8f890ae52 100644
 -
  Library("array_view_gn")
 diff --git third_party/libwebrtc/api/async_dns_resolver_gn/moz.build third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
-index 02d940bac470..eaca805506ef 100644
+index b4939a5514c1..1c688af7efa3 100644
 --- third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
 +++ third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -427,6 +396,7 @@ index 02d940bac470..eaca805506ef 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -435,13 +405,12 @@ index 02d940bac470..eaca805506ef 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -481,7 +450,6 @@ index 02d940bac470..eaca805506ef 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -538,7 +506,7 @@ index 02d940bac470..eaca805506ef 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -564,7 +532,7 @@ index 02d940bac470..eaca805506ef 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -606,18 +574,10 @@ index 02d940bac470..eaca805506ef 100644
 -
  Library("async_dns_resolver_gn")
 diff --git third_party/libwebrtc/api/audio/aec3_config_gn/moz.build third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-index 9281d07ae0fd..6b5d596ace4a 100644
+index 4ae595bcba6d..3e9fbb0332ff 100644
 --- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -625,6 +585,7 @@ index 9281d07ae0fd..6b5d596ace4a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -633,23 +594,18 @@ index 9281d07ae0fd..6b5d596ace4a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -668,10 +624,6 @@ index 9281d07ae0fd..6b5d596ace4a 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -679,10 +631,6 @@ index 9281d07ae0fd..6b5d596ace4a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -690,7 +638,6 @@ index 9281d07ae0fd..6b5d596ace4a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -698,10 +645,6 @@ index 9281d07ae0fd..6b5d596ace4a 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -714,10 +657,6 @@ index 9281d07ae0fd..6b5d596ace4a 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -748,7 +687,7 @@ index 9281d07ae0fd..6b5d596ace4a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -835,18 +774,10 @@ index 9281d07ae0fd..6b5d596ace4a 100644
  
  Library("aec3_config_gn")
 diff --git third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-index 21a38089fa53..9edfe25c428b 100644
+index 6f88ea8491e1..9fe5afa4dd03 100644
 --- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
 +++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -855,6 +786,7 @@ index 21a38089fa53..9edfe25c428b 100644
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -863,23 +795,18 @@ index 21a38089fa53..9edfe25c428b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -898,10 +825,6 @@ index 21a38089fa53..9edfe25c428b 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -909,10 +832,6 @@ index 21a38089fa53..9edfe25c428b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -920,7 +839,6 @@ index 21a38089fa53..9edfe25c428b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -928,10 +846,6 @@ index 21a38089fa53..9edfe25c428b 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -944,10 +858,6 @@ index 21a38089fa53..9edfe25c428b 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -985,7 +895,7 @@ index 21a38089fa53..9edfe25c428b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -1043,10 +953,10 @@ index 21a38089fa53..9edfe25c428b 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -1057,10 +967,10 @@ index 21a38089fa53..9edfe25c428b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -1072,7 +982,7 @@ index 21a38089fa53..9edfe25c428b 100644
  
  Library("aec3_factory_gn")
 diff --git third_party/libwebrtc/api/audio/audio_device_gn/moz.build third_party/libwebrtc/api/audio/audio_device_gn/moz.build
-index ec9e287800f9..8406c1f27370 100644
+index 8e0dddd4c23e..1812ab6bedf8 100644
 --- third_party/libwebrtc/api/audio/audio_device_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_device_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -1083,6 +993,7 @@ index ec9e287800f9..8406c1f27370 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -1091,13 +1002,12 @@ index ec9e287800f9..8406c1f27370 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1136,7 +1046,6 @@ index ec9e287800f9..8406c1f27370 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -1186,7 +1095,7 @@ index ec9e287800f9..8406c1f27370 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -1212,7 +1121,7 @@ index ec9e287800f9..8406c1f27370 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -1254,18 +1163,10 @@ index ec9e287800f9..8406c1f27370 100644
 -
  Library("audio_device_gn")
 diff --git third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-index 48004d56d26c..eead287814ee 100644
+index fb633e3930e2..9ba8edf80c44 100644
 --- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -1273,6 +1174,7 @@ index 48004d56d26c..eead287814ee 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -1281,23 +1183,18 @@ index 48004d56d26c..eead287814ee 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -1316,10 +1213,6 @@ index 48004d56d26c..eead287814ee 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -1327,10 +1220,6 @@ index 48004d56d26c..eead287814ee 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -1338,7 +1227,6 @@ index 48004d56d26c..eead287814ee 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -1346,10 +1234,6 @@ index 48004d56d26c..eead287814ee 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -1362,10 +1246,6 @@ index 48004d56d26c..eead287814ee 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -1403,7 +1283,7 @@ index 48004d56d26c..eead287814ee 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -1461,10 +1341,10 @@ index 48004d56d26c..eead287814ee 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -1475,10 +1355,10 @@ index 48004d56d26c..eead287814ee 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -1490,7 +1370,7 @@ index 48004d56d26c..eead287814ee 100644
  
  Library("audio_frame_api_gn")
 diff --git third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
-index e24b887aca02..afe5ea321104 100644
+index 0088f18ad2dc..8228190616ec 100644
 --- third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -1501,6 +1381,7 @@ index e24b887aca02..afe5ea321104 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -1509,13 +1390,12 @@ index e24b887aca02..afe5ea321104 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1550,7 +1430,6 @@ index e24b887aca02..afe5ea321104 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -1600,7 +1479,7 @@ index e24b887aca02..afe5ea321104 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -1626,7 +1505,7 @@ index e24b887aca02..afe5ea321104 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -1668,7 +1547,7 @@ index e24b887aca02..afe5ea321104 100644
 -
  Library("audio_frame_processor_gn")
 diff --git third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
-index c71e4aefc473..d5094f32fe87 100644
+index 28b98ffce7a9..ac544c619786 100644
 --- third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -1679,6 +1558,7 @@ index c71e4aefc473..d5094f32fe87 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -1687,13 +1567,12 @@ index c71e4aefc473..d5094f32fe87 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1732,7 +1611,6 @@ index c71e4aefc473..d5094f32fe87 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -1789,7 +1667,7 @@ index c71e4aefc473..d5094f32fe87 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -1815,7 +1693,7 @@ index c71e4aefc473..d5094f32fe87 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -1857,18 +1735,10 @@ index c71e4aefc473..d5094f32fe87 100644
 -
  Library("audio_mixer_api_gn")
 diff --git third_party/libwebrtc/api/audio/audio_processing_gn/moz.build third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
-index d978579b2abd..8ca9f207ec62 100644
+index cdd225e6797e..bc5318d09ca8 100644
 --- third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -1876,6 +1746,7 @@ index d978579b2abd..8ca9f207ec62 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -1884,23 +1755,18 @@ index d978579b2abd..8ca9f207ec62 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -1919,10 +1785,6 @@ index d978579b2abd..8ca9f207ec62 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -1930,10 +1792,6 @@ index d978579b2abd..8ca9f207ec62 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -1941,7 +1799,6 @@ index d978579b2abd..8ca9f207ec62 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -1949,10 +1806,6 @@ index d978579b2abd..8ca9f207ec62 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -1965,10 +1818,6 @@ index d978579b2abd..8ca9f207ec62 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -2006,7 +1855,7 @@ index d978579b2abd..8ca9f207ec62 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -2064,10 +1913,10 @@ index d978579b2abd..8ca9f207ec62 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -2078,10 +1927,10 @@ index d978579b2abd..8ca9f207ec62 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -2093,18 +1942,10 @@ index d978579b2abd..8ca9f207ec62 100644
  
  Library("audio_processing_gn")
 diff --git third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build
-index bcbad6855330..fc175bc15db7 100644
+index 5e452f4c3ed0..fcb573b9c8c6 100644
 --- third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -2112,6 +1953,7 @@ index bcbad6855330..fc175bc15db7 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -2120,23 +1962,18 @@ index bcbad6855330..fc175bc15db7 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -2151,10 +1988,6 @@ index bcbad6855330..fc175bc15db7 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -2162,10 +1995,6 @@ index bcbad6855330..fc175bc15db7 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -2173,7 +2002,6 @@ index bcbad6855330..fc175bc15db7 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -2181,10 +2009,6 @@ index bcbad6855330..fc175bc15db7 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -2197,10 +2021,6 @@ index bcbad6855330..fc175bc15db7 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -2231,7 +2051,7 @@ index bcbad6855330..fc175bc15db7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -2289,10 +2109,10 @@ index bcbad6855330..fc175bc15db7 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -2303,10 +2123,10 @@ index bcbad6855330..fc175bc15db7 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -2318,18 +2138,10 @@ index bcbad6855330..fc175bc15db7 100644
  
  Library("audio_processing_statistics_gn")
 diff --git third_party/libwebrtc/api/audio/builtin_audio_processing_builder_gn/moz.build third_party/libwebrtc/api/audio/builtin_audio_processing_builder_gn/moz.build
-index 91819267ea18..190da4597629 100644
+index 23730cb4c781..b3c9022f62d2 100644
 --- third_party/libwebrtc/api/audio/builtin_audio_processing_builder_gn/moz.build
 +++ third_party/libwebrtc/api/audio/builtin_audio_processing_builder_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -2338,6 +2150,7 @@ index 91819267ea18..190da4597629 100644
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -2346,23 +2159,18 @@ index 91819267ea18..190da4597629 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -2381,10 +2189,6 @@ index 91819267ea18..190da4597629 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -2392,10 +2196,6 @@ index 91819267ea18..190da4597629 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -2403,7 +2203,6 @@ index 91819267ea18..190da4597629 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -2411,10 +2210,6 @@ index 91819267ea18..190da4597629 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -2427,10 +2222,6 @@ index 91819267ea18..190da4597629 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -2468,7 +2259,7 @@ index 91819267ea18..190da4597629 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -2526,10 +2317,10 @@ index 91819267ea18..190da4597629 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -2540,10 +2331,10 @@ index 91819267ea18..190da4597629 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -2555,7 +2346,7 @@ index 91819267ea18..190da4597629 100644
  
  Library("builtin_audio_processing_builder_gn")
 diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-index 0447b43cda76..e63333ff3a68 100644
+index 003dd55e4b8c..a7421daf3fc4 100644
 --- third_party/libwebrtc/api/audio/echo_control_gn/moz.build
 +++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -2566,6 +2357,7 @@ index 0447b43cda76..e63333ff3a68 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -2574,13 +2366,12 @@ index 0447b43cda76..e63333ff3a68 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2619,7 +2410,6 @@ index 0447b43cda76..e63333ff3a68 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -2676,7 +2466,7 @@ index 0447b43cda76..e63333ff3a68 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -2702,7 +2492,7 @@ index 0447b43cda76..e63333ff3a68 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -2744,18 +2534,10 @@ index 0447b43cda76..e63333ff3a68 100644
 -
  Library("echo_control_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
-index ddc08b43582a..3474430e39d6 100644
+index 6877f2e2caba..0a94c771f597 100644
 --- third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -2763,6 +2545,7 @@ index ddc08b43582a..3474430e39d6 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -2771,23 +2554,18 @@ index ddc08b43582a..3474430e39d6 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -2806,10 +2584,6 @@ index ddc08b43582a..3474430e39d6 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -2817,10 +2591,6 @@ index ddc08b43582a..3474430e39d6 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -2828,7 +2598,6 @@ index ddc08b43582a..3474430e39d6 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -2836,10 +2605,6 @@ index ddc08b43582a..3474430e39d6 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -2852,10 +2617,6 @@ index ddc08b43582a..3474430e39d6 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -2893,7 +2654,7 @@ index ddc08b43582a..3474430e39d6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -2951,10 +2712,10 @@ index ddc08b43582a..3474430e39d6 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -2965,10 +2726,10 @@ index ddc08b43582a..3474430e39d6 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -2980,18 +2741,10 @@ index ddc08b43582a..3474430e39d6 100644
  
  Library("audio_decoder_L16_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
-index 4f20b35f175a..c897f5d972c6 100644
+index 107e5544da1b..44b16b46dd4b 100644
 --- third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -2999,6 +2752,7 @@ index 4f20b35f175a..c897f5d972c6 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -3007,23 +2761,18 @@ index 4f20b35f175a..c897f5d972c6 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -3042,10 +2791,6 @@ index 4f20b35f175a..c897f5d972c6 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -3053,10 +2798,6 @@ index 4f20b35f175a..c897f5d972c6 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -3064,7 +2805,6 @@ index 4f20b35f175a..c897f5d972c6 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -3072,10 +2812,6 @@ index 4f20b35f175a..c897f5d972c6 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -3088,10 +2824,6 @@ index 4f20b35f175a..c897f5d972c6 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -3129,7 +2861,7 @@ index 4f20b35f175a..c897f5d972c6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -3187,10 +2919,10 @@ index 4f20b35f175a..c897f5d972c6 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -3201,10 +2933,10 @@ index 4f20b35f175a..c897f5d972c6 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -3216,18 +2948,10 @@ index 4f20b35f175a..c897f5d972c6 100644
  
  Library("audio_encoder_L16_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
-index 34219b497edb..f92b57a92fad 100644
+index 2fcb098ef1df..624eb7a63ed3 100644
 --- third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -3235,6 +2959,7 @@ index 34219b497edb..f92b57a92fad 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -3243,23 +2968,18 @@ index 34219b497edb..f92b57a92fad 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -3278,10 +2998,6 @@ index 34219b497edb..f92b57a92fad 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -3289,10 +3005,6 @@ index 34219b497edb..f92b57a92fad 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -3300,7 +3012,6 @@ index 34219b497edb..f92b57a92fad 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -3308,10 +3019,6 @@ index 34219b497edb..f92b57a92fad 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -3324,10 +3031,6 @@ index 34219b497edb..f92b57a92fad 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -3365,7 +3068,7 @@ index 34219b497edb..f92b57a92fad 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -3423,10 +3126,10 @@ index 34219b497edb..f92b57a92fad 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -3437,10 +3140,10 @@ index 34219b497edb..f92b57a92fad 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -3452,18 +3155,10 @@ index 34219b497edb..f92b57a92fad 100644
  
  Library("audio_codecs_api_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
-index dd1fb2ab90f9..9ca2d1b9cc08 100644
+index 2dfec6bd8ace..2c87cb06e541 100644
 --- third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -3471,6 +3166,7 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -3480,23 +3176,18 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -3515,10 +3206,6 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -3526,10 +3213,6 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -3537,7 +3220,6 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -3545,10 +3227,6 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -3561,10 +3239,6 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -3602,7 +3276,7 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -3660,10 +3334,10 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -3674,10 +3348,10 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -3689,18 +3363,10 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
  
  Library("builtin_audio_decoder_factory_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
-index 5c50f1d023a5..f4d3b969a2d8 100644
+index 559645de2de6..8af7c3467f2b 100644
 --- third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -3708,6 +3374,7 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -3717,23 +3384,18 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -3752,10 +3414,6 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -3763,10 +3421,6 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -3774,7 +3428,6 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -3782,10 +3435,6 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -3798,10 +3447,6 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -3839,7 +3484,7 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -3897,10 +3542,10 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -3911,10 +3556,10 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -3926,18 +3571,10 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
  
  Library("builtin_audio_encoder_factory_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
-index ff5f3ef6bb92..4ad68a39c2ef 100644
+index ad147399181d..b24120ede667 100644
 --- third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -3945,6 +3582,7 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -3953,23 +3591,18 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -3988,10 +3621,6 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -3999,10 +3628,6 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -4010,7 +3635,6 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -4018,10 +3642,6 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -4034,10 +3654,6 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -4075,7 +3691,7 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -4133,10 +3749,10 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -4147,10 +3763,10 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -4162,18 +3778,10 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
  
  Library("audio_decoder_g711_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
-index e06f9a48fb40..29c1063fe54f 100644
+index 6433c15e39ea..e2eb177fab83 100644
 --- third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -4181,6 +3789,7 @@ index e06f9a48fb40..29c1063fe54f 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -4189,23 +3798,18 @@ index e06f9a48fb40..29c1063fe54f 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -4224,10 +3828,6 @@ index e06f9a48fb40..29c1063fe54f 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -4235,10 +3835,6 @@ index e06f9a48fb40..29c1063fe54f 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -4246,7 +3842,6 @@ index e06f9a48fb40..29c1063fe54f 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -4254,10 +3849,6 @@ index e06f9a48fb40..29c1063fe54f 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -4270,10 +3861,6 @@ index e06f9a48fb40..29c1063fe54f 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -4311,7 +3898,7 @@ index e06f9a48fb40..29c1063fe54f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -4369,10 +3956,10 @@ index e06f9a48fb40..29c1063fe54f 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -4383,10 +3970,10 @@ index e06f9a48fb40..29c1063fe54f 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -4398,18 +3985,10 @@ index e06f9a48fb40..29c1063fe54f 100644
  
  Library("audio_encoder_g711_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
-index 3bf3cbe2d4c3..57d954de06c2 100644
+index e1a1d3c8e9d4..77c49f946aeb 100644
 --- third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -4417,6 +3996,7 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -4425,23 +4005,18 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -4460,10 +4035,6 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -4471,10 +4042,6 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -4482,7 +4049,6 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -4490,10 +4056,6 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -4506,10 +4068,6 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -4547,7 +4105,7 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -4605,10 +4163,10 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -4619,10 +4177,10 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -4634,7 +4192,7 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
  
  Library("audio_decoder_g722_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
-index 69b390a8d78d..da241ca25304 100644
+index 7254662163f2..3046572aba75 100644
 --- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -4645,6 +4203,7 @@ index 69b390a8d78d..da241ca25304 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -4653,13 +4212,12 @@ index 69b390a8d78d..da241ca25304 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4698,7 +4256,6 @@ index 69b390a8d78d..da241ca25304 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -4755,7 +4312,7 @@ index 69b390a8d78d..da241ca25304 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -4781,7 +4338,7 @@ index 69b390a8d78d..da241ca25304 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -4823,18 +4380,10 @@ index 69b390a8d78d..da241ca25304 100644
 -
  Library("audio_encoder_g722_config_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
-index 4a214578903a..b263dc5c5671 100644
+index 7d9475c9e15e..d35fe3533ed8 100644
 --- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -4842,6 +4391,7 @@ index 4a214578903a..b263dc5c5671 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -4850,23 +4400,18 @@ index 4a214578903a..b263dc5c5671 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -4885,10 +4430,6 @@ index 4a214578903a..b263dc5c5671 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -4896,10 +4437,6 @@ index 4a214578903a..b263dc5c5671 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -4907,7 +4444,6 @@ index 4a214578903a..b263dc5c5671 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -4915,10 +4451,6 @@ index 4a214578903a..b263dc5c5671 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -4931,10 +4463,6 @@ index 4a214578903a..b263dc5c5671 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -4972,7 +4500,7 @@ index 4a214578903a..b263dc5c5671 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -5030,10 +4558,10 @@ index 4a214578903a..b263dc5c5671 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -5044,10 +4572,10 @@ index 4a214578903a..b263dc5c5671 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -5059,18 +4587,10 @@ index 4a214578903a..b263dc5c5671 100644
  
  Library("audio_encoder_g722_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
-index 7cdb268dfead..516dbbf91567 100644
+index 8d5b597b98cd..3c9f2c3b50cb 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -5078,6 +4598,7 @@ index 7cdb268dfead..516dbbf91567 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -5086,23 +4607,18 @@ index 7cdb268dfead..516dbbf91567 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -5121,10 +4637,6 @@ index 7cdb268dfead..516dbbf91567 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -5132,10 +4644,6 @@ index 7cdb268dfead..516dbbf91567 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -5143,7 +4651,6 @@ index 7cdb268dfead..516dbbf91567 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -5151,10 +4658,6 @@ index 7cdb268dfead..516dbbf91567 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -5167,10 +4670,6 @@ index 7cdb268dfead..516dbbf91567 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -5208,7 +4707,7 @@ index 7cdb268dfead..516dbbf91567 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -5266,10 +4765,10 @@ index 7cdb268dfead..516dbbf91567 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -5280,10 +4779,10 @@ index 7cdb268dfead..516dbbf91567 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -5295,7 +4794,7 @@ index 7cdb268dfead..516dbbf91567 100644
  
  Library("audio_decoder_multiopus_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
-index 0de46076d269..7f2da454fead 100644
+index 35c1f3b1d7dc..eeb1e3e24104 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -5306,6 +4805,7 @@ index 0de46076d269..7f2da454fead 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -5314,13 +4814,12 @@ index 0de46076d269..7f2da454fead 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5359,7 +4858,6 @@ index 0de46076d269..7f2da454fead 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -5416,7 +4914,7 @@ index 0de46076d269..7f2da454fead 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -5442,7 +4940,7 @@ index 0de46076d269..7f2da454fead 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -5484,18 +4982,10 @@ index 0de46076d269..7f2da454fead 100644
 -
  Library("audio_decoder_opus_config_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
-index ff8d5a8a045d..4eb2e353971f 100644
+index cf0f5ac728d5..21a0df0059f5 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -5503,6 +4993,7 @@ index ff8d5a8a045d..4eb2e353971f 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -5511,23 +5002,18 @@ index ff8d5a8a045d..4eb2e353971f 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -5546,10 +5032,6 @@ index ff8d5a8a045d..4eb2e353971f 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -5557,10 +5039,6 @@ index ff8d5a8a045d..4eb2e353971f 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -5568,7 +5046,6 @@ index ff8d5a8a045d..4eb2e353971f 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -5576,10 +5053,6 @@ index ff8d5a8a045d..4eb2e353971f 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -5592,10 +5065,6 @@ index ff8d5a8a045d..4eb2e353971f 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -5633,7 +5102,7 @@ index ff8d5a8a045d..4eb2e353971f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -5691,10 +5160,10 @@ index ff8d5a8a045d..4eb2e353971f 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -5705,10 +5174,10 @@ index ff8d5a8a045d..4eb2e353971f 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -5720,18 +5189,10 @@ index ff8d5a8a045d..4eb2e353971f 100644
  
  Library("audio_decoder_opus_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
-index d8667c0e683b..1c7456f0533e 100644
+index 2a92d825dff0..1acf41cea4cc 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -5739,6 +5200,7 @@ index d8667c0e683b..1c7456f0533e 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -5747,23 +5209,18 @@ index d8667c0e683b..1c7456f0533e 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -5782,10 +5239,6 @@ index d8667c0e683b..1c7456f0533e 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -5793,10 +5246,6 @@ index d8667c0e683b..1c7456f0533e 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -5804,7 +5253,6 @@ index d8667c0e683b..1c7456f0533e 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -5812,10 +5260,6 @@ index d8667c0e683b..1c7456f0533e 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -5828,10 +5272,6 @@ index d8667c0e683b..1c7456f0533e 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -5869,7 +5309,7 @@ index d8667c0e683b..1c7456f0533e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -5927,10 +5367,10 @@ index d8667c0e683b..1c7456f0533e 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -5941,10 +5381,10 @@ index d8667c0e683b..1c7456f0533e 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -5956,18 +5396,10 @@ index d8667c0e683b..1c7456f0533e 100644
  
  Library("audio_encoder_multiopus_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
-index 228087036228..9cbb90f8404c 100644
+index 72567d1deba1..9d44290fa3c8 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -5975,6 +5407,7 @@ index 228087036228..9cbb90f8404c 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -5984,23 +5417,18 @@ index 228087036228..9cbb90f8404c 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -51,114 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,93 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -6019,10 +5447,6 @@ index 228087036228..9cbb90f8404c 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -6030,10 +5454,6 @@ index 228087036228..9cbb90f8404c 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -6041,7 +5461,6 @@ index 228087036228..9cbb90f8404c 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -6049,10 +5468,6 @@ index 228087036228..9cbb90f8404c 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -6065,10 +5480,6 @@ index 228087036228..9cbb90f8404c 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -6106,7 +5517,7 @@ index 228087036228..9cbb90f8404c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -166,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -145,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -6164,10 +5575,10 @@ index 228087036228..9cbb90f8404c 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -6178,10 +5589,10 @@ index 228087036228..9cbb90f8404c 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -6193,18 +5604,10 @@ index 228087036228..9cbb90f8404c 100644
  
  Library("audio_encoder_opus_config_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
-index 768f143888a3..82aae85d04c3 100644
+index c38bcbc671fc..0bff614d13c4 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -6212,6 +5615,7 @@ index 768f143888a3..82aae85d04c3 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -6220,23 +5624,18 @@ index 768f143888a3..82aae85d04c3 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -6255,10 +5654,6 @@ index 768f143888a3..82aae85d04c3 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -6266,10 +5661,6 @@ index 768f143888a3..82aae85d04c3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -6277,7 +5668,6 @@ index 768f143888a3..82aae85d04c3 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -6285,10 +5675,6 @@ index 768f143888a3..82aae85d04c3 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -6301,10 +5687,6 @@ index 768f143888a3..82aae85d04c3 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -6342,7 +5724,7 @@ index 768f143888a3..82aae85d04c3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -6400,10 +5782,10 @@ index 768f143888a3..82aae85d04c3 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -6414,10 +5796,10 @@ index 768f143888a3..82aae85d04c3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -6429,18 +5811,10 @@ index 768f143888a3..82aae85d04c3 100644
  
  Library("audio_encoder_opus_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus_audio_decoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus_audio_decoder_factory_gn/moz.build
-index 29253b42c50c..093987e65a08 100644
+index 22027800ff54..889064300cef 100644
 --- third_party/libwebrtc/api/audio_codecs/opus_audio_decoder_factory_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus_audio_decoder_factory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -6448,6 +5822,7 @@ index 29253b42c50c..093987e65a08 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -6456,23 +5831,18 @@ index 29253b42c50c..093987e65a08 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -6491,10 +5861,6 @@ index 29253b42c50c..093987e65a08 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -6502,10 +5868,6 @@ index 29253b42c50c..093987e65a08 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -6513,7 +5875,6 @@ index 29253b42c50c..093987e65a08 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -6521,10 +5882,6 @@ index 29253b42c50c..093987e65a08 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -6537,10 +5894,6 @@ index 29253b42c50c..093987e65a08 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -6578,7 +5931,7 @@ index 29253b42c50c..093987e65a08 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -6636,10 +5989,10 @@ index 29253b42c50c..093987e65a08 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -6650,10 +6003,10 @@ index 29253b42c50c..093987e65a08 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -6665,18 +6018,10 @@ index 29253b42c50c..093987e65a08 100644
  
  Library("opus_audio_decoder_factory_gn")
 diff --git third_party/libwebrtc/api/audio_options_api_gn/moz.build third_party/libwebrtc/api/audio_options_api_gn/moz.build
-index 13401fe31fc3..335c9e764a18 100644
+index c23c271b22e1..7132a5211aa1 100644
 --- third_party/libwebrtc/api/audio_options_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio_options_api_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -6684,6 +6029,7 @@ index 13401fe31fc3..335c9e764a18 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -6692,23 +6038,18 @@ index 13401fe31fc3..335c9e764a18 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -6727,10 +6068,6 @@ index 13401fe31fc3..335c9e764a18 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -6738,10 +6075,6 @@ index 13401fe31fc3..335c9e764a18 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -6749,7 +6082,6 @@ index 13401fe31fc3..335c9e764a18 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -6757,10 +6089,6 @@ index 13401fe31fc3..335c9e764a18 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -6773,10 +6101,6 @@ index 13401fe31fc3..335c9e764a18 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -6807,7 +6131,7 @@ index 13401fe31fc3..335c9e764a18 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -6894,7 +6218,7 @@ index 13401fe31fc3..335c9e764a18 100644
  
  Library("audio_options_api_gn")
 diff --git third_party/libwebrtc/api/bitrate_allocation_gn/moz.build third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
-index d82b6d36d152..0534696d9a46 100644
+index e554b81f633f..8999ae4c13a9 100644
 --- third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
 +++ third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -6905,6 +6229,7 @@ index d82b6d36d152..0534696d9a46 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -6913,13 +6238,12 @@ index d82b6d36d152..0534696d9a46 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6958,7 +6282,6 @@ index d82b6d36d152..0534696d9a46 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -7008,7 +6331,7 @@ index d82b6d36d152..0534696d9a46 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -7034,7 +6357,7 @@ index d82b6d36d152..0534696d9a46 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -7076,7 +6399,7 @@ index d82b6d36d152..0534696d9a46 100644
 -
  Library("bitrate_allocation_gn")
 diff --git third_party/libwebrtc/api/call_api_gn/moz.build third_party/libwebrtc/api/call_api_gn/moz.build
-index 705bf2e04244..52ae9a5aaa46 100644
+index 2d2e381b8423..bd8e01b40700 100644
 --- third_party/libwebrtc/api/call_api_gn/moz.build
 +++ third_party/libwebrtc/api/call_api_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -7087,6 +6410,7 @@ index 705bf2e04244..52ae9a5aaa46 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -7095,13 +6419,12 @@ index 705bf2e04244..52ae9a5aaa46 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7136,7 +6459,6 @@ index 705bf2e04244..52ae9a5aaa46 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -7186,7 +6508,7 @@ index 705bf2e04244..52ae9a5aaa46 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -7212,7 +6534,7 @@ index 705bf2e04244..52ae9a5aaa46 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -7254,7 +6576,7 @@ index 705bf2e04244..52ae9a5aaa46 100644
 -
  Library("call_api_gn")
 diff --git third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
-index 2c37fab92885..eb610c5ae493 100644
+index 803d3f1eff52..cf3f00cfd583 100644
 --- third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
 +++ third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -7265,6 +6587,7 @@ index 2c37fab92885..eb610c5ae493 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -7273,13 +6596,12 @@ index 2c37fab92885..eb610c5ae493 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7318,7 +6640,6 @@ index 2c37fab92885..eb610c5ae493 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -7368,7 +6689,7 @@ index 2c37fab92885..eb610c5ae493 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -7394,7 +6715,7 @@ index 2c37fab92885..eb610c5ae493 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -7436,7 +6757,7 @@ index 2c37fab92885..eb610c5ae493 100644
 -
  Library("frame_decryptor_interface_gn")
 diff --git third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
-index 1e581de158e2..f470e1833365 100644
+index 64ce06200fbe..a4f99ff8357a 100644
 --- third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
 +++ third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -7447,6 +6768,7 @@ index 1e581de158e2..f470e1833365 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -7455,13 +6777,12 @@ index 1e581de158e2..f470e1833365 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7500,7 +6821,6 @@ index 1e581de158e2..f470e1833365 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -7550,7 +6870,7 @@ index 1e581de158e2..f470e1833365 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -7576,7 +6896,7 @@ index 1e581de158e2..f470e1833365 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -7618,18 +6938,10 @@ index 1e581de158e2..f470e1833365 100644
 -
  Library("frame_encryptor_interface_gn")
 diff --git third_party/libwebrtc/api/crypto/options_gn/moz.build third_party/libwebrtc/api/crypto/options_gn/moz.build
-index c5a963140c3b..eb08976e0155 100644
+index 071165211246..77d8eb74d010 100644
 --- third_party/libwebrtc/api/crypto/options_gn/moz.build
 +++ third_party/libwebrtc/api/crypto/options_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -7637,6 +6949,7 @@ index c5a963140c3b..eb08976e0155 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -7645,23 +6958,18 @@ index c5a963140c3b..eb08976e0155 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -7680,10 +6988,6 @@ index c5a963140c3b..eb08976e0155 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -7691,10 +6995,6 @@ index c5a963140c3b..eb08976e0155 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -7702,7 +7002,6 @@ index c5a963140c3b..eb08976e0155 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -7710,10 +7009,6 @@ index c5a963140c3b..eb08976e0155 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -7726,10 +7021,6 @@ index c5a963140c3b..eb08976e0155 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -7760,7 +7051,7 @@ index c5a963140c3b..eb08976e0155 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -7846,19 +7137,11 @@ index c5a963140c3b..eb08976e0155 100644
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
  Library("options_gn")
-diff --git third_party/libwebrtc/api/environment/environment_factory_gn/moz.build third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
-index bfe66c238792..fa0977f74725 100644
---- third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
-+++ third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+diff --git third_party/libwebrtc/api/environment/deprecated_global_field_trials_gn/moz.build third_party/libwebrtc/api/environment/deprecated_global_field_trials_gn/moz.build
+index 95b07bc6261f..4c2ff30dab40 100644
+--- third_party/libwebrtc/api/environment/deprecated_global_field_trials_gn/moz.build
++++ third_party/libwebrtc/api/environment/deprecated_global_field_trials_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -7866,6 +7149,7 @@ index bfe66c238792..fa0977f74725 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -7874,23 +7158,18 @@ index bfe66c238792..fa0977f74725 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -7909,10 +7188,6 @@ index bfe66c238792..fa0977f74725 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -7920,10 +7195,6 @@ index bfe66c238792..fa0977f74725 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -7931,7 +7202,6 @@ index bfe66c238792..fa0977f74725 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -7939,10 +7209,6 @@ index bfe66c238792..fa0977f74725 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -7955,10 +7221,6 @@ index bfe66c238792..fa0977f74725 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -7996,7 +7258,7 @@ index bfe66c238792..fa0977f74725 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -8054,24 +7316,231 @@ index bfe66c238792..fa0977f74725 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
 -    CXXFLAGS += [
 -        "-msse2"
 -    ]
 -
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
++if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+ Library("deprecated_global_field_trials_gn")
+diff --git third_party/libwebrtc/api/environment/environment_factory_gn/moz.build third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
+index ed3d1c43a856..fdd57e9f22b3 100644
+--- third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
++++ third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+ FINAL_LIBRARY = "xul"
+ 
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+ 
+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
+-if CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["ANDROID"] = True
+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
+-    DEFINES["HAVE_SYS_UIO_H"] = True
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-    DEFINES["NOMINMAX"] = True
+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
+-    DEFINES["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
+-    DEFINES["WIN32"] = True
+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+-    DEFINES["WINVER"] = "0x0A00"
+-    DEFINES["_ATL_NO_OPENGL"] = True
+-    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
+-    DEFINES["_CRT_RAND_S"] = True
+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
+-    DEFINES["_HAS_NODISCARD"] = True
+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_SECURE_ATL"] = True
+-    DEFINES["_UNICODE"] = True
+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
+-    DEFINES["_WINDOWS"] = True
+-    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
+-    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
++    DEFINES["_DEBUG"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "aarch64":
+ 
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+     DEFINES["WEBRTC_HAS_NEON"] = True
+     DEFINES["__ARM_NEON__"] = "1"
+ 
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["TARGET_CPU"] == "loongarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
 -
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+ if CONFIG["TARGET_CPU"] == "mips32":
+ 
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "x86":
+ 
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
      CXXFLAGS += [
          "-msse2"
      ]
  
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -8083,7 +7552,7 @@ index bfe66c238792..fa0977f74725 100644
  
  Library("environment_factory_gn")
 diff --git third_party/libwebrtc/api/environment/environment_gn/moz.build third_party/libwebrtc/api/environment/environment_gn/moz.build
-index 07ce4e1dbb2a..beaf734ba830 100644
+index 623399700cb5..631f307ea954 100644
 --- third_party/libwebrtc/api/environment/environment_gn/moz.build
 +++ third_party/libwebrtc/api/environment/environment_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -8094,6 +7563,7 @@ index 07ce4e1dbb2a..beaf734ba830 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -8102,13 +7572,12 @@ index 07ce4e1dbb2a..beaf734ba830 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8147,7 +7616,6 @@ index 07ce4e1dbb2a..beaf734ba830 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -8204,7 +7672,7 @@ index 07ce4e1dbb2a..beaf734ba830 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -8230,7 +7698,7 @@ index 07ce4e1dbb2a..beaf734ba830 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -8272,7 +7740,7 @@ index 07ce4e1dbb2a..beaf734ba830 100644
 -
  Library("environment_gn")
 diff --git third_party/libwebrtc/api/fec_controller_api_gn/moz.build third_party/libwebrtc/api/fec_controller_api_gn/moz.build
-index 5313c0045ec2..aab46b963082 100644
+index 26322221e75c..c2960773bae5 100644
 --- third_party/libwebrtc/api/fec_controller_api_gn/moz.build
 +++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -8283,6 +7751,7 @@ index 5313c0045ec2..aab46b963082 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -8291,13 +7760,12 @@ index 5313c0045ec2..aab46b963082 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8336,7 +7804,6 @@ index 5313c0045ec2..aab46b963082 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -8393,7 +7860,7 @@ index 5313c0045ec2..aab46b963082 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -8419,7 +7886,7 @@ index 5313c0045ec2..aab46b963082 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -8461,18 +7928,10 @@ index 5313c0045ec2..aab46b963082 100644
 -
  Library("fec_controller_api_gn")
 diff --git third_party/libwebrtc/api/field_trials_registry_gn/moz.build third_party/libwebrtc/api/field_trials_registry_gn/moz.build
-index 37de6d110f27..86f276f7dee2 100644
+index 834d5f8de566..382075b68488 100644
 --- third_party/libwebrtc/api/field_trials_registry_gn/moz.build
 +++ third_party/libwebrtc/api/field_trials_registry_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -8480,6 +7939,7 @@ index 37de6d110f27..86f276f7dee2 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -8488,23 +7948,18 @@ index 37de6d110f27..86f276f7dee2 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -8523,10 +7978,6 @@ index 37de6d110f27..86f276f7dee2 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -8534,10 +7985,6 @@ index 37de6d110f27..86f276f7dee2 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -8545,7 +7992,6 @@ index 37de6d110f27..86f276f7dee2 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -8553,10 +7999,6 @@ index 37de6d110f27..86f276f7dee2 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -8569,10 +8011,6 @@ index 37de6d110f27..86f276f7dee2 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -8610,7 +8048,7 @@ index 37de6d110f27..86f276f7dee2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -8668,10 +8106,10 @@ index 37de6d110f27..86f276f7dee2 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -8682,10 +8120,10 @@ index 37de6d110f27..86f276f7dee2 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -8697,7 +8135,7 @@ index 37de6d110f27..86f276f7dee2 100644
  
  Library("field_trials_registry_gn")
 diff --git third_party/libwebrtc/api/field_trials_view_gn/moz.build third_party/libwebrtc/api/field_trials_view_gn/moz.build
-index d229ad4b07f7..7f3c05488404 100644
+index 6b034fd3a963..59ff862b5aff 100644
 --- third_party/libwebrtc/api/field_trials_view_gn/moz.build
 +++ third_party/libwebrtc/api/field_trials_view_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -8708,6 +8146,7 @@ index d229ad4b07f7..7f3c05488404 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -8716,13 +8155,12 @@ index d229ad4b07f7..7f3c05488404 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8757,7 +8195,6 @@ index d229ad4b07f7..7f3c05488404 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -8807,7 +8244,7 @@ index d229ad4b07f7..7f3c05488404 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -8833,7 +8270,7 @@ index d229ad4b07f7..7f3c05488404 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -8875,18 +8312,10 @@ index d229ad4b07f7..7f3c05488404 100644
 -
  Library("field_trials_view_gn")
 diff --git third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build
-index 98cf27b280d5..169cbd285741 100644
+index e5a1b83d2822..a437cb5392b2 100644
 --- third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build
 +++ third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -8894,6 +8323,7 @@ index 98cf27b280d5..169cbd285741 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -8902,23 +8332,18 @@ index 98cf27b280d5..169cbd285741 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -8938,10 +8363,6 @@ index 98cf27b280d5..169cbd285741 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -8949,10 +8370,6 @@ index 98cf27b280d5..169cbd285741 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -8960,7 +8377,6 @@ index 98cf27b280d5..169cbd285741 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -8968,10 +8384,6 @@ index 98cf27b280d5..169cbd285741 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -8984,10 +8396,6 @@ index 98cf27b280d5..169cbd285741 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -9025,7 +8433,7 @@ index 98cf27b280d5..169cbd285741 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -9083,10 +8491,10 @@ index 98cf27b280d5..169cbd285741 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -9097,10 +8505,10 @@ index 98cf27b280d5..169cbd285741 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -9112,18 +8520,10 @@ index 98cf27b280d5..169cbd285741 100644
  
  Library("frame_transformer_factory_gn")
 diff --git third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
-index 6b6749937d6a..fb36a9f6a884 100644
+index ba884e273d4b..b85c50f05417 100644
 --- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
 +++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -9131,6 +8531,7 @@ index 6b6749937d6a..fb36a9f6a884 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -9139,23 +8540,18 @@ index 6b6749937d6a..fb36a9f6a884 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -9174,10 +8570,6 @@ index 6b6749937d6a..fb36a9f6a884 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -9185,10 +8577,6 @@ index 6b6749937d6a..fb36a9f6a884 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -9196,7 +8584,6 @@ index 6b6749937d6a..fb36a9f6a884 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -9204,10 +8591,6 @@ index 6b6749937d6a..fb36a9f6a884 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -9220,10 +8603,6 @@ index 6b6749937d6a..fb36a9f6a884 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -9261,7 +8640,7 @@ index 6b6749937d6a..fb36a9f6a884 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -9319,10 +8698,10 @@ index 6b6749937d6a..fb36a9f6a884 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -9333,10 +8712,10 @@ index 6b6749937d6a..fb36a9f6a884 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -9348,7 +8727,7 @@ index 6b6749937d6a..fb36a9f6a884 100644
  
  Library("frame_transformer_interface_gn")
 diff --git third_party/libwebrtc/api/function_view_gn/moz.build third_party/libwebrtc/api/function_view_gn/moz.build
-index d4c22b97a672..942e98bfe0e2 100644
+index 37e1e4a3cb61..22e59d619687 100644
 --- third_party/libwebrtc/api/function_view_gn/moz.build
 +++ third_party/libwebrtc/api/function_view_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -9359,6 +8738,7 @@ index d4c22b97a672..942e98bfe0e2 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -9367,13 +8747,12 @@ index d4c22b97a672..942e98bfe0e2 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9412,7 +8791,6 @@ index d4c22b97a672..942e98bfe0e2 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -9462,7 +8840,7 @@ index d4c22b97a672..942e98bfe0e2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -9488,7 +8866,7 @@ index d4c22b97a672..942e98bfe0e2 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -9530,7 +8908,7 @@ index d4c22b97a672..942e98bfe0e2 100644
 -
  Library("function_view_gn")
 diff --git third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
-index fa18e171a29e..81e962a72646 100644
+index 031193bbf246..420fe76c9250 100644
 --- third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
 +++ third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -9541,6 +8919,7 @@ index fa18e171a29e..81e962a72646 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -9549,13 +8928,12 @@ index fa18e171a29e..81e962a72646 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9590,7 +8968,6 @@ index fa18e171a29e..81e962a72646 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -9640,7 +9017,7 @@ index fa18e171a29e..81e962a72646 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -9666,7 +9043,7 @@ index fa18e171a29e..81e962a72646 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -9708,7 +9085,7 @@ index fa18e171a29e..81e962a72646 100644
 -
  Library("jingle_logging_api_gn")
 diff --git third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
-index 40b640eebadc..2134f306b45f 100644
+index 570cfe3e0f46..0cf698831744 100644
 --- third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
 +++ third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -9719,6 +9096,7 @@ index 40b640eebadc..2134f306b45f 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -9727,13 +9105,12 @@ index 40b640eebadc..2134f306b45f 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9768,7 +9145,6 @@ index 40b640eebadc..2134f306b45f 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -9818,7 +9194,7 @@ index 40b640eebadc..2134f306b45f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -9844,7 +9220,7 @@ index 40b640eebadc..2134f306b45f 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -9886,7 +9262,7 @@ index 40b640eebadc..2134f306b45f 100644
 -
  Library("jingle_peerconnection_api_gn")
 diff --git third_party/libwebrtc/api/location_gn/moz.build third_party/libwebrtc/api/location_gn/moz.build
-index 71e2e1f0bc05..903e6070a8d3 100644
+index bb48aa293591..0df5683760a9 100644
 --- third_party/libwebrtc/api/location_gn/moz.build
 +++ third_party/libwebrtc/api/location_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -9897,6 +9273,7 @@ index 71e2e1f0bc05..903e6070a8d3 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -9905,13 +9282,12 @@ index 71e2e1f0bc05..903e6070a8d3 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9946,7 +9322,6 @@ index 71e2e1f0bc05..903e6070a8d3 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -9996,7 +9371,7 @@ index 71e2e1f0bc05..903e6070a8d3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -10022,7 +9397,7 @@ index 71e2e1f0bc05..903e6070a8d3 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -10064,7 +9439,7 @@ index 71e2e1f0bc05..903e6070a8d3 100644
 -
  Library("location_gn")
 diff --git third_party/libwebrtc/api/make_ref_counted_gn/moz.build third_party/libwebrtc/api/make_ref_counted_gn/moz.build
-index 734e2ff2ee3c..a92aaf7d3960 100644
+index e8c3318f0297..e255232b7c0f 100644
 --- third_party/libwebrtc/api/make_ref_counted_gn/moz.build
 +++ third_party/libwebrtc/api/make_ref_counted_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -10075,6 +9450,7 @@ index 734e2ff2ee3c..a92aaf7d3960 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -10083,13 +9459,12 @@ index 734e2ff2ee3c..a92aaf7d3960 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10124,7 +9499,6 @@ index 734e2ff2ee3c..a92aaf7d3960 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -10174,7 +9548,7 @@ index 734e2ff2ee3c..a92aaf7d3960 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -10200,7 +9574,7 @@ index 734e2ff2ee3c..a92aaf7d3960 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -10242,18 +9616,10 @@ index 734e2ff2ee3c..a92aaf7d3960 100644
 -
  Library("make_ref_counted_gn")
 diff --git third_party/libwebrtc/api/media_stream_interface_gn/moz.build third_party/libwebrtc/api/media_stream_interface_gn/moz.build
-index 9bda91f8387f..e2e583f0e715 100644
+index d2036a2a6aaa..84b69c959ded 100644
 --- third_party/libwebrtc/api/media_stream_interface_gn/moz.build
 +++ third_party/libwebrtc/api/media_stream_interface_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -10261,6 +9627,7 @@ index 9bda91f8387f..e2e583f0e715 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -10269,23 +9636,18 @@ index 9bda91f8387f..e2e583f0e715 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -10304,10 +9666,6 @@ index 9bda91f8387f..e2e583f0e715 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -10315,10 +9673,6 @@ index 9bda91f8387f..e2e583f0e715 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -10326,7 +9680,6 @@ index 9bda91f8387f..e2e583f0e715 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -10334,10 +9687,6 @@ index 9bda91f8387f..e2e583f0e715 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -10350,10 +9699,6 @@ index 9bda91f8387f..e2e583f0e715 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -10391,7 +9736,7 @@ index 9bda91f8387f..e2e583f0e715 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -10449,10 +9794,10 @@ index 9bda91f8387f..e2e583f0e715 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -10463,10 +9808,10 @@ index 9bda91f8387f..e2e583f0e715 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -10478,7 +9823,7 @@ index 9bda91f8387f..e2e583f0e715 100644
  
  Library("media_stream_interface_gn")
 diff --git third_party/libwebrtc/api/metronome/metronome_gn/moz.build third_party/libwebrtc/api/metronome/metronome_gn/moz.build
-index 175a179e516d..e3bc694d44e5 100644
+index 8fc12ea95fda..4dd6b378c5c6 100644
 --- third_party/libwebrtc/api/metronome/metronome_gn/moz.build
 +++ third_party/libwebrtc/api/metronome/metronome_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -10489,6 +9834,7 @@ index 175a179e516d..e3bc694d44e5 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -10497,13 +9843,12 @@ index 175a179e516d..e3bc694d44e5 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10542,7 +9887,6 @@ index 175a179e516d..e3bc694d44e5 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -10592,7 +9936,7 @@ index 175a179e516d..e3bc694d44e5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -10618,7 +9962,7 @@ index 175a179e516d..e3bc694d44e5 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -10660,18 +10004,10 @@ index 175a179e516d..e3bc694d44e5 100644
 -
  Library("metronome_gn")
 diff --git third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
-index e881fd3e0895..9f788008e593 100644
+index 72fc97e1e4d0..578be91eda8a 100644
 --- third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -10679,6 +10015,7 @@ index e881fd3e0895..9f788008e593 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -10687,23 +10024,18 @@ index e881fd3e0895..9f788008e593 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -10722,10 +10054,6 @@ index e881fd3e0895..9f788008e593 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -10733,10 +10061,6 @@ index e881fd3e0895..9f788008e593 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -10744,7 +10068,6 @@ index e881fd3e0895..9f788008e593 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -10752,10 +10075,6 @@ index e881fd3e0895..9f788008e593 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -10768,10 +10087,6 @@ index e881fd3e0895..9f788008e593 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -10809,7 +10124,7 @@ index e881fd3e0895..9f788008e593 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -10867,10 +10182,10 @@ index e881fd3e0895..9f788008e593 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -10881,10 +10196,10 @@ index e881fd3e0895..9f788008e593 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -10896,18 +10211,10 @@ index e881fd3e0895..9f788008e593 100644
  
  Library("default_neteq_controller_factory_gn")
 diff --git third_party/libwebrtc/api/neteq/default_neteq_factory_gn/moz.build third_party/libwebrtc/api/neteq/default_neteq_factory_gn/moz.build
-index 6c0ac3eacaa6..af150d2ad9c2 100644
+index 1fac43ca8133..3822f3c47cf0 100644
 --- third_party/libwebrtc/api/neteq/default_neteq_factory_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/default_neteq_factory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -10915,6 +10222,7 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -10923,23 +10231,18 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -10958,10 +10261,6 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -10969,10 +10268,6 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -10980,7 +10275,6 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -10988,10 +10282,6 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -11004,10 +10294,6 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -11045,7 +10331,7 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -11103,10 +10389,10 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -11117,10 +10403,10 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -11132,7 +10418,7 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
  
  Library("default_neteq_factory_gn")
 diff --git third_party/libwebrtc/api/neteq/delay_manager_api_gn/moz.build third_party/libwebrtc/api/neteq/delay_manager_api_gn/moz.build
-index 7b391f843b1a..e878c22c5811 100644
+index 3063e1118a14..1cef703f3744 100644
 --- third_party/libwebrtc/api/neteq/delay_manager_api_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/delay_manager_api_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -11143,6 +10429,7 @@ index 7b391f843b1a..e878c22c5811 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -11151,13 +10438,12 @@ index 7b391f843b1a..e878c22c5811 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11196,7 +10482,6 @@ index 7b391f843b1a..e878c22c5811 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -11253,7 +10538,7 @@ index 7b391f843b1a..e878c22c5811 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -11279,7 +10564,7 @@ index 7b391f843b1a..e878c22c5811 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -11321,18 +10606,10 @@ index 7b391f843b1a..e878c22c5811 100644
 -
  Library("delay_manager_api_gn")
 diff --git third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
-index 5870536292fb..5ca950628495 100644
+index 1afebecfa713..e6cae2901777 100644
 --- third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -11340,6 +10617,7 @@ index 5870536292fb..5ca950628495 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -11348,23 +10626,18 @@ index 5870536292fb..5ca950628495 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -11383,10 +10656,6 @@ index 5870536292fb..5ca950628495 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -11394,10 +10663,6 @@ index 5870536292fb..5ca950628495 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -11405,7 +10670,6 @@ index 5870536292fb..5ca950628495 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -11413,10 +10677,6 @@ index 5870536292fb..5ca950628495 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -11429,10 +10689,6 @@ index 5870536292fb..5ca950628495 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -11470,7 +10726,7 @@ index 5870536292fb..5ca950628495 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -11528,10 +10784,10 @@ index 5870536292fb..5ca950628495 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -11542,10 +10798,10 @@ index 5870536292fb..5ca950628495 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -11557,7 +10813,7 @@ index 5870536292fb..5ca950628495 100644
  
  Library("neteq_api_gn")
 diff --git third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
-index aaca246c346a..faadd8470d90 100644
+index 360aeb8c1888..b3725c959c68 100644
 --- third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -11568,6 +10824,7 @@ index aaca246c346a..faadd8470d90 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -11576,13 +10833,12 @@ index aaca246c346a..faadd8470d90 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11621,7 +10877,6 @@ index aaca246c346a..faadd8470d90 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -11678,7 +10933,7 @@ index aaca246c346a..faadd8470d90 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -11704,7 +10959,7 @@ index aaca246c346a..faadd8470d90 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -11746,18 +11001,10 @@ index aaca246c346a..faadd8470d90 100644
 -
  Library("neteq_controller_api_gn")
 diff --git third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
-index a35e00f8603e..627fb0d77b44 100644
+index ce574f703e85..f63d71206fa2 100644
 --- third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -11765,6 +11012,7 @@ index a35e00f8603e..627fb0d77b44 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -11773,23 +11021,18 @@ index a35e00f8603e..627fb0d77b44 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -11808,10 +11051,6 @@ index a35e00f8603e..627fb0d77b44 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -11819,10 +11058,6 @@ index a35e00f8603e..627fb0d77b44 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -11830,7 +11065,6 @@ index a35e00f8603e..627fb0d77b44 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -11838,10 +11072,6 @@ index a35e00f8603e..627fb0d77b44 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -11854,10 +11084,6 @@ index a35e00f8603e..627fb0d77b44 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -11888,7 +11114,7 @@ index a35e00f8603e..627fb0d77b44 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -11975,7 +11201,7 @@ index a35e00f8603e..627fb0d77b44 100644
  
  Library("tick_timer_gn")
 diff --git third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
-index 89c7b2f1bbee..e19cb0366383 100644
+index dfdf9c995949..c5307e1d122c 100644
 --- third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
 +++ third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -11986,6 +11212,7 @@ index 89c7b2f1bbee..e19cb0366383 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -11994,13 +11221,12 @@ index 89c7b2f1bbee..e19cb0366383 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12035,7 +11261,6 @@ index 89c7b2f1bbee..e19cb0366383 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -12085,7 +11310,7 @@ index 89c7b2f1bbee..e19cb0366383 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -12111,7 +11336,7 @@ index 89c7b2f1bbee..e19cb0366383 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -12153,18 +11378,10 @@ index 89c7b2f1bbee..e19cb0366383 100644
 -
  Library("network_state_predictor_api_gn")
 diff --git third_party/libwebrtc/api/priority_gn/moz.build third_party/libwebrtc/api/priority_gn/moz.build
-index 2ae9d6e256bf..9506fe3d8523 100644
+index bf2fa1665e7e..1048dc991346 100644
 --- third_party/libwebrtc/api/priority_gn/moz.build
 +++ third_party/libwebrtc/api/priority_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -12172,6 +11389,7 @@ index 2ae9d6e256bf..9506fe3d8523 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -12180,23 +11398,18 @@ index 2ae9d6e256bf..9506fe3d8523 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -12215,10 +11428,6 @@ index 2ae9d6e256bf..9506fe3d8523 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -12226,10 +11435,6 @@ index 2ae9d6e256bf..9506fe3d8523 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -12237,7 +11442,6 @@ index 2ae9d6e256bf..9506fe3d8523 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -12245,10 +11449,6 @@ index 2ae9d6e256bf..9506fe3d8523 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -12261,10 +11461,6 @@ index 2ae9d6e256bf..9506fe3d8523 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -12295,7 +11491,7 @@ index 2ae9d6e256bf..9506fe3d8523 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -12382,7 +11578,7 @@ index 2ae9d6e256bf..9506fe3d8523 100644
  
  Library("priority_gn")
 diff --git third_party/libwebrtc/api/ref_count_gn/moz.build third_party/libwebrtc/api/ref_count_gn/moz.build
-index 6e708d91c28e..8e5737e376cb 100644
+index b348930d7ec3..6e1ce2a4baad 100644
 --- third_party/libwebrtc/api/ref_count_gn/moz.build
 +++ third_party/libwebrtc/api/ref_count_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -12393,6 +11589,7 @@ index 6e708d91c28e..8e5737e376cb 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -12401,13 +11598,12 @@ index 6e708d91c28e..8e5737e376cb 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12442,7 +11638,6 @@ index 6e708d91c28e..8e5737e376cb 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -12492,7 +11687,7 @@ index 6e708d91c28e..8e5737e376cb 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -12518,7 +11713,7 @@ index 6e708d91c28e..8e5737e376cb 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -12560,7 +11755,7 @@ index 6e708d91c28e..8e5737e376cb 100644
 -
  Library("ref_count_gn")
 diff --git third_party/libwebrtc/api/refcountedbase_gn/moz.build third_party/libwebrtc/api/refcountedbase_gn/moz.build
-index 5cc39bebe881..d7236ced3bac 100644
+index 8f218b17aea6..0d0dc0b4711b 100644
 --- third_party/libwebrtc/api/refcountedbase_gn/moz.build
 +++ third_party/libwebrtc/api/refcountedbase_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -12571,6 +11766,7 @@ index 5cc39bebe881..d7236ced3bac 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -12579,13 +11775,12 @@ index 5cc39bebe881..d7236ced3bac 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12620,7 +11815,6 @@ index 5cc39bebe881..d7236ced3bac 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -12670,7 +11864,7 @@ index 5cc39bebe881..d7236ced3bac 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -12696,7 +11890,7 @@ index 5cc39bebe881..d7236ced3bac 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -12738,18 +11932,10 @@ index 5cc39bebe881..d7236ced3bac 100644
 -
  Library("refcountedbase_gn")
 diff --git third_party/libwebrtc/api/rtc_error_gn/moz.build third_party/libwebrtc/api/rtc_error_gn/moz.build
-index 22af15c986d7..b08e37ef6637 100644
+index 8a09b2f6a451..4cd767026bc4 100644
 --- third_party/libwebrtc/api/rtc_error_gn/moz.build
 +++ third_party/libwebrtc/api/rtc_error_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -12757,6 +11943,7 @@ index 22af15c986d7..b08e37ef6637 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -12765,23 +11952,18 @@ index 22af15c986d7..b08e37ef6637 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -12800,10 +11982,6 @@ index 22af15c986d7..b08e37ef6637 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -12811,10 +11989,6 @@ index 22af15c986d7..b08e37ef6637 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -12822,7 +11996,6 @@ index 22af15c986d7..b08e37ef6637 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -12830,10 +12003,6 @@ index 22af15c986d7..b08e37ef6637 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -12846,10 +12015,6 @@ index 22af15c986d7..b08e37ef6637 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -12887,7 +12052,7 @@ index 22af15c986d7..b08e37ef6637 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -12945,10 +12110,10 @@ index 22af15c986d7..b08e37ef6637 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -12959,10 +12124,10 @@ index 22af15c986d7..b08e37ef6637 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -12974,18 +12139,10 @@ index 22af15c986d7..b08e37ef6637 100644
  
  Library("rtc_error_gn")
 diff --git third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
-index ef7443badabe..1ebd539654ba 100644
+index e736b4682ea0..9f5e2d9ba4a3 100644
 --- third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
 +++ third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -12993,6 +12150,7 @@ index ef7443badabe..1ebd539654ba 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -13001,23 +12159,18 @@ index ef7443badabe..1ebd539654ba 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -13036,10 +12189,6 @@ index ef7443badabe..1ebd539654ba 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -13047,10 +12196,6 @@ index ef7443badabe..1ebd539654ba 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -13058,7 +12203,6 @@ index ef7443badabe..1ebd539654ba 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -13066,10 +12210,6 @@ index ef7443badabe..1ebd539654ba 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -13082,10 +12222,6 @@ index ef7443badabe..1ebd539654ba 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -13123,7 +12259,7 @@ index ef7443badabe..1ebd539654ba 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -13181,10 +12317,10 @@ index ef7443badabe..1ebd539654ba 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -13195,10 +12331,10 @@ index ef7443badabe..1ebd539654ba 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -13210,18 +12346,10 @@ index ef7443badabe..1ebd539654ba 100644
  
  Library("rtc_event_log_gn")
 diff --git third_party/libwebrtc/api/rtp_headers_gn/moz.build third_party/libwebrtc/api/rtp_headers_gn/moz.build
-index 6b8fa70f917e..ccb5b524512b 100644
+index fb46ff525fa5..4f0061742b36 100644
 --- third_party/libwebrtc/api/rtp_headers_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_headers_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -13229,6 +12357,7 @@ index 6b8fa70f917e..ccb5b524512b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -13237,23 +12366,18 @@ index 6b8fa70f917e..ccb5b524512b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -13272,10 +12396,6 @@ index 6b8fa70f917e..ccb5b524512b 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -13283,10 +12403,6 @@ index 6b8fa70f917e..ccb5b524512b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -13294,7 +12410,6 @@ index 6b8fa70f917e..ccb5b524512b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -13302,10 +12417,6 @@ index 6b8fa70f917e..ccb5b524512b 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -13318,10 +12429,6 @@ index 6b8fa70f917e..ccb5b524512b 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -13359,7 +12466,7 @@ index 6b8fa70f917e..ccb5b524512b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -13417,10 +12524,10 @@ index 6b8fa70f917e..ccb5b524512b 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -13431,10 +12538,10 @@ index 6b8fa70f917e..ccb5b524512b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -13446,18 +12553,10 @@ index 6b8fa70f917e..ccb5b524512b 100644
  
  Library("rtp_headers_gn")
 diff --git third_party/libwebrtc/api/rtp_packet_info_gn/moz.build third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
-index 60ac57fdb088..e6d8ea47cb13 100644
+index 3a7abf97f0ae..462e922c57e9 100644
 --- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -13465,6 +12564,7 @@ index 60ac57fdb088..e6d8ea47cb13 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -13473,23 +12573,18 @@ index 60ac57fdb088..e6d8ea47cb13 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -13508,10 +12603,6 @@ index 60ac57fdb088..e6d8ea47cb13 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -13519,10 +12610,6 @@ index 60ac57fdb088..e6d8ea47cb13 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -13530,7 +12617,6 @@ index 60ac57fdb088..e6d8ea47cb13 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -13538,10 +12624,6 @@ index 60ac57fdb088..e6d8ea47cb13 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -13554,10 +12636,6 @@ index 60ac57fdb088..e6d8ea47cb13 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -13595,7 +12673,7 @@ index 60ac57fdb088..e6d8ea47cb13 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -13653,10 +12731,10 @@ index 60ac57fdb088..e6d8ea47cb13 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -13667,10 +12745,10 @@ index 60ac57fdb088..e6d8ea47cb13 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -13682,7 +12760,7 @@ index 60ac57fdb088..e6d8ea47cb13 100644
  
  Library("rtp_packet_info_gn")
 diff --git third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build
-index f5380aa782ca..ada14ba1b2f8 100644
+index 7b9074f4195f..3f90e181f653 100644
 --- third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -13693,6 +12771,7 @@ index f5380aa782ca..ada14ba1b2f8 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -13701,13 +12780,12 @@ index f5380aa782ca..ada14ba1b2f8 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13742,7 +12820,6 @@ index f5380aa782ca..ada14ba1b2f8 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -13792,7 +12869,7 @@ index f5380aa782ca..ada14ba1b2f8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -13818,7 +12895,7 @@ index f5380aa782ca..ada14ba1b2f8 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -13860,18 +12937,10 @@ index f5380aa782ca..ada14ba1b2f8 100644
 -
  Library("rtp_packet_sender_gn")
 diff --git third_party/libwebrtc/api/rtp_parameters_gn/moz.build third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-index ca88debead18..ad44a44dbe44 100644
+index 4abaae2609eb..8228db31aa88 100644
 --- third_party/libwebrtc/api/rtp_parameters_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -13879,6 +12948,7 @@ index ca88debead18..ad44a44dbe44 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -13887,23 +12957,18 @@ index ca88debead18..ad44a44dbe44 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,107 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -13922,10 +12987,6 @@ index ca88debead18..ad44a44dbe44 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -13933,10 +12994,6 @@ index ca88debead18..ad44a44dbe44 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -13944,7 +13001,6 @@ index ca88debead18..ad44a44dbe44 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -13952,10 +13008,6 @@ index ca88debead18..ad44a44dbe44 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -13968,10 +13020,6 @@ index ca88debead18..ad44a44dbe44 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -14002,7 +13050,7 @@ index ca88debead18..ad44a44dbe44 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -155,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -14089,7 +13137,7 @@ index ca88debead18..ad44a44dbe44 100644
  
  Library("rtp_parameters_gn")
 diff --git third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
-index 4d234f8b55b0..0ad2a4fbf32b 100644
+index 4d2b9eb891c6..b14399134c2d 100644
 --- third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -14100,6 +13148,7 @@ index 4d234f8b55b0..0ad2a4fbf32b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -14108,13 +13157,12 @@ index 4d234f8b55b0..0ad2a4fbf32b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14149,7 +13197,6 @@ index 4d234f8b55b0..0ad2a4fbf32b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -14199,7 +13246,7 @@ index 4d234f8b55b0..0ad2a4fbf32b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -14225,7 +13272,7 @@ index 4d234f8b55b0..0ad2a4fbf32b 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -14267,18 +13314,10 @@ index 4d234f8b55b0..0ad2a4fbf32b 100644
 -
  Library("rtp_sender_interface_gn")
 diff --git third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
-index a4805ffc1c99..bff6bf560c8a 100644
+index 638db7eff309..361fb3659953 100644
 --- third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -14286,6 +13325,7 @@ index a4805ffc1c99..bff6bf560c8a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -14294,23 +13334,18 @@ index a4805ffc1c99..bff6bf560c8a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -14329,10 +13364,6 @@ index a4805ffc1c99..bff6bf560c8a 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -14340,10 +13371,6 @@ index a4805ffc1c99..bff6bf560c8a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -14351,7 +13378,6 @@ index a4805ffc1c99..bff6bf560c8a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -14359,10 +13385,6 @@ index a4805ffc1c99..bff6bf560c8a 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -14375,10 +13397,6 @@ index a4805ffc1c99..bff6bf560c8a 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -14416,7 +13434,7 @@ index a4805ffc1c99..bff6bf560c8a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -14474,10 +13492,10 @@ index a4805ffc1c99..bff6bf560c8a 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -14488,10 +13506,10 @@ index a4805ffc1c99..bff6bf560c8a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -14503,7 +13521,7 @@ index a4805ffc1c99..bff6bf560c8a 100644
  
  Library("rtp_sender_setparameters_callback_gn")
 diff --git third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
-index 3200010d7be9..a7f3de771f21 100644
+index 2ac81053797a..ad498fba2370 100644
 --- third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -14514,6 +13532,7 @@ index 3200010d7be9..a7f3de771f21 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -14522,13 +13541,12 @@ index 3200010d7be9..a7f3de771f21 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14563,7 +13581,6 @@ index 3200010d7be9..a7f3de771f21 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -14613,7 +13630,7 @@ index 3200010d7be9..a7f3de771f21 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -14639,7 +13656,7 @@ index 3200010d7be9..a7f3de771f21 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -14681,7 +13698,7 @@ index 3200010d7be9..a7f3de771f21 100644
 -
  Library("rtp_transceiver_direction_gn")
 diff --git third_party/libwebrtc/api/scoped_refptr_gn/moz.build third_party/libwebrtc/api/scoped_refptr_gn/moz.build
-index 05d52fc67a4c..0cc6993ab717 100644
+index 538b3be29bf7..d21843a6e841 100644
 --- third_party/libwebrtc/api/scoped_refptr_gn/moz.build
 +++ third_party/libwebrtc/api/scoped_refptr_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -14692,6 +13709,7 @@ index 05d52fc67a4c..0cc6993ab717 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -14700,13 +13718,12 @@ index 05d52fc67a4c..0cc6993ab717 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14741,7 +13758,6 @@ index 05d52fc67a4c..0cc6993ab717 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -14791,7 +13807,7 @@ index 05d52fc67a4c..0cc6993ab717 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -14817,7 +13833,7 @@ index 05d52fc67a4c..0cc6993ab717 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -14859,7 +13875,7 @@ index 05d52fc67a4c..0cc6993ab717 100644
 -
  Library("scoped_refptr_gn")
 diff --git third_party/libwebrtc/api/sequence_checker_gn/moz.build third_party/libwebrtc/api/sequence_checker_gn/moz.build
-index 94361b85f4a3..1d99c403a99d 100644
+index 7191593a76b3..3d6fb81819e5 100644
 --- third_party/libwebrtc/api/sequence_checker_gn/moz.build
 +++ third_party/libwebrtc/api/sequence_checker_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -14870,6 +13886,7 @@ index 94361b85f4a3..1d99c403a99d 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -14878,13 +13895,12 @@ index 94361b85f4a3..1d99c403a99d 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14923,7 +13939,6 @@ index 94361b85f4a3..1d99c403a99d 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -14973,7 +13988,7 @@ index 94361b85f4a3..1d99c403a99d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -14999,7 +14014,7 @@ index 94361b85f4a3..1d99c403a99d 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -15041,7 +14056,7 @@ index 94361b85f4a3..1d99c403a99d 100644
 -
  Library("sequence_checker_gn")
 diff --git third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build
-index 3efdfa726191..f049abc3ddf5 100644
+index 369ff54e9cc8..6cc93ea1aeff 100644
 --- third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build
 +++ third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -15052,6 +14067,7 @@ index 3efdfa726191..f049abc3ddf5 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -15060,13 +14076,12 @@ index 3efdfa726191..f049abc3ddf5 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15101,7 +14116,6 @@ index 3efdfa726191..f049abc3ddf5 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -15151,7 +14165,7 @@ index 3efdfa726191..f049abc3ddf5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -15177,7 +14191,7 @@ index 3efdfa726191..f049abc3ddf5 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -15219,18 +14233,10 @@ index 3efdfa726191..f049abc3ddf5 100644
 -
  Library("default_task_queue_factory_gn")
 diff --git third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
-index 714eb9e748de..9359661039d6 100644
+index 3103b41da833..04259db6efb1 100644
 --- third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
 +++ third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -15238,6 +14244,7 @@ index 714eb9e748de..9359661039d6 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -15246,23 +14253,18 @@ index 714eb9e748de..9359661039d6 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -15281,10 +14283,6 @@ index 714eb9e748de..9359661039d6 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -15292,10 +14290,6 @@ index 714eb9e748de..9359661039d6 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -15303,7 +14297,6 @@ index 714eb9e748de..9359661039d6 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -15311,10 +14304,6 @@ index 714eb9e748de..9359661039d6 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -15327,10 +14316,6 @@ index 714eb9e748de..9359661039d6 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -15361,7 +14346,7 @@ index 714eb9e748de..9359661039d6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -15448,18 +14433,10 @@ index 714eb9e748de..9359661039d6 100644
  
  Library("pending_task_safety_flag_gn")
 diff --git third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
-index 67bbd643dcf2..f1a5bc97fc2c 100644
+index 4dfef6fa6711..c94462630755 100644
 --- third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
 +++ third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -15467,6 +14444,7 @@ index 67bbd643dcf2..f1a5bc97fc2c 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -15475,23 +14453,18 @@ index 67bbd643dcf2..f1a5bc97fc2c 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -15510,10 +14483,6 @@ index 67bbd643dcf2..f1a5bc97fc2c 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -15521,10 +14490,6 @@ index 67bbd643dcf2..f1a5bc97fc2c 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -15532,7 +14497,6 @@ index 67bbd643dcf2..f1a5bc97fc2c 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -15540,10 +14504,6 @@ index 67bbd643dcf2..f1a5bc97fc2c 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -15556,10 +14516,6 @@ index 67bbd643dcf2..f1a5bc97fc2c 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -15590,7 +14546,7 @@ index 67bbd643dcf2..f1a5bc97fc2c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -15677,7 +14633,7 @@ index 67bbd643dcf2..f1a5bc97fc2c 100644
  
  Library("task_queue_gn")
 diff --git third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
-index 161cde130304..8e0139eafbb4 100644
+index b09ad121a6af..53e93cf4ca63 100644
 --- third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
 +++ third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -15688,6 +14644,7 @@ index 161cde130304..8e0139eafbb4 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -15696,13 +14653,12 @@ index 161cde130304..8e0139eafbb4 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15737,7 +14693,6 @@ index 161cde130304..8e0139eafbb4 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -15787,7 +14742,7 @@ index 161cde130304..8e0139eafbb4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -15813,7 +14768,7 @@ index 161cde130304..8e0139eafbb4 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -15855,7 +14810,7 @@ index 161cde130304..8e0139eafbb4 100644
 -
  Library("bandwidth_estimation_settings_gn")
 diff --git third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build
-index f8ad511f0820..5b490cc8b03c 100644
+index a6b96ce34164..d6a055dc77ba 100644
 --- third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build
 +++ third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -15866,6 +14821,7 @@ index f8ad511f0820..5b490cc8b03c 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -15874,13 +14830,12 @@ index f8ad511f0820..5b490cc8b03c 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15915,7 +14870,6 @@ index f8ad511f0820..5b490cc8b03c 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -15965,7 +14919,7 @@ index f8ad511f0820..5b490cc8b03c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -15991,7 +14945,7 @@ index f8ad511f0820..5b490cc8b03c 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -16033,18 +14987,10 @@ index f8ad511f0820..5b490cc8b03c 100644
 -
  Library("bandwidth_usage_gn")
 diff --git third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
-index 15a02a15ec22..47b4ba15b41c 100644
+index 1f1d1c4c736a..ce48d9240524 100644
 --- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
 +++ third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -16052,6 +14998,7 @@ index 15a02a15ec22..47b4ba15b41c 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -16060,23 +15007,18 @@ index 15a02a15ec22..47b4ba15b41c 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -16091,10 +15033,6 @@ index 15a02a15ec22..47b4ba15b41c 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -16102,10 +15040,6 @@ index 15a02a15ec22..47b4ba15b41c 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -16113,7 +15047,6 @@ index 15a02a15ec22..47b4ba15b41c 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -16121,10 +15054,6 @@ index 15a02a15ec22..47b4ba15b41c 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -16137,10 +15066,6 @@ index 15a02a15ec22..47b4ba15b41c 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -16171,7 +15096,7 @@ index 15a02a15ec22..47b4ba15b41c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -16229,10 +15154,10 @@ index 15a02a15ec22..47b4ba15b41c 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -16243,10 +15168,10 @@ index 15a02a15ec22..47b4ba15b41c 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -16258,7 +15183,7 @@ index 15a02a15ec22..47b4ba15b41c 100644
  
  Library("bitrate_settings_gn")
 diff --git third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
-index 86faea91265a..d33ba400e8de 100644
+index cee851fd0446..b16ccce6f104 100644
 --- third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
 +++ third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -16269,6 +15194,7 @@ index 86faea91265a..d33ba400e8de 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -16277,13 +15203,12 @@ index 86faea91265a..d33ba400e8de 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16322,7 +15247,6 @@ index 86faea91265a..d33ba400e8de 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -16379,7 +15303,7 @@ index 86faea91265a..d33ba400e8de 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -16405,7 +15329,7 @@ index 86faea91265a..d33ba400e8de 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -16447,7 +15371,7 @@ index 86faea91265a..d33ba400e8de 100644
 -
  Library("datagram_transport_interface_gn")
 diff --git third_party/libwebrtc/api/transport/ecn_marking_gn/moz.build third_party/libwebrtc/api/transport/ecn_marking_gn/moz.build
-index 208ee8847f83..208719b03b57 100644
+index d398fe8173ce..de8ef38e2bbc 100644
 --- third_party/libwebrtc/api/transport/ecn_marking_gn/moz.build
 +++ third_party/libwebrtc/api/transport/ecn_marking_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -16458,6 +15382,7 @@ index 208ee8847f83..208719b03b57 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -16466,13 +15391,12 @@ index 208ee8847f83..208719b03b57 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16507,7 +15431,6 @@ index 208ee8847f83..208719b03b57 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -16557,7 +15480,7 @@ index 208ee8847f83..208719b03b57 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -16583,7 +15506,7 @@ index 208ee8847f83..208719b03b57 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -16624,19 +15547,11 @@ index 208ee8847f83..208719b03b57 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
  Library("ecn_marking_gn")
-diff --git third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
-index 2e54542f5291..a73c2a391505 100644
---- third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
-+++ third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+diff --git third_party/libwebrtc/api/transport/goog_cc_gn/moz.build third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
+index 0ea320c48cb1..7f4d08190fbd 100644
+--- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
++++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -16644,6 +15559,7 @@ index 2e54542f5291..a73c2a391505 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -16652,23 +15568,18 @@ index 2e54542f5291..a73c2a391505 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -16682,15 +15593,12 @@ index 2e54542f5291..a73c2a391505 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
+-        "GLESv2",
 -        "log"
 -    ]
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -16698,10 +15606,6 @@ index 2e54542f5291..a73c2a391505 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -16709,7 +15613,6 @@ index 2e54542f5291..a73c2a391505 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -16717,10 +15620,6 @@ index 2e54542f5291..a73c2a391505 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -16733,10 +15632,6 @@ index 2e54542f5291..a73c2a391505 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -16774,7 +15669,7 @@ index 2e54542f5291..a73c2a391505 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -16832,10 +15727,10 @@ index 2e54542f5291..a73c2a391505 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -16846,10 +15741,10 @@ index 2e54542f5291..a73c2a391505 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -16859,20 +15754,12 @@ index 2e54542f5291..a73c2a391505 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("field_trial_based_config_gn")
-diff --git third_party/libwebrtc/api/transport/goog_cc_gn/moz.build third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-index 7a66e70ca013..3f3045103dce 100644
---- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-+++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("goog_cc_gn")
+diff --git third_party/libwebrtc/api/transport/network_control_gn/moz.build third_party/libwebrtc/api/transport/network_control_gn/moz.build
+index 3daf12907a25..fe17cc7e3b41 100644
+--- third_party/libwebrtc/api/transport/network_control_gn/moz.build
++++ third_party/libwebrtc/api/transport/network_control_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -16880,6 +15767,7 @@ index 7a66e70ca013..3f3045103dce 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -16888,23 +15776,18 @@ index 7a66e70ca013..3f3045103dce 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -16918,16 +15801,11 @@ index 7a66e70ca013..3f3045103dce 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -16935,10 +15813,6 @@ index 7a66e70ca013..3f3045103dce 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -16946,7 +15820,6 @@ index 7a66e70ca013..3f3045103dce 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -16954,10 +15827,6 @@ index 7a66e70ca013..3f3045103dce 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -16970,10 +15839,6 @@ index 7a66e70ca013..3f3045103dce 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -17011,7 +15876,7 @@ index 7a66e70ca013..3f3045103dce 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -17069,10 +15934,10 @@ index 7a66e70ca013..3f3045103dce 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -17083,10 +15948,10 @@ index 7a66e70ca013..3f3045103dce 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -17096,20 +15961,12 @@ index 7a66e70ca013..3f3045103dce 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("goog_cc_gn")
-diff --git third_party/libwebrtc/api/transport/network_control_gn/moz.build third_party/libwebrtc/api/transport/network_control_gn/moz.build
-index c901772b804b..f439f12a64a0 100644
---- third_party/libwebrtc/api/transport/network_control_gn/moz.build
-+++ third_party/libwebrtc/api/transport/network_control_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("network_control_gn")
+diff --git third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
+index ae81701a1bd9..8f83c4414424 100644
+--- third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
++++ third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -17117,6 +15974,7 @@ index c901772b804b..f439f12a64a0 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -17125,23 +15983,18 @@ index c901772b804b..f439f12a64a0 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -17160,10 +16013,6 @@ index c901772b804b..f439f12a64a0 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -17171,10 +16020,6 @@ index c901772b804b..f439f12a64a0 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -17182,7 +16027,6 @@ index c901772b804b..f439f12a64a0 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -17190,10 +16034,6 @@ index c901772b804b..f439f12a64a0 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -17206,10 +16046,6 @@ index c901772b804b..f439f12a64a0 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -17236,18 +16072,11 @@ index c901772b804b..f439f12a64a0 100644
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
 -    DEFINES["__STD_C"] = True
--
--    OS_LIBS += [
--        "crypt32",
--        "iphlpapi",
--        "secur32",
--        "winmm"
--    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -17305,10 +16134,10 @@ index c901772b804b..f439f12a64a0 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -17319,10 +16148,10 @@ index c901772b804b..f439f12a64a0 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -17332,11 +16161,11 @@ index c901772b804b..f439f12a64a0 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("network_control_gn")
-diff --git third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
-index b6e01a151f48..858f49e8ebc3 100644
---- third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
-+++ third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
+ Library("corruption_detection_message_gn")
+diff --git third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
+index c491583efb60..d0cc148b59ed 100644
+--- third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
++++ third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -17345,6 +16174,7 @@ index b6e01a151f48..858f49e8ebc3 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -17353,13 +16183,12 @@ index b6e01a151f48..858f49e8ebc3 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17398,7 +16227,6 @@ index b6e01a151f48..858f49e8ebc3 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -17448,12 +16276,16 @@ index b6e01a151f48..858f49e8ebc3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
 -if CONFIG["TARGET_CPU"] == "arm":
 -
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -17474,10 +16306,12 @@ index b6e01a151f48..858f49e8ebc3 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
- 
-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["_DEBUG"] = True
@@ -17498,6 +16332,12 @@ index b6e01a151f48..858f49e8ebc3 100644
 -
 -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 -
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -17508,26 +16348,25 @@ index b6e01a151f48..858f49e8ebc3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    DEFINES["_GNU_SOURCE"] = True
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
 -
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
--
++if CONFIG["TARGET_CPU"] == "x86_64":
+ 
 -    DEFINES["_GNU_SOURCE"] = True
--
- Library("corruption_detection_message_gn")
-diff --git third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
-index d90f5c1fff26..aa6d3855421a 100644
---- third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
-+++ third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("dependency_descriptor_gn")
+diff --git third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
+index cb0e7defe522..793859a3646e 100644
+--- third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
++++ third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -17535,6 +16374,7 @@ index d90f5c1fff26..aa6d3855421a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -17543,23 +16383,18 @@ index d90f5c1fff26..aa6d3855421a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -17578,10 +16413,6 @@ index d90f5c1fff26..aa6d3855421a 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -17589,10 +16420,6 @@ index d90f5c1fff26..aa6d3855421a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -17600,7 +16427,6 @@ index d90f5c1fff26..aa6d3855421a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -17608,10 +16434,6 @@ index d90f5c1fff26..aa6d3855421a 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -17624,10 +16446,6 @@ index d90f5c1fff26..aa6d3855421a 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -17654,20 +16472,23 @@ index d90f5c1fff26..aa6d3855421a 100644
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
 -    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
 -if CONFIG["TARGET_CPU"] == "arm":
 -
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -17688,12 +16509,10 @@ index d90f5c1fff26..aa6d3855421a 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
--if CONFIG["TARGET_CPU"] == "x86_64":
--
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["_DEBUG"] = True
@@ -17714,12 +16533,6 @@ index d90f5c1fff26..aa6d3855421a 100644
 -
 -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 -
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -17730,24 +16543,17 @@ index d90f5c1fff26..aa6d3855421a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
 -    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["TARGET_CPU"] == "x86_64":
- 
+-
 -    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
- Library("dependency_descriptor_gn")
-diff --git third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
-index 04dea7a88a95..4a75f1179c77 100644
---- third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
-+++ third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
+-
+ Library("rtp_source_gn")
+diff --git third_party/libwebrtc/api/transport/stun_types_gn/moz.build third_party/libwebrtc/api/transport/stun_types_gn/moz.build
+index d04fea40304d..204fddb0f9fe 100644
+--- third_party/libwebrtc/api/transport/stun_types_gn/moz.build
++++ third_party/libwebrtc/api/transport/stun_types_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -17756,6 +16562,7 @@ index 04dea7a88a95..4a75f1179c77 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -17764,13 +16571,12 @@ index 04dea7a88a95..4a75f1179c77 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17789,10 +16595,6 @@ index 04dea7a88a95..4a75f1179c77 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -17809,7 +16611,6 @@ index 04dea7a88a95..4a75f1179c77 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -17855,18 +16656,11 @@ index 04dea7a88a95..4a75f1179c77 100644
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
 -    DEFINES["__STD_C"] = True
--
--    OS_LIBS += [
--        "crypt32",
--        "iphlpapi",
--        "secur32",
--        "winmm"
--    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -17892,7 +16686,7 @@ index 04dea7a88a95..4a75f1179c77 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -17932,11 +16726,11 @@ index 04dea7a88a95..4a75f1179c77 100644
 -
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("rtp_source_gn")
-diff --git third_party/libwebrtc/api/transport/stun_types_gn/moz.build third_party/libwebrtc/api/transport/stun_types_gn/moz.build
-index 1df2fbf24564..19472d624dec 100644
---- third_party/libwebrtc/api/transport/stun_types_gn/moz.build
-+++ third_party/libwebrtc/api/transport/stun_types_gn/moz.build
+ Library("stun_types_gn")
+diff --git third_party/libwebrtc/api/transport_api_gn/moz.build third_party/libwebrtc/api/transport_api_gn/moz.build
+index 7af13124c2db..c979fda6e5bc 100644
+--- third_party/libwebrtc/api/transport_api_gn/moz.build
++++ third_party/libwebrtc/api/transport_api_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -17945,6 +16739,7 @@ index 1df2fbf24564..19472d624dec 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -17953,13 +16748,12 @@ index 1df2fbf24564..19472d624dec 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17978,6 +16772,10 @@ index 1df2fbf24564..19472d624dec 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -17994,7 +16792,6 @@ index 1df2fbf24564..19472d624dec 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -18044,12 +16841,16 @@ index 1df2fbf24564..19472d624dec 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
 -if CONFIG["TARGET_CPU"] == "arm":
 -
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -18070,10 +16871,12 @@ index 1df2fbf24564..19472d624dec 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
- 
-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["_DEBUG"] = True
@@ -18094,6 +16897,12 @@ index 1df2fbf24564..19472d624dec 100644
 -
 -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 -
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -18104,26 +16913,25 @@ index 1df2fbf24564..19472d624dec 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    DEFINES["_GNU_SOURCE"] = True
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
 -
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
--
++if CONFIG["TARGET_CPU"] == "x86_64":
+ 
 -    DEFINES["_GNU_SOURCE"] = True
--
- Library("stun_types_gn")
-diff --git third_party/libwebrtc/api/transport_api_gn/moz.build third_party/libwebrtc/api/transport_api_gn/moz.build
-index ae593f92c78f..6d7690536e17 100644
---- third_party/libwebrtc/api/transport_api_gn/moz.build
-+++ third_party/libwebrtc/api/transport_api_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("transport_api_gn")
+diff --git third_party/libwebrtc/api/units/data_rate_gn/moz.build third_party/libwebrtc/api/units/data_rate_gn/moz.build
+index 1b35b7cf5a8a..14ba2c78be54 100644
+--- third_party/libwebrtc/api/units/data_rate_gn/moz.build
++++ third_party/libwebrtc/api/units/data_rate_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -18131,6 +16939,7 @@ index ae593f92c78f..6d7690536e17 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -18139,23 +16948,18 @@ index ae593f92c78f..6d7690536e17 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -18174,10 +16978,6 @@ index ae593f92c78f..6d7690536e17 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -18185,10 +16985,6 @@ index ae593f92c78f..6d7690536e17 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -18196,7 +16992,6 @@ index ae593f92c78f..6d7690536e17 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -18204,10 +16999,6 @@ index ae593f92c78f..6d7690536e17 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -18220,10 +17011,6 @@ index ae593f92c78f..6d7690536e17 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -18254,7 +17041,7 @@ index ae593f92c78f..6d7690536e17 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -18339,20 +17126,12 @@ index ae593f92c78f..6d7690536e17 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("transport_api_gn")
-diff --git third_party/libwebrtc/api/units/data_rate_gn/moz.build third_party/libwebrtc/api/units/data_rate_gn/moz.build
-index 5cd3be22e3be..d24a6c085e9e 100644
---- third_party/libwebrtc/api/units/data_rate_gn/moz.build
-+++ third_party/libwebrtc/api/units/data_rate_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("data_rate_gn")
+diff --git third_party/libwebrtc/api/units/data_size_gn/moz.build third_party/libwebrtc/api/units/data_size_gn/moz.build
+index 6f099efeb030..ed647bda87f0 100644
+--- third_party/libwebrtc/api/units/data_size_gn/moz.build
++++ third_party/libwebrtc/api/units/data_size_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -18360,6 +17139,7 @@ index 5cd3be22e3be..d24a6c085e9e 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -18368,23 +17148,18 @@ index 5cd3be22e3be..d24a6c085e9e 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -18403,10 +17178,6 @@ index 5cd3be22e3be..d24a6c085e9e 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -18414,10 +17185,6 @@ index 5cd3be22e3be..d24a6c085e9e 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -18425,7 +17192,6 @@ index 5cd3be22e3be..d24a6c085e9e 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -18433,10 +17199,6 @@ index 5cd3be22e3be..d24a6c085e9e 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -18449,10 +17211,6 @@ index 5cd3be22e3be..d24a6c085e9e 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -18483,7 +17241,7 @@ index 5cd3be22e3be..d24a6c085e9e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -18568,20 +17326,12 @@ index 5cd3be22e3be..d24a6c085e9e 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("data_rate_gn")
-diff --git third_party/libwebrtc/api/units/data_size_gn/moz.build third_party/libwebrtc/api/units/data_size_gn/moz.build
-index d7ed81461302..f3c3b04ba2dc 100644
---- third_party/libwebrtc/api/units/data_size_gn/moz.build
-+++ third_party/libwebrtc/api/units/data_size_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("data_size_gn")
+diff --git third_party/libwebrtc/api/units/frequency_gn/moz.build third_party/libwebrtc/api/units/frequency_gn/moz.build
+index deea0df50db3..d23c1b6e2035 100644
+--- third_party/libwebrtc/api/units/frequency_gn/moz.build
++++ third_party/libwebrtc/api/units/frequency_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -18589,6 +17339,7 @@ index d7ed81461302..f3c3b04ba2dc 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -18597,23 +17348,18 @@ index d7ed81461302..f3c3b04ba2dc 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -18632,10 +17378,6 @@ index d7ed81461302..f3c3b04ba2dc 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -18643,10 +17385,6 @@ index d7ed81461302..f3c3b04ba2dc 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -18654,7 +17392,6 @@ index d7ed81461302..f3c3b04ba2dc 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -18662,10 +17399,6 @@ index d7ed81461302..f3c3b04ba2dc 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -18678,10 +17411,6 @@ index d7ed81461302..f3c3b04ba2dc 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -18712,7 +17441,7 @@ index d7ed81461302..f3c3b04ba2dc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -18797,20 +17526,12 @@ index d7ed81461302..f3c3b04ba2dc 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("data_size_gn")
-diff --git third_party/libwebrtc/api/units/frequency_gn/moz.build third_party/libwebrtc/api/units/frequency_gn/moz.build
-index 7a0251439e48..fcaf081a5be8 100644
---- third_party/libwebrtc/api/units/frequency_gn/moz.build
-+++ third_party/libwebrtc/api/units/frequency_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("frequency_gn")
+diff --git third_party/libwebrtc/api/units/time_delta_gn/moz.build third_party/libwebrtc/api/units/time_delta_gn/moz.build
+index 33ad19538d59..59b23badc5ef 100644
+--- third_party/libwebrtc/api/units/time_delta_gn/moz.build
++++ third_party/libwebrtc/api/units/time_delta_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -18818,6 +17539,7 @@ index 7a0251439e48..fcaf081a5be8 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -18826,23 +17548,18 @@ index 7a0251439e48..fcaf081a5be8 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -18861,10 +17578,6 @@ index 7a0251439e48..fcaf081a5be8 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -18872,10 +17585,6 @@ index 7a0251439e48..fcaf081a5be8 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -18883,7 +17592,6 @@ index 7a0251439e48..fcaf081a5be8 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -18891,10 +17599,6 @@ index 7a0251439e48..fcaf081a5be8 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -18907,10 +17611,6 @@ index 7a0251439e48..fcaf081a5be8 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -18941,7 +17641,7 @@ index 7a0251439e48..fcaf081a5be8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -19026,20 +17726,12 @@ index 7a0251439e48..fcaf081a5be8 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("frequency_gn")
-diff --git third_party/libwebrtc/api/units/time_delta_gn/moz.build third_party/libwebrtc/api/units/time_delta_gn/moz.build
-index 33d1ff96cc22..b7676710e4e7 100644
---- third_party/libwebrtc/api/units/time_delta_gn/moz.build
-+++ third_party/libwebrtc/api/units/time_delta_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("time_delta_gn")
+diff --git third_party/libwebrtc/api/units/timestamp_gn/moz.build third_party/libwebrtc/api/units/timestamp_gn/moz.build
+index 5f80d61516fd..73a877084b26 100644
+--- third_party/libwebrtc/api/units/timestamp_gn/moz.build
++++ third_party/libwebrtc/api/units/timestamp_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -19047,6 +17739,7 @@ index 33d1ff96cc22..b7676710e4e7 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -19055,23 +17748,18 @@ index 33d1ff96cc22..b7676710e4e7 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -19090,10 +17778,6 @@ index 33d1ff96cc22..b7676710e4e7 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -19101,10 +17785,6 @@ index 33d1ff96cc22..b7676710e4e7 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -19112,7 +17792,6 @@ index 33d1ff96cc22..b7676710e4e7 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -19120,10 +17799,6 @@ index 33d1ff96cc22..b7676710e4e7 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -19136,10 +17811,6 @@ index 33d1ff96cc22..b7676710e4e7 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -19170,7 +17841,7 @@ index 33d1ff96cc22..b7676710e4e7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -19255,20 +17926,12 @@ index 33d1ff96cc22..b7676710e4e7 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("time_delta_gn")
-diff --git third_party/libwebrtc/api/units/timestamp_gn/moz.build third_party/libwebrtc/api/units/timestamp_gn/moz.build
-index 1c78d311f808..d839dbd4c05f 100644
---- third_party/libwebrtc/api/units/timestamp_gn/moz.build
-+++ third_party/libwebrtc/api/units/timestamp_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("timestamp_gn")
+diff --git third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
+index 5eb24e52173a..bae12fef07bf 100644
+--- third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
++++ third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -19276,6 +17939,7 @@ index 1c78d311f808..d839dbd4c05f 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -19284,23 +17948,18 @@ index 1c78d311f808..d839dbd4c05f 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -19314,15 +17973,12 @@ index 1c78d311f808..d839dbd4c05f 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
+-        "GLESv2",
 -        "log"
 -    ]
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -19330,10 +17986,6 @@ index 1c78d311f808..d839dbd4c05f 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -19341,7 +17993,6 @@ index 1c78d311f808..d839dbd4c05f 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -19349,10 +18000,209 @@ index 1c78d311f808..d839dbd4c05f 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-    DEFINES["NOMINMAX"] = True
+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
+-    DEFINES["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
+-    DEFINES["WIN32"] = True
+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+-    DEFINES["WINVER"] = "0x0A00"
+-    DEFINES["_ATL_NO_OPENGL"] = True
+-    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
+-    DEFINES["_CRT_RAND_S"] = True
+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
+-    DEFINES["_HAS_NODISCARD"] = True
+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_SECURE_ATL"] = True
+-    DEFINES["_UNICODE"] = True
+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
+-    DEFINES["_WINDOWS"] = True
+-    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
+-    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
++    DEFINES["_DEBUG"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "aarch64":
+ 
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+     DEFINES["WEBRTC_HAS_NEON"] = True
+     DEFINES["__ARM_NEON__"] = "1"
+ 
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["TARGET_CPU"] == "loongarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+ if CONFIG["TARGET_CPU"] == "mips32":
+ 
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "x86":
+ 
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
 -    CXXFLAGS += [
--        "-std=gnu++20"
+-        "-msse2"
 -    ]
 -
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
++if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+ Library("builtin_video_bitrate_allocator_factory_gn")
+diff --git third_party/libwebrtc/api/video/corruption_detection/filter_settings_gn/moz.build third_party/libwebrtc/api/video/corruption_detection/filter_settings_gn/moz.build
+index e38f35fd89c4..7f0f4946ad7c 100644
+--- third_party/libwebrtc/api/video/corruption_detection/filter_settings_gn/moz.build
++++ third_party/libwebrtc/api/video/corruption_detection/filter_settings_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+ FINAL_LIBRARY = "xul"
+ 
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+ 
+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["ANDROID"] = True
+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
+-    DEFINES["HAVE_SYS_UIO_H"] = True
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -19365,10 +18215,187 @@ index 1c78d311f808..d839dbd4c05f 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-    DEFINES["NOMINMAX"] = True
+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
+-    DEFINES["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
+-    DEFINES["WIN32"] = True
+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+-    DEFINES["WINVER"] = "0x0A00"
+-    DEFINES["_ATL_NO_OPENGL"] = True
+-    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
+-    DEFINES["_CRT_RAND_S"] = True
+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
+-    DEFINES["_HAS_NODISCARD"] = True
+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_SECURE_ATL"] = True
+-    DEFINES["_UNICODE"] = True
+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
+-    DEFINES["_WINDOWS"] = True
+-    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
+-    DEFINES["__STD_C"] = True
++    DEFINES["_DEBUG"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "aarch64":
+ 
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+     DEFINES["WEBRTC_HAS_NEON"] = True
+     DEFINES["__ARM_NEON__"] = "1"
+ 
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["TARGET_CPU"] == "loongarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+ if CONFIG["TARGET_CPU"] == "mips32":
+ 
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "x86":
+ 
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+ Library("filter_settings_gn")
+diff --git third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_gn/moz.build third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_gn/moz.build
+index 784b4ebfa65a..5fd5f86f273b 100644
+--- third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_gn/moz.build
++++ third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+ FINAL_LIBRARY = "xul"
+ 
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+ 
+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["ANDROID"] = True
+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
+-    DEFINES["HAVE_SYS_UIO_H"] = True
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-    OS_LIBS += [
+-        "log"
 -    ]
 -
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -19399,7 +18426,7 @@ index 1c78d311f808..d839dbd4c05f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -19484,20 +18511,12 @@ index 1c78d311f808..d839dbd4c05f 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("timestamp_gn")
-diff --git third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
-index 21396f2532b3..515f9ef7ce12 100644
---- third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
-+++ third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("frame_instrumentation_data_gn")
+diff --git third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_reader_gn/moz.build third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_reader_gn/moz.build
+index f50de2a3968f..aac961573d3a 100644
+--- third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_reader_gn/moz.build
++++ third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_reader_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -19505,6 +18524,7 @@ index 21396f2532b3..515f9ef7ce12 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -19513,23 +18533,18 @@ index 21396f2532b3..515f9ef7ce12 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -19543,16 +18558,11 @@ index 21396f2532b3..515f9ef7ce12 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -19560,10 +18570,6 @@ index 21396f2532b3..515f9ef7ce12 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -19571,7 +18577,6 @@ index 21396f2532b3..515f9ef7ce12 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -19579,10 +18584,6 @@ index 21396f2532b3..515f9ef7ce12 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -19595,10 +18596,6 @@ index 21396f2532b3..515f9ef7ce12 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -19636,7 +18633,7 @@ index 21396f2532b3..515f9ef7ce12 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -19694,10 +18691,10 @@ index 21396f2532b3..515f9ef7ce12 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -19708,10 +18705,10 @@ index 21396f2532b3..515f9ef7ce12 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -19721,11 +18718,11 @@ index 21396f2532b3..515f9ef7ce12 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("builtin_video_bitrate_allocator_factory_gn")
-diff --git third_party/libwebrtc/api/video/corruption_detection_filter_settings_gn/moz.build third_party/libwebrtc/api/video/corruption_detection_filter_settings_gn/moz.build
-index 007b03f40df4..f35f563d51d6 100644
---- third_party/libwebrtc/api/video/corruption_detection_filter_settings_gn/moz.build
-+++ third_party/libwebrtc/api/video/corruption_detection_filter_settings_gn/moz.build
+ Library("frame_instrumentation_data_reader_gn")
+diff --git third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build
+index 259f7cf19bd8..8e982b933563 100644
+--- third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build
++++ third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -19734,6 +18731,7 @@ index 007b03f40df4..f35f563d51d6 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -19742,13 +18740,12 @@ index 007b03f40df4..f35f563d51d6 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19767,6 +18764,10 @@ index 007b03f40df4..f35f563d51d6 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -19783,7 +18784,6 @@ index 007b03f40df4..f35f563d51d6 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -19829,16 +18829,27 @@ index 007b03f40df4..f35f563d51d6 100644
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
 -    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
 -if CONFIG["TARGET_CPU"] == "arm":
 -
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -19859,10 +18870,12 @@ index 007b03f40df4..f35f563d51d6 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
- 
-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["_DEBUG"] = True
@@ -19883,6 +18896,12 @@ index 007b03f40df4..f35f563d51d6 100644
 -
 -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 -
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -19893,26 +18912,25 @@ index 007b03f40df4..f35f563d51d6 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    DEFINES["_GNU_SOURCE"] = True
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
 -
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
--
++if CONFIG["TARGET_CPU"] == "x86_64":
+ 
 -    DEFINES["_GNU_SOURCE"] = True
--
- Library("corruption_detection_filter_settings_gn")
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+ Library("frame_instrumentation_evaluation_gn")
 diff --git third_party/libwebrtc/api/video/encoded_frame_gn/moz.build third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
-index ce7e805a6e46..80b0a7e36c3e 100644
+index f43d0c641ef3..d2b102c61127 100644
 --- third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
 +++ third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -19920,6 +18938,7 @@ index ce7e805a6e46..80b0a7e36c3e 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -19928,23 +18947,18 @@ index ce7e805a6e46..80b0a7e36c3e 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -19963,10 +18977,6 @@ index ce7e805a6e46..80b0a7e36c3e 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -19974,10 +18984,6 @@ index ce7e805a6e46..80b0a7e36c3e 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -19985,7 +18991,6 @@ index ce7e805a6e46..80b0a7e36c3e 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -19993,10 +18998,6 @@ index ce7e805a6e46..80b0a7e36c3e 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -20009,10 +19010,6 @@ index ce7e805a6e46..80b0a7e36c3e 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -20050,7 +19047,7 @@ index ce7e805a6e46..80b0a7e36c3e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -20108,10 +19105,10 @@ index ce7e805a6e46..80b0a7e36c3e 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -20122,10 +19119,10 @@ index ce7e805a6e46..80b0a7e36c3e 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -20137,18 +19134,10 @@ index ce7e805a6e46..80b0a7e36c3e 100644
  
  Library("encoded_frame_gn")
 diff --git third_party/libwebrtc/api/video/encoded_image_gn/moz.build third_party/libwebrtc/api/video/encoded_image_gn/moz.build
-index ef3923f3f0a1..ab2df18f8879 100644
+index 858df454d82a..85fa5f6f2ae1 100644
 --- third_party/libwebrtc/api/video/encoded_image_gn/moz.build
 +++ third_party/libwebrtc/api/video/encoded_image_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -20156,6 +19145,7 @@ index ef3923f3f0a1..ab2df18f8879 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -20164,23 +19154,18 @@ index ef3923f3f0a1..ab2df18f8879 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -20199,10 +19184,6 @@ index ef3923f3f0a1..ab2df18f8879 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -20210,10 +19191,6 @@ index ef3923f3f0a1..ab2df18f8879 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -20221,7 +19198,6 @@ index ef3923f3f0a1..ab2df18f8879 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -20229,10 +19205,6 @@ index ef3923f3f0a1..ab2df18f8879 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -20245,10 +19217,6 @@ index ef3923f3f0a1..ab2df18f8879 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -20286,7 +19254,7 @@ index ef3923f3f0a1..ab2df18f8879 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -20344,10 +19312,10 @@ index ef3923f3f0a1..ab2df18f8879 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -20358,10 +19326,10 @@ index ef3923f3f0a1..ab2df18f8879 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -20373,18 +19341,10 @@ index ef3923f3f0a1..ab2df18f8879 100644
  
  Library("encoded_image_gn")
 diff --git third_party/libwebrtc/api/video/frame_buffer_gn/moz.build third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
-index 976a6ff25651..01221e0c95b7 100644
+index 0e97349cfc77..068e9983902f 100644
 --- third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
 +++ third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -20392,6 +19352,7 @@ index 976a6ff25651..01221e0c95b7 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -20400,23 +19361,18 @@ index 976a6ff25651..01221e0c95b7 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -20436,10 +19392,6 @@ index 976a6ff25651..01221e0c95b7 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -20447,10 +19399,6 @@ index 976a6ff25651..01221e0c95b7 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -20458,7 +19406,6 @@ index 976a6ff25651..01221e0c95b7 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -20466,10 +19413,6 @@ index 976a6ff25651..01221e0c95b7 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -20482,10 +19425,6 @@ index 976a6ff25651..01221e0c95b7 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -20523,7 +19462,7 @@ index 976a6ff25651..01221e0c95b7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -20581,10 +19520,10 @@ index 976a6ff25651..01221e0c95b7 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -20595,10 +19534,10 @@ index 976a6ff25651..01221e0c95b7 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -20610,7 +19549,7 @@ index 976a6ff25651..01221e0c95b7 100644
  
  Library("frame_buffer_gn")
 diff --git third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
-index 90c39627ea9c..315daacff346 100644
+index dbe54e47fb98..9b136ac42704 100644
 --- third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
 +++ third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -20621,6 +19560,7 @@ index 90c39627ea9c..315daacff346 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -20629,13 +19569,12 @@ index 90c39627ea9c..315daacff346 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20674,7 +19613,6 @@ index 90c39627ea9c..315daacff346 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -20731,7 +19669,7 @@ index 90c39627ea9c..315daacff346 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -20757,7 +19695,7 @@ index 90c39627ea9c..315daacff346 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -20799,7 +19737,7 @@ index 90c39627ea9c..315daacff346 100644
 -
  Library("recordable_encoded_frame_gn")
 diff --git third_party/libwebrtc/api/video/render_resolution_gn/moz.build third_party/libwebrtc/api/video/render_resolution_gn/moz.build
-index 6b314536b258..9961eaa7d49b 100644
+index 84f9a2b2c68a..d15140c641c2 100644
 --- third_party/libwebrtc/api/video/render_resolution_gn/moz.build
 +++ third_party/libwebrtc/api/video/render_resolution_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -20810,6 +19748,7 @@ index 6b314536b258..9961eaa7d49b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -20818,13 +19757,12 @@ index 6b314536b258..9961eaa7d49b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20859,7 +19797,6 @@ index 6b314536b258..9961eaa7d49b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -20909,7 +19846,7 @@ index 6b314536b258..9961eaa7d49b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -20935,7 +19872,7 @@ index 6b314536b258..9961eaa7d49b 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -20977,7 +19914,7 @@ index 6b314536b258..9961eaa7d49b 100644
 -
  Library("render_resolution_gn")
 diff --git third_party/libwebrtc/api/video/resolution_gn/moz.build third_party/libwebrtc/api/video/resolution_gn/moz.build
-index 04e2b1922e32..e6dbc2d6f88c 100644
+index 4a33d1cb0e9e..4080a7a25dd3 100644
 --- third_party/libwebrtc/api/video/resolution_gn/moz.build
 +++ third_party/libwebrtc/api/video/resolution_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -20988,6 +19925,7 @@ index 04e2b1922e32..e6dbc2d6f88c 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -20996,13 +19934,12 @@ index 04e2b1922e32..e6dbc2d6f88c 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21037,7 +19974,6 @@ index 04e2b1922e32..e6dbc2d6f88c 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -21087,7 +20023,7 @@ index 04e2b1922e32..e6dbc2d6f88c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -21113,7 +20049,7 @@ index 04e2b1922e32..e6dbc2d6f88c 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -21155,18 +20091,10 @@ index 04e2b1922e32..e6dbc2d6f88c 100644
 -
  Library("resolution_gn")
 diff --git third_party/libwebrtc/api/video/video_adaptation_gn/moz.build third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
-index d142cec6811b..5b0a157dee57 100644
+index 6c2807380aff..ad2ccb022fdc 100644
 --- third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -21174,6 +20102,7 @@ index d142cec6811b..5b0a157dee57 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -21182,23 +20111,18 @@ index d142cec6811b..5b0a157dee57 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -21217,10 +20141,6 @@ index d142cec6811b..5b0a157dee57 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -21228,10 +20148,6 @@ index d142cec6811b..5b0a157dee57 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -21239,7 +20155,6 @@ index d142cec6811b..5b0a157dee57 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -21247,10 +20162,6 @@ index d142cec6811b..5b0a157dee57 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -21263,10 +20174,6 @@ index d142cec6811b..5b0a157dee57 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -21297,7 +20204,7 @@ index d142cec6811b..5b0a157dee57 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -21384,18 +20291,10 @@ index d142cec6811b..5b0a157dee57 100644
  
  Library("video_adaptation_gn")
 diff --git third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
-index 8d1cc02953c4..1139199f56de 100644
+index a18df7dbd8f7..6343a67de50e 100644
 --- third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -21403,6 +20302,7 @@ index 8d1cc02953c4..1139199f56de 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -21411,23 +20311,18 @@ index 8d1cc02953c4..1139199f56de 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -21446,10 +20341,6 @@ index 8d1cc02953c4..1139199f56de 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -21457,10 +20348,6 @@ index 8d1cc02953c4..1139199f56de 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -21468,7 +20355,6 @@ index 8d1cc02953c4..1139199f56de 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -21476,10 +20362,6 @@ index 8d1cc02953c4..1139199f56de 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -21492,10 +20374,6 @@ index 8d1cc02953c4..1139199f56de 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -21526,7 +20404,7 @@ index 8d1cc02953c4..1139199f56de 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -21613,7 +20491,7 @@ index 8d1cc02953c4..1139199f56de 100644
  
  Library("video_bitrate_allocation_gn")
 diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
-index d2bf0c7403d6..6be377872652 100644
+index 5091c53d089e..a62643cf926a 100644
 --- third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -21624,6 +20502,7 @@ index d2bf0c7403d6..6be377872652 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -21632,13 +20511,12 @@ index d2bf0c7403d6..6be377872652 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21677,7 +20555,6 @@ index d2bf0c7403d6..6be377872652 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -21734,7 +20611,7 @@ index d2bf0c7403d6..6be377872652 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -21760,7 +20637,7 @@ index d2bf0c7403d6..6be377872652 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -21802,18 +20679,10 @@ index d2bf0c7403d6..6be377872652 100644
 -
  Library("video_bitrate_allocator_factory_gn")
 diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
-index 53ac7e089c7a..c36c59f06b72 100644
+index 37a5eb0ed8c2..175739fe4569 100644
 --- third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -21821,6 +20690,7 @@ index 53ac7e089c7a..c36c59f06b72 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -21829,23 +20699,18 @@ index 53ac7e089c7a..c36c59f06b72 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -21864,10 +20729,6 @@ index 53ac7e089c7a..c36c59f06b72 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -21875,10 +20736,6 @@ index 53ac7e089c7a..c36c59f06b72 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -21886,7 +20743,6 @@ index 53ac7e089c7a..c36c59f06b72 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -21894,10 +20750,6 @@ index 53ac7e089c7a..c36c59f06b72 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -21910,10 +20762,6 @@ index 53ac7e089c7a..c36c59f06b72 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -21944,7 +20792,7 @@ index 53ac7e089c7a..c36c59f06b72 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -22031,7 +20879,7 @@ index 53ac7e089c7a..c36c59f06b72 100644
  
  Library("video_bitrate_allocator_gn")
 diff --git third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
-index 12364de002c7..3dcb2f1fa8a7 100644
+index 258360394b9b..0b37739d6af2 100644
 --- third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -22042,6 +20890,7 @@ index 12364de002c7..3dcb2f1fa8a7 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -22050,13 +20899,12 @@ index 12364de002c7..3dcb2f1fa8a7 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22091,7 +20939,6 @@ index 12364de002c7..3dcb2f1fa8a7 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -22141,7 +20988,7 @@ index 12364de002c7..3dcb2f1fa8a7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -22167,7 +21014,7 @@ index 12364de002c7..3dcb2f1fa8a7 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -22209,18 +21056,10 @@ index 12364de002c7..3dcb2f1fa8a7 100644
 -
  Library("video_codec_constants_gn")
 diff --git third_party/libwebrtc/api/video/video_frame_gn/moz.build third_party/libwebrtc/api/video/video_frame_gn/moz.build
-index 0563038a395c..ea93de3e6bbf 100644
+index 002adff7180e..22b486c49f35 100644
 --- third_party/libwebrtc/api/video/video_frame_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_frame_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -22228,6 +21067,7 @@ index 0563038a395c..ea93de3e6bbf 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -22236,23 +21076,18 @@ index 0563038a395c..ea93de3e6bbf 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -57,114 +70,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -57,93 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -22271,10 +21106,6 @@ index 0563038a395c..ea93de3e6bbf 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -22282,10 +21113,6 @@ index 0563038a395c..ea93de3e6bbf 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -22293,7 +21120,6 @@ index 0563038a395c..ea93de3e6bbf 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -22301,10 +21127,6 @@ index 0563038a395c..ea93de3e6bbf 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -22317,10 +21139,6 @@ index 0563038a395c..ea93de3e6bbf 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -22358,7 +21176,7 @@ index 0563038a395c..ea93de3e6bbf 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -172,82 +78,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -151,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -22416,10 +21234,10 @@ index 0563038a395c..ea93de3e6bbf 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -22430,10 +21248,10 @@ index 0563038a395c..ea93de3e6bbf 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -22445,18 +21263,10 @@ index 0563038a395c..ea93de3e6bbf 100644
  
  Library("video_frame_gn")
 diff --git third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
-index bfbd610a528b..3b78a97299cb 100644
+index 95be4b1cae96..99647b85c184 100644
 --- third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -22464,6 +21274,7 @@ index bfbd610a528b..3b78a97299cb 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -22472,23 +21283,18 @@ index bfbd610a528b..3b78a97299cb 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -53,114 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,93 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -22507,10 +21313,6 @@ index bfbd610a528b..3b78a97299cb 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -22518,10 +21320,6 @@ index bfbd610a528b..3b78a97299cb 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -22529,7 +21327,6 @@ index bfbd610a528b..3b78a97299cb 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -22537,10 +21334,6 @@ index bfbd610a528b..3b78a97299cb 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -22553,10 +21346,6 @@ index bfbd610a528b..3b78a97299cb 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -22594,7 +21383,7 @@ index bfbd610a528b..3b78a97299cb 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -168,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -147,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -22652,10 +21441,10 @@ index bfbd610a528b..3b78a97299cb 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -22666,10 +21455,10 @@ index bfbd610a528b..3b78a97299cb 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -22681,18 +21470,10 @@ index bfbd610a528b..3b78a97299cb 100644
  
  Library("video_frame_i010_gn")
 diff --git third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
-index 75b269e2048f..732982ea8f93 100644
+index 874879d32abc..a472607df4b9 100644
 --- third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -22700,6 +21481,7 @@ index 75b269e2048f..732982ea8f93 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -22708,23 +21490,18 @@ index 75b269e2048f..732982ea8f93 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -22743,10 +21520,6 @@ index 75b269e2048f..732982ea8f93 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -22754,10 +21527,6 @@ index 75b269e2048f..732982ea8f93 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -22765,7 +21534,6 @@ index 75b269e2048f..732982ea8f93 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -22773,10 +21541,6 @@ index 75b269e2048f..732982ea8f93 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -22789,10 +21553,6 @@ index 75b269e2048f..732982ea8f93 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -22830,7 +21590,7 @@ index 75b269e2048f..732982ea8f93 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -22888,10 +21648,10 @@ index 75b269e2048f..732982ea8f93 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -22902,10 +21662,10 @@ index 75b269e2048f..732982ea8f93 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -22917,7 +21677,7 @@ index 75b269e2048f..732982ea8f93 100644
  
  Library("video_frame_metadata_gn")
 diff --git third_party/libwebrtc/api/video/video_frame_type_gn/moz.build third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
-index 5935a6c894c2..095217577bc0 100644
+index 5c47765d9f2f..e05d85a65fe4 100644
 --- third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -22928,6 +21688,7 @@ index 5935a6c894c2..095217577bc0 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -22936,13 +21697,12 @@ index 5935a6c894c2..095217577bc0 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22981,7 +21741,6 @@ index 5935a6c894c2..095217577bc0 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -23031,7 +21790,7 @@ index 5935a6c894c2..095217577bc0 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -23057,7 +21816,7 @@ index 5935a6c894c2..095217577bc0 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -23099,7 +21858,7 @@ index 5935a6c894c2..095217577bc0 100644
 -
  Library("video_frame_type_gn")
 diff --git third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
-index af9ad6ff4c34..ad3d57b292f1 100644
+index 5628699424f6..23d72244a799 100644
 --- third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -23110,6 +21869,7 @@ index af9ad6ff4c34..ad3d57b292f1 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -23118,13 +21878,12 @@ index af9ad6ff4c34..ad3d57b292f1 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23163,7 +21922,6 @@ index af9ad6ff4c34..ad3d57b292f1 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -23213,7 +21971,7 @@ index af9ad6ff4c34..ad3d57b292f1 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -23239,7 +21997,7 @@ index af9ad6ff4c34..ad3d57b292f1 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -23281,18 +22039,10 @@ index af9ad6ff4c34..ad3d57b292f1 100644
 -
  Library("video_layers_allocation_gn")
 diff --git third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
-index 7c66b583afd8..ff59a9c613f9 100644
+index 99588de22230..e3d29e8670c4 100644
 --- third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -23300,6 +22050,7 @@ index 7c66b583afd8..ff59a9c613f9 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -23308,23 +22059,18 @@ index 7c66b583afd8..ff59a9c613f9 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -23343,10 +22089,6 @@ index 7c66b583afd8..ff59a9c613f9 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -23354,10 +22096,6 @@ index 7c66b583afd8..ff59a9c613f9 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -23365,7 +22103,6 @@ index 7c66b583afd8..ff59a9c613f9 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -23373,10 +22110,6 @@ index 7c66b583afd8..ff59a9c613f9 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -23389,10 +22122,6 @@ index 7c66b583afd8..ff59a9c613f9 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -23430,7 +22159,7 @@ index 7c66b583afd8..ff59a9c613f9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -23488,10 +22217,10 @@ index 7c66b583afd8..ff59a9c613f9 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -23502,10 +22231,10 @@ index 7c66b583afd8..ff59a9c613f9 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -23517,7 +22246,7 @@ index 7c66b583afd8..ff59a9c613f9 100644
  
  Library("video_rtp_headers_gn")
 diff --git third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
-index a006d12053d8..21688646efab 100644
+index 23e709e46e9c..4df907e99963 100644
 --- third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -23528,6 +22257,7 @@ index a006d12053d8..21688646efab 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -23536,13 +22266,12 @@ index a006d12053d8..21688646efab 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23581,7 +22310,6 @@ index a006d12053d8..21688646efab 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -23638,7 +22366,7 @@ index a006d12053d8..21688646efab 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -23664,7 +22392,7 @@ index a006d12053d8..21688646efab 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -23706,7 +22434,7 @@ index a006d12053d8..21688646efab 100644
 -
  Library("video_stream_encoder_gn")
 diff --git third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
-index 07c2bb5faf09..ab4917f08c5b 100644
+index 6e26714bac12..b20f7bf51dff 100644
 --- third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -23717,6 +22445,7 @@ index 07c2bb5faf09..ab4917f08c5b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -23725,13 +22454,12 @@ index 07c2bb5faf09..ab4917f08c5b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23770,7 +22498,6 @@ index 07c2bb5faf09..ab4917f08c5b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -23820,7 +22547,7 @@ index 07c2bb5faf09..ab4917f08c5b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -23846,7 +22573,7 @@ index 07c2bb5faf09..ab4917f08c5b 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -23888,18 +22615,10 @@ index 07c2bb5faf09..ab4917f08c5b 100644
 -
  Library("bitstream_parser_api_gn")
 diff --git third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
-index 8395acf5481d..5b5ee908771a 100644
+index 67ef507d3097..7c7190358344 100644
 --- third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -23907,6 +22626,7 @@ index 8395acf5481d..5b5ee908771a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -23915,23 +22635,18 @@ index 8395acf5481d..5b5ee908771a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -23951,10 +22666,6 @@ index 8395acf5481d..5b5ee908771a 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -23962,10 +22673,6 @@ index 8395acf5481d..5b5ee908771a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -23973,7 +22680,6 @@ index 8395acf5481d..5b5ee908771a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -23981,10 +22687,6 @@ index 8395acf5481d..5b5ee908771a 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -23997,10 +22699,6 @@ index 8395acf5481d..5b5ee908771a 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -24038,7 +22736,7 @@ index 8395acf5481d..5b5ee908771a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -24096,10 +22794,10 @@ index 8395acf5481d..5b5ee908771a 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -24110,10 +22808,10 @@ index 8395acf5481d..5b5ee908771a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -24125,18 +22823,10 @@ index 8395acf5481d..5b5ee908771a 100644
  
  Library("builtin_video_decoder_factory_gn")
 diff --git third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
-index 83b3e5382450..56d24eb49b3a 100644
+index 86d649512c50..b757e05614e6 100644
 --- third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -24144,6 +22834,7 @@ index 83b3e5382450..56d24eb49b3a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -24152,23 +22843,18 @@ index 83b3e5382450..56d24eb49b3a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,115 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -24188,10 +22874,6 @@ index 83b3e5382450..56d24eb49b3a 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -24199,10 +22881,6 @@ index 83b3e5382450..56d24eb49b3a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -24210,7 +22888,6 @@ index 83b3e5382450..56d24eb49b3a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -24218,10 +22895,6 @@ index 83b3e5382450..56d24eb49b3a 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -24234,10 +22907,6 @@ index 83b3e5382450..56d24eb49b3a 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -24275,7 +22944,7 @@ index 83b3e5382450..56d24eb49b3a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -163,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -24333,10 +23002,10 @@ index 83b3e5382450..56d24eb49b3a 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -24347,10 +23016,10 @@ index 83b3e5382450..56d24eb49b3a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -24362,18 +23031,10 @@ index 83b3e5382450..56d24eb49b3a 100644
  
  Library("rtc_software_fallback_wrappers_gn")
 diff --git third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
-index 661ac13346af..289cbee55009 100644
+index a6663bb723e5..d08276393a91 100644
 --- third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -24381,6 +23042,7 @@ index 661ac13346af..289cbee55009 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -24389,23 +23051,18 @@ index 661ac13346af..289cbee55009 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -24424,10 +23081,6 @@ index 661ac13346af..289cbee55009 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -24435,10 +23088,6 @@ index 661ac13346af..289cbee55009 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -24446,7 +23095,6 @@ index 661ac13346af..289cbee55009 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -24454,10 +23102,6 @@ index 661ac13346af..289cbee55009 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -24470,10 +23114,6 @@ index 661ac13346af..289cbee55009 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -24504,7 +23144,7 @@ index 661ac13346af..289cbee55009 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -24591,18 +23231,10 @@ index 661ac13346af..289cbee55009 100644
  
  Library("scalability_mode_gn")
 diff --git third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
-index da45996c83c0..055e6ae6e83b 100644
+index 32e58da25377..fb69cedb88b3 100644
 --- third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -24610,6 +23242,7 @@ index da45996c83c0..055e6ae6e83b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -24618,23 +23251,18 @@ index da45996c83c0..055e6ae6e83b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -56,114 +69,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -56,93 +65,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -24653,10 +23281,6 @@ index da45996c83c0..055e6ae6e83b 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -24664,10 +23288,6 @@ index da45996c83c0..055e6ae6e83b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -24675,7 +23295,6 @@ index da45996c83c0..055e6ae6e83b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -24683,10 +23302,6 @@ index da45996c83c0..055e6ae6e83b 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -24699,10 +23314,6 @@ index da45996c83c0..055e6ae6e83b 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -24740,7 +23351,7 @@ index da45996c83c0..055e6ae6e83b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -171,82 +77,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -150,82 +73,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -24798,10 +23409,10 @@ index da45996c83c0..055e6ae6e83b 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -24812,10 +23423,10 @@ index da45996c83c0..055e6ae6e83b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -24827,7 +23438,7 @@ index da45996c83c0..055e6ae6e83b 100644
  
  Library("video_codecs_api_gn")
 diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
-index 1a9164e7e41c..c76c9a3552d7 100644
+index 4ace541c8629..1ba39e749117 100644
 --- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -24838,6 +23449,7 @@ index 1a9164e7e41c..c76c9a3552d7 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -24846,13 +23458,12 @@ index 1a9164e7e41c..c76c9a3552d7 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24891,7 +23502,6 @@ index 1a9164e7e41c..c76c9a3552d7 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -24948,7 +23558,7 @@ index 1a9164e7e41c..c76c9a3552d7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -24974,7 +23584,7 @@ index 1a9164e7e41c..c76c9a3552d7 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -25016,7 +23626,7 @@ index 1a9164e7e41c..c76c9a3552d7 100644
 -
  Library("video_encoder_factory_template_gn")
 diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build
-index a8b930a85b6b..b22b0a732179 100644
+index 2a97afcba467..cc35215f7f73 100644
 --- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -25027,6 +23637,7 @@ index a8b930a85b6b..b22b0a732179 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -25035,7 +23646,6 @@ index a8b930a85b6b..b22b0a732179 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -25061,6 +23671,7 @@ index a8b930a85b6b..b22b0a732179 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
+-        "GLESv2",
 -        "log"
 -    ]
 -
@@ -25080,7 +23691,6 @@ index a8b930a85b6b..b22b0a732179 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -25205,7 +23815,7 @@ index a8b930a85b6b..b22b0a732179 100644
 -
  Library("video_encoder_factory_template_libaom_av1_adapter_gn")
 diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
-index 9dac3c93b2a3..db12a5af1e46 100644
+index 0ed909d22eaa..30b36e992434 100644
 --- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -25216,6 +23826,7 @@ index 9dac3c93b2a3..db12a5af1e46 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -25224,13 +23835,12 @@ index 9dac3c93b2a3..db12a5af1e46 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25270,7 +23880,6 @@ index 9dac3c93b2a3..db12a5af1e46 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -25327,7 +23936,7 @@ index 9dac3c93b2a3..db12a5af1e46 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -25353,7 +23962,7 @@ index 9dac3c93b2a3..db12a5af1e46 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -25395,7 +24004,7 @@ index 9dac3c93b2a3..db12a5af1e46 100644
 -
  Library("video_encoder_factory_template_libvpx_vp8_adapter_gn")
 diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
-index 0eef288f971c..1bb0b123d76f 100644
+index 35016b696d1f..c7733ec4e5b5 100644
 --- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -25406,6 +24015,7 @@ index 0eef288f971c..1bb0b123d76f 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -25414,13 +24024,12 @@ index 0eef288f971c..1bb0b123d76f 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25460,7 +24069,6 @@ index 0eef288f971c..1bb0b123d76f 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -25517,7 +24125,7 @@ index 0eef288f971c..1bb0b123d76f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -25543,7 +24151,7 @@ index 0eef288f971c..1bb0b123d76f 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -25585,7 +24193,7 @@ index 0eef288f971c..1bb0b123d76f 100644
 -
  Library("video_encoder_factory_template_libvpx_vp9_adapter_gn")
 diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
-index 62b95f84fd54..c3611901cec2 100644
+index d6781fc429cb..e8a512374002 100644
 --- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -25596,6 +24204,7 @@ index 62b95f84fd54..c3611901cec2 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -25604,13 +24213,12 @@ index 62b95f84fd54..c3611901cec2 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25650,7 +24258,6 @@ index 62b95f84fd54..c3611901cec2 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -25707,7 +24314,7 @@ index 62b95f84fd54..c3611901cec2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -25733,7 +24340,7 @@ index 62b95f84fd54..c3611901cec2 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -25775,18 +24382,10 @@ index 62b95f84fd54..c3611901cec2 100644
 -
  Library("video_encoder_factory_template_open_h264_adapter_gn")
 diff --git third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
-index 287b47573441..8987834c3404 100644
+index 0da2c0072645..528d6c674073 100644
 --- third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -25794,6 +24393,7 @@ index 287b47573441..8987834c3404 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -25802,23 +24402,18 @@ index 287b47573441..8987834c3404 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -25838,10 +24433,6 @@ index 287b47573441..8987834c3404 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -25849,10 +24440,6 @@ index 287b47573441..8987834c3404 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -25860,7 +24447,6 @@ index 287b47573441..8987834c3404 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -25868,10 +24454,6 @@ index 287b47573441..8987834c3404 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -25884,10 +24466,6 @@ index 287b47573441..8987834c3404 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -25925,7 +24503,7 @@ index 287b47573441..8987834c3404 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -25983,10 +24561,10 @@ index 287b47573441..8987834c3404 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -25997,10 +24575,10 @@ index 287b47573441..8987834c3404 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -26012,7 +24590,7 @@ index 287b47573441..8987834c3404 100644
  
  Library("vp8_temporal_layers_factory_gn")
 diff --git third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
-index 2ea47a17004e..60fc36572eb3 100644
+index eff44f748eb9..999796fa561f 100644
 --- third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
 +++ third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -26023,6 +24601,7 @@ index 2ea47a17004e..60fc36572eb3 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -26031,13 +24610,12 @@ index 2ea47a17004e..60fc36572eb3 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26072,7 +24650,6 @@ index 2ea47a17004e..60fc36572eb3 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -26122,7 +24699,7 @@ index 2ea47a17004e..60fc36572eb3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -26148,7 +24725,7 @@ index 2ea47a17004e..60fc36572eb3 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -26190,18 +24767,10 @@ index 2ea47a17004e..60fc36572eb3 100644
 -
  Library("video_track_source_constraints_gn")
 diff --git third_party/libwebrtc/audio/audio_gn/moz.build third_party/libwebrtc/audio/audio_gn/moz.build
-index 0f6558106fa3..8713480a7a16 100644
+index 61c208cfe98b..2668ec4480d4 100644
 --- third_party/libwebrtc/audio/audio_gn/moz.build
 +++ third_party/libwebrtc/audio/audio_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -26209,6 +24778,7 @@ index 0f6558106fa3..8713480a7a16 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -26217,23 +24787,18 @@ index 0f6558106fa3..8713480a7a16 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -58,115 +71,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -58,94 +67,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -26253,10 +24818,6 @@ index 0f6558106fa3..8713480a7a16 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -26264,10 +24825,6 @@ index 0f6558106fa3..8713480a7a16 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -26275,7 +24832,6 @@ index 0f6558106fa3..8713480a7a16 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -26283,10 +24839,6 @@ index 0f6558106fa3..8713480a7a16 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -26299,10 +24851,6 @@ index 0f6558106fa3..8713480a7a16 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -26340,7 +24888,7 @@ index 0f6558106fa3..8713480a7a16 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -174,82 +79,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -153,82 +75,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -26398,10 +24946,10 @@ index 0f6558106fa3..8713480a7a16 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -26412,10 +24960,10 @@ index 0f6558106fa3..8713480a7a16 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -26427,18 +24975,10 @@ index 0f6558106fa3..8713480a7a16 100644
  
  Library("audio_gn")
 diff --git third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
-index c9e14552b453..266fce02a468 100644
+index 00a2557568ab..d2a840371942 100644
 --- third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
 +++ third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -26446,6 +24986,7 @@ index c9e14552b453..266fce02a468 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -26454,23 +24995,18 @@ index c9e14552b453..266fce02a468 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,114 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -26489,10 +25025,6 @@ index c9e14552b453..266fce02a468 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -26500,10 +25032,6 @@ index c9e14552b453..266fce02a468 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -26511,7 +25039,6 @@ index c9e14552b453..266fce02a468 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -26519,10 +25046,6 @@ index c9e14552b453..266fce02a468 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -26535,10 +25058,6 @@ index c9e14552b453..266fce02a468 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -26576,7 +25095,7 @@ index c9e14552b453..266fce02a468 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -163,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -26634,10 +25153,10 @@ index c9e14552b453..266fce02a468 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -26648,10 +25167,10 @@ index c9e14552b453..266fce02a468 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -26663,18 +25182,10 @@ index c9e14552b453..266fce02a468 100644
  
  Library("audio_frame_operations_gn")
 diff --git third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
-index 78921cc941f9..e8a3cb15337b 100644
+index 9c873a9f4383..97a9005397cf 100644
 --- third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
 +++ third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -26682,6 +25193,7 @@ index 78921cc941f9..e8a3cb15337b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -26690,23 +25202,18 @@ index 78921cc941f9..e8a3cb15337b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -55,114 +68,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,93 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -26725,10 +25232,6 @@ index 78921cc941f9..e8a3cb15337b 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -26736,10 +25239,6 @@ index 78921cc941f9..e8a3cb15337b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -26747,7 +25246,6 @@ index 78921cc941f9..e8a3cb15337b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -26755,10 +25253,6 @@ index 78921cc941f9..e8a3cb15337b 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -26771,10 +25265,6 @@ index 78921cc941f9..e8a3cb15337b 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -26812,7 +25302,7 @@ index 78921cc941f9..e8a3cb15337b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -170,82 +76,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -149,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -26870,10 +25360,10 @@ index 78921cc941f9..e8a3cb15337b 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -26884,10 +25374,10 @@ index 78921cc941f9..e8a3cb15337b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -26899,7 +25389,7 @@ index 78921cc941f9..e8a3cb15337b 100644
  
  Library("resource_adaptation_gn")
 diff --git third_party/libwebrtc/call/audio_sender_interface_gn/moz.build third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
-index d585bb6edff0..b4a643771882 100644
+index 0fdbdec46999..38a38464659a 100644
 --- third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
 +++ third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -26910,6 +25400,7 @@ index d585bb6edff0..b4a643771882 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -26918,13 +25409,12 @@ index d585bb6edff0..b4a643771882 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26963,7 +25453,6 @@ index d585bb6edff0..b4a643771882 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -27020,7 +25509,7 @@ index d585bb6edff0..b4a643771882 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -27046,7 +25535,7 @@ index d585bb6edff0..b4a643771882 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -27088,18 +25577,10 @@ index d585bb6edff0..b4a643771882 100644
 -
  Library("audio_sender_interface_gn")
 diff --git third_party/libwebrtc/call/bitrate_allocator_gn/moz.build third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
-index 3ed5924b069f..c233d4789a84 100644
+index 7b8696b587d4..10a5020edb33 100644
 --- third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
 +++ third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -27107,6 +25588,7 @@ index 3ed5924b069f..c233d4789a84 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -27115,23 +25597,18 @@ index 3ed5924b069f..c233d4789a84 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -27150,10 +25627,6 @@ index 3ed5924b069f..c233d4789a84 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -27161,10 +25634,6 @@ index 3ed5924b069f..c233d4789a84 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -27172,7 +25641,6 @@ index 3ed5924b069f..c233d4789a84 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -27180,10 +25648,6 @@ index 3ed5924b069f..c233d4789a84 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -27196,10 +25660,6 @@ index 3ed5924b069f..c233d4789a84 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -27237,7 +25697,7 @@ index 3ed5924b069f..c233d4789a84 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -27295,10 +25755,10 @@ index 3ed5924b069f..c233d4789a84 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -27309,10 +25769,10 @@ index 3ed5924b069f..c233d4789a84 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -27324,18 +25784,10 @@ index 3ed5924b069f..c233d4789a84 100644
  
  Library("bitrate_allocator_gn")
 diff --git third_party/libwebrtc/call/bitrate_configurator_gn/moz.build third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
-index c58befd49ca2..698f00ffa213 100644
+index cd5491bdefec..25c0b6e740f9 100644
 --- third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
 +++ third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -27343,6 +25795,7 @@ index c58befd49ca2..698f00ffa213 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -27351,23 +25804,18 @@ index c58befd49ca2..698f00ffa213 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -27386,10 +25834,6 @@ index c58befd49ca2..698f00ffa213 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -27397,10 +25841,6 @@ index c58befd49ca2..698f00ffa213 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -27408,7 +25848,6 @@ index c58befd49ca2..698f00ffa213 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -27416,10 +25855,6 @@ index c58befd49ca2..698f00ffa213 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -27432,10 +25867,6 @@ index c58befd49ca2..698f00ffa213 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -27466,7 +25897,7 @@ index c58befd49ca2..698f00ffa213 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -27553,18 +25984,10 @@ index c58befd49ca2..698f00ffa213 100644
  
  Library("bitrate_configurator_gn")
 diff --git third_party/libwebrtc/call/call_gn/moz.build third_party/libwebrtc/call/call_gn/moz.build
-index f9aec69b9481..0b6233af7cf4 100644
+index 4b923766e44a..72c3383fd96e 100644
 --- third_party/libwebrtc/call/call_gn/moz.build
 +++ third_party/libwebrtc/call/call_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -27572,6 +25995,7 @@ index f9aec69b9481..0b6233af7cf4 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -27580,23 +26004,18 @@ index f9aec69b9481..0b6233af7cf4 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,115 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,94 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -27616,10 +26035,6 @@ index f9aec69b9481..0b6233af7cf4 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -27627,10 +26042,6 @@ index f9aec69b9481..0b6233af7cf4 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -27638,7 +26049,6 @@ index f9aec69b9481..0b6233af7cf4 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -27646,10 +26056,6 @@ index f9aec69b9481..0b6233af7cf4 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -27662,10 +26068,6 @@ index f9aec69b9481..0b6233af7cf4 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -27703,7 +26105,7 @@ index f9aec69b9481..0b6233af7cf4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -164,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -27761,10 +26163,10 @@ index f9aec69b9481..0b6233af7cf4 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -27775,10 +26177,10 @@ index f9aec69b9481..0b6233af7cf4 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -27790,18 +26192,10 @@ index f9aec69b9481..0b6233af7cf4 100644
  
  Library("call_gn")
 diff --git third_party/libwebrtc/call/call_interfaces_gn/moz.build third_party/libwebrtc/call/call_interfaces_gn/moz.build
-index 1f23b1b27a12..1ea225bc89ec 100644
+index 2b39c60732c3..e60a38eeef33 100644
 --- third_party/libwebrtc/call/call_interfaces_gn/moz.build
 +++ third_party/libwebrtc/call/call_interfaces_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -27809,6 +26203,7 @@ index 1f23b1b27a12..1ea225bc89ec 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -27817,23 +26212,18 @@ index 1f23b1b27a12..1ea225bc89ec 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -51,115 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,94 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -27853,10 +26243,6 @@ index 1f23b1b27a12..1ea225bc89ec 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -27864,10 +26250,6 @@ index 1f23b1b27a12..1ea225bc89ec 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -27875,7 +26257,6 @@ index 1f23b1b27a12..1ea225bc89ec 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -27883,10 +26264,6 @@ index 1f23b1b27a12..1ea225bc89ec 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -27899,10 +26276,6 @@ index 1f23b1b27a12..1ea225bc89ec 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -27940,7 +26313,7 @@ index 1f23b1b27a12..1ea225bc89ec 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -167,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -146,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -27998,10 +26371,10 @@ index 1f23b1b27a12..1ea225bc89ec 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -28012,10 +26385,10 @@ index 1f23b1b27a12..1ea225bc89ec 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -28027,7 +26400,7 @@ index 1f23b1b27a12..1ea225bc89ec 100644
  
  Library("call_interfaces_gn")
 diff --git third_party/libwebrtc/call/payload_type_gn/moz.build third_party/libwebrtc/call/payload_type_gn/moz.build
-index cdfdd3213e1c..f4ab9557672a 100644
+index b92feaad097c..a2eb5b7adca2 100644
 --- third_party/libwebrtc/call/payload_type_gn/moz.build
 +++ third_party/libwebrtc/call/payload_type_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -28038,6 +26411,7 @@ index cdfdd3213e1c..f4ab9557672a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -28046,13 +26420,12 @@ index cdfdd3213e1c..f4ab9557672a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28091,7 +26464,6 @@ index cdfdd3213e1c..f4ab9557672a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -28148,7 +26520,7 @@ index cdfdd3213e1c..f4ab9557672a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -28174,7 +26546,7 @@ index cdfdd3213e1c..f4ab9557672a 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -28216,18 +26588,10 @@ index cdfdd3213e1c..f4ab9557672a 100644
 -
  Library("payload_type_gn")
 diff --git third_party/libwebrtc/call/payload_type_picker_gn/moz.build third_party/libwebrtc/call/payload_type_picker_gn/moz.build
-index ec169391df3f..9ba0c035a513 100644
+index 71a4ce74fdb0..1efa64dbafa5 100644
 --- third_party/libwebrtc/call/payload_type_picker_gn/moz.build
 +++ third_party/libwebrtc/call/payload_type_picker_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -28235,6 +26599,7 @@ index ec169391df3f..9ba0c035a513 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -28243,23 +26608,18 @@ index ec169391df3f..9ba0c035a513 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -28278,10 +26638,6 @@ index ec169391df3f..9ba0c035a513 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -28289,10 +26645,6 @@ index ec169391df3f..9ba0c035a513 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -28300,7 +26652,6 @@ index ec169391df3f..9ba0c035a513 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -28308,10 +26659,6 @@ index ec169391df3f..9ba0c035a513 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -28324,10 +26671,6 @@ index ec169391df3f..9ba0c035a513 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -28365,7 +26708,7 @@ index ec169391df3f..9ba0c035a513 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -28423,10 +26766,10 @@ index ec169391df3f..9ba0c035a513 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -28437,10 +26780,10 @@ index ec169391df3f..9ba0c035a513 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -28452,7 +26795,7 @@ index ec169391df3f..9ba0c035a513 100644
  
  Library("payload_type_picker_gn")
 diff --git third_party/libwebrtc/call/receive_stream_interface_gn/moz.build third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
-index 64966940592a..63ee63d8fd44 100644
+index bb48e450e2a4..318dff45f0f9 100644
 --- third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
 +++ third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -28463,6 +26806,7 @@ index 64966940592a..63ee63d8fd44 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -28471,13 +26815,12 @@ index 64966940592a..63ee63d8fd44 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28516,7 +26859,6 @@ index 64966940592a..63ee63d8fd44 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -28573,7 +26915,7 @@ index 64966940592a..63ee63d8fd44 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -28599,7 +26941,7 @@ index 64966940592a..63ee63d8fd44 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -28641,18 +26983,10 @@ index 64966940592a..63ee63d8fd44 100644
 -
  Library("receive_stream_interface_gn")
 diff --git third_party/libwebrtc/call/rtp_interfaces_gn/moz.build third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
-index a28b8e1a3ffb..bf8bfc4afa1a 100644
+index bfeb90e9822d..d9502b3458ce 100644
 --- third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
 +++ third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -28660,6 +26994,7 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -28668,23 +27003,18 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -28703,10 +27033,6 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -28714,10 +27040,6 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -28725,7 +27047,6 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -28733,10 +27054,6 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -28749,10 +27066,6 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -28790,7 +27103,7 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -28848,10 +27161,10 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -28862,10 +27175,10 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -28877,18 +27190,10 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
  
  Library("rtp_interfaces_gn")
 diff --git third_party/libwebrtc/call/rtp_receiver_gn/moz.build third_party/libwebrtc/call/rtp_receiver_gn/moz.build
-index 2270482f3cec..411cfe288875 100644
+index 53e5ed96c15c..91f237e7a432 100644
 --- third_party/libwebrtc/call/rtp_receiver_gn/moz.build
 +++ third_party/libwebrtc/call/rtp_receiver_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -28896,6 +27201,7 @@ index 2270482f3cec..411cfe288875 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -28904,23 +27210,18 @@ index 2270482f3cec..411cfe288875 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,115 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,94 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -28940,10 +27241,6 @@ index 2270482f3cec..411cfe288875 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -28951,10 +27248,6 @@ index 2270482f3cec..411cfe288875 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -28962,7 +27255,6 @@ index 2270482f3cec..411cfe288875 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -28970,10 +27262,6 @@ index 2270482f3cec..411cfe288875 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -28986,10 +27274,6 @@ index 2270482f3cec..411cfe288875 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -29027,7 +27311,7 @@ index 2270482f3cec..411cfe288875 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -164,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -29085,10 +27369,10 @@ index 2270482f3cec..411cfe288875 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -29099,10 +27383,10 @@ index 2270482f3cec..411cfe288875 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -29114,18 +27398,10 @@ index 2270482f3cec..411cfe288875 100644
  
  Library("rtp_receiver_gn")
 diff --git third_party/libwebrtc/call/rtp_sender_gn/moz.build third_party/libwebrtc/call/rtp_sender_gn/moz.build
-index a700eea303e1..214f2fa96582 100644
+index 3c344e2a71f3..34f4eee93bb4 100644
 --- third_party/libwebrtc/call/rtp_sender_gn/moz.build
 +++ third_party/libwebrtc/call/rtp_sender_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -29133,6 +27409,7 @@ index a700eea303e1..214f2fa96582 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -29141,23 +27418,18 @@ index a700eea303e1..214f2fa96582 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,115 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,94 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -29177,10 +27449,6 @@ index a700eea303e1..214f2fa96582 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -29188,10 +27456,6 @@ index a700eea303e1..214f2fa96582 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -29199,7 +27463,6 @@ index a700eea303e1..214f2fa96582 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -29207,10 +27470,6 @@ index a700eea303e1..214f2fa96582 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -29223,10 +27482,6 @@ index a700eea303e1..214f2fa96582 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -29264,7 +27519,7 @@ index a700eea303e1..214f2fa96582 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -164,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -29322,10 +27577,10 @@ index a700eea303e1..214f2fa96582 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -29336,10 +27591,10 @@ index a700eea303e1..214f2fa96582 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -29351,18 +27606,10 @@ index a700eea303e1..214f2fa96582 100644
  
  Library("rtp_sender_gn")
 diff --git third_party/libwebrtc/call/version_gn/moz.build third_party/libwebrtc/call/version_gn/moz.build
-index 6df784f98d03..7ce9a2c33b2a 100644
+index e1d6a6a1229c..6ad8a263227e 100644
 --- third_party/libwebrtc/call/version_gn/moz.build
 +++ third_party/libwebrtc/call/version_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -29370,6 +27617,7 @@ index 6df784f98d03..7ce9a2c33b2a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -29378,23 +27626,18 @@ index 6df784f98d03..7ce9a2c33b2a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -29409,10 +27652,6 @@ index 6df784f98d03..7ce9a2c33b2a 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -29420,10 +27659,6 @@ index 6df784f98d03..7ce9a2c33b2a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -29431,7 +27666,6 @@ index 6df784f98d03..7ce9a2c33b2a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -29439,10 +27673,6 @@ index 6df784f98d03..7ce9a2c33b2a 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -29455,10 +27685,6 @@ index 6df784f98d03..7ce9a2c33b2a 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -29489,7 +27715,7 @@ index 6df784f98d03..7ce9a2c33b2a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -29547,10 +27773,10 @@ index 6df784f98d03..7ce9a2c33b2a 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -29561,10 +27787,10 @@ index 6df784f98d03..7ce9a2c33b2a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -29576,18 +27802,10 @@ index 6df784f98d03..7ce9a2c33b2a 100644
  
  Library("version_gn")
 diff --git third_party/libwebrtc/call/video_receive_stream_api_gn/moz.build third_party/libwebrtc/call/video_receive_stream_api_gn/moz.build
-index 3f79e8283204..193d1cf61255 100644
+index 201cca266c32..00e509a7b4aa 100644
 --- third_party/libwebrtc/call/video_receive_stream_api_gn/moz.build
 +++ third_party/libwebrtc/call/video_receive_stream_api_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -29595,6 +27813,7 @@ index 3f79e8283204..193d1cf61255 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -29603,23 +27822,18 @@ index 3f79e8283204..193d1cf61255 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -29638,10 +27852,6 @@ index 3f79e8283204..193d1cf61255 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -29649,10 +27859,6 @@ index 3f79e8283204..193d1cf61255 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -29660,7 +27866,6 @@ index 3f79e8283204..193d1cf61255 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -29668,10 +27873,6 @@ index 3f79e8283204..193d1cf61255 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -29684,10 +27885,6 @@ index 3f79e8283204..193d1cf61255 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -29725,7 +27922,7 @@ index 3f79e8283204..193d1cf61255 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -29783,10 +27980,10 @@ index 3f79e8283204..193d1cf61255 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -29797,10 +27994,10 @@ index 3f79e8283204..193d1cf61255 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -29812,18 +28009,10 @@ index 3f79e8283204..193d1cf61255 100644
  
  Library("video_receive_stream_api_gn")
 diff --git third_party/libwebrtc/call/video_send_stream_api_gn/moz.build third_party/libwebrtc/call/video_send_stream_api_gn/moz.build
-index b2b129fde9a1..3fb37cb3423d 100644
+index 6d75d15802d5..f750e52c2b20 100644
 --- third_party/libwebrtc/call/video_send_stream_api_gn/moz.build
 +++ third_party/libwebrtc/call/video_send_stream_api_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -29831,6 +28020,7 @@ index b2b129fde9a1..3fb37cb3423d 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -29839,23 +28029,18 @@ index b2b129fde9a1..3fb37cb3423d 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -29874,10 +28059,6 @@ index b2b129fde9a1..3fb37cb3423d 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -29885,10 +28066,6 @@ index b2b129fde9a1..3fb37cb3423d 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -29896,7 +28073,6 @@ index b2b129fde9a1..3fb37cb3423d 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -29904,10 +28080,6 @@ index b2b129fde9a1..3fb37cb3423d 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -29920,10 +28092,6 @@ index b2b129fde9a1..3fb37cb3423d 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -29961,7 +28129,7 @@ index b2b129fde9a1..3fb37cb3423d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -30019,10 +28187,10 @@ index b2b129fde9a1..3fb37cb3423d 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -30033,10 +28201,10 @@ index b2b129fde9a1..3fb37cb3423d 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -30048,19 +28216,10 @@ index b2b129fde9a1..3fb37cb3423d 100644
  
  Library("video_send_stream_api_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
-index 5ffb201a4212..99fbd769e4f3 100644
+index 3588afcceba4..efee4c684b12 100644
 --- third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
-@@ -11,20 +11,30 @@ AllowCompilerWarnings()
- 
- CXXFLAGS += [
-     "-mavx2",
--    "-mfma"
-+    "-mfma",
-+    "-std=gnu++20"
- ]
- 
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -18,13 +18,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -30069,6 +28228,7 @@ index 5ffb201a4212..99fbd769e4f3 100644
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_AVX2"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -30077,23 +28237,18 @@ index 5ffb201a4212..99fbd769e4f3 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -53,143 +63,9 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,122 +62,9 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -30112,10 +28267,6 @@ index 5ffb201a4212..99fbd769e4f3 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -30123,10 +28274,6 @@ index 5ffb201a4212..99fbd769e4f3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -30134,7 +28281,6 @@ index 5ffb201a4212..99fbd769e4f3 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_GNU_SOURCE"] = True
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
@@ -30143,10 +28289,6 @@ index 5ffb201a4212..99fbd769e4f3 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -30159,10 +28301,6 @@ index 5ffb201a4212..99fbd769e4f3 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -30229,7 +28367,7 @@ index 5ffb201a4212..99fbd769e4f3 100644
      CXXFLAGS += [
          "-msse2"
 diff --git third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
-index 5d96fe0893a9..0bb8ba5e4738 100644
+index a72dea0e692c..d0d04f598860 100644
 --- third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -30240,6 +28378,7 @@ index 5d96fe0893a9..0bb8ba5e4738 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -30248,13 +28387,12 @@ index 5d96fe0893a9..0bb8ba5e4738 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30289,7 +28427,6 @@ index 5d96fe0893a9..0bb8ba5e4738 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -30339,7 +28476,7 @@ index 5d96fe0893a9..0bb8ba5e4738 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,30 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,30 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -30370,7 +28507,7 @@ index 5d96fe0893a9..0bb8ba5e4738 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -159,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -30412,7 +28549,7 @@ index 5d96fe0893a9..0bb8ba5e4738 100644
 -
  Library("common_audio_c_arm_asm_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
-index aedc5ef7c816..8381d9637936 100644
+index d75aa3581510..85f93bbcaadf 100644
 --- third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -30423,6 +28560,7 @@ index aedc5ef7c816..8381d9637936 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -30431,13 +28569,12 @@ index aedc5ef7c816..8381d9637936 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -83,109 +92,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -83,108 +92,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30486,7 +28623,6 @@ index aedc5ef7c816..8381d9637936 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -30548,7 +28684,7 @@ index aedc5ef7c816..8381d9637936 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -193,20 +100,14 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -192,20 +100,14 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -30573,7 +28709,7 @@ index aedc5ef7c816..8381d9637936 100644
      UNIFIED_SOURCES += [
          "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
          "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c",
-@@ -217,7 +118,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -216,7 +118,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
  
      DEFINES["MIPS32_LE"] = True
      DEFINES["MIPS_FPU_LE"] = True
@@ -30581,7 +28717,7 @@ index aedc5ef7c816..8381d9637936 100644
  
      SOURCES += [
          "/third_party/libwebrtc/common_audio/signal_processing/resample_by_2_mips.c"
-@@ -234,8 +134,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -233,8 +134,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
  
  if CONFIG["TARGET_CPU"] == "mips64":
  
@@ -30590,7 +28726,7 @@ index aedc5ef7c816..8381d9637936 100644
      UNIFIED_SOURCES += [
          "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
          "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c",
-@@ -250,78 +148,7 @@ if CONFIG["TARGET_CPU"] == "ppc64":
+@@ -249,78 +148,7 @@ if CONFIG["TARGET_CPU"] == "ppc64":
          "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
      ]
  
@@ -30670,7 +28806,7 @@ index aedc5ef7c816..8381d9637936 100644
  
      UNIFIED_SOURCES += [
          "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
-@@ -329,13 +156,13 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
+@@ -328,13 +156,13 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
          "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
      ]
  
@@ -30686,7 +28822,7 @@ index aedc5ef7c816..8381d9637936 100644
  
      UNIFIED_SOURCES += [
          "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
-@@ -343,9 +170,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -342,9 +170,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
          "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
      ]
  
@@ -30699,18 +28835,10 @@ index aedc5ef7c816..8381d9637936 100644
      UNIFIED_SOURCES += [
          "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
 diff --git third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
-index 0164db65a36b..b19a8495d919 100644
+index 47e1bb77f92a..5b67907b2df6 100644
 --- third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -30718,6 +28846,7 @@ index 0164db65a36b..b19a8495d919 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -30726,23 +28855,18 @@ index 0164db65a36b..b19a8495d919 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -30761,10 +28885,6 @@ index 0164db65a36b..b19a8495d919 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -30772,10 +28892,6 @@ index 0164db65a36b..b19a8495d919 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -30783,7 +28899,6 @@ index 0164db65a36b..b19a8495d919 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -30791,10 +28906,6 @@ index 0164db65a36b..b19a8495d919 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -30807,10 +28918,6 @@ index 0164db65a36b..b19a8495d919 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -30841,7 +28948,7 @@ index 0164db65a36b..b19a8495d919 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -30928,18 +29035,10 @@ index 0164db65a36b..b19a8495d919 100644
  
  Library("common_audio_cc_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_gn/moz.build third_party/libwebrtc/common_audio/common_audio_gn/moz.build
-index 13dbab50bc9a..46d820a5f097 100644
+index 4b2f40786f1b..9649eb186b74 100644
 --- third_party/libwebrtc/common_audio/common_audio_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -30947,6 +29046,7 @@ index 13dbab50bc9a..46d820a5f097 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -30955,23 +29055,18 @@ index 13dbab50bc9a..46d820a5f097 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -59,114 +72,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -59,93 +68,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -30990,10 +29085,6 @@ index 13dbab50bc9a..46d820a5f097 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -31001,10 +29092,6 @@ index 13dbab50bc9a..46d820a5f097 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -31012,7 +29099,6 @@ index 13dbab50bc9a..46d820a5f097 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -31020,10 +29106,6 @@ index 13dbab50bc9a..46d820a5f097 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -31036,10 +29118,6 @@ index 13dbab50bc9a..46d820a5f097 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -31077,7 +29155,7 @@ index 13dbab50bc9a..46d820a5f097 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -174,82 +80,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -153,82 +76,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -31135,10 +29213,10 @@ index 13dbab50bc9a..46d820a5f097 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -31149,10 +29227,10 @@ index 13dbab50bc9a..46d820a5f097 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -31164,7 +29242,7 @@ index 13dbab50bc9a..46d820a5f097 100644
  
  Library("common_audio_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
-index e259acd562b7..ae82c184e9c5 100644
+index 1c183693402d..52efab61eed2 100644
 --- third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
 @@ -13,13 +13,24 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -31176,6 +29254,7 @@ index e259acd562b7..ae82c184e9c5 100644
 +DEFINES["WEBRTC_ARCH_ARM64"] = True
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_HAS_NEON"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
@@ -31185,14 +29264,13 @@ index e259acd562b7..ae82c184e9c5 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__ARM_NEON__"] = "1"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,132 +60,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,131 +60,6 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31233,7 +29311,6 @@ index e259acd562b7..ae82c184e9c5 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_GNU_SOURCE"] = True
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
@@ -31326,18 +29403,10 @@ index e259acd562b7..ae82c184e9c5 100644
 -
  Library("common_audio_neon_c_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
-index 410a9b6c9e1e..fcf864a3511b 100644
+index 9c94e51dfd8f..b3d1eae8da85 100644
 --- third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
-@@ -9,17 +9,32 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,24 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -31346,6 +29415,7 @@ index 410a9b6c9e1e..fcf864a3511b 100644
 +DEFINES["WEBRTC_ARCH_ARM64"] = True
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_HAS_NEON"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
@@ -31355,24 +29425,19 @@ index 410a9b6c9e1e..fcf864a3511b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__ARM_NEON__"] = "1"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,159 +63,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,138 +59,6 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -31391,10 +29456,6 @@ index 410a9b6c9e1e..fcf864a3511b 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_ARCH_ARM64"] = True
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
@@ -31404,10 +29465,6 @@ index 410a9b6c9e1e..fcf864a3511b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -31415,7 +29472,6 @@ index 410a9b6c9e1e..fcf864a3511b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_GNU_SOURCE"] = True
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
@@ -31424,10 +29480,6 @@ index 410a9b6c9e1e..fcf864a3511b 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_ARCH_ARM64"] = True
@@ -31442,10 +29494,6 @@ index 410a9b6c9e1e..fcf864a3511b 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -31501,12 +29549,12 @@ index 410a9b6c9e1e..fcf864a3511b 100644
 -
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 -
-     DEFINES["_DEBUG"] = True
- 
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
 -    DEFINES["_DEBUG"] = True
 -
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+     DEFINES["_DEBUG"] = True
+ 
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 -
 -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -31523,18 +29571,10 @@ index 410a9b6c9e1e..fcf864a3511b 100644
 -
  Library("common_audio_neon_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
-index 95fa6e2c26ca..b53526107ee5 100644
+index 8ce96ca06673..6703ddb08c0e 100644
 --- third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -31543,6 +29583,7 @@ index 95fa6e2c26ca..b53526107ee5 100644
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_AVX2"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -31551,23 +29592,18 @@ index 95fa6e2c26ca..b53526107ee5 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,159 +61,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,144 +57,16 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -31587,8 +29623,7 @@ index 95fa6e2c26ca..b53526107ee5 100644
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    CXXFLAGS += [
--        "-msse2",
--        "-std=gnu++20"
+-        "-msse2"
 -    ]
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -31598,10 +29633,6 @@ index 95fa6e2c26ca..b53526107ee5 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -31609,7 +29640,6 @@ index 95fa6e2c26ca..b53526107ee5 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_GNU_SOURCE"] = True
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
@@ -31619,8 +29649,7 @@ index 95fa6e2c26ca..b53526107ee5 100644
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
 -    CXXFLAGS += [
--        "-msse2",
--        "-std=gnu++20"
+-        "-msse2"
 -    ]
 -
 -    DEFINES["USE_GLIB"] = "1"
@@ -31635,10 +29664,6 @@ index 95fa6e2c26ca..b53526107ee5 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -31675,8 +29700,8 @@ index 95fa6e2c26ca..b53526107ee5 100644
 -
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 -
--    DEFINES["_DEBUG"] = True
--
+     DEFINES["_DEBUG"] = True
+ 
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["_DEBUG"] = True
@@ -31687,8 +29712,8 @@ index 95fa6e2c26ca..b53526107ee5 100644
 -
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
 -
-     DEFINES["_DEBUG"] = True
- 
+-    DEFINES["_DEBUG"] = True
+-
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 -
 -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -31720,18 +29745,10 @@ index 95fa6e2c26ca..b53526107ee5 100644
      CXXFLAGS += [
          "-msse2"
 diff --git third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
-index 722bf527c9ba..b3573a266567 100644
+index accaf02cc53f..9c4b7ce7e534 100644
 --- third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
 +++ third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -31739,6 +29756,7 @@ index 722bf527c9ba..b3573a266567 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -31747,23 +29765,18 @@ index 722bf527c9ba..b3573a266567 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -31782,10 +29795,6 @@ index 722bf527c9ba..b3573a266567 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -31793,10 +29802,6 @@ index 722bf527c9ba..b3573a266567 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -31804,7 +29809,6 @@ index 722bf527c9ba..b3573a266567 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -31812,10 +29816,6 @@ index 722bf527c9ba..b3573a266567 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -31828,10 +29828,6 @@ index 722bf527c9ba..b3573a266567 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -31869,7 +29865,7 @@ index 722bf527c9ba..b3573a266567 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -31927,10 +29923,10 @@ index 722bf527c9ba..b3573a266567 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -31941,10 +29937,10 @@ index 722bf527c9ba..b3573a266567 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -31956,7 +29952,7 @@ index 722bf527c9ba..b3573a266567 100644
  
  Library("fir_filter_factory_gn")
 diff --git third_party/libwebrtc/common_audio/fir_filter_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
-index 577a3319bc5e..97bfb46c2b34 100644
+index 785075282cd4..5e006e643f40 100644
 --- third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
 +++ third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -31967,6 +29963,7 @@ index 577a3319bc5e..97bfb46c2b34 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -31975,13 +29972,12 @@ index 577a3319bc5e..97bfb46c2b34 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32016,7 +30012,6 @@ index 577a3319bc5e..97bfb46c2b34 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -32066,7 +30061,7 @@ index 577a3319bc5e..97bfb46c2b34 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -32092,7 +30087,7 @@ index 577a3319bc5e..97bfb46c2b34 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -32134,7 +30129,7 @@ index 577a3319bc5e..97bfb46c2b34 100644
 -
  Library("fir_filter_gn")
 diff --git third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
-index 5169bab0cd78..66ce24f0c8a8 100644
+index 15e2cd1c8e4d..31ec751b206c 100644
 --- third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
 +++ third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -32145,6 +30140,7 @@ index 5169bab0cd78..66ce24f0c8a8 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -32153,13 +30149,12 @@ index 5169bab0cd78..66ce24f0c8a8 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32198,7 +30193,6 @@ index 5169bab0cd78..66ce24f0c8a8 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -32255,7 +30249,7 @@ index 5169bab0cd78..66ce24f0c8a8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -32281,7 +30275,7 @@ index 5169bab0cd78..66ce24f0c8a8 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -32323,18 +30317,10 @@ index 5169bab0cd78..66ce24f0c8a8 100644
 -
  Library("sinc_resampler_gn")
 diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
-index 9b470d2c3df3..35ff0b9cb1ca 100644
+index cab1d4bdd6df..aa3b4773526a 100644
 --- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
 +++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -32342,6 +30328,7 @@ index 9b470d2c3df3..35ff0b9cb1ca 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -32350,23 +30337,18 @@ index 9b470d2c3df3..35ff0b9cb1ca 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -32385,10 +30367,6 @@ index 9b470d2c3df3..35ff0b9cb1ca 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -32396,10 +30374,6 @@ index 9b470d2c3df3..35ff0b9cb1ca 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -32407,7 +30381,6 @@ index 9b470d2c3df3..35ff0b9cb1ca 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -32415,10 +30388,6 @@ index 9b470d2c3df3..35ff0b9cb1ca 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -32431,10 +30400,6 @@ index 9b470d2c3df3..35ff0b9cb1ca 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -32472,7 +30437,7 @@ index 9b470d2c3df3..35ff0b9cb1ca 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -165,122 +71,38 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,122 +67,38 @@ if CONFIG["TARGET_CPU"] == "aarch64":
          "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc"
      ]
  
@@ -32603,18 +30568,10 @@ index 9b470d2c3df3..35ff0b9cb1ca 100644
  
  Library("fft_size_128_gn")
 diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
-index a97e1340a1c4..2bdbd579a813 100644
+index 913e7fa3a754..4018659e1055 100644
 --- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
 +++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -32622,6 +30579,7 @@ index a97e1340a1c4..2bdbd579a813 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -32630,23 +30588,18 @@ index a97e1340a1c4..2bdbd579a813 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -32661,10 +30614,6 @@ index a97e1340a1c4..2bdbd579a813 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -32672,10 +30621,6 @@ index a97e1340a1c4..2bdbd579a813 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -32683,7 +30628,6 @@ index a97e1340a1c4..2bdbd579a813 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -32691,10 +30635,6 @@ index a97e1340a1c4..2bdbd579a813 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -32707,10 +30647,6 @@ index a97e1340a1c4..2bdbd579a813 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -32741,7 +30677,7 @@ index a97e1340a1c4..2bdbd579a813 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -32799,10 +30735,10 @@ index a97e1340a1c4..2bdbd579a813 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -32813,10 +30749,10 @@ index a97e1340a1c4..2bdbd579a813 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -32828,7 +30764,7 @@ index a97e1340a1c4..2bdbd579a813 100644
  
  Library("fft_size_256_gn")
 diff --git third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
-index 0d7a0bd85cf2..202e317ddd5c 100644
+index 6045726afc80..969d9eb06c39 100644
 --- third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
 +++ third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -32839,6 +30775,7 @@ index 0d7a0bd85cf2..202e317ddd5c 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -32847,13 +30784,12 @@ index 0d7a0bd85cf2..202e317ddd5c 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32892,7 +30828,6 @@ index 0d7a0bd85cf2..202e317ddd5c 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -32950,7 +30885,7 @@ index 0d7a0bd85cf2..202e317ddd5c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -138,20 +59,12 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,20 +59,12 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -32973,7 +30908,7 @@ index 0d7a0bd85cf2..202e317ddd5c 100644
      UNIFIED_SOURCES += [
          "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
      ]
-@@ -160,7 +73,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -159,7 +73,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
  
      DEFINES["MIPS32_LE"] = True
      DEFINES["MIPS_FPU_LE"] = True
@@ -32981,7 +30916,7 @@ index 0d7a0bd85cf2..202e317ddd5c 100644
  
      UNIFIED_SOURCES += [
          "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_mips.c"
-@@ -168,8 +80,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -167,8 +80,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
  
  if CONFIG["TARGET_CPU"] == "mips64":
  
@@ -32990,7 +30925,7 @@ index 0d7a0bd85cf2..202e317ddd5c 100644
      UNIFIED_SOURCES += [
          "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
      ]
-@@ -180,89 +90,27 @@ if CONFIG["TARGET_CPU"] == "ppc64":
+@@ -179,89 +90,27 @@ if CONFIG["TARGET_CPU"] == "ppc64":
          "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
      ]
  
@@ -33086,18 +31021,10 @@ index 0d7a0bd85cf2..202e317ddd5c 100644
      UNIFIED_SOURCES += [
          "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
 diff --git third_party/libwebrtc/common_video/common_video_gn/moz.build third_party/libwebrtc/common_video/common_video_gn/moz.build
-index 5d190a1d8e58..8b7c8f83b3e9 100644
+index 29f0179f0773..4ee8b246ab59 100644
 --- third_party/libwebrtc/common_video/common_video_gn/moz.build
 +++ third_party/libwebrtc/common_video/common_video_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -33105,6 +31032,7 @@ index 5d190a1d8e58..8b7c8f83b3e9 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -33113,23 +31041,18 @@ index 5d190a1d8e58..8b7c8f83b3e9 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -58,114 +71,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -58,93 +67,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -33148,10 +31071,6 @@ index 5d190a1d8e58..8b7c8f83b3e9 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -33159,10 +31078,6 @@ index 5d190a1d8e58..8b7c8f83b3e9 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -33170,7 +31085,6 @@ index 5d190a1d8e58..8b7c8f83b3e9 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -33178,10 +31092,6 @@ index 5d190a1d8e58..8b7c8f83b3e9 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -33194,10 +31104,6 @@ index 5d190a1d8e58..8b7c8f83b3e9 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -33235,236 +31141,7 @@ index 5d190a1d8e58..8b7c8f83b3e9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -173,82 +79,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
-     DEFINES["WEBRTC_HAS_NEON"] = True
-     DEFINES["__ARM_NEON__"] = "1"
- 
--if CONFIG["TARGET_CPU"] == "arm":
--
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
--    DEFINES["WEBRTC_ARCH_ARM"] = True
--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
--    DEFINES["WEBRTC_HAS_NEON"] = True
--
--if CONFIG["TARGET_CPU"] == "loongarch64":
--
--    DEFINES["_GNU_SOURCE"] = True
--
- if CONFIG["TARGET_CPU"] == "mips32":
- 
-     DEFINES["MIPS32_LE"] = True
-     DEFINES["MIPS_FPU_LE"] = True
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["TARGET_CPU"] == "mips64":
--
--    DEFINES["_GNU_SOURCE"] = True
- 
- if CONFIG["TARGET_CPU"] == "x86":
- 
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
--if CONFIG["TARGET_CPU"] == "x86_64":
--
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
--
--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
--
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
--
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
--    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["TARGET_CPU"] == "x86_64":
- 
--    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
- Library("common_video_gn")
-diff --git third_party/libwebrtc/common_video/corruption_detection_converters_gn/moz.build third_party/libwebrtc/common_video/corruption_detection_converters_gn/moz.build
-index c0ab4b4e89a7..bbcf737b8ba9 100644
---- third_party/libwebrtc/common_video/corruption_detection_converters_gn/moz.build
-+++ third_party/libwebrtc/common_video/corruption_detection_converters_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
- DEFINES["RTC_ENABLE_VP9"] = True
-+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_OZONE"] = "1"
-+DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-+DEFINES["WEBRTC_POSIX"] = True
- DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
-+DEFINES["_FILE_OFFSET_BITS"] = "64"
-+DEFINES["_LARGEFILE64_SOURCE"] = True
-+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-+DEFINES["__STDC_CONSTANT_MACROS"] = True
-+DEFINES["__STDC_FORMAT_MACROS"] = True
- 
- FINAL_LIBRARY = "xul"
- 
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
- if CONFIG["MOZ_DEBUG"] == "1":
- 
-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
--
--if CONFIG["OS_TARGET"] == "Android":
--
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
--    DEFINES["ANDROID"] = True
--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
--    DEFINES["HAVE_SYS_UIO_H"] = True
--    DEFINES["WEBRTC_ANDROID"] = True
--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
--    DEFINES["WEBRTC_LINUX"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_GNU_SOURCE"] = True
--    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--    OS_LIBS += [
--        "log"
--    ]
--
--if CONFIG["OS_TARGET"] == "Darwin":
--
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
--    DEFINES["WEBRTC_MAC"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "Linux":
--
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["USE_GLIB"] = "1"
--    DEFINES["USE_OZONE"] = "1"
--    DEFINES["USE_UDEV"] = True
--    DEFINES["WEBRTC_LINUX"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "OpenBSD":
--
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
--    DEFINES["USE_GLIB"] = "1"
--    DEFINES["USE_OZONE"] = "1"
--    DEFINES["WEBRTC_BSD"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "WINNT":
--
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
--    DEFINES["NOMINMAX"] = True
--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
--    DEFINES["PSAPI_VERSION"] = "2"
--    DEFINES["RTC_ENABLE_WIN_WGC"] = True
--    DEFINES["UNICODE"] = True
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["WEBRTC_WIN"] = True
--    DEFINES["WIN32"] = True
--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
--    DEFINES["WINVER"] = "0x0A00"
--    DEFINES["_ATL_NO_OPENGL"] = True
--    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
--    DEFINES["_CRT_RAND_S"] = True
--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
--    DEFINES["_HAS_EXCEPTIONS"] = "0"
--    DEFINES["_HAS_NODISCARD"] = True
--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_SECURE_ATL"] = True
--    DEFINES["_UNICODE"] = True
--    DEFINES["_WIN32_WINNT"] = "0x0A00"
--    DEFINES["_WINDOWS"] = True
--    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
--    DEFINES["__STD_C"] = True
-+    DEFINES["_DEBUG"] = True
- 
- if CONFIG["TARGET_CPU"] == "aarch64":
- 
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -152,82 +75,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -33549,9 +31226,9 @@ index c0ab4b4e89a7..bbcf737b8ba9 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("corruption_detection_converters_gn")
+ Library("common_video_gn")
 diff --git third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build
-index 8a58185d4906..cd4f1b658226 100644
+index d6dca2520c59..530a94e8643b 100644
 --- third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build
 +++ third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -33562,6 +31239,7 @@ index 8a58185d4906..cd4f1b658226 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -33570,13 +31248,12 @@ index 8a58185d4906..cd4f1b658226 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33615,7 +31292,6 @@ index 8a58185d4906..cd4f1b658226 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -33672,7 +31348,7 @@ index 8a58185d4906..cd4f1b658226 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -33698,7 +31374,7 @@ index 8a58185d4906..cd4f1b658226 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -33740,7 +31416,7 @@ index 8a58185d4906..cd4f1b658226 100644
 -
  Library("corruption_score_calculator_gn")
 diff --git third_party/libwebrtc/common_video/frame_counts_gn/moz.build third_party/libwebrtc/common_video/frame_counts_gn/moz.build
-index ae398195f804..5606ed4ca120 100644
+index 4d4150d00c2a..7242f0d8a3ae 100644
 --- third_party/libwebrtc/common_video/frame_counts_gn/moz.build
 +++ third_party/libwebrtc/common_video/frame_counts_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -33751,6 +31427,7 @@ index ae398195f804..5606ed4ca120 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -33759,13 +31436,12 @@ index ae398195f804..5606ed4ca120 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33800,7 +31476,6 @@ index ae398195f804..5606ed4ca120 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -33850,7 +31525,7 @@ index ae398195f804..5606ed4ca120 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -33876,7 +31551,7 @@ index ae398195f804..5606ed4ca120 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -33917,197 +31592,11 @@ index ae398195f804..5606ed4ca120 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
  Library("frame_counts_gn")
-diff --git third_party/libwebrtc/common_video/frame_instrumentation_data_gn/moz.build third_party/libwebrtc/common_video/frame_instrumentation_data_gn/moz.build
-index 5f35af97085c..ab2507d63de5 100644
---- third_party/libwebrtc/common_video/frame_instrumentation_data_gn/moz.build
-+++ third_party/libwebrtc/common_video/frame_instrumentation_data_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
- DEFINES["RTC_ENABLE_VP9"] = True
-+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_OZONE"] = "1"
-+DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-+DEFINES["WEBRTC_POSIX"] = True
- DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
-+DEFINES["_FILE_OFFSET_BITS"] = "64"
-+DEFINES["_LARGEFILE64_SOURCE"] = True
-+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-+DEFINES["__STDC_CONSTANT_MACROS"] = True
-+DEFINES["__STDC_FORMAT_MACROS"] = True
- 
- FINAL_LIBRARY = "xul"
- 
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
- if CONFIG["MOZ_DEBUG"] == "1":
- 
-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
--
--if CONFIG["OS_TARGET"] == "Android":
--
--    DEFINES["ANDROID"] = True
--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
--    DEFINES["HAVE_SYS_UIO_H"] = True
--    DEFINES["WEBRTC_ANDROID"] = True
--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
--    DEFINES["WEBRTC_LINUX"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_GNU_SOURCE"] = True
--    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "Darwin":
--
--    DEFINES["WEBRTC_MAC"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["USE_GLIB"] = "1"
--    DEFINES["USE_OZONE"] = "1"
--    DEFINES["USE_UDEV"] = True
--    DEFINES["WEBRTC_LINUX"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "OpenBSD":
--
--    DEFINES["USE_GLIB"] = "1"
--    DEFINES["USE_OZONE"] = "1"
--    DEFINES["WEBRTC_BSD"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "WINNT":
--
--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
--    DEFINES["NOMINMAX"] = True
--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
--    DEFINES["PSAPI_VERSION"] = "2"
--    DEFINES["RTC_ENABLE_WIN_WGC"] = True
--    DEFINES["UNICODE"] = True
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["WEBRTC_WIN"] = True
--    DEFINES["WIN32"] = True
--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
--    DEFINES["WINVER"] = "0x0A00"
--    DEFINES["_ATL_NO_OPENGL"] = True
--    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
--    DEFINES["_CRT_RAND_S"] = True
--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
--    DEFINES["_HAS_EXCEPTIONS"] = "0"
--    DEFINES["_HAS_NODISCARD"] = True
--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_SECURE_ATL"] = True
--    DEFINES["_UNICODE"] = True
--    DEFINES["_WIN32_WINNT"] = "0x0A00"
--    DEFINES["_WINDOWS"] = True
--    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
--    DEFINES["__STD_C"] = True
-+    DEFINES["_DEBUG"] = True
- 
- if CONFIG["TARGET_CPU"] == "aarch64":
- 
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
-     DEFINES["WEBRTC_HAS_NEON"] = True
-     DEFINES["__ARM_NEON__"] = "1"
- 
--if CONFIG["TARGET_CPU"] == "arm":
--
--    DEFINES["WEBRTC_ARCH_ARM"] = True
--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
--    DEFINES["WEBRTC_HAS_NEON"] = True
--
--if CONFIG["TARGET_CPU"] == "loongarch64":
--
--    DEFINES["_GNU_SOURCE"] = True
--
- if CONFIG["TARGET_CPU"] == "mips32":
- 
-     DEFINES["MIPS32_LE"] = True
-     DEFINES["MIPS_FPU_LE"] = True
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["TARGET_CPU"] == "mips64":
--
--    DEFINES["_GNU_SOURCE"] = True
- 
- if CONFIG["TARGET_CPU"] == "x86":
- 
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
- 
-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
--
--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
--
--    DEFINES["_GNU_SOURCE"] = True
--
- Library("frame_instrumentation_data_gn")
 diff --git third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
-index 622a838eca2a..ad084e2194ad 100644
+index 8a8df2cad0f0..940b58e66a82 100644
 --- third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
 +++ third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -34115,6 +31604,7 @@ index 622a838eca2a..ad084e2194ad 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -34123,23 +31613,18 @@ index 622a838eca2a..ad084e2194ad 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -34158,10 +31643,6 @@ index 622a838eca2a..ad084e2194ad 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -34169,10 +31650,6 @@ index 622a838eca2a..ad084e2194ad 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -34180,7 +31657,6 @@ index 622a838eca2a..ad084e2194ad 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -34188,10 +31664,6 @@ index 622a838eca2a..ad084e2194ad 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -34204,10 +31676,6 @@ index 622a838eca2a..ad084e2194ad 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -34238,7 +31706,7 @@ index 622a838eca2a..ad084e2194ad 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -34325,7 +31793,7 @@ index 622a838eca2a..ad084e2194ad 100644
  
  Library("generic_frame_descriptor_gn")
 diff --git third_party/libwebrtc/dcsctp_gn/moz.build third_party/libwebrtc/dcsctp_gn/moz.build
-index 44f583c80d8a..f4469da2599d 100644
+index e36ba8e99307..d5c1d389564b 100644
 --- third_party/libwebrtc/dcsctp_gn/moz.build
 +++ third_party/libwebrtc/dcsctp_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -34336,6 +31804,7 @@ index 44f583c80d8a..f4469da2599d 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -34344,13 +31813,12 @@ index 44f583c80d8a..f4469da2599d 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34389,7 +31857,6 @@ index 44f583c80d8a..f4469da2599d 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -34446,7 +31913,7 @@ index 44f583c80d8a..f4469da2599d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -34472,7 +31939,7 @@ index 44f583c80d8a..f4469da2599d 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -34514,7 +31981,7 @@ index 44f583c80d8a..f4469da2599d 100644
 -
  Library("dcsctp_gn")
 diff --git third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
-index 352ec8e82f14..0ae34bbf3159 100644
+index c01a31a5b7da..164662ca337c 100644
 --- third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
 +++ third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -34525,6 +31992,7 @@ index 352ec8e82f14..0ae34bbf3159 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -34533,13 +32001,12 @@ index 352ec8e82f14..0ae34bbf3159 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34574,7 +32041,6 @@ index 352ec8e82f14..0ae34bbf3159 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -34624,7 +32090,7 @@ index 352ec8e82f14..0ae34bbf3159 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -34650,7 +32116,7 @@ index 352ec8e82f14..0ae34bbf3159 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -34706,18 +32172,10 @@ index edb8e084a33a..e2236e78c4a0 100644
 -
  Library("registered_field_trials_header_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
-index 92e42333271c..fc88fc12b670 100644
+index 158436eafa45..251655a1a226 100644
 --- third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -34725,6 +32183,7 @@ index 92e42333271c..fc88fc12b670 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -34733,23 +32192,18 @@ index 92e42333271c..fc88fc12b670 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -50,114 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -34768,10 +32222,6 @@ index 92e42333271c..fc88fc12b670 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -34779,10 +32229,6 @@ index 92e42333271c..fc88fc12b670 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -34790,7 +32236,6 @@ index 92e42333271c..fc88fc12b670 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -34798,10 +32243,6 @@ index 92e42333271c..fc88fc12b670 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -34814,10 +32255,6 @@ index 92e42333271c..fc88fc12b670 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -34855,7 +32292,7 @@ index 92e42333271c..fc88fc12b670 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -165,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -34913,10 +32350,10 @@ index 92e42333271c..fc88fc12b670 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -34927,10 +32364,10 @@ index 92e42333271c..fc88fc12b670 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -34942,18 +32379,10 @@ index 92e42333271c..fc88fc12b670 100644
  
  Library("rtc_event_audio_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
-index cf656cb19359..d1d7b99a002a 100644
+index 1ac713b1e2a5..552eb9cf4167 100644
 --- third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -34961,6 +32390,7 @@ index cf656cb19359..d1d7b99a002a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -34969,23 +32399,18 @@ index cf656cb19359..d1d7b99a002a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -51,114 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,93 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -35004,10 +32429,6 @@ index cf656cb19359..d1d7b99a002a 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -35015,10 +32436,6 @@ index cf656cb19359..d1d7b99a002a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -35026,7 +32443,6 @@ index cf656cb19359..d1d7b99a002a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -35034,10 +32450,6 @@ index cf656cb19359..d1d7b99a002a 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -35050,10 +32462,6 @@ index cf656cb19359..d1d7b99a002a 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -35091,7 +32499,7 @@ index cf656cb19359..d1d7b99a002a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -166,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -145,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -35149,10 +32557,10 @@ index cf656cb19359..d1d7b99a002a 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -35163,10 +32571,10 @@ index cf656cb19359..d1d7b99a002a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -35178,18 +32586,10 @@ index cf656cb19359..d1d7b99a002a 100644
  
  Library("rtc_event_bwe_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_field_gn/moz.build third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
-index b01bd2a19d2a..ff4a8f56a922 100644
+index c1305a84a6cc..3087fdcc327a 100644
 --- third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -35197,6 +32597,7 @@ index b01bd2a19d2a..ff4a8f56a922 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -35205,23 +32606,18 @@ index b01bd2a19d2a..ff4a8f56a922 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -35240,10 +32636,6 @@ index b01bd2a19d2a..ff4a8f56a922 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -35251,10 +32643,6 @@ index b01bd2a19d2a..ff4a8f56a922 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -35262,7 +32650,6 @@ index b01bd2a19d2a..ff4a8f56a922 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -35270,10 +32657,6 @@ index b01bd2a19d2a..ff4a8f56a922 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -35286,10 +32669,6 @@ index b01bd2a19d2a..ff4a8f56a922 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -35327,7 +32706,7 @@ index b01bd2a19d2a..ff4a8f56a922 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -35385,10 +32764,10 @@ index b01bd2a19d2a..ff4a8f56a922 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -35399,10 +32778,10 @@ index b01bd2a19d2a..ff4a8f56a922 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -35414,7 +32793,7 @@ index b01bd2a19d2a..ff4a8f56a922 100644
  
  Library("rtc_event_field_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build
-index 42336df5fa6b..2f1eb4312e6a 100644
+index 81e5642488fb..27983ddaa07f 100644
 --- third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -35425,6 +32804,7 @@ index 42336df5fa6b..2f1eb4312e6a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -35433,13 +32813,12 @@ index 42336df5fa6b..2f1eb4312e6a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35478,7 +32857,6 @@ index 42336df5fa6b..2f1eb4312e6a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -35528,7 +32906,7 @@ index 42336df5fa6b..2f1eb4312e6a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -35554,7 +32932,7 @@ index 42336df5fa6b..2f1eb4312e6a 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -35596,18 +32974,10 @@ index 42336df5fa6b..2f1eb4312e6a 100644
 -
  Library("rtc_event_log_parse_status_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
-index 48f605b67536..28e02820b18e 100644
+index 68c681097dd3..f050b1ed6acd 100644
 --- third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -35615,6 +32985,7 @@ index 48f605b67536..28e02820b18e 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -35623,23 +32994,18 @@ index 48f605b67536..28e02820b18e 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,107 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,86 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -35658,10 +33024,6 @@ index 48f605b67536..28e02820b18e 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -35669,10 +33031,6 @@ index 48f605b67536..28e02820b18e 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -35680,7 +33038,6 @@ index 48f605b67536..28e02820b18e 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -35688,10 +33045,6 @@ index 48f605b67536..28e02820b18e 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -35704,10 +33057,6 @@ index 48f605b67536..28e02820b18e 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -35738,7 +33087,7 @@ index 48f605b67536..28e02820b18e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -156,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -135,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -35825,18 +33174,10 @@ index 48f605b67536..28e02820b18e 100644
  
  Library("rtc_event_number_encodings_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
-index 769426790d5e..2c19edcb9ef3 100644
+index 8e54172d3ffc..15705b114eb9 100644
 --- third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -35844,6 +33185,7 @@ index 769426790d5e..2c19edcb9ef3 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -35852,23 +33194,18 @@ index 769426790d5e..2c19edcb9ef3 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -35887,10 +33224,6 @@ index 769426790d5e..2c19edcb9ef3 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -35898,10 +33231,6 @@ index 769426790d5e..2c19edcb9ef3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -35909,7 +33238,6 @@ index 769426790d5e..2c19edcb9ef3 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -35917,10 +33245,6 @@ index 769426790d5e..2c19edcb9ef3 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -35933,10 +33257,6 @@ index 769426790d5e..2c19edcb9ef3 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -35974,7 +33294,7 @@ index 769426790d5e..2c19edcb9ef3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -36032,10 +33352,10 @@ index 769426790d5e..2c19edcb9ef3 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -36046,10 +33366,10 @@ index 769426790d5e..2c19edcb9ef3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -36061,18 +33381,10 @@ index 769426790d5e..2c19edcb9ef3 100644
  
  Library("rtc_event_pacing_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
-index 3667d09360a2..2a003ff5236b 100644
+index 3e27015753fd..7a52b559595d 100644
 --- third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -36080,6 +33392,7 @@ index 3667d09360a2..2a003ff5236b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -36088,23 +33401,18 @@ index 3667d09360a2..2a003ff5236b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -36123,10 +33431,6 @@ index 3667d09360a2..2a003ff5236b 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -36134,10 +33438,6 @@ index 3667d09360a2..2a003ff5236b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -36145,7 +33445,6 @@ index 3667d09360a2..2a003ff5236b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -36153,10 +33452,6 @@ index 3667d09360a2..2a003ff5236b 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -36169,10 +33464,6 @@ index 3667d09360a2..2a003ff5236b 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -36210,7 +33501,7 @@ index 3667d09360a2..2a003ff5236b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -36268,10 +33559,10 @@ index 3667d09360a2..2a003ff5236b 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -36282,10 +33573,10 @@ index 3667d09360a2..2a003ff5236b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -36297,18 +33588,10 @@ index 3667d09360a2..2a003ff5236b 100644
  
  Library("rtc_event_rtp_rtcp_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_video_gn/moz.build third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
-index ba5e515cd8e4..0648ec187f14 100644
+index 79fa2f18c369..42638e9c1a58 100644
 --- third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -36316,6 +33599,7 @@ index ba5e515cd8e4..0648ec187f14 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -36324,23 +33608,18 @@ index ba5e515cd8e4..0648ec187f14 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -36359,10 +33638,6 @@ index ba5e515cd8e4..0648ec187f14 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -36370,10 +33645,6 @@ index ba5e515cd8e4..0648ec187f14 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -36381,7 +33652,6 @@ index ba5e515cd8e4..0648ec187f14 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -36389,10 +33659,6 @@ index ba5e515cd8e4..0648ec187f14 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -36405,10 +33671,6 @@ index ba5e515cd8e4..0648ec187f14 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -36446,7 +33708,7 @@ index ba5e515cd8e4..0648ec187f14 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -36504,10 +33766,10 @@ index ba5e515cd8e4..0648ec187f14 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -36518,10 +33780,10 @@ index ba5e515cd8e4..0648ec187f14 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -36533,18 +33795,10 @@ index ba5e515cd8e4..0648ec187f14 100644
  
  Library("rtc_event_video_gn")
 diff --git third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
-index 916957e22c81..10f7b60985b4 100644
+index 4567caafbe26..2017f2c23000 100644
 --- third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -36552,6 +33806,7 @@ index 916957e22c81..10f7b60985b4 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -36560,23 +33815,18 @@ index 916957e22c81..10f7b60985b4 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -36595,10 +33845,6 @@ index 916957e22c81..10f7b60985b4 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -36606,10 +33852,6 @@ index 916957e22c81..10f7b60985b4 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -36617,7 +33859,6 @@ index 916957e22c81..10f7b60985b4 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -36625,10 +33866,6 @@ index 916957e22c81..10f7b60985b4 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -36641,10 +33878,6 @@ index 916957e22c81..10f7b60985b4 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -36682,7 +33915,7 @@ index 916957e22c81..10f7b60985b4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -36740,10 +33973,10 @@ index 916957e22c81..10f7b60985b4 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -36754,10 +33987,10 @@ index 916957e22c81..10f7b60985b4 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -36769,18 +34002,10 @@ index 916957e22c81..10f7b60985b4 100644
  
  Library("rtc_stream_config_gn")
 diff --git third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build
-index 695b2ba30bd3..7ebde21eaa29 100644
+index 170ceb38ea18..ff3ef7c10365 100644
 --- third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build
 +++ third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -36788,6 +34013,7 @@ index 695b2ba30bd3..7ebde21eaa29 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -36796,23 +34022,18 @@ index 695b2ba30bd3..7ebde21eaa29 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -36831,10 +34052,6 @@ index 695b2ba30bd3..7ebde21eaa29 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -36842,10 +34059,6 @@ index 695b2ba30bd3..7ebde21eaa29 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -36853,7 +34066,6 @@ index 695b2ba30bd3..7ebde21eaa29 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -36861,10 +34073,6 @@ index 695b2ba30bd3..7ebde21eaa29 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -36877,10 +34085,6 @@ index 695b2ba30bd3..7ebde21eaa29 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -36918,7 +34122,7 @@ index 695b2ba30bd3..7ebde21eaa29 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -36976,10 +34180,10 @@ index 695b2ba30bd3..7ebde21eaa29 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -36990,10 +34194,10 @@ index 695b2ba30bd3..7ebde21eaa29 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -37005,7 +34209,7 @@ index 695b2ba30bd3..7ebde21eaa29 100644
  
  Library("adapted_video_track_source_gn")
 diff --git third_party/libwebrtc/media/audio_source_gn/moz.build third_party/libwebrtc/media/audio_source_gn/moz.build
-index 3581e20cca1b..9b54caddd0de 100644
+index f1168831de90..5fd47ccaeddd 100644
 --- third_party/libwebrtc/media/audio_source_gn/moz.build
 +++ third_party/libwebrtc/media/audio_source_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -37016,6 +34220,7 @@ index 3581e20cca1b..9b54caddd0de 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -37024,13 +34229,12 @@ index 3581e20cca1b..9b54caddd0de 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37065,7 +34269,6 @@ index 3581e20cca1b..9b54caddd0de 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -37115,7 +34318,7 @@ index 3581e20cca1b..9b54caddd0de 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -37141,7 +34344,7 @@ index 3581e20cca1b..9b54caddd0de 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -37183,18 +34386,10 @@ index 3581e20cca1b..9b54caddd0de 100644
 -
  Library("audio_source_gn")
 diff --git third_party/libwebrtc/media/codec_gn/moz.build third_party/libwebrtc/media/codec_gn/moz.build
-index 1a17cd2f4d2d..2e47ae5fdda4 100644
+index 4dbfaebba1b4..ac11b1371193 100644
 --- third_party/libwebrtc/media/codec_gn/moz.build
 +++ third_party/libwebrtc/media/codec_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -37202,6 +34397,7 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -37210,23 +34406,18 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -37245,10 +34436,6 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -37256,10 +34443,6 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -37267,7 +34450,6 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -37275,10 +34457,6 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -37291,10 +34469,6 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -37332,7 +34506,7 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -37390,10 +34564,10 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -37404,10 +34578,10 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -37419,7 +34593,7 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
  
  Library("codec_gn")
 diff --git third_party/libwebrtc/media/media_channel_gn/moz.build third_party/libwebrtc/media/media_channel_gn/moz.build
-index b49bb251e1b9..e01e3b526b85 100644
+index 0848daf93ca9..6dab893e0066 100644
 --- third_party/libwebrtc/media/media_channel_gn/moz.build
 +++ third_party/libwebrtc/media/media_channel_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -37430,6 +34604,7 @@ index b49bb251e1b9..e01e3b526b85 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -37438,13 +34613,12 @@ index b49bb251e1b9..e01e3b526b85 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37484,7 +34658,6 @@ index b49bb251e1b9..e01e3b526b85 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -37541,7 +34714,7 @@ index b49bb251e1b9..e01e3b526b85 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -37567,7 +34740,7 @@ index b49bb251e1b9..e01e3b526b85 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -37609,7 +34782,7 @@ index b49bb251e1b9..e01e3b526b85 100644
 -
  Library("media_channel_gn")
 diff --git third_party/libwebrtc/media/media_channel_impl_gn/moz.build third_party/libwebrtc/media/media_channel_impl_gn/moz.build
-index 37f5a67f2bcc..6533a1bbd386 100644
+index e758c604f5f3..a59748d1b38c 100644
 --- third_party/libwebrtc/media/media_channel_impl_gn/moz.build
 +++ third_party/libwebrtc/media/media_channel_impl_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -37620,6 +34793,7 @@ index 37f5a67f2bcc..6533a1bbd386 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -37628,13 +34802,12 @@ index 37f5a67f2bcc..6533a1bbd386 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37669,7 +34842,6 @@ index 37f5a67f2bcc..6533a1bbd386 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -37719,7 +34891,7 @@ index 37f5a67f2bcc..6533a1bbd386 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -37745,7 +34917,7 @@ index 37f5a67f2bcc..6533a1bbd386 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -37787,18 +34959,10 @@ index 37f5a67f2bcc..6533a1bbd386 100644
 -
  Library("media_channel_impl_gn")
 diff --git third_party/libwebrtc/media/media_constants_gn/moz.build third_party/libwebrtc/media/media_constants_gn/moz.build
-index a104d2262dee..20928cdabcd3 100644
+index 95445fbdf6e8..68728dd78931 100644
 --- third_party/libwebrtc/media/media_constants_gn/moz.build
 +++ third_party/libwebrtc/media/media_constants_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -37806,6 +34970,7 @@ index a104d2262dee..20928cdabcd3 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -37814,23 +34979,18 @@ index a104d2262dee..20928cdabcd3 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -37845,10 +35005,6 @@ index a104d2262dee..20928cdabcd3 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -37856,10 +35012,6 @@ index a104d2262dee..20928cdabcd3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -37867,7 +35019,6 @@ index a104d2262dee..20928cdabcd3 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -37875,10 +35026,6 @@ index a104d2262dee..20928cdabcd3 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -37891,10 +35038,6 @@ index a104d2262dee..20928cdabcd3 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -37925,7 +35068,7 @@ index a104d2262dee..20928cdabcd3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -37983,10 +35126,10 @@ index a104d2262dee..20928cdabcd3 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -37997,10 +35140,10 @@ index a104d2262dee..20928cdabcd3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -38012,7 +35155,7 @@ index a104d2262dee..20928cdabcd3 100644
  
  Library("media_constants_gn")
 diff --git third_party/libwebrtc/media/media_engine_gn/moz.build third_party/libwebrtc/media/media_engine_gn/moz.build
-index fdf4a8ebf6e8..de1d36c1c373 100644
+index cf139814ceb9..eaff43e12948 100644
 --- third_party/libwebrtc/media/media_engine_gn/moz.build
 +++ third_party/libwebrtc/media/media_engine_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -38023,6 +35166,7 @@ index fdf4a8ebf6e8..de1d36c1c373 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -38031,13 +35175,12 @@ index fdf4a8ebf6e8..de1d36c1c373 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38077,7 +35220,6 @@ index fdf4a8ebf6e8..de1d36c1c373 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -38134,7 +35276,7 @@ index fdf4a8ebf6e8..de1d36c1c373 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -38160,7 +35302,7 @@ index fdf4a8ebf6e8..de1d36c1c373 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -38202,18 +35344,10 @@ index fdf4a8ebf6e8..de1d36c1c373 100644
 -
  Library("media_engine_gn")
 diff --git third_party/libwebrtc/media/rid_description_gn/moz.build third_party/libwebrtc/media/rid_description_gn/moz.build
-index 50a2fd68b45b..1e41f0c073af 100644
+index 0989e698875d..2e232c6ada46 100644
 --- third_party/libwebrtc/media/rid_description_gn/moz.build
 +++ third_party/libwebrtc/media/rid_description_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -38221,6 +35355,7 @@ index 50a2fd68b45b..1e41f0c073af 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -38229,23 +35364,18 @@ index 50a2fd68b45b..1e41f0c073af 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -38264,10 +35394,6 @@ index 50a2fd68b45b..1e41f0c073af 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -38275,10 +35401,6 @@ index 50a2fd68b45b..1e41f0c073af 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -38286,7 +35408,6 @@ index 50a2fd68b45b..1e41f0c073af 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -38294,10 +35415,6 @@ index 50a2fd68b45b..1e41f0c073af 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -38310,10 +35427,6 @@ index 50a2fd68b45b..1e41f0c073af 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -38351,7 +35464,7 @@ index 50a2fd68b45b..1e41f0c073af 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -38409,10 +35522,10 @@ index 50a2fd68b45b..1e41f0c073af 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -38423,10 +35536,10 @@ index 50a2fd68b45b..1e41f0c073af 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -38438,19 +35551,10 @@ index 50a2fd68b45b..1e41f0c073af 100644
  
  Library("rid_description_gn")
 diff --git third_party/libwebrtc/media/rtc_audio_video_gn/moz.build third_party/libwebrtc/media/rtc_audio_video_gn/moz.build
-index e13e7218f6af..9c05bb7e2414 100644
+index 72d03172392a..235284ab4f03 100644
 --- third_party/libwebrtc/media/rtc_audio_video_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_audio_video_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["HAVE_WEBRTC_VIDEO"] = True
+@@ -14,12 +14,21 @@ DEFINES["HAVE_WEBRTC_VIDEO"] = True
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -38458,6 +35562,7 @@ index e13e7218f6af..9c05bb7e2414 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -38466,23 +35571,18 @@ index e13e7218f6af..9c05bb7e2414 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,119 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,98 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -38502,10 +35602,6 @@ index e13e7218f6af..9c05bb7e2414 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -38513,10 +35609,6 @@ index e13e7218f6af..9c05bb7e2414 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -38524,7 +35616,6 @@ index e13e7218f6af..9c05bb7e2414 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -38532,10 +35623,6 @@ index e13e7218f6af..9c05bb7e2414 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -38548,10 +35635,6 @@ index e13e7218f6af..9c05bb7e2414 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -38593,7 +35676,7 @@ index e13e7218f6af..9c05bb7e2414 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -168,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -147,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -38651,10 +35734,10 @@ index e13e7218f6af..9c05bb7e2414 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -38665,10 +35748,10 @@ index e13e7218f6af..9c05bb7e2414 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -38680,19 +35763,10 @@ index e13e7218f6af..9c05bb7e2414 100644
  
  Library("rtc_audio_video_gn")
 diff --git third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
-index 29d2e027afa8..6daa5629a1eb 100644
+index f72d9c49f1de..7254f017e2f2 100644
 --- third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+@@ -14,12 +14,21 @@ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
  DEFINES["RTC_USE_LIBAOM_AV1_ENCODER"] = True
@@ -38700,6 +35774,7 @@ index 29d2e027afa8..6daa5629a1eb 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -38708,23 +35783,18 @@ index 29d2e027afa8..6daa5629a1eb 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,115 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -38744,10 +35814,6 @@ index 29d2e027afa8..6daa5629a1eb 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -38755,10 +35821,6 @@ index 29d2e027afa8..6daa5629a1eb 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -38766,7 +35828,6 @@ index 29d2e027afa8..6daa5629a1eb 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -38774,10 +35835,6 @@ index 29d2e027afa8..6daa5629a1eb 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -38790,10 +35847,6 @@ index 29d2e027afa8..6daa5629a1eb 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -38831,7 +35884,7 @@ index 29d2e027afa8..6daa5629a1eb 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -163,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -38889,10 +35942,10 @@ index 29d2e027afa8..6daa5629a1eb 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -38903,10 +35956,10 @@ index 29d2e027afa8..6daa5629a1eb 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -38918,7 +35971,7 @@ index 29d2e027afa8..6daa5629a1eb 100644
  
  Library("rtc_internal_video_codecs_gn")
 diff --git third_party/libwebrtc/media/rtc_media_base_gn/moz.build third_party/libwebrtc/media/rtc_media_base_gn/moz.build
-index 492ef557c6d5..2d9dd74dd71d 100644
+index f465cb96722d..7110338b2381 100644
 --- third_party/libwebrtc/media/rtc_media_base_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_media_base_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -38929,6 +35982,7 @@ index 492ef557c6d5..2d9dd74dd71d 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -38937,13 +35991,12 @@ index 492ef557c6d5..2d9dd74dd71d 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38983,7 +36036,6 @@ index 492ef557c6d5..2d9dd74dd71d 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -39040,7 +36092,7 @@ index 492ef557c6d5..2d9dd74dd71d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -39066,7 +36118,7 @@ index 492ef557c6d5..2d9dd74dd71d 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -39108,7 +36160,7 @@ index 492ef557c6d5..2d9dd74dd71d 100644
 -
  Library("rtc_media_base_gn")
 diff --git third_party/libwebrtc/media/rtc_media_config_gn/moz.build third_party/libwebrtc/media/rtc_media_config_gn/moz.build
-index c42978367e79..ae42a4df5b02 100644
+index ea8062a2e446..7b25a9566dbe 100644
 --- third_party/libwebrtc/media/rtc_media_config_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_media_config_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -39119,6 +36171,7 @@ index c42978367e79..ae42a4df5b02 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -39127,13 +36180,12 @@ index c42978367e79..ae42a4df5b02 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39168,7 +36220,6 @@ index c42978367e79..ae42a4df5b02 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -39218,7 +36269,7 @@ index c42978367e79..ae42a4df5b02 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -39244,7 +36295,7 @@ index c42978367e79..ae42a4df5b02 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -39286,7 +36337,7 @@ index c42978367e79..ae42a4df5b02 100644
 -
  Library("rtc_media_config_gn")
 diff --git third_party/libwebrtc/media/rtc_media_gn/moz.build third_party/libwebrtc/media/rtc_media_gn/moz.build
-index ab0badb3130e..fe7e6cd83f1f 100644
+index 0feaa31871e0..d506d7e4b811 100644
 --- third_party/libwebrtc/media/rtc_media_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_media_gn/moz.build
 @@ -14,12 +14,21 @@ DEFINES["HAVE_WEBRTC_VIDEO"] = True
@@ -39297,6 +36348,7 @@ index ab0badb3130e..fe7e6cd83f1f 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -39305,13 +36357,12 @@ index ab0badb3130e..fe7e6cd83f1f 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -43,99 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,98 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39351,7 +36402,6 @@ index ab0badb3130e..fe7e6cd83f1f 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -39412,7 +36462,7 @@ index ab0badb3130e..fe7e6cd83f1f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -143,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -39438,7 +36488,7 @@ index ab0badb3130e..fe7e6cd83f1f 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -171,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -170,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -39480,18 +36530,10 @@ index ab0badb3130e..fe7e6cd83f1f 100644
 -
  Library("rtc_media_gn")
 diff --git third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build
-index 38bdd82cbc57..27de3f907e68 100644
+index a1618fa38d5e..9969fddbb391 100644
 --- third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -39499,6 +36541,7 @@ index 38bdd82cbc57..27de3f907e68 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -39507,23 +36550,18 @@ index 38bdd82cbc57..27de3f907e68 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -39542,10 +36580,6 @@ index 38bdd82cbc57..27de3f907e68 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -39553,10 +36587,6 @@ index 38bdd82cbc57..27de3f907e68 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -39564,7 +36594,6 @@ index 38bdd82cbc57..27de3f907e68 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -39572,10 +36601,6 @@ index 38bdd82cbc57..27de3f907e68 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -39588,10 +36613,6 @@ index 38bdd82cbc57..27de3f907e68 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -39629,7 +36650,7 @@ index 38bdd82cbc57..27de3f907e68 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -39687,10 +36708,10 @@ index 38bdd82cbc57..27de3f907e68 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -39701,10 +36722,10 @@ index 38bdd82cbc57..27de3f907e68 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -39716,18 +36737,10 @@ index 38bdd82cbc57..27de3f907e68 100644
  
  Library("rtc_sdp_video_format_utils_gn")
 diff --git third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
-index 66a71c40c4c3..68ac3e57788c 100644
+index 077f256b7ae4..1fce89407712 100644
 --- third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -39735,6 +36748,7 @@ index 66a71c40c4c3..68ac3e57788c 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -39743,23 +36757,18 @@ index 66a71c40c4c3..68ac3e57788c 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -39779,10 +36788,6 @@ index 66a71c40c4c3..68ac3e57788c 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -39790,10 +36795,6 @@ index 66a71c40c4c3..68ac3e57788c 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -39801,7 +36802,6 @@ index 66a71c40c4c3..68ac3e57788c 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -39809,10 +36809,6 @@ index 66a71c40c4c3..68ac3e57788c 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -39825,10 +36821,6 @@ index 66a71c40c4c3..68ac3e57788c 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -39866,7 +36858,7 @@ index 66a71c40c4c3..68ac3e57788c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -39924,10 +36916,10 @@ index 66a71c40c4c3..68ac3e57788c 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -39938,10 +36930,10 @@ index 66a71c40c4c3..68ac3e57788c 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -39953,7 +36945,7 @@ index 66a71c40c4c3..68ac3e57788c 100644
  
  Library("rtc_simulcast_encoder_adapter_gn")
 diff --git third_party/libwebrtc/media/rtp_utils_gn/moz.build third_party/libwebrtc/media/rtp_utils_gn/moz.build
-index 4f6c7ecc79c1..05909ae9d9ab 100644
+index 718787db4fdc..148d2e911e47 100644
 --- third_party/libwebrtc/media/rtp_utils_gn/moz.build
 +++ third_party/libwebrtc/media/rtp_utils_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -39964,6 +36956,7 @@ index 4f6c7ecc79c1..05909ae9d9ab 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -39972,13 +36965,12 @@ index 4f6c7ecc79c1..05909ae9d9ab 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40013,7 +37005,6 @@ index 4f6c7ecc79c1..05909ae9d9ab 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -40063,7 +37054,7 @@ index 4f6c7ecc79c1..05909ae9d9ab 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -40089,7 +37080,7 @@ index 4f6c7ecc79c1..05909ae9d9ab 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -40131,7 +37122,7 @@ index 4f6c7ecc79c1..05909ae9d9ab 100644
 -
  Library("rtp_utils_gn")
 diff --git third_party/libwebrtc/media/stream_params_gn/moz.build third_party/libwebrtc/media/stream_params_gn/moz.build
-index d55e6e09f06c..c4f947183b41 100644
+index 54aeb0b59974..af579ccfc539 100644
 --- third_party/libwebrtc/media/stream_params_gn/moz.build
 +++ third_party/libwebrtc/media/stream_params_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -40142,6 +37133,7 @@ index d55e6e09f06c..c4f947183b41 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -40150,13 +37142,12 @@ index d55e6e09f06c..c4f947183b41 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40191,7 +37182,6 @@ index d55e6e09f06c..c4f947183b41 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -40241,7 +37231,7 @@ index d55e6e09f06c..c4f947183b41 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -40267,7 +37257,7 @@ index d55e6e09f06c..c4f947183b41 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -40309,18 +37299,10 @@ index d55e6e09f06c..c4f947183b41 100644
 -
  Library("stream_params_gn")
 diff --git third_party/libwebrtc/media/video_adapter_gn/moz.build third_party/libwebrtc/media/video_adapter_gn/moz.build
-index 4dc558ddbbb7..d620cd03ecc7 100644
+index b69a51a5983d..ededc9780d49 100644
 --- third_party/libwebrtc/media/video_adapter_gn/moz.build
 +++ third_party/libwebrtc/media/video_adapter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -40328,6 +37310,7 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -40336,23 +37319,18 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -40371,10 +37349,6 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -40382,10 +37356,6 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -40393,7 +37363,6 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -40401,10 +37370,6 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -40417,10 +37382,6 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -40458,7 +37419,7 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -40516,10 +37477,10 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -40530,10 +37491,10 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -40545,18 +37506,10 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
  
  Library("video_adapter_gn")
 diff --git third_party/libwebrtc/media/video_broadcaster_gn/moz.build third_party/libwebrtc/media/video_broadcaster_gn/moz.build
-index a93d5af7f5fe..8c063e2cd0d2 100644
+index f615256ba4ed..c1f7fc585462 100644
 --- third_party/libwebrtc/media/video_broadcaster_gn/moz.build
 +++ third_party/libwebrtc/media/video_broadcaster_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -40564,6 +37517,7 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -40572,23 +37526,18 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -40607,10 +37556,6 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -40618,10 +37563,6 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -40629,7 +37570,6 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -40637,10 +37577,6 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -40653,10 +37589,6 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -40694,7 +37626,7 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -40752,10 +37684,10 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -40766,10 +37698,10 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -40781,18 +37713,10 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
  
  Library("video_broadcaster_gn")
 diff --git third_party/libwebrtc/media/video_common_gn/moz.build third_party/libwebrtc/media/video_common_gn/moz.build
-index 6c29143ad9aa..1125008a4f6c 100644
+index 8fe45f5a5bd6..cea55451b02a 100644
 --- third_party/libwebrtc/media/video_common_gn/moz.build
 +++ third_party/libwebrtc/media/video_common_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -40800,6 +37724,7 @@ index 6c29143ad9aa..1125008a4f6c 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -40808,23 +37733,18 @@ index 6c29143ad9aa..1125008a4f6c 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -40843,10 +37763,6 @@ index 6c29143ad9aa..1125008a4f6c 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -40854,10 +37770,6 @@ index 6c29143ad9aa..1125008a4f6c 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -40865,7 +37777,6 @@ index 6c29143ad9aa..1125008a4f6c 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -40873,10 +37784,6 @@ index 6c29143ad9aa..1125008a4f6c 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -40889,10 +37796,6 @@ index 6c29143ad9aa..1125008a4f6c 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -40930,7 +37833,7 @@ index 6c29143ad9aa..1125008a4f6c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -40988,10 +37891,10 @@ index 6c29143ad9aa..1125008a4f6c 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -41002,10 +37905,10 @@ index 6c29143ad9aa..1125008a4f6c 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -41017,18 +37920,10 @@ index 6c29143ad9aa..1125008a4f6c 100644
  
  Library("video_common_gn")
 diff --git third_party/libwebrtc/media/video_source_base_gn/moz.build third_party/libwebrtc/media/video_source_base_gn/moz.build
-index 4dc607134aac..546b829badfc 100644
+index 0c67351e481a..b7102601a5f8 100644
 --- third_party/libwebrtc/media/video_source_base_gn/moz.build
 +++ third_party/libwebrtc/media/video_source_base_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -41036,6 +37931,7 @@ index 4dc607134aac..546b829badfc 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -41044,23 +37940,18 @@ index 4dc607134aac..546b829badfc 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -41079,10 +37970,6 @@ index 4dc607134aac..546b829badfc 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -41090,10 +37977,6 @@ index 4dc607134aac..546b829badfc 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -41101,7 +37984,6 @@ index 4dc607134aac..546b829badfc 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -41109,10 +37991,6 @@ index 4dc607134aac..546b829badfc 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -41125,10 +38003,6 @@ index 4dc607134aac..546b829badfc 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -41166,7 +38040,7 @@ index 4dc607134aac..546b829badfc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -41224,10 +38098,10 @@ index 4dc607134aac..546b829badfc 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -41238,10 +38112,10 @@ index 4dc607134aac..546b829badfc 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -41253,18 +38127,10 @@ index 4dc607134aac..546b829badfc 100644
  
  Library("video_source_base_gn")
 diff --git third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
-index d46f1a759687..542b5a54b1f2 100644
+index 910b12a46a63..9220db367d82 100644
 --- third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
 +++ third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -41272,6 +38138,7 @@ index d46f1a759687..542b5a54b1f2 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -41280,23 +38147,18 @@ index d46f1a759687..542b5a54b1f2 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -41315,10 +38177,6 @@ index d46f1a759687..542b5a54b1f2 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -41326,10 +38184,6 @@ index d46f1a759687..542b5a54b1f2 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -41337,7 +38191,6 @@ index d46f1a759687..542b5a54b1f2 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -41345,10 +38198,6 @@ index d46f1a759687..542b5a54b1f2 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -41361,10 +38210,6 @@ index d46f1a759687..542b5a54b1f2 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -41402,7 +38247,7 @@ index d46f1a759687..542b5a54b1f2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -41460,10 +38305,10 @@ index d46f1a759687..542b5a54b1f2 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -41474,10 +38319,10 @@ index d46f1a759687..542b5a54b1f2 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -41489,18 +38334,10 @@ index d46f1a759687..542b5a54b1f2 100644
  
  Library("async_audio_processing_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
-index d82a5a14f4b8..778a9aafefbd 100644
+index 9c56b76d17a5..442c62b648b5 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -41508,6 +38345,7 @@ index d82a5a14f4b8..778a9aafefbd 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -41516,23 +38354,18 @@ index d82a5a14f4b8..778a9aafefbd 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -41551,10 +38384,6 @@ index d82a5a14f4b8..778a9aafefbd 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -41562,10 +38391,6 @@ index d82a5a14f4b8..778a9aafefbd 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -41573,7 +38398,6 @@ index d82a5a14f4b8..778a9aafefbd 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -41581,10 +38405,6 @@ index d82a5a14f4b8..778a9aafefbd 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -41597,10 +38417,6 @@ index d82a5a14f4b8..778a9aafefbd 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -41638,7 +38454,7 @@ index d82a5a14f4b8..778a9aafefbd 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -41696,10 +38512,10 @@ index d82a5a14f4b8..778a9aafefbd 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -41710,10 +38526,10 @@ index d82a5a14f4b8..778a9aafefbd 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -41725,7 +38541,7 @@ index d82a5a14f4b8..778a9aafefbd 100644
  
  Library("audio_coding_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
-index 318901c1a44e..295c746c4637 100644
+index 489b534c2fb3..7a4d82a43b5e 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -41736,6 +38552,7 @@ index 318901c1a44e..295c746c4637 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -41744,13 +38561,12 @@ index 318901c1a44e..295c746c4637 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41785,7 +38601,6 @@ index 318901c1a44e..295c746c4637 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -41835,7 +38650,7 @@ index 318901c1a44e..295c746c4637 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -41861,7 +38676,7 @@ index 318901c1a44e..295c746c4637 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -41903,18 +38718,10 @@ index 318901c1a44e..295c746c4637 100644
 -
  Library("audio_coding_module_typedefs_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
-index faa1f1264733..db7345eab074 100644
+index 28a4474f3b01..c44eaba16b4e 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -41922,6 +38729,7 @@ index faa1f1264733..db7345eab074 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -41930,23 +38738,18 @@ index faa1f1264733..db7345eab074 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -41965,10 +38768,6 @@ index faa1f1264733..db7345eab074 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -41976,10 +38775,6 @@ index faa1f1264733..db7345eab074 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -41987,7 +38782,6 @@ index faa1f1264733..db7345eab074 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -41995,10 +38789,6 @@ index faa1f1264733..db7345eab074 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -42011,10 +38801,6 @@ index faa1f1264733..db7345eab074 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -42052,7 +38838,7 @@ index faa1f1264733..db7345eab074 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -42110,10 +38896,10 @@ index faa1f1264733..db7345eab074 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -42124,10 +38910,10 @@ index faa1f1264733..db7345eab074 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -42139,18 +38925,10 @@ index faa1f1264733..db7345eab074 100644
  
  Library("audio_coding_opus_common_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
-index 17b5510ed9c7..18e473fd2581 100644
+index c334503506ad..d0c66e82a230 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -42158,6 +38936,7 @@ index 17b5510ed9c7..18e473fd2581 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -42166,23 +38945,18 @@ index 17b5510ed9c7..18e473fd2581 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -42201,10 +38975,6 @@ index 17b5510ed9c7..18e473fd2581 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -42212,10 +38982,6 @@ index 17b5510ed9c7..18e473fd2581 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -42223,7 +38989,6 @@ index 17b5510ed9c7..18e473fd2581 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -42231,10 +38996,6 @@ index 17b5510ed9c7..18e473fd2581 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -42247,10 +39008,6 @@ index 17b5510ed9c7..18e473fd2581 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -42288,7 +39045,7 @@ index 17b5510ed9c7..18e473fd2581 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -42346,10 +39103,10 @@ index 17b5510ed9c7..18e473fd2581 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -42360,10 +39117,10 @@ index 17b5510ed9c7..18e473fd2581 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -42375,18 +39132,10 @@ index 17b5510ed9c7..18e473fd2581 100644
  
  Library("audio_encoder_cng_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
-index cda4075cf2bc..01b991429a96 100644
+index a8342784a2e6..9b789e0e576c 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -42394,6 +39143,7 @@ index cda4075cf2bc..01b991429a96 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -42402,23 +39152,18 @@ index cda4075cf2bc..01b991429a96 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -42433,10 +39178,6 @@ index cda4075cf2bc..01b991429a96 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -42444,10 +39185,6 @@ index cda4075cf2bc..01b991429a96 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -42455,7 +39192,6 @@ index cda4075cf2bc..01b991429a96 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -42463,10 +39199,6 @@ index cda4075cf2bc..01b991429a96 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -42479,10 +39211,6 @@ index cda4075cf2bc..01b991429a96 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -42513,7 +39241,7 @@ index cda4075cf2bc..01b991429a96 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -42571,10 +39299,10 @@ index cda4075cf2bc..01b991429a96 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -42585,10 +39313,10 @@ index cda4075cf2bc..01b991429a96 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -42600,18 +39328,10 @@ index cda4075cf2bc..01b991429a96 100644
  
  Library("audio_network_adaptor_config_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
-index 7caacff1ca9c..5364c2abc969 100644
+index 98b4ab3b43dc..ccae536ad564 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -42619,6 +39339,7 @@ index 7caacff1ca9c..5364c2abc969 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -42627,23 +39348,18 @@ index 7caacff1ca9c..5364c2abc969 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -56,114 +69,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -56,93 +65,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -42662,10 +39378,6 @@ index 7caacff1ca9c..5364c2abc969 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -42673,10 +39385,6 @@ index 7caacff1ca9c..5364c2abc969 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -42684,7 +39392,6 @@ index 7caacff1ca9c..5364c2abc969 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -42692,10 +39399,6 @@ index 7caacff1ca9c..5364c2abc969 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -42708,10 +39411,6 @@ index 7caacff1ca9c..5364c2abc969 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -42749,7 +39448,7 @@ index 7caacff1ca9c..5364c2abc969 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -171,82 +77,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -150,82 +73,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -42807,10 +39506,10 @@ index 7caacff1ca9c..5364c2abc969 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -42821,10 +39520,10 @@ index 7caacff1ca9c..5364c2abc969 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -42836,7 +39535,7 @@ index 7caacff1ca9c..5364c2abc969 100644
  
  Library("audio_network_adaptor_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
-index 3a67db4a6326..9d507b56f1b9 100644
+index b83a1cfcfb20..131a60705075 100644
 --- third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -42847,6 +39546,7 @@ index 3a67db4a6326..9d507b56f1b9 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -42855,13 +39555,12 @@ index 3a67db4a6326..9d507b56f1b9 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,83 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42896,7 +39595,6 @@ index 3a67db4a6326..9d507b56f1b9 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -42946,7 +39644,7 @@ index 3a67db4a6326..9d507b56f1b9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -43033,18 +39731,10 @@ index 3a67db4a6326..9d507b56f1b9 100644
  
  Library("g711_c_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
-index eb2bea17da78..010e4bca5d7a 100644
+index 1675e90d8790..d01e4b686418 100644
 --- third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -43052,6 +39742,7 @@ index eb2bea17da78..010e4bca5d7a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -43060,23 +39751,18 @@ index eb2bea17da78..010e4bca5d7a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -43095,10 +39781,6 @@ index eb2bea17da78..010e4bca5d7a 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -43106,10 +39788,6 @@ index eb2bea17da78..010e4bca5d7a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -43117,7 +39795,6 @@ index eb2bea17da78..010e4bca5d7a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -43125,10 +39802,6 @@ index eb2bea17da78..010e4bca5d7a 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -43141,10 +39814,6 @@ index eb2bea17da78..010e4bca5d7a 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -43182,7 +39851,7 @@ index eb2bea17da78..010e4bca5d7a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -43240,10 +39909,10 @@ index eb2bea17da78..010e4bca5d7a 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -43254,10 +39923,10 @@ index eb2bea17da78..010e4bca5d7a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -43269,7 +39938,7 @@ index eb2bea17da78..010e4bca5d7a 100644
  
  Library("g711_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
-index 16611741d3a7..324042e8bb7b 100644
+index fa99447ca050..44978ebedb1d 100644
 --- third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -43280,6 +39949,7 @@ index 16611741d3a7..324042e8bb7b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -43288,13 +39958,12 @@ index 16611741d3a7..324042e8bb7b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,83 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43329,7 +39998,6 @@ index 16611741d3a7..324042e8bb7b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -43379,7 +40047,7 @@ index 16611741d3a7..324042e8bb7b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -43466,18 +40134,10 @@ index 16611741d3a7..324042e8bb7b 100644
  
  Library("g722_c_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
-index 532a8c1f6de6..eade52d13d0d 100644
+index fa074502a127..4f9ad9cd4a62 100644
 --- third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -43485,6 +40145,7 @@ index 532a8c1f6de6..eade52d13d0d 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -43493,23 +40154,18 @@ index 532a8c1f6de6..eade52d13d0d 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -43528,10 +40184,6 @@ index 532a8c1f6de6..eade52d13d0d 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -43539,10 +40191,6 @@ index 532a8c1f6de6..eade52d13d0d 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -43550,7 +40198,6 @@ index 532a8c1f6de6..eade52d13d0d 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -43558,10 +40205,6 @@ index 532a8c1f6de6..eade52d13d0d 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -43574,10 +40217,6 @@ index 532a8c1f6de6..eade52d13d0d 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -43615,7 +40254,7 @@ index 532a8c1f6de6..eade52d13d0d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -43673,10 +40312,10 @@ index 532a8c1f6de6..eade52d13d0d 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -43687,10 +40326,10 @@ index 532a8c1f6de6..eade52d13d0d 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -43702,7 +40341,7 @@ index 532a8c1f6de6..eade52d13d0d 100644
  
  Library("g722_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
-index b8dd874ca987..33ad21e88a9b 100644
+index deddbd7bc6a3..279051a8188f 100644
 --- third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -43713,6 +40352,7 @@ index b8dd874ca987..33ad21e88a9b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -43721,13 +40361,12 @@ index b8dd874ca987..33ad21e88a9b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43762,7 +40401,6 @@ index b8dd874ca987..33ad21e88a9b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -43812,7 +40450,7 @@ index b8dd874ca987..33ad21e88a9b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -43838,7 +40476,7 @@ index b8dd874ca987..33ad21e88a9b 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -43880,7 +40518,7 @@ index b8dd874ca987..33ad21e88a9b 100644
 -
  Library("isac_bwinfo_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
-index 6c96470ac113..6f26b7613ac0 100644
+index 9a2813ef474b..975128b1fe25 100644
 --- third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -43891,6 +40529,7 @@ index 6c96470ac113..6f26b7613ac0 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -43899,13 +40538,12 @@ index 6c96470ac113..6f26b7613ac0 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,83 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,82 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43940,7 +40578,6 @@ index 6c96470ac113..6f26b7613ac0 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -43990,7 +40627,7 @@ index 6c96470ac113..6f26b7613ac0 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -132,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -44077,18 +40714,10 @@ index 6c96470ac113..6f26b7613ac0 100644
  
  Library("isac_vad_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
-index c42f54743647..ef46df1da4fc 100644
+index 68845ebff19a..1463a804bbff 100644
 --- third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -44096,6 +40725,7 @@ index c42f54743647..ef46df1da4fc 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -44104,23 +40734,18 @@ index c42f54743647..ef46df1da4fc 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -44139,10 +40764,6 @@ index c42f54743647..ef46df1da4fc 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -44150,10 +40771,6 @@ index c42f54743647..ef46df1da4fc 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -44161,7 +40778,6 @@ index c42f54743647..ef46df1da4fc 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -44169,10 +40785,6 @@ index c42f54743647..ef46df1da4fc 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -44185,10 +40797,6 @@ index c42f54743647..ef46df1da4fc 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -44226,7 +40834,7 @@ index c42f54743647..ef46df1da4fc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -44284,10 +40892,10 @@ index c42f54743647..ef46df1da4fc 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -44298,10 +40906,10 @@ index c42f54743647..ef46df1da4fc 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -44313,18 +40921,10 @@ index c42f54743647..ef46df1da4fc 100644
  
  Library("legacy_encoded_audio_frame_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
-index 61d03c2b24c2..5df332e08375 100644
+index b7100e120ab2..7e31677674ef 100644
 --- third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -44332,6 +40932,7 @@ index 61d03c2b24c2..5df332e08375 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -44340,23 +40941,18 @@ index 61d03c2b24c2..5df332e08375 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -81,114 +94,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -81,93 +90,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -44375,10 +40971,6 @@ index 61d03c2b24c2..5df332e08375 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -44386,10 +40978,6 @@ index 61d03c2b24c2..5df332e08375 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -44397,7 +40985,6 @@ index 61d03c2b24c2..5df332e08375 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -44405,10 +40992,6 @@ index 61d03c2b24c2..5df332e08375 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -44421,10 +41004,6 @@ index 61d03c2b24c2..5df332e08375 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -44462,7 +41041,7 @@ index 61d03c2b24c2..5df332e08375 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -196,82 +102,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -175,82 +98,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -44549,7 +41128,7 @@ index 61d03c2b24c2..5df332e08375 100644
  
  Library("neteq_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
-index 5f8526cb4069..55d6407090fc 100644
+index 1f9fc4f74a1a..8dfe667be13c 100644
 --- third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -44560,6 +41139,7 @@ index 5f8526cb4069..55d6407090fc 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -44568,13 +41148,12 @@ index 5f8526cb4069..55d6407090fc 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,83 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44609,7 +41188,6 @@ index 5f8526cb4069..55d6407090fc 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -44659,7 +41237,7 @@ index 5f8526cb4069..55d6407090fc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -44746,18 +41324,10 @@ index 5f8526cb4069..55d6407090fc 100644
  
  Library("pcm16b_c_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
-index 428977fd1acf..cce6098221c5 100644
+index db4b694011a3..8abc614eedbe 100644
 --- third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -44765,6 +41335,7 @@ index 428977fd1acf..cce6098221c5 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -44773,23 +41344,18 @@ index 428977fd1acf..cce6098221c5 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,114 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -44808,10 +41374,6 @@ index 428977fd1acf..cce6098221c5 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -44819,10 +41381,6 @@ index 428977fd1acf..cce6098221c5 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -44830,7 +41388,6 @@ index 428977fd1acf..cce6098221c5 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -44838,10 +41395,6 @@ index 428977fd1acf..cce6098221c5 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -44854,10 +41407,6 @@ index 428977fd1acf..cce6098221c5 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -44895,7 +41444,7 @@ index 428977fd1acf..cce6098221c5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -163,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -44953,10 +41502,10 @@ index 428977fd1acf..cce6098221c5 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -44967,10 +41516,10 @@ index 428977fd1acf..cce6098221c5 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -44982,18 +41531,10 @@ index 428977fd1acf..cce6098221c5 100644
  
  Library("pcm16b_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/red_gn/moz.build third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
-index 773bab244a03..351564a69485 100644
+index 7896cb765a18..f16ef0cde7d2 100644
 --- third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -45001,6 +41542,7 @@ index 773bab244a03..351564a69485 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -45009,23 +41551,18 @@ index 773bab244a03..351564a69485 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -45044,10 +41581,6 @@ index 773bab244a03..351564a69485 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -45055,10 +41588,6 @@ index 773bab244a03..351564a69485 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -45066,7 +41595,6 @@ index 773bab244a03..351564a69485 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -45074,10 +41602,6 @@ index 773bab244a03..351564a69485 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -45090,10 +41614,6 @@ index 773bab244a03..351564a69485 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -45131,7 +41651,7 @@ index 773bab244a03..351564a69485 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -45189,10 +41709,10 @@ index 773bab244a03..351564a69485 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -45203,10 +41723,10 @@ index 773bab244a03..351564a69485 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -45218,18 +41738,10 @@ index 773bab244a03..351564a69485 100644
  
  Library("red_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
-index 4104878e3d6a..c599a97f8fcf 100644
+index d81c924c7314..bf58ee8f6ccc 100644
 --- third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -45237,6 +41749,7 @@ index 4104878e3d6a..c599a97f8fcf 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -45245,23 +41758,18 @@ index 4104878e3d6a..c599a97f8fcf 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -45280,10 +41788,6 @@ index 4104878e3d6a..c599a97f8fcf 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -45291,10 +41795,6 @@ index 4104878e3d6a..c599a97f8fcf 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -45302,7 +41802,6 @@ index 4104878e3d6a..c599a97f8fcf 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -45310,10 +41809,6 @@ index 4104878e3d6a..c599a97f8fcf 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -45326,10 +41821,6 @@ index 4104878e3d6a..c599a97f8fcf 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -45360,7 +41851,7 @@ index 4104878e3d6a..c599a97f8fcf 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -45447,18 +41938,10 @@ index 4104878e3d6a..c599a97f8fcf 100644
  
  Library("webrtc_cng_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
-index 9403fd91f3d2..2991ddf102f6 100644
+index c79834bb21b0..1d99ea5b574c 100644
 --- third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
-@@ -9,18 +9,31 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,6 +13,9 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -45467,7 +41950,8 @@ index 9403fd91f3d2..2991ddf102f6 100644
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_CODEC_OPUS"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+@@ -20,7 +23,13 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
  DEFINES["WEBRTC_OPUS_SUPPORT_120MS_PTIME"] = "1"
@@ -45476,23 +41960,18 @@ index 9403fd91f3d2..2991ddf102f6 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -50,114 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -45511,10 +41990,6 @@ index 9403fd91f3d2..2991ddf102f6 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -45522,10 +41997,6 @@ index 9403fd91f3d2..2991ddf102f6 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -45533,7 +42004,6 @@ index 9403fd91f3d2..2991ddf102f6 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -45541,10 +42011,6 @@ index 9403fd91f3d2..2991ddf102f6 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -45557,10 +42023,6 @@ index 9403fd91f3d2..2991ddf102f6 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -45598,7 +42060,7 @@ index 9403fd91f3d2..2991ddf102f6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -165,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -45656,10 +42118,10 @@ index 9403fd91f3d2..2991ddf102f6 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -45670,10 +42132,10 @@ index 9403fd91f3d2..2991ddf102f6 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -45685,18 +42147,10 @@ index 9403fd91f3d2..2991ddf102f6 100644
  
  Library("webrtc_multiopus_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
-index f3aaa0d67bdc..08c694f63e18 100644
+index 359c64bca323..ca89800b1f98 100644
 --- third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
-@@ -9,18 +9,31 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,6 +13,9 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -45705,7 +42159,8 @@ index f3aaa0d67bdc..08c694f63e18 100644
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_CODEC_OPUS"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+@@ -20,7 +23,13 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
  DEFINES["WEBRTC_OPUS_SUPPORT_120MS_PTIME"] = "1"
@@ -45714,23 +42169,18 @@ index f3aaa0d67bdc..08c694f63e18 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -50,114 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -45749,10 +42199,6 @@ index f3aaa0d67bdc..08c694f63e18 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -45760,10 +42206,6 @@ index f3aaa0d67bdc..08c694f63e18 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -45771,7 +42213,6 @@ index f3aaa0d67bdc..08c694f63e18 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -45779,10 +42220,6 @@ index f3aaa0d67bdc..08c694f63e18 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -45795,10 +42232,6 @@ index f3aaa0d67bdc..08c694f63e18 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -45836,7 +42269,7 @@ index f3aaa0d67bdc..08c694f63e18 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -165,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -45894,10 +42327,10 @@ index f3aaa0d67bdc..08c694f63e18 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -45908,10 +42341,10 @@ index f3aaa0d67bdc..08c694f63e18 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -45923,18 +42356,10 @@ index f3aaa0d67bdc..08c694f63e18 100644
  
  Library("webrtc_opus_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
-index 86fc3f405429..5f8f8e535835 100644
+index e255da9f0e5d..cbdb8e61184f 100644
 --- third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
-@@ -9,18 +9,31 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,6 +13,9 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -45943,7 +42368,8 @@ index 86fc3f405429..5f8f8e535835 100644
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_CODEC_OPUS"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+@@ -20,7 +23,13 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
  DEFINES["WEBRTC_OPUS_SUPPORT_120MS_PTIME"] = "1"
@@ -45952,23 +42378,18 @@ index 86fc3f405429..5f8f8e535835 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,107 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,86 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -45987,10 +42408,6 @@ index 86fc3f405429..5f8f8e535835 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -45998,10 +42415,6 @@ index 86fc3f405429..5f8f8e535835 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -46009,7 +42422,6 @@ index 86fc3f405429..5f8f8e535835 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -46017,10 +42429,6 @@ index 86fc3f405429..5f8f8e535835 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -46033,10 +42441,6 @@ index 86fc3f405429..5f8f8e535835 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -46067,7 +42471,7 @@ index 86fc3f405429..5f8f8e535835 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -157,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -46154,7 +42558,7 @@ index 86fc3f405429..5f8f8e535835 100644
  
  Library("webrtc_opus_wrapper_gn")
 diff --git third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
-index 87d11c2579e5..8406c1f27370 100644
+index 32a52b9ad4dc..1812ab6bedf8 100644
 --- third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -46165,6 +42569,7 @@ index 87d11c2579e5..8406c1f27370 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -46173,13 +42578,12 @@ index 87d11c2579e5..8406c1f27370 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46214,7 +42618,6 @@ index 87d11c2579e5..8406c1f27370 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -46264,7 +42667,7 @@ index 87d11c2579e5..8406c1f27370 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -46290,7 +42693,7 @@ index 87d11c2579e5..8406c1f27370 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -46332,18 +42735,10 @@ index 87d11c2579e5..8406c1f27370 100644
 -
  Library("audio_device_gn")
 diff --git third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
-index c7e35781d9d6..ca6b5b3e12d6 100644
+index 84025f54a42e..67a9ba3e660f 100644
 --- third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -46351,6 +42746,7 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -46359,23 +42755,18 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -46394,10 +42785,6 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -46405,10 +42792,6 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -46416,7 +42799,6 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -46424,10 +42806,6 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -46440,10 +42818,6 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -46481,7 +42855,7 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -46539,10 +42913,10 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -46553,10 +42927,10 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -46568,18 +42942,10 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
  
  Library("audio_frame_manipulator_gn")
 diff --git third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
-index 168b462ae903..67171da3d582 100644
+index 266eeae7423d..29d13fa8a836 100644
 --- third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -46588,6 +42954,7 @@ index 168b462ae903..67171da3d582 100644
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -46596,23 +42963,18 @@ index 168b462ae903..67171da3d582 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -46631,10 +42993,6 @@ index 168b462ae903..67171da3d582 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -46642,10 +43000,6 @@ index 168b462ae903..67171da3d582 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -46653,7 +43007,6 @@ index 168b462ae903..67171da3d582 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -46661,10 +43014,6 @@ index 168b462ae903..67171da3d582 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -46677,10 +43026,6 @@ index 168b462ae903..67171da3d582 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -46718,7 +43063,7 @@ index 168b462ae903..67171da3d582 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -46776,10 +43121,10 @@ index 168b462ae903..67171da3d582 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -46790,10 +43135,10 @@ index 168b462ae903..67171da3d582 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -46805,7 +43150,7 @@ index 168b462ae903..67171da3d582 100644
  
  Library("audio_mixer_impl_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
-index a5ea7a055c2a..257c41f92e45 100644
+index 67dbd0364954..af1781edae5a 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -46816,6 +43161,7 @@ index a5ea7a055c2a..257c41f92e45 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -46824,13 +43170,12 @@ index a5ea7a055c2a..257c41f92e45 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46869,7 +43214,6 @@ index a5ea7a055c2a..257c41f92e45 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -46919,7 +43263,7 @@ index a5ea7a055c2a..257c41f92e45 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -46945,7 +43289,7 @@ index a5ea7a055c2a..257c41f92e45 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -46987,7 +43331,7 @@ index a5ea7a055c2a..257c41f92e45 100644
 -
  Library("adaptive_fir_filter_erl_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
-index 1c7aed16fb44..ff5f6f5c6b52 100644
+index 826757be30b2..248e97af3f24 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -46998,6 +43342,7 @@ index 1c7aed16fb44..ff5f6f5c6b52 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -47006,13 +43351,12 @@ index 1c7aed16fb44..ff5f6f5c6b52 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47051,7 +43395,6 @@ index 1c7aed16fb44..ff5f6f5c6b52 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -47108,7 +43451,7 @@ index 1c7aed16fb44..ff5f6f5c6b52 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -47134,7 +43477,7 @@ index 1c7aed16fb44..ff5f6f5c6b52 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -47176,19 +43519,10 @@ index 1c7aed16fb44..ff5f6f5c6b52 100644
 -
  Library("adaptive_fir_filter_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
-index b199b50b1ec1..c7db7f029811 100644
+index 841514fe7c05..07f83ec4dd88 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
-@@ -11,21 +11,31 @@ AllowCompilerWarnings()
- 
- CXXFLAGS += [
-     "-mavx2",
--    "-mfma"
-+    "-mfma",
-+    "-std=gnu++20"
- ]
- 
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -18,14 +18,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -47198,6 +43532,7 @@ index b199b50b1ec1..c7db7f029811 100644
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_AVX2"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -47206,23 +43541,18 @@ index b199b50b1ec1..c7db7f029811 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -57,143 +67,9 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -57,122 +66,9 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -47241,10 +43571,6 @@ index b199b50b1ec1..c7db7f029811 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -47252,10 +43578,6 @@ index b199b50b1ec1..c7db7f029811 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -47263,7 +43585,6 @@ index b199b50b1ec1..c7db7f029811 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_GNU_SOURCE"] = True
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
@@ -47272,10 +43593,6 @@ index b199b50b1ec1..c7db7f029811 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -47288,10 +43605,6 @@ index b199b50b1ec1..c7db7f029811 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -47358,7 +43671,7 @@ index b199b50b1ec1..c7db7f029811 100644
      CXXFLAGS += [
          "-msse2"
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
-index e4aecfab22ab..c4156a9ff2f4 100644
+index 8ee5cb9e07a8..87efd357dcbd 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -47369,6 +43682,7 @@ index e4aecfab22ab..c4156a9ff2f4 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -47377,13 +43691,12 @@ index e4aecfab22ab..c4156a9ff2f4 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47418,7 +43731,6 @@ index e4aecfab22ab..c4156a9ff2f4 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -47468,7 +43780,7 @@ index e4aecfab22ab..c4156a9ff2f4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -47494,7 +43806,7 @@ index e4aecfab22ab..c4156a9ff2f4 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -47536,7 +43848,7 @@ index e4aecfab22ab..c4156a9ff2f4 100644
 -
  Library("aec3_common_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
-index f891acfdb6bc..09b3550994f4 100644
+index 0a4f5b6f98bf..2f6d1401854f 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -47547,6 +43859,7 @@ index f891acfdb6bc..09b3550994f4 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -47555,13 +43868,12 @@ index f891acfdb6bc..09b3550994f4 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47600,7 +43912,6 @@ index f891acfdb6bc..09b3550994f4 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -47657,7 +43968,7 @@ index f891acfdb6bc..09b3550994f4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -47683,7 +43994,7 @@ index f891acfdb6bc..09b3550994f4 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -47725,18 +44036,10 @@ index f891acfdb6bc..09b3550994f4 100644
 -
  Library("aec3_fft_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
-index deb61ac306cd..7e0457fca6db 100644
+index 7ba40bca2b1a..ab0e74825f70 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -47745,6 +44048,7 @@ index deb61ac306cd..7e0457fca6db 100644
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -47753,23 +44057,18 @@ index deb61ac306cd..7e0457fca6db 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -103,114 +116,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -103,93 +112,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -47788,10 +44087,6 @@ index deb61ac306cd..7e0457fca6db 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -47799,10 +44094,6 @@ index deb61ac306cd..7e0457fca6db 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -47810,7 +44101,6 @@ index deb61ac306cd..7e0457fca6db 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -47818,10 +44108,6 @@ index deb61ac306cd..7e0457fca6db 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -47834,10 +44120,6 @@ index deb61ac306cd..7e0457fca6db 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -47875,7 +44157,7 @@ index deb61ac306cd..7e0457fca6db 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -218,82 +124,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -197,82 +120,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -47962,7 +44244,7 @@ index deb61ac306cd..7e0457fca6db 100644
  
  Library("aec3_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
-index 595f2c8257c5..5decd286f131 100644
+index f65afa9ac2f6..46165a8d7f41 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -47973,6 +44255,7 @@ index 595f2c8257c5..5decd286f131 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -47981,13 +44264,12 @@ index 595f2c8257c5..5decd286f131 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48026,7 +44308,6 @@ index 595f2c8257c5..5decd286f131 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -48076,7 +44357,7 @@ index 595f2c8257c5..5decd286f131 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -48102,7 +44383,7 @@ index 595f2c8257c5..5decd286f131 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -48144,7 +44425,7 @@ index 595f2c8257c5..5decd286f131 100644
 -
  Library("fft_data_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
-index afb8ec4fcc88..5db219d43ef4 100644
+index 511f5e83ffca..803c26a3f14e 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -48155,6 +44436,7 @@ index afb8ec4fcc88..5db219d43ef4 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -48163,13 +44445,12 @@ index afb8ec4fcc88..5db219d43ef4 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48208,7 +44489,6 @@ index afb8ec4fcc88..5db219d43ef4 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -48258,7 +44538,7 @@ index afb8ec4fcc88..5db219d43ef4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -48284,7 +44564,7 @@ index afb8ec4fcc88..5db219d43ef4 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -48326,7 +44606,7 @@ index afb8ec4fcc88..5db219d43ef4 100644
 -
  Library("matched_filter_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
-index eff40ca1ec3b..a552fc95aca4 100644
+index dd3a8042526c..a61dbeb42dac 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -48337,6 +44617,7 @@ index eff40ca1ec3b..a552fc95aca4 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -48345,13 +44626,12 @@ index eff40ca1ec3b..a552fc95aca4 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48390,7 +44670,6 @@ index eff40ca1ec3b..a552fc95aca4 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -48440,7 +44719,7 @@ index eff40ca1ec3b..a552fc95aca4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -48466,7 +44745,7 @@ index eff40ca1ec3b..a552fc95aca4 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -48508,7 +44787,7 @@ index eff40ca1ec3b..a552fc95aca4 100644
 -
  Library("render_buffer_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
-index 2f5d61998ddb..1475e1f30524 100644
+index 1a8f09ed9c10..4ebff1919c6f 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -48519,6 +44798,7 @@ index 2f5d61998ddb..1475e1f30524 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -48527,13 +44807,12 @@ index 2f5d61998ddb..1475e1f30524 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48572,7 +44851,6 @@ index 2f5d61998ddb..1475e1f30524 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -48622,7 +44900,7 @@ index 2f5d61998ddb..1475e1f30524 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -48648,7 +44926,7 @@ index 2f5d61998ddb..1475e1f30524 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -48690,7 +44968,7 @@ index 2f5d61998ddb..1475e1f30524 100644
 -
  Library("vector_math_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
-index 2cdcfb48d81f..fe42eaa02d10 100644
+index 0fc8981378df..411bcb480900 100644
 --- third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -48701,6 +44979,7 @@ index 2cdcfb48d81f..fe42eaa02d10 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -48709,13 +44988,12 @@ index 2cdcfb48d81f..fe42eaa02d10 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48754,7 +45032,6 @@ index 2cdcfb48d81f..fe42eaa02d10 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -48811,7 +45088,7 @@ index 2cdcfb48d81f..fe42eaa02d10 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -48837,7 +45114,7 @@ index 2cdcfb48d81f..fe42eaa02d10 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -48879,18 +45156,10 @@ index 2cdcfb48d81f..fe42eaa02d10 100644
 -
  Library("aec_dump_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
-index a2d83ddf0b3d..a4a5c2aa7805 100644
+index 8856ebd34b1d..58073c04a13f 100644
 --- third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -48898,6 +45167,7 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -48906,23 +45176,18 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -48941,10 +45206,6 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -48952,10 +45213,6 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -48963,7 +45220,6 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -48971,10 +45227,6 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -48987,10 +45239,6 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -49028,7 +45276,7 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -49086,10 +45334,10 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -49100,10 +45348,10 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -49115,18 +45363,10 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
  
  Library("null_aec_dump_factory_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
-index 5e57979690e7..0c17eeaf4606 100644
+index 27439b35bb70..02b5f3aa25f7 100644
 --- third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -49134,6 +45374,7 @@ index 5e57979690e7..0c17eeaf4606 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -49142,23 +45383,18 @@ index 5e57979690e7..0c17eeaf4606 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -49177,10 +45413,6 @@ index 5e57979690e7..0c17eeaf4606 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -49188,10 +45420,6 @@ index 5e57979690e7..0c17eeaf4606 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -49199,7 +45427,6 @@ index 5e57979690e7..0c17eeaf4606 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -49207,10 +45434,6 @@ index 5e57979690e7..0c17eeaf4606 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -49223,10 +45446,6 @@ index 5e57979690e7..0c17eeaf4606 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -49264,7 +45483,7 @@ index 5e57979690e7..0c17eeaf4606 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -49322,10 +45541,10 @@ index 5e57979690e7..0c17eeaf4606 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -49336,10 +45555,10 @@ index 5e57979690e7..0c17eeaf4606 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -49351,18 +45570,10 @@ index 5e57979690e7..0c17eeaf4606 100644
  
  Library("aec_dump_interface_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
-index 77ba6c3ff20d..31a5bd1a8db5 100644
+index 60d496606730..f7b819222e3d 100644
 --- third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -49370,6 +45581,7 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -49378,23 +45590,18 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,123 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,102 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -49417,10 +45624,6 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -49432,10 +45635,6 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -49443,7 +45642,6 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -49451,10 +45649,6 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -49471,10 +45665,6 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -49509,7 +45699,7 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -172,27 +69,12 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -151,27 +65,12 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["__ARM_NEON__"] = "1"
  
      SOURCES += [
@@ -49538,7 +45728,7 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
      SOURCES += [
          "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
      ]
-@@ -201,7 +83,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -180,7 +79,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
  
      DEFINES["MIPS32_LE"] = True
      DEFINES["MIPS_FPU_LE"] = True
@@ -49546,7 +45736,7 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
  
      SOURCES += [
          "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_mips.cc"
-@@ -209,8 +90,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -188,8 +86,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
  
  if CONFIG["TARGET_CPU"] == "mips64":
  
@@ -49555,7 +45745,7 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
      SOURCES += [
          "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
      ]
-@@ -221,77 +100,27 @@ if CONFIG["TARGET_CPU"] == "ppc64":
+@@ -200,77 +96,27 @@ if CONFIG["TARGET_CPU"] == "ppc64":
          "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
      ]
  
@@ -49604,18 +45794,18 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
 -
 -    DEFINES["_GNU_SOURCE"] = True
--
--    SOURCES += [
--        "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
--    ]
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
 +if CONFIG["TARGET_CPU"] == "riscv64":
  
      SOURCES += [
          "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
      ]
  
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
+-
+-    SOURCES += [
+-        "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 +if CONFIG["TARGET_CPU"] == "x86":
  
@@ -49639,18 +45829,10 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
      SOURCES += [
          "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
 diff --git third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
-index 83396ea27045..8705ee7bcbdc 100644
+index b3eada70e070..1e05f9215cb7 100644
 --- third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -49659,6 +45841,7 @@ index 83396ea27045..8705ee7bcbdc 100644
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -49667,23 +45850,18 @@ index 83396ea27045..8705ee7bcbdc 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -49702,10 +45880,6 @@ index 83396ea27045..8705ee7bcbdc 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -49713,10 +45887,6 @@ index 83396ea27045..8705ee7bcbdc 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -49724,7 +45894,6 @@ index 83396ea27045..8705ee7bcbdc 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -49732,10 +45901,6 @@ index 83396ea27045..8705ee7bcbdc 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -49748,10 +45913,6 @@ index 83396ea27045..8705ee7bcbdc 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -49789,7 +45950,7 @@ index 83396ea27045..8705ee7bcbdc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -49847,10 +46008,10 @@ index 83396ea27045..8705ee7bcbdc 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -49861,10 +46022,10 @@ index 83396ea27045..8705ee7bcbdc 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -49876,7 +46037,7 @@ index 83396ea27045..8705ee7bcbdc 100644
  
  Library("agc_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
-index efe63a81707f..c96d332898a4 100644
+index 8e992e81b365..04869edc3c5f 100644
 --- third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -49887,6 +46048,7 @@ index efe63a81707f..c96d332898a4 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -49895,13 +46057,12 @@ index efe63a81707f..c96d332898a4 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49936,7 +46097,6 @@ index efe63a81707f..c96d332898a4 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -49986,7 +46146,7 @@ index efe63a81707f..c96d332898a4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -50012,7 +46172,7 @@ index efe63a81707f..c96d332898a4 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -50054,18 +46214,10 @@ index efe63a81707f..c96d332898a4 100644
 -
  Library("gain_control_interface_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
-index 64296ecfebc2..6b25d2368901 100644
+index 5cb20550eb9b..63d3222f12fc 100644
 --- third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -50073,6 +46225,7 @@ index 64296ecfebc2..6b25d2368901 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -50081,23 +46234,18 @@ index 64296ecfebc2..6b25d2368901 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -50116,10 +46264,6 @@ index 64296ecfebc2..6b25d2368901 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -50127,10 +46271,6 @@ index 64296ecfebc2..6b25d2368901 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -50138,7 +46278,6 @@ index 64296ecfebc2..6b25d2368901 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -50146,10 +46285,6 @@ index 64296ecfebc2..6b25d2368901 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -50162,10 +46297,6 @@ index 64296ecfebc2..6b25d2368901 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -50203,7 +46334,7 @@ index 64296ecfebc2..6b25d2368901 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -50261,10 +46392,10 @@ index 64296ecfebc2..6b25d2368901 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -50275,10 +46406,10 @@ index 64296ecfebc2..6b25d2368901 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -50290,18 +46421,10 @@ index 64296ecfebc2..6b25d2368901 100644
  
  Library("legacy_agc_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
-index 06fa8de95211..34978e1ca94d 100644
+index 60bc520f030d..3539b6f3f359 100644
 --- third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -50309,6 +46432,7 @@ index 06fa8de95211..34978e1ca94d 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -50317,23 +46441,18 @@ index 06fa8de95211..34978e1ca94d 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,114 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -50352,10 +46471,6 @@ index 06fa8de95211..34978e1ca94d 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -50363,10 +46478,6 @@ index 06fa8de95211..34978e1ca94d 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -50374,7 +46485,6 @@ index 06fa8de95211..34978e1ca94d 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -50382,10 +46492,6 @@ index 06fa8de95211..34978e1ca94d 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -50398,10 +46504,6 @@ index 06fa8de95211..34978e1ca94d 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -50439,7 +46541,7 @@ index 06fa8de95211..34978e1ca94d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -163,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -50497,10 +46599,10 @@ index 06fa8de95211..34978e1ca94d 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -50511,10 +46613,10 @@ index 06fa8de95211..34978e1ca94d 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -50526,18 +46628,10 @@ index 06fa8de95211..34978e1ca94d 100644
  
  Library("level_estimation_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
-index dbb2c6020758..88317a4d59c8 100644
+index 2330433745f4..f613f26874c6 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -50546,6 +46640,7 @@ index dbb2c6020758..88317a4d59c8 100644
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -50554,23 +46649,18 @@ index dbb2c6020758..88317a4d59c8 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -50589,10 +46679,6 @@ index dbb2c6020758..88317a4d59c8 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -50600,10 +46686,6 @@ index dbb2c6020758..88317a4d59c8 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -50611,7 +46693,6 @@ index dbb2c6020758..88317a4d59c8 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -50619,10 +46700,6 @@ index dbb2c6020758..88317a4d59c8 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -50635,10 +46712,6 @@ index dbb2c6020758..88317a4d59c8 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -50676,7 +46749,7 @@ index dbb2c6020758..88317a4d59c8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -50734,10 +46807,10 @@ index dbb2c6020758..88317a4d59c8 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -50748,10 +46821,10 @@ index dbb2c6020758..88317a4d59c8 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -50763,18 +46836,10 @@ index dbb2c6020758..88317a4d59c8 100644
  
  Library("adaptive_digital_gain_controller_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
-index 65ef01a3df9c..c8e2620f015b 100644
+index d5c67b371823..3092974ef246 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -50782,6 +46847,7 @@ index 65ef01a3df9c..c8e2620f015b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -50790,23 +46856,18 @@ index 65ef01a3df9c..c8e2620f015b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -50825,10 +46886,6 @@ index 65ef01a3df9c..c8e2620f015b 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -50836,10 +46893,6 @@ index 65ef01a3df9c..c8e2620f015b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -50847,7 +46900,6 @@ index 65ef01a3df9c..c8e2620f015b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -50855,10 +46907,6 @@ index 65ef01a3df9c..c8e2620f015b 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -50871,10 +46919,6 @@ index 65ef01a3df9c..c8e2620f015b 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -50905,7 +46949,7 @@ index 65ef01a3df9c..c8e2620f015b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -50992,18 +47036,10 @@ index 65ef01a3df9c..c8e2620f015b 100644
  
  Library("biquad_filter_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
-index e548e1a7df62..e4de39263699 100644
+index 667b65137559..2f73f17c2555 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -51011,6 +47047,7 @@ index e548e1a7df62..e4de39263699 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -51019,23 +47056,18 @@ index e548e1a7df62..e4de39263699 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -51054,10 +47086,6 @@ index e548e1a7df62..e4de39263699 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -51065,10 +47093,6 @@ index e548e1a7df62..e4de39263699 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -51076,7 +47100,6 @@ index e548e1a7df62..e4de39263699 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -51084,10 +47107,6 @@ index e548e1a7df62..e4de39263699 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -51100,10 +47119,6 @@ index e548e1a7df62..e4de39263699 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -51141,7 +47156,7 @@ index e548e1a7df62..e4de39263699 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -51199,10 +47214,10 @@ index e548e1a7df62..e4de39263699 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -51213,10 +47228,10 @@ index e548e1a7df62..e4de39263699 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -51228,7 +47243,7 @@ index e548e1a7df62..e4de39263699 100644
  
  Library("clipping_predictor_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
-index 0ffd3ac34d75..b94364f25d2a 100644
+index e1a0baae554c..9b86a297b3bf 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -51239,6 +47254,7 @@ index 0ffd3ac34d75..b94364f25d2a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -51247,13 +47263,12 @@ index 0ffd3ac34d75..b94364f25d2a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51288,7 +47303,6 @@ index 0ffd3ac34d75..b94364f25d2a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -51338,7 +47352,7 @@ index 0ffd3ac34d75..b94364f25d2a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -51364,7 +47378,7 @@ index 0ffd3ac34d75..b94364f25d2a 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -51406,18 +47420,10 @@ index 0ffd3ac34d75..b94364f25d2a 100644
 -
  Library("common_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
-index a7a2bbb1a173..b65a6c700d04 100644
+index be4610aa0cf4..95ae3f5c0f93 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -51425,6 +47431,7 @@ index a7a2bbb1a173..b65a6c700d04 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -51433,23 +47440,18 @@ index a7a2bbb1a173..b65a6c700d04 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -51468,10 +47470,6 @@ index a7a2bbb1a173..b65a6c700d04 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -51479,10 +47477,6 @@ index a7a2bbb1a173..b65a6c700d04 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -51490,7 +47484,6 @@ index a7a2bbb1a173..b65a6c700d04 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -51498,10 +47491,6 @@ index a7a2bbb1a173..b65a6c700d04 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -51514,10 +47503,6 @@ index a7a2bbb1a173..b65a6c700d04 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -51555,7 +47540,7 @@ index a7a2bbb1a173..b65a6c700d04 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -51613,10 +47598,10 @@ index a7a2bbb1a173..b65a6c700d04 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -51627,10 +47612,10 @@ index a7a2bbb1a173..b65a6c700d04 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -51642,18 +47627,10 @@ index a7a2bbb1a173..b65a6c700d04 100644
  
  Library("cpu_features_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
-index 5a94688af9e4..57f0eb221338 100644
+index 2e53dee9e378..3d538b54dcb6 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -51662,6 +47639,7 @@ index 5a94688af9e4..57f0eb221338 100644
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -51670,23 +47648,18 @@ index 5a94688af9e4..57f0eb221338 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -51705,10 +47678,6 @@ index 5a94688af9e4..57f0eb221338 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -51716,10 +47685,6 @@ index 5a94688af9e4..57f0eb221338 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -51727,7 +47692,6 @@ index 5a94688af9e4..57f0eb221338 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -51735,10 +47699,6 @@ index 5a94688af9e4..57f0eb221338 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -51751,10 +47711,6 @@ index 5a94688af9e4..57f0eb221338 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -51792,7 +47748,7 @@ index 5a94688af9e4..57f0eb221338 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -51850,10 +47806,10 @@ index 5a94688af9e4..57f0eb221338 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -51864,10 +47820,10 @@ index 5a94688af9e4..57f0eb221338 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -51879,18 +47835,10 @@ index 5a94688af9e4..57f0eb221338 100644
  
  Library("fixed_digital_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
-index 2e16a28ccc52..5b1a4dde05c6 100644
+index 0301076b89fd..7fc8cd8541ce 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -51898,6 +47846,7 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -51906,23 +47855,18 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -51941,10 +47885,6 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -51952,10 +47892,6 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -51963,7 +47899,6 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -51971,10 +47906,6 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -51987,10 +47918,6 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -52028,7 +47955,7 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -52086,10 +48013,10 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -52100,10 +48027,10 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -52115,7 +48042,7 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
  
  Library("gain_applier_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
-index d02bbba1b46e..f2650a2d1f47 100644
+index fc03d1e950c9..925eefbff872 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -52126,6 +48053,7 @@ index d02bbba1b46e..f2650a2d1f47 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -52134,13 +48062,12 @@ index d02bbba1b46e..f2650a2d1f47 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52175,7 +48102,6 @@ index d02bbba1b46e..f2650a2d1f47 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -52225,7 +48151,7 @@ index d02bbba1b46e..f2650a2d1f47 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -52251,7 +48177,7 @@ index d02bbba1b46e..f2650a2d1f47 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -52293,18 +48219,10 @@ index d02bbba1b46e..f2650a2d1f47 100644
 -
  Library("gain_map_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
-index 280b95eee7f8..e0519ff9a168 100644
+index 3312eb9b2687..7475d4f5fcc9 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -52313,6 +48231,7 @@ index 280b95eee7f8..e0519ff9a168 100644
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -52321,23 +48240,18 @@ index 280b95eee7f8..e0519ff9a168 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,114 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -52356,10 +48270,6 @@ index 280b95eee7f8..e0519ff9a168 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -52367,10 +48277,6 @@ index 280b95eee7f8..e0519ff9a168 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -52378,7 +48284,6 @@ index 280b95eee7f8..e0519ff9a168 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -52386,10 +48291,6 @@ index 280b95eee7f8..e0519ff9a168 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -52402,10 +48303,6 @@ index 280b95eee7f8..e0519ff9a168 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -52443,7 +48340,7 @@ index 280b95eee7f8..e0519ff9a168 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -163,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -52501,10 +48398,10 @@ index 280b95eee7f8..e0519ff9a168 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -52515,10 +48412,10 @@ index 280b95eee7f8..e0519ff9a168 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -52530,18 +48427,10 @@ index 280b95eee7f8..e0519ff9a168 100644
  
  Library("input_volume_controller_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
-index 8e5f14dd12b5..c8fa737a9e36 100644
+index eeb45cb8db7a..767564b38e70 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -52549,6 +48438,7 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -52557,23 +48447,18 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -52592,10 +48477,6 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -52603,10 +48484,6 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -52614,7 +48491,6 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -52622,10 +48498,6 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -52638,10 +48510,6 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -52679,7 +48547,7 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -52737,10 +48605,10 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -52751,10 +48619,10 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -52766,18 +48634,10 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
  
  Library("input_volume_stats_reporter_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
-index 69e15a976256..48d3994e3b62 100644
+index 78a1ea36bea8..aef58f171a81 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -52786,6 +48646,7 @@ index 69e15a976256..48d3994e3b62 100644
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -52794,23 +48655,18 @@ index 69e15a976256..48d3994e3b62 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -52829,10 +48685,6 @@ index 69e15a976256..48d3994e3b62 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -52840,10 +48692,6 @@ index 69e15a976256..48d3994e3b62 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -52851,7 +48699,6 @@ index 69e15a976256..48d3994e3b62 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -52859,10 +48706,6 @@ index 69e15a976256..48d3994e3b62 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -52875,10 +48718,6 @@ index 69e15a976256..48d3994e3b62 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -52916,7 +48755,7 @@ index 69e15a976256..48d3994e3b62 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -52974,10 +48813,10 @@ index 69e15a976256..48d3994e3b62 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -52988,10 +48827,10 @@ index 69e15a976256..48d3994e3b62 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -53003,18 +48842,10 @@ index 69e15a976256..48d3994e3b62 100644
  
  Library("noise_level_estimator_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
-index a666f58d28e9..cf694d66ec5c 100644
+index 1de463d8cf15..590703ff90d7 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -53022,6 +48853,7 @@ index a666f58d28e9..cf694d66ec5c 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -53030,23 +48862,18 @@ index a666f58d28e9..cf694d66ec5c 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -53065,10 +48892,6 @@ index a666f58d28e9..cf694d66ec5c 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -53076,10 +48899,6 @@ index a666f58d28e9..cf694d66ec5c 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -53087,7 +48906,6 @@ index a666f58d28e9..cf694d66ec5c 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -53095,10 +48913,6 @@ index a666f58d28e9..cf694d66ec5c 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -53111,10 +48925,6 @@ index a666f58d28e9..cf694d66ec5c 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -53152,7 +48962,7 @@ index a666f58d28e9..cf694d66ec5c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -53210,10 +49020,10 @@ index a666f58d28e9..cf694d66ec5c 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -53224,10 +49034,10 @@ index a666f58d28e9..cf694d66ec5c 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -53239,7 +49049,7 @@ index a666f58d28e9..cf694d66ec5c 100644
  
  Library("rnn_vad_auto_correlation_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
-index ec3430f0ea3b..24afcb8f8ed1 100644
+index 570b4d1a7bb2..77b99ab85ab7 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -53250,6 +49060,7 @@ index ec3430f0ea3b..24afcb8f8ed1 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -53258,13 +49069,12 @@ index ec3430f0ea3b..24afcb8f8ed1 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53303,7 +49113,6 @@ index ec3430f0ea3b..24afcb8f8ed1 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -53360,7 +49169,7 @@ index ec3430f0ea3b..24afcb8f8ed1 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -53386,7 +49195,7 @@ index ec3430f0ea3b..24afcb8f8ed1 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -53428,18 +49237,10 @@ index ec3430f0ea3b..24afcb8f8ed1 100644
 -
  Library("rnn_vad_common_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
-index 694be007a960..36f79264c472 100644
+index 73cf1d07a5c3..7b7869c1cc0f 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -53447,6 +49248,7 @@ index 694be007a960..36f79264c472 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -53455,23 +49257,18 @@ index 694be007a960..36f79264c472 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -53490,10 +49287,6 @@ index 694be007a960..36f79264c472 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -53501,10 +49294,6 @@ index 694be007a960..36f79264c472 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -53512,7 +49301,6 @@ index 694be007a960..36f79264c472 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -53520,10 +49308,6 @@ index 694be007a960..36f79264c472 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -53536,10 +49320,6 @@ index 694be007a960..36f79264c472 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -53577,7 +49357,7 @@ index 694be007a960..36f79264c472 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -53635,10 +49415,10 @@ index 694be007a960..36f79264c472 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -53649,10 +49429,10 @@ index 694be007a960..36f79264c472 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -53664,18 +49444,10 @@ index 694be007a960..36f79264c472 100644
  
  Library("rnn_vad_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
-index b737105b2e2c..1470fb8c682a 100644
+index efb1ea3b48bb..784bf34261ff 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -53683,6 +49455,7 @@ index b737105b2e2c..1470fb8c682a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -53691,23 +49464,18 @@ index b737105b2e2c..1470fb8c682a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -53726,10 +49494,6 @@ index b737105b2e2c..1470fb8c682a 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -53737,10 +49501,6 @@ index b737105b2e2c..1470fb8c682a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -53748,7 +49508,6 @@ index b737105b2e2c..1470fb8c682a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -53756,10 +49515,6 @@ index b737105b2e2c..1470fb8c682a 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -53772,10 +49527,6 @@ index b737105b2e2c..1470fb8c682a 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -53813,7 +49564,7 @@ index b737105b2e2c..1470fb8c682a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -53871,10 +49622,10 @@ index b737105b2e2c..1470fb8c682a 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -53885,10 +49636,10 @@ index b737105b2e2c..1470fb8c682a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -53900,18 +49651,10 @@ index b737105b2e2c..1470fb8c682a 100644
  
  Library("rnn_vad_layers_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
-index 071308946506..73cbc265e149 100644
+index 4fefa7795aa0..9b8a2d18952e 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -53919,6 +49662,7 @@ index 071308946506..73cbc265e149 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -53927,23 +49671,18 @@ index 071308946506..73cbc265e149 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -53962,10 +49701,6 @@ index 071308946506..73cbc265e149 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -53973,10 +49708,6 @@ index 071308946506..73cbc265e149 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -53984,7 +49715,6 @@ index 071308946506..73cbc265e149 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -53992,10 +49722,6 @@ index 071308946506..73cbc265e149 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -54008,10 +49734,6 @@ index 071308946506..73cbc265e149 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -54042,7 +49764,7 @@ index 071308946506..73cbc265e149 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -54129,18 +49851,10 @@ index 071308946506..73cbc265e149 100644
  
  Library("rnn_vad_lp_residual_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
-index f8aa3e0757df..061f1056932c 100644
+index e5b6ee12a51f..bb89272d797c 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -54148,6 +49862,7 @@ index f8aa3e0757df..061f1056932c 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -54156,23 +49871,18 @@ index f8aa3e0757df..061f1056932c 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -54191,10 +49901,6 @@ index f8aa3e0757df..061f1056932c 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -54202,10 +49908,6 @@ index f8aa3e0757df..061f1056932c 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -54213,7 +49915,6 @@ index f8aa3e0757df..061f1056932c 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -54221,10 +49922,6 @@ index f8aa3e0757df..061f1056932c 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -54237,10 +49934,6 @@ index f8aa3e0757df..061f1056932c 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -54278,7 +49971,7 @@ index f8aa3e0757df..061f1056932c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -54336,10 +50029,10 @@ index f8aa3e0757df..061f1056932c 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -54350,10 +50043,10 @@ index f8aa3e0757df..061f1056932c 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -54365,7 +50058,7 @@ index f8aa3e0757df..061f1056932c 100644
  
  Library("rnn_vad_pitch_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
-index e417e97673c7..76bc962a8aad 100644
+index 4375c115591f..de7a77543eb5 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -54376,6 +50069,7 @@ index e417e97673c7..76bc962a8aad 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -54384,13 +50078,12 @@ index e417e97673c7..76bc962a8aad 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54429,7 +50122,6 @@ index e417e97673c7..76bc962a8aad 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -54479,7 +50171,7 @@ index e417e97673c7..76bc962a8aad 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -54505,7 +50197,7 @@ index e417e97673c7..76bc962a8aad 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -54547,7 +50239,7 @@ index e417e97673c7..76bc962a8aad 100644
 -
  Library("rnn_vad_ring_buffer_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
-index e18a5bd7f9dc..2be62f51e029 100644
+index 3fb4fa37a59d..a2ec0e64002f 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -54558,6 +50250,7 @@ index e18a5bd7f9dc..2be62f51e029 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -54566,13 +50259,12 @@ index e18a5bd7f9dc..2be62f51e029 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54611,7 +50303,6 @@ index e18a5bd7f9dc..2be62f51e029 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -54661,7 +50352,7 @@ index e18a5bd7f9dc..2be62f51e029 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -54687,7 +50378,7 @@ index e18a5bd7f9dc..2be62f51e029 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -54729,18 +50420,10 @@ index e18a5bd7f9dc..2be62f51e029 100644
 -
  Library("rnn_vad_sequence_buffer_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
-index 542765dac9e3..40a3328b5980 100644
+index cf0ed3ecaf31..611573ee4186 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -54748,6 +50431,7 @@ index 542765dac9e3..40a3328b5980 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -54756,23 +50440,18 @@ index 542765dac9e3..40a3328b5980 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -54791,10 +50470,6 @@ index 542765dac9e3..40a3328b5980 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -54802,10 +50477,6 @@ index 542765dac9e3..40a3328b5980 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -54813,7 +50484,6 @@ index 542765dac9e3..40a3328b5980 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -54821,10 +50491,6 @@ index 542765dac9e3..40a3328b5980 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -54837,10 +50503,6 @@ index 542765dac9e3..40a3328b5980 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -54878,7 +50540,7 @@ index 542765dac9e3..40a3328b5980 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -54936,10 +50598,10 @@ index 542765dac9e3..40a3328b5980 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -54950,10 +50612,10 @@ index 542765dac9e3..40a3328b5980 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -54965,7 +50627,7 @@ index 542765dac9e3..40a3328b5980 100644
  
  Library("rnn_vad_spectral_features_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
-index f09fc9513baf..7cc5592dfd1d 100644
+index e0efdff86364..d3eef1484e27 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -54976,6 +50638,7 @@ index f09fc9513baf..7cc5592dfd1d 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -54984,13 +50647,12 @@ index f09fc9513baf..7cc5592dfd1d 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55029,7 +50691,6 @@ index f09fc9513baf..7cc5592dfd1d 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -55079,7 +50740,7 @@ index f09fc9513baf..7cc5592dfd1d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -55105,7 +50766,7 @@ index f09fc9513baf..7cc5592dfd1d 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -55147,19 +50808,10 @@ index f09fc9513baf..7cc5592dfd1d 100644
 -
  Library("rnn_vad_symmetric_matrix_buffer_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
-index 45291330790b..c6229c6dc7e5 100644
+index 67d0bfcbe14d..9df5c4c6c530 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
-@@ -11,20 +11,30 @@ AllowCompilerWarnings()
- 
- CXXFLAGS += [
-     "-mavx2",
--    "-mfma"
-+    "-mfma",
-+    "-std=gnu++20"
- ]
- 
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -18,13 +18,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -55168,6 +50820,7 @@ index 45291330790b..c6229c6dc7e5 100644
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_AVX2"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -55176,23 +50829,18 @@ index 45291330790b..c6229c6dc7e5 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -52,143 +62,9 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,122 +61,9 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -55211,10 +50859,6 @@ index 45291330790b..c6229c6dc7e5 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -55222,10 +50866,6 @@ index 45291330790b..c6229c6dc7e5 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -55233,7 +50873,6 @@ index 45291330790b..c6229c6dc7e5 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_GNU_SOURCE"] = True
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
@@ -55242,10 +50881,6 @@ index 45291330790b..c6229c6dc7e5 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -55258,10 +50893,6 @@ index 45291330790b..c6229c6dc7e5 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -55328,7 +50959,7 @@ index 45291330790b..c6229c6dc7e5 100644
      CXXFLAGS += [
          "-msse2"
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
-index 44ef3df6cc24..1475e1f30524 100644
+index f7c42e9e9d61..4ebff1919c6f 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -55339,6 +50970,7 @@ index 44ef3df6cc24..1475e1f30524 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -55347,13 +50979,12 @@ index 44ef3df6cc24..1475e1f30524 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55392,7 +51023,6 @@ index 44ef3df6cc24..1475e1f30524 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -55449,7 +51079,7 @@ index 44ef3df6cc24..1475e1f30524 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -55475,7 +51105,7 @@ index 44ef3df6cc24..1475e1f30524 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -55517,18 +51147,10 @@ index 44ef3df6cc24..1475e1f30524 100644
 -
  Library("vector_math_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
-index b3af82c3d3e6..34d1c7e84cd1 100644
+index 1bdd827e45aa..fde13760ef04 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -55537,6 +51159,7 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -55545,23 +51168,18 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,114 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -55580,10 +51198,6 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -55591,10 +51205,6 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -55602,7 +51212,6 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -55610,10 +51219,6 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -55626,10 +51231,6 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -55667,7 +51268,7 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -163,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -55725,10 +51326,10 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -55739,10 +51340,10 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -55754,18 +51355,10 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
  
  Library("saturation_protector_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
-index 4d509a799a63..6ce5e1de874e 100644
+index b159467faa87..3de8cc3c3437 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -55774,6 +51367,7 @@ index 4d509a799a63..6ce5e1de874e 100644
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -55782,23 +51376,18 @@ index 4d509a799a63..6ce5e1de874e 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -55817,10 +51406,6 @@ index 4d509a799a63..6ce5e1de874e 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -55828,10 +51413,6 @@ index 4d509a799a63..6ce5e1de874e 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -55839,7 +51420,6 @@ index 4d509a799a63..6ce5e1de874e 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -55847,10 +51427,6 @@ index 4d509a799a63..6ce5e1de874e 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -55863,10 +51439,6 @@ index 4d509a799a63..6ce5e1de874e 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -55904,7 +51476,7 @@ index 4d509a799a63..6ce5e1de874e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -55962,10 +51534,10 @@ index 4d509a799a63..6ce5e1de874e 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -55976,10 +51548,10 @@ index 4d509a799a63..6ce5e1de874e 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -55991,18 +51563,10 @@ index 4d509a799a63..6ce5e1de874e 100644
  
  Library("speech_level_estimator_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
-index 383103815df1..e6d34f2e9963 100644
+index 88f39d6c59ae..1c7395007405 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -56010,6 +51574,7 @@ index 383103815df1..e6d34f2e9963 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -56018,23 +51583,18 @@ index 383103815df1..e6d34f2e9963 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -56053,10 +51613,6 @@ index 383103815df1..e6d34f2e9963 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -56064,10 +51620,6 @@ index 383103815df1..e6d34f2e9963 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -56075,7 +51627,6 @@ index 383103815df1..e6d34f2e9963 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -56083,10 +51634,6 @@ index 383103815df1..e6d34f2e9963 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -56099,10 +51646,6 @@ index 383103815df1..e6d34f2e9963 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -56140,7 +51683,7 @@ index 383103815df1..e6d34f2e9963 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -56198,10 +51741,10 @@ index 383103815df1..e6d34f2e9963 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -56212,10 +51755,10 @@ index 383103815df1..e6d34f2e9963 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -56227,18 +51770,10 @@ index 383103815df1..e6d34f2e9963 100644
  
  Library("vad_wrapper_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
-index 98d6b29cc08a..b7dde8b2de94 100644
+index 9cf92bd2a934..998b3c95ab71 100644
 --- third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -56247,6 +51782,7 @@ index 98d6b29cc08a..b7dde8b2de94 100644
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -56255,23 +51791,18 @@ index 98d6b29cc08a..b7dde8b2de94 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -56290,10 +51821,6 @@ index 98d6b29cc08a..b7dde8b2de94 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -56301,10 +51828,6 @@ index 98d6b29cc08a..b7dde8b2de94 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -56312,7 +51835,6 @@ index 98d6b29cc08a..b7dde8b2de94 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -56320,10 +51842,6 @@ index 98d6b29cc08a..b7dde8b2de94 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -56336,10 +51854,6 @@ index 98d6b29cc08a..b7dde8b2de94 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -56377,7 +51891,7 @@ index 98d6b29cc08a..b7dde8b2de94 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -56435,10 +51949,10 @@ index 98d6b29cc08a..b7dde8b2de94 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -56449,10 +51963,10 @@ index 98d6b29cc08a..b7dde8b2de94 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -56464,18 +51978,10 @@ index 98d6b29cc08a..b7dde8b2de94 100644
  
  Library("apm_logging_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
-index 058ad74950dd..977deec4d7f4 100644
+index 17ed3d672a03..1c1b8d4143d8 100644
 --- third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -56484,6 +51990,7 @@ index 058ad74950dd..977deec4d7f4 100644
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -56492,23 +51999,18 @@ index 058ad74950dd..977deec4d7f4 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -56527,10 +52029,6 @@ index 058ad74950dd..977deec4d7f4 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -56538,10 +52036,6 @@ index 058ad74950dd..977deec4d7f4 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -56549,7 +52043,6 @@ index 058ad74950dd..977deec4d7f4 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -56557,10 +52050,6 @@ index 058ad74950dd..977deec4d7f4 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -56573,10 +52062,6 @@ index 058ad74950dd..977deec4d7f4 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -56614,7 +52099,7 @@ index 058ad74950dd..977deec4d7f4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -56672,10 +52157,10 @@ index 058ad74950dd..977deec4d7f4 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -56686,10 +52171,10 @@ index 058ad74950dd..977deec4d7f4 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -56701,18 +52186,10 @@ index 058ad74950dd..977deec4d7f4 100644
  
  Library("audio_buffer_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
-index 23ffb08d2621..c014bab9b892 100644
+index c1c5e0b27d94..b56d3e9d131c 100644
 --- third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -56720,6 +52197,7 @@ index 23ffb08d2621..c014bab9b892 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -56728,23 +52206,18 @@ index 23ffb08d2621..c014bab9b892 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -56763,10 +52236,6 @@ index 23ffb08d2621..c014bab9b892 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -56774,10 +52243,6 @@ index 23ffb08d2621..c014bab9b892 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -56785,7 +52250,6 @@ index 23ffb08d2621..c014bab9b892 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -56793,10 +52257,6 @@ index 23ffb08d2621..c014bab9b892 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -56809,10 +52269,6 @@ index 23ffb08d2621..c014bab9b892 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -56850,7 +52306,7 @@ index 23ffb08d2621..c014bab9b892 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -56908,10 +52364,10 @@ index 23ffb08d2621..c014bab9b892 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -56922,10 +52378,10 @@ index 23ffb08d2621..c014bab9b892 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -56937,7 +52393,7 @@ index 23ffb08d2621..c014bab9b892 100644
  
  Library("audio_frame_proxies_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
-index 6d2602568141..379149997075 100644
+index 1a41d352a6b7..c2d5f48fe19f 100644
 --- third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -56948,6 +52404,7 @@ index 6d2602568141..379149997075 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -56956,13 +52413,12 @@ index 6d2602568141..379149997075 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57001,7 +52457,6 @@ index 6d2602568141..379149997075 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -57058,7 +52513,7 @@ index 6d2602568141..379149997075 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -57084,7 +52539,7 @@ index 6d2602568141..379149997075 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -57126,18 +52581,10 @@ index 6d2602568141..379149997075 100644
 -
  Library("audio_frame_view_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
-index 92550aa6d0d4..a2ffd5dd447a 100644
+index cbf16e2d8d5a..7204f516a50d 100644
 --- third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -57146,6 +52593,7 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -57154,23 +52602,18 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -52,114 +65,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,93 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -57189,10 +52632,6 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -57200,10 +52639,6 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -57211,7 +52646,6 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -57219,10 +52653,6 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -57235,10 +52665,6 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -57276,7 +52702,7 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -167,82 +73,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -146,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -57334,10 +52760,10 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -57348,10 +52774,10 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -57363,18 +52789,10 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
  
  Library("audio_processing_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
-index 3dbfcd5a6f9f..a08fb28c3289 100644
+index 566fa702e086..8df1dc59bb19 100644
 --- third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -57382,6 +52800,7 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -57390,23 +52809,18 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -57425,10 +52839,6 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -57436,10 +52846,6 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -57447,7 +52853,6 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -57455,10 +52860,6 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -57471,10 +52872,6 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -57512,7 +52909,7 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -57570,10 +52967,10 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -57584,10 +52981,10 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -57599,18 +52996,10 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
  
  Library("capture_levels_adjuster_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
-index 24d24a7b0a63..507db98ee882 100644
+index 52e13f77d65e..2a4fd4b2f230 100644
 --- third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -57619,6 +53008,7 @@ index 24d24a7b0a63..507db98ee882 100644
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -57627,23 +53017,18 @@ index 24d24a7b0a63..507db98ee882 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -57662,10 +53047,6 @@ index 24d24a7b0a63..507db98ee882 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -57673,10 +53054,6 @@ index 24d24a7b0a63..507db98ee882 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -57684,7 +53061,6 @@ index 24d24a7b0a63..507db98ee882 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -57692,10 +53068,6 @@ index 24d24a7b0a63..507db98ee882 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -57708,10 +53080,6 @@ index 24d24a7b0a63..507db98ee882 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -57749,7 +53117,7 @@ index 24d24a7b0a63..507db98ee882 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -57807,10 +53175,10 @@ index 24d24a7b0a63..507db98ee882 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -57821,10 +53189,10 @@ index 24d24a7b0a63..507db98ee882 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -57836,18 +53204,10 @@ index 24d24a7b0a63..507db98ee882 100644
  
  Library("gain_controller2_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
-index 4090a31bc00c..399836f5bd82 100644
+index a1c9ddba74f3..0f0e8130fc1d 100644
 --- third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -57855,6 +53215,7 @@ index 4090a31bc00c..399836f5bd82 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -57863,23 +53224,18 @@ index 4090a31bc00c..399836f5bd82 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -57898,10 +53254,6 @@ index 4090a31bc00c..399836f5bd82 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -57909,10 +53261,6 @@ index 4090a31bc00c..399836f5bd82 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -57920,7 +53268,6 @@ index 4090a31bc00c..399836f5bd82 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -57928,10 +53275,6 @@ index 4090a31bc00c..399836f5bd82 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -57944,10 +53287,6 @@ index 4090a31bc00c..399836f5bd82 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -57985,7 +53324,7 @@ index 4090a31bc00c..399836f5bd82 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -58043,10 +53382,10 @@ index 4090a31bc00c..399836f5bd82 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -58057,10 +53396,10 @@ index 4090a31bc00c..399836f5bd82 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -58072,18 +53411,10 @@ index 4090a31bc00c..399836f5bd82 100644
  
  Library("high_pass_filter_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
-index c6b493c74573..ab6efa463be2 100644
+index 913766a7301e..d7e4306b8748 100644
 --- third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -58092,6 +53423,7 @@ index c6b493c74573..ab6efa463be2 100644
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -58100,23 +53432,18 @@ index c6b493c74573..ab6efa463be2 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -59,114 +72,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -59,93 +68,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -58135,10 +53462,6 @@ index c6b493c74573..ab6efa463be2 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -58146,10 +53469,6 @@ index c6b493c74573..ab6efa463be2 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -58157,7 +53476,6 @@ index c6b493c74573..ab6efa463be2 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -58165,10 +53483,6 @@ index c6b493c74573..ab6efa463be2 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -58181,10 +53495,6 @@ index c6b493c74573..ab6efa463be2 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -58222,7 +53532,7 @@ index c6b493c74573..ab6efa463be2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -174,82 +80,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -153,82 +76,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -58280,10 +53590,10 @@ index c6b493c74573..ab6efa463be2 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -58294,10 +53604,10 @@ index c6b493c74573..ab6efa463be2 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -58309,18 +53619,10 @@ index c6b493c74573..ab6efa463be2 100644
  
  Library("ns_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/post_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/post_filter_gn/moz.build
-index 6677bc0c5c90..8c43bca031b3 100644
+index adbf42b91139..595a0ad0d37c 100644
 --- third_party/libwebrtc/modules/audio_processing/post_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/post_filter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -58328,6 +53630,7 @@ index 6677bc0c5c90..8c43bca031b3 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -58336,23 +53639,18 @@ index 6677bc0c5c90..8c43bca031b3 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -58371,10 +53669,6 @@ index 6677bc0c5c90..8c43bca031b3 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -58382,10 +53676,6 @@ index 6677bc0c5c90..8c43bca031b3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -58393,7 +53683,6 @@ index 6677bc0c5c90..8c43bca031b3 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -58401,10 +53690,6 @@ index 6677bc0c5c90..8c43bca031b3 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -58417,10 +53702,6 @@ index 6677bc0c5c90..8c43bca031b3 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -58458,7 +53739,7 @@ index 6677bc0c5c90..8c43bca031b3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -58516,10 +53797,10 @@ index 6677bc0c5c90..8c43bca031b3 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -58530,10 +53811,10 @@ index 6677bc0c5c90..8c43bca031b3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -58545,18 +53826,10 @@ index 6677bc0c5c90..8c43bca031b3 100644
  
  Library("post_filter_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
-index 3276b98346a3..7c8a2be7ff49 100644
+index bcdec468bd11..2c78ef2b8605 100644
 --- third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -58564,6 +53837,7 @@ index 3276b98346a3..7c8a2be7ff49 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -58572,23 +53846,18 @@ index 3276b98346a3..7c8a2be7ff49 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -58607,10 +53876,6 @@ index 3276b98346a3..7c8a2be7ff49 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -58618,10 +53883,6 @@ index 3276b98346a3..7c8a2be7ff49 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -58629,7 +53890,6 @@ index 3276b98346a3..7c8a2be7ff49 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -58637,10 +53897,6 @@ index 3276b98346a3..7c8a2be7ff49 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -58653,10 +53909,6 @@ index 3276b98346a3..7c8a2be7ff49 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -58687,7 +53939,7 @@ index 3276b98346a3..7c8a2be7ff49 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -58774,18 +54026,10 @@ index 3276b98346a3..7c8a2be7ff49 100644
  
  Library("rms_level_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
-index af67cfe4ed78..480ce2321da9 100644
+index d0c4e5e064dc..159e9cf582d7 100644
 --- third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -58793,6 +54037,7 @@ index af67cfe4ed78..480ce2321da9 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -58801,23 +54046,18 @@ index af67cfe4ed78..480ce2321da9 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -58836,10 +54076,6 @@ index af67cfe4ed78..480ce2321da9 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -58847,10 +54083,6 @@ index af67cfe4ed78..480ce2321da9 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -58858,7 +54090,6 @@ index af67cfe4ed78..480ce2321da9 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -58866,10 +54097,6 @@ index af67cfe4ed78..480ce2321da9 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -58882,10 +54109,6 @@ index af67cfe4ed78..480ce2321da9 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -58916,7 +54139,7 @@ index af67cfe4ed78..480ce2321da9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -59003,18 +54226,10 @@ index af67cfe4ed78..480ce2321da9 100644
  
  Library("cascaded_biquad_filter_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
-index d5df1c79df2a..433da84b049f 100644
+index e56b8a7cc52c..a037bee529b4 100644
 --- third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -59022,6 +54237,7 @@ index d5df1c79df2a..433da84b049f 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -59030,23 +54246,18 @@ index d5df1c79df2a..433da84b049f 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,107 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -59065,10 +54276,6 @@ index d5df1c79df2a..433da84b049f 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -59076,10 +54283,6 @@ index d5df1c79df2a..433da84b049f 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -59087,7 +54290,6 @@ index d5df1c79df2a..433da84b049f 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -59095,10 +54297,6 @@ index d5df1c79df2a..433da84b049f 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -59111,10 +54309,6 @@ index d5df1c79df2a..433da84b049f 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -59145,7 +54339,7 @@ index d5df1c79df2a..433da84b049f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -155,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -59232,18 +54426,10 @@ index d5df1c79df2a..433da84b049f 100644
  
  Library("legacy_delay_estimator_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
-index 2541f6fc8210..d61f972b1321 100644
+index 4d177ba51e76..1352dcf9dd77 100644
 --- third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -59251,6 +54437,7 @@ index 2541f6fc8210..d61f972b1321 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -59259,23 +54446,18 @@ index 2541f6fc8210..d61f972b1321 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -59294,10 +54476,6 @@ index 2541f6fc8210..d61f972b1321 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -59305,10 +54483,6 @@ index 2541f6fc8210..d61f972b1321 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -59316,7 +54490,6 @@ index 2541f6fc8210..d61f972b1321 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -59324,10 +54497,6 @@ index 2541f6fc8210..d61f972b1321 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -59340,10 +54509,6 @@ index 2541f6fc8210..d61f972b1321 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -59374,7 +54539,7 @@ index 2541f6fc8210..d61f972b1321 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -59461,18 +54626,10 @@ index 2541f6fc8210..d61f972b1321 100644
  
  Library("pffft_wrapper_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
-index 1ceb37d542e2..0f4bb1e12367 100644
+index b75e258645f5..47eebf564575 100644
 --- third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -59480,6 +54637,7 @@ index 1ceb37d542e2..0f4bb1e12367 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -59488,23 +54646,18 @@ index 1ceb37d542e2..0f4bb1e12367 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -53,114 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,93 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -59523,10 +54676,6 @@ index 1ceb37d542e2..0f4bb1e12367 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -59534,10 +54683,6 @@ index 1ceb37d542e2..0f4bb1e12367 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -59545,7 +54690,6 @@ index 1ceb37d542e2..0f4bb1e12367 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -59553,10 +54697,6 @@ index 1ceb37d542e2..0f4bb1e12367 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -59569,10 +54709,6 @@ index 1ceb37d542e2..0f4bb1e12367 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -59610,7 +54746,7 @@ index 1ceb37d542e2..0f4bb1e12367 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -168,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -147,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -59668,10 +54804,10 @@ index 1ceb37d542e2..0f4bb1e12367 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -59682,10 +54818,10 @@ index 1ceb37d542e2..0f4bb1e12367 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -59697,18 +54833,10 @@ index 1ceb37d542e2..0f4bb1e12367 100644
  
  Library("vad_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
-index 8c869f510632..904649b32ae0 100644
+index 3c4421782f08..3db34e302b65 100644
 --- third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -59716,6 +54844,7 @@ index 8c869f510632..904649b32ae0 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -59724,23 +54853,18 @@ index 8c869f510632..904649b32ae0 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,115 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -59760,10 +54884,6 @@ index 8c869f510632..904649b32ae0 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -59771,10 +54891,6 @@ index 8c869f510632..904649b32ae0 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -59782,7 +54898,6 @@ index 8c869f510632..904649b32ae0 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -59790,10 +54905,6 @@ index 8c869f510632..904649b32ae0 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -59806,10 +54917,6 @@ index 8c869f510632..904649b32ae0 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -59847,7 +54954,7 @@ index 8c869f510632..904649b32ae0 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -163,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -59905,10 +55012,10 @@ index 8c869f510632..904649b32ae0 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -59919,10 +55026,10 @@ index 8c869f510632..904649b32ae0 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -59934,18 +55041,10 @@ index 8c869f510632..904649b32ae0 100644
  
  Library("congestion_controller_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
-index cd003ec3869f..5a485118c983 100644
+index c3eac770d4a4..44e65e3af3dd 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -59953,6 +55052,7 @@ index cd003ec3869f..5a485118c983 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -59961,23 +55061,18 @@ index cd003ec3869f..5a485118c983 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -59996,10 +55091,6 @@ index cd003ec3869f..5a485118c983 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60007,10 +55098,6 @@ index cd003ec3869f..5a485118c983 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -60018,7 +55105,6 @@ index cd003ec3869f..5a485118c983 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60026,10 +55112,6 @@ index cd003ec3869f..5a485118c983 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -60042,10 +55124,6 @@ index cd003ec3869f..5a485118c983 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -60083,7 +55161,7 @@ index cd003ec3869f..5a485118c983 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -60141,10 +55219,10 @@ index cd003ec3869f..5a485118c983 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -60155,10 +55233,10 @@ index cd003ec3869f..5a485118c983 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -60170,18 +55248,10 @@ index cd003ec3869f..5a485118c983 100644
  
  Library("alr_detector_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
-index e6b717e83cff..d8c2ef06bccb 100644
+index 21fff249f2b7..6535a0ec9e81 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -60189,6 +55259,7 @@ index e6b717e83cff..d8c2ef06bccb 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -60197,23 +55268,18 @@ index e6b717e83cff..d8c2ef06bccb 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,115 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -60233,10 +55299,6 @@ index e6b717e83cff..d8c2ef06bccb 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60244,10 +55306,6 @@ index e6b717e83cff..d8c2ef06bccb 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -60255,7 +55313,6 @@ index e6b717e83cff..d8c2ef06bccb 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60263,10 +55320,6 @@ index e6b717e83cff..d8c2ef06bccb 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -60279,10 +55332,6 @@ index e6b717e83cff..d8c2ef06bccb 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -60320,7 +55369,7 @@ index e6b717e83cff..d8c2ef06bccb 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -163,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -60378,10 +55427,10 @@ index e6b717e83cff..d8c2ef06bccb 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -60392,10 +55441,10 @@ index e6b717e83cff..d8c2ef06bccb 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -60407,18 +55456,10 @@ index e6b717e83cff..d8c2ef06bccb 100644
  
  Library("delay_based_bwe_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
-index 160eccc1f99d..28c377fc9c57 100644
+index a77055ccdac9..9475b31f9aaa 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -60426,6 +55467,7 @@ index 160eccc1f99d..28c377fc9c57 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -60434,23 +55476,18 @@ index 160eccc1f99d..28c377fc9c57 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -51,114 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,93 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -60469,10 +55506,6 @@ index 160eccc1f99d..28c377fc9c57 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60480,10 +55513,6 @@ index 160eccc1f99d..28c377fc9c57 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -60491,7 +55520,6 @@ index 160eccc1f99d..28c377fc9c57 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60499,10 +55527,6 @@ index 160eccc1f99d..28c377fc9c57 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -60515,10 +55539,6 @@ index 160eccc1f99d..28c377fc9c57 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -60556,7 +55576,7 @@ index 160eccc1f99d..28c377fc9c57 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -166,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -145,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -60614,10 +55634,10 @@ index 160eccc1f99d..28c377fc9c57 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -60628,10 +55648,10 @@ index 160eccc1f99d..28c377fc9c57 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -60643,18 +55663,10 @@ index 160eccc1f99d..28c377fc9c57 100644
  
  Library("estimators_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
-index 3911e8ff1001..948acef63e79 100644
+index 0a9814333b31..212b0ad6dd21 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -60662,6 +55674,7 @@ index 3911e8ff1001..948acef63e79 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -60670,23 +55683,18 @@ index 3911e8ff1001..948acef63e79 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -60706,10 +55714,6 @@ index 3911e8ff1001..948acef63e79 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60717,10 +55721,6 @@ index 3911e8ff1001..948acef63e79 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -60728,7 +55728,6 @@ index 3911e8ff1001..948acef63e79 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60736,10 +55735,6 @@ index 3911e8ff1001..948acef63e79 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -60752,10 +55747,6 @@ index 3911e8ff1001..948acef63e79 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -60793,7 +55784,7 @@ index 3911e8ff1001..948acef63e79 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -60851,10 +55842,10 @@ index 3911e8ff1001..948acef63e79 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -60865,10 +55856,10 @@ index 3911e8ff1001..948acef63e79 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -60880,18 +55871,10 @@ index 3911e8ff1001..948acef63e79 100644
  
  Library("goog_cc_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
-index 44c809dfedd9..5d7411ee9700 100644
+index aac6b3bd8559..837ba3ec6c9f 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -60899,6 +55882,7 @@ index 44c809dfedd9..5d7411ee9700 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -60907,23 +55891,18 @@ index 44c809dfedd9..5d7411ee9700 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -60942,10 +55921,6 @@ index 44c809dfedd9..5d7411ee9700 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60953,10 +55928,6 @@ index 44c809dfedd9..5d7411ee9700 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -60964,7 +55935,6 @@ index 44c809dfedd9..5d7411ee9700 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60972,10 +55942,6 @@ index 44c809dfedd9..5d7411ee9700 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -60988,10 +55954,6 @@ index 44c809dfedd9..5d7411ee9700 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -61022,7 +55984,7 @@ index 44c809dfedd9..5d7411ee9700 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -61109,18 +56071,10 @@ index 44c809dfedd9..5d7411ee9700 100644
  
  Library("link_capacity_estimator_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
-index baed3863d12f..a3655b8f658d 100644
+index 966c3862293a..f458c2372ba0 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -61128,6 +56082,7 @@ index baed3863d12f..a3655b8f658d 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -61136,23 +56091,18 @@ index baed3863d12f..a3655b8f658d 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -61171,10 +56121,6 @@ index baed3863d12f..a3655b8f658d 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -61182,10 +56128,6 @@ index baed3863d12f..a3655b8f658d 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -61193,7 +56135,6 @@ index baed3863d12f..a3655b8f658d 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -61201,10 +56142,6 @@ index baed3863d12f..a3655b8f658d 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -61217,10 +56154,6 @@ index baed3863d12f..a3655b8f658d 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -61258,7 +56191,7 @@ index baed3863d12f..a3655b8f658d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -61316,10 +56249,10 @@ index baed3863d12f..a3655b8f658d 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -61330,10 +56263,10 @@ index baed3863d12f..a3655b8f658d 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -61345,18 +56278,10 @@ index baed3863d12f..a3655b8f658d 100644
  
  Library("loss_based_bwe_v2_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
-index 701eb9f46814..d6bdf50e6195 100644
+index ff8f2a440a1f..063cb6f8f88d 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -61364,6 +56289,7 @@ index 701eb9f46814..d6bdf50e6195 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -61372,23 +56298,18 @@ index 701eb9f46814..d6bdf50e6195 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -61407,10 +56328,6 @@ index 701eb9f46814..d6bdf50e6195 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -61418,10 +56335,6 @@ index 701eb9f46814..d6bdf50e6195 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -61429,7 +56342,6 @@ index 701eb9f46814..d6bdf50e6195 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -61437,10 +56349,6 @@ index 701eb9f46814..d6bdf50e6195 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -61453,10 +56361,6 @@ index 701eb9f46814..d6bdf50e6195 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -61494,7 +56398,7 @@ index 701eb9f46814..d6bdf50e6195 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -61552,10 +56456,10 @@ index 701eb9f46814..d6bdf50e6195 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -61566,10 +56470,10 @@ index 701eb9f46814..d6bdf50e6195 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -61581,18 +56485,10 @@ index 701eb9f46814..d6bdf50e6195 100644
  
  Library("probe_controller_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
-index f31df05e9cc1..8f9781707754 100644
+index 50844ee8832c..37b71e85844f 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -61600,6 +56496,7 @@ index f31df05e9cc1..8f9781707754 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -61608,23 +56505,18 @@ index f31df05e9cc1..8f9781707754 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -61643,10 +56535,6 @@ index f31df05e9cc1..8f9781707754 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -61654,10 +56542,6 @@ index f31df05e9cc1..8f9781707754 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -61665,7 +56549,6 @@ index f31df05e9cc1..8f9781707754 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -61673,10 +56556,6 @@ index f31df05e9cc1..8f9781707754 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -61689,10 +56568,6 @@ index f31df05e9cc1..8f9781707754 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -61730,7 +56605,7 @@ index f31df05e9cc1..8f9781707754 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -61788,10 +56663,10 @@ index f31df05e9cc1..8f9781707754 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -61802,10 +56677,10 @@ index f31df05e9cc1..8f9781707754 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -61817,18 +56692,10 @@ index f31df05e9cc1..8f9781707754 100644
  
  Library("pushback_controller_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
-index 43e7fdcca440..2e6b77ca422d 100644
+index fc3f36198875..162fbab4195f 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -61836,6 +56703,7 @@ index 43e7fdcca440..2e6b77ca422d 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -61844,23 +56712,18 @@ index 43e7fdcca440..2e6b77ca422d 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -61879,10 +56742,6 @@ index 43e7fdcca440..2e6b77ca422d 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -61890,10 +56749,6 @@ index 43e7fdcca440..2e6b77ca422d 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -61901,7 +56756,6 @@ index 43e7fdcca440..2e6b77ca422d 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -61909,10 +56763,6 @@ index 43e7fdcca440..2e6b77ca422d 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -61925,10 +56775,6 @@ index 43e7fdcca440..2e6b77ca422d 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -61966,7 +56812,7 @@ index 43e7fdcca440..2e6b77ca422d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -62024,10 +56870,10 @@ index 43e7fdcca440..2e6b77ca422d 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -62038,10 +56884,10 @@ index 43e7fdcca440..2e6b77ca422d 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -62053,18 +56899,10 @@ index 43e7fdcca440..2e6b77ca422d 100644
  
  Library("send_side_bwe_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
-index 03eba1c22a16..10b8dd972fbe 100644
+index 2360a15491dc..5f1a2ac7442a 100644
 --- third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -62072,6 +56910,7 @@ index 03eba1c22a16..10b8dd972fbe 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -62080,23 +56919,18 @@ index 03eba1c22a16..10b8dd972fbe 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -62116,10 +56950,6 @@ index 03eba1c22a16..10b8dd972fbe 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -62127,10 +56957,6 @@ index 03eba1c22a16..10b8dd972fbe 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -62138,7 +56964,6 @@ index 03eba1c22a16..10b8dd972fbe 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -62146,10 +56971,6 @@ index 03eba1c22a16..10b8dd972fbe 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -62162,10 +56983,6 @@ index 03eba1c22a16..10b8dd972fbe 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -62203,7 +57020,7 @@ index 03eba1c22a16..10b8dd972fbe 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -62261,10 +57078,10 @@ index 03eba1c22a16..10b8dd972fbe 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -62275,10 +57092,10 @@ index 03eba1c22a16..10b8dd972fbe 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -62290,18 +57107,10 @@ index 03eba1c22a16..10b8dd972fbe 100644
  
  Library("control_handler_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
-index 2f3d51d2d0f3..ca791c4ffb1e 100644
+index d29224be7452..f3bcafd8ad85 100644
 --- third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -62309,6 +57118,7 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -62317,23 +57127,18 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -62352,10 +57157,6 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -62363,10 +57164,6 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -62374,7 +57171,6 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -62382,10 +57178,6 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -62398,10 +57190,6 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -62439,7 +57227,7 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -62497,10 +57285,10 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -62511,10 +57299,10 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -62526,18 +57314,10 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
  
  Library("transport_feedback_gn")
 diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
-index 5ac5f9dc2618..6a80673f02c5 100644
+index e7579297f794..3a83dde9190a 100644
 --- third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
 +++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -62546,6 +57326,7 @@ index 5ac5f9dc2618..6a80673f02c5 100644
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_AVX2"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -62554,13 +57335,12 @@ index 5ac5f9dc2618..6a80673f02c5 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,113 +60,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,102 +56,16 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62568,8 +57348,7 @@ index 5ac5f9dc2618..6a80673f02c5 100644
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    CXXFLAGS += [
--        "-msse2",
--        "-std=gnu++20"
+-        "-msse2"
 -    ]
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -62579,10 +57358,6 @@ index 5ac5f9dc2618..6a80673f02c5 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -62590,7 +57365,6 @@ index 5ac5f9dc2618..6a80673f02c5 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_GNU_SOURCE"] = True
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
@@ -62600,8 +57374,7 @@ index 5ac5f9dc2618..6a80673f02c5 100644
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
 -    CXXFLAGS += [
--        "-msse2",
--        "-std=gnu++20"
+-        "-msse2"
 -    ]
 -
 -    DEFINES["USE_GLIB"] = "1"
@@ -62616,10 +57389,6 @@ index 5ac5f9dc2618..6a80673f02c5 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -62649,12 +57418,12 @@ index 5ac5f9dc2618..6a80673f02c5 100644
 -
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
 -
-     DEFINES["_DEBUG"] = True
- 
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
 -    DEFINES["_DEBUG"] = True
 -
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+     DEFINES["_DEBUG"] = True
+ 
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
 -
 -    DEFINES["_DEBUG"] = True
@@ -62677,18 +57446,10 @@ index 5ac5f9dc2618..6a80673f02c5 100644
      CXXFLAGS += [
          "-msse2"
 diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
-index 89bec9b845b0..cdb54c132cb5 100644
+index 9e856db8df87..78652d03cb96 100644
 --- third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
 +++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
-@@ -22,16 +22,29 @@ if not CONFIG["MOZ_SYSTEM_PIPEWIRE"]:
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -26,12 +26,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -62696,6 +57457,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -62704,23 +57466,18 @@ index 89bec9b845b0..cdb54c132cb5 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -84,197 +97,14 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -84,180 +93,14 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -62735,10 +57492,6 @@ index 89bec9b845b0..cdb54c132cb5 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -62746,7 +57499,6 @@ index 89bec9b845b0..cdb54c132cb5 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -62763,10 +57515,6 @@ index 89bec9b845b0..cdb54c132cb5 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -62808,10 +57556,6 @@ index 89bec9b845b0..cdb54c132cb5 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -62910,7 +57654,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
  
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
-@@ -282,7 +112,8 @@ if CONFIG["TARGET_CPU"] == "arm":
+@@ -265,7 +108,8 @@ if CONFIG["TARGET_CPU"] == "arm":
      ]
  
      SOURCES += [
@@ -62920,7 +57664,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
      ]
  
      UNIFIED_SOURCES += [
-@@ -292,34 +123,9 @@ if CONFIG["TARGET_CPU"] == "arm":
+@@ -275,34 +119,9 @@ if CONFIG["TARGET_CPU"] == "arm":
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -62958,7 +57702,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
      ]
  
  if CONFIG["TARGET_CPU"] == "mips32":
-@@ -327,7 +133,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -310,7 +129,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
      DEFINES["MIPS32_LE"] = True
      DEFINES["MIPS_FPU_LE"] = True
      DEFINES["WEBRTC_USE_PIPEWIRE"] = True
@@ -62966,7 +57710,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
  
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
-@@ -335,7 +140,8 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -318,7 +136,8 @@ if CONFIG["TARGET_CPU"] == "mips32":
      ]
  
      SOURCES += [
@@ -62976,7 +57720,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
      ]
  
      UNIFIED_SOURCES += [
-@@ -345,13 +151,14 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -328,13 +147,14 @@ if CONFIG["TARGET_CPU"] == "mips32":
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -62993,7 +57737,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
  
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
-@@ -359,7 +166,8 @@ if CONFIG["TARGET_CPU"] == "mips64":
+@@ -342,7 +162,8 @@ if CONFIG["TARGET_CPU"] == "mips64":
      ]
  
      SOURCES += [
@@ -63003,7 +57747,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
      ]
  
      UNIFIED_SOURCES += [
-@@ -369,117 +177,19 @@ if CONFIG["TARGET_CPU"] == "mips64":
+@@ -352,117 +173,19 @@ if CONFIG["TARGET_CPU"] == "mips64":
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -63125,7 +57869,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
  
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
-@@ -487,7 +197,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -470,7 +193,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
      ]
  
      SOURCES += [
@@ -63135,7 +57879,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
      ]
  
      UNIFIED_SOURCES += [
-@@ -497,13 +208,15 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -480,13 +204,15 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -63154,7 +57898,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
  
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
-@@ -511,7 +224,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+@@ -494,7 +220,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
      ]
  
      SOURCES += [
@@ -63164,7 +57908,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
      ]
  
      UNIFIED_SOURCES += [
-@@ -521,10 +235,12 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+@@ -504,10 +231,12 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -63179,7 +57923,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
  
      DEFINES["WEBRTC_USE_X11"] = True
  
-@@ -550,134 +266,61 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGE
+@@ -533,134 +262,61 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGE
          "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc"
      ]
  
@@ -63346,7 +58090,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
  Library("desktop_capture_gn")
 diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build
 deleted file mode 100644
-index 8d73e6328be6..000000000000
+index e27c2d700063..000000000000
 --- third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build
 +++ /dev/null
 @@ -1,81 +0,0 @@
@@ -63370,13 +58114,13 @@ index 8d73e6328be6..000000000000
 -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
 -DEFINES["RTC_ENABLE_VP9"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
 -DEFINES["WEBRTC_MAC"] = True
 -DEFINES["WEBRTC_MOZILLA_BUILD"] = True
 -DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
 -DEFINES["WEBRTC_POSIX"] = True
 -DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 -DEFINES["__STDC_CONSTANT_MACROS"] = True
 -DEFINES["__STDC_FORMAT_MACROS"] = True
 -
@@ -63432,18 +58176,10 @@ index 8d73e6328be6..000000000000
 -
 -Library("desktop_capture_objc_gn")
 diff --git third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
-index 08c499404beb..e4eb5944e021 100644
+index 9d966c83f568..fe4c0e8d1fb2 100644
 --- third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
 +++ third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -63451,6 +58187,7 @@ index 08c499404beb..e4eb5944e021 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -63459,23 +58196,18 @@ index 08c499404beb..e4eb5944e021 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -52,85 +65,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,75 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -63483,10 +58215,6 @@ index 08c499404beb..e4eb5944e021 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -63494,7 +58222,6 @@ index 08c499404beb..e4eb5944e021 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -63502,10 +58229,6 @@ index 08c499404beb..e4eb5944e021 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -63518,10 +58241,6 @@ index 08c499404beb..e4eb5944e021 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -63548,11 +58267,18 @@ index 08c499404beb..e4eb5944e021 100644
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
 -    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -138,69 +73,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -128,69 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -63626,7 +58352,7 @@ index 08c499404beb..e4eb5944e021 100644
  
  Library("primitives_gn")
 diff --git third_party/libwebrtc/modules/module_api_gn/moz.build third_party/libwebrtc/modules/module_api_gn/moz.build
-index f7bcafadcd73..f41f90b9b985 100644
+index 88c4f9659e24..57cdaa5b4aa7 100644
 --- third_party/libwebrtc/modules/module_api_gn/moz.build
 +++ third_party/libwebrtc/modules/module_api_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -63637,6 +58363,7 @@ index f7bcafadcd73..f41f90b9b985 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -63645,13 +58372,12 @@ index f7bcafadcd73..f41f90b9b985 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63686,7 +58412,6 @@ index f7bcafadcd73..f41f90b9b985 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -63736,7 +58461,7 @@ index f7bcafadcd73..f41f90b9b985 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -63762,7 +58487,7 @@ index f7bcafadcd73..f41f90b9b985 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -63804,7 +58529,7 @@ index f7bcafadcd73..f41f90b9b985 100644
 -
  Library("module_api_gn")
 diff --git third_party/libwebrtc/modules/module_api_public_gn/moz.build third_party/libwebrtc/modules/module_api_public_gn/moz.build
-index 18ed1d8f113e..b8b1a89645df 100644
+index 60a59ac68ba0..5cadc26111a4 100644
 --- third_party/libwebrtc/modules/module_api_public_gn/moz.build
 +++ third_party/libwebrtc/modules/module_api_public_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -63815,6 +58540,7 @@ index 18ed1d8f113e..b8b1a89645df 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -63823,13 +58549,12 @@ index 18ed1d8f113e..b8b1a89645df 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63864,7 +58589,6 @@ index 18ed1d8f113e..b8b1a89645df 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -63914,7 +58638,7 @@ index 18ed1d8f113e..b8b1a89645df 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -63940,7 +58664,7 @@ index 18ed1d8f113e..b8b1a89645df 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -63982,7 +58706,7 @@ index 18ed1d8f113e..b8b1a89645df 100644
 -
  Library("module_api_public_gn")
 diff --git third_party/libwebrtc/modules/module_fec_api_gn/moz.build third_party/libwebrtc/modules/module_fec_api_gn/moz.build
-index 848229844edd..0d1db13f4e15 100644
+index af36f290a1db..bbb06a63bfc0 100644
 --- third_party/libwebrtc/modules/module_fec_api_gn/moz.build
 +++ third_party/libwebrtc/modules/module_fec_api_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -63993,6 +58717,7 @@ index 848229844edd..0d1db13f4e15 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -64001,13 +58726,12 @@ index 848229844edd..0d1db13f4e15 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64042,7 +58766,6 @@ index 848229844edd..0d1db13f4e15 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -64092,7 +58815,7 @@ index 848229844edd..0d1db13f4e15 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -64118,7 +58841,7 @@ index 848229844edd..0d1db13f4e15 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -64160,18 +58883,10 @@ index 848229844edd..0d1db13f4e15 100644
 -
  Library("module_fec_api_gn")
 diff --git third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
-index 440873268213..690d12ace5e1 100644
+index 1a5e2ac45c89..b9cc24f035e6 100644
 --- third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
 +++ third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -64179,6 +58894,7 @@ index 440873268213..690d12ace5e1 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -64187,23 +58903,18 @@ index 440873268213..690d12ace5e1 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -64222,10 +58933,6 @@ index 440873268213..690d12ace5e1 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -64233,10 +58940,6 @@ index 440873268213..690d12ace5e1 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -64244,7 +58947,6 @@ index 440873268213..690d12ace5e1 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -64252,10 +58954,6 @@ index 440873268213..690d12ace5e1 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -64268,10 +58966,6 @@ index 440873268213..690d12ace5e1 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -64302,7 +58996,7 @@ index 440873268213..690d12ace5e1 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -64389,18 +59083,10 @@ index 440873268213..690d12ace5e1 100644
  
  Library("interval_budget_gn")
 diff --git third_party/libwebrtc/modules/pacing/pacing_gn/moz.build third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
-index 3988f5c881cf..a7bf33d61697 100644
+index f9e685490ccc..9c976398855b 100644
 --- third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
 +++ third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -64408,6 +59094,7 @@ index 3988f5c881cf..a7bf33d61697 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -64416,23 +59103,18 @@ index 3988f5c881cf..a7bf33d61697 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -53,115 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,94 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -64452,10 +59134,6 @@ index 3988f5c881cf..a7bf33d61697 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -64463,10 +59141,6 @@ index 3988f5c881cf..a7bf33d61697 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -64474,7 +59148,6 @@ index 3988f5c881cf..a7bf33d61697 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -64482,10 +59155,6 @@ index 3988f5c881cf..a7bf33d61697 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -64498,10 +59167,6 @@ index 3988f5c881cf..a7bf33d61697 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -64539,7 +59204,7 @@ index 3988f5c881cf..a7bf33d61697 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -169,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -148,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -64597,10 +59262,10 @@ index 3988f5c881cf..a7bf33d61697 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -64611,10 +59276,10 @@ index 3988f5c881cf..a7bf33d61697 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -64626,10 +59291,10 @@ index 3988f5c881cf..a7bf33d61697 100644
  
  Library("pacing_gn")
 diff --git third_party/libwebrtc/modules/portal/portal_gn/moz.build third_party/libwebrtc/modules/portal/portal_gn/moz.build
-index db71b13e786c..393e3a0ce470 100644
+index a50648a9760d..c23281dee375 100644
 --- third_party/libwebrtc/modules/portal/portal_gn/moz.build
 +++ third_party/libwebrtc/modules/portal/portal_gn/moz.build
-@@ -30,21 +30,17 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -26,21 +26,18 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -64639,6 +59304,7 @@ index db71b13e786c..393e3a0ce470 100644
 -DEFINES["USE_UDEV"] = True
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
 -DEFINES["WEBRTC_LINUX"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
@@ -64647,12 +59313,11 @@ index db71b13e786c..393e3a0ce470 100644
  DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
  DEFINES["WEBRTC_USE_PIPEWIRE"] = True
  DEFINES["_FILE_OFFSET_BITS"] = "64"
--DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -DEFINES["_GNU_SOURCE"] = True
  DEFINES["_LARGEFILE64_SOURCE"] = True
  DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-@@ -89,16 +85,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+ DEFINES["__STDC_CONSTANT_MACROS"] = True
+@@ -84,16 +81,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -64670,18 +59335,10 @@ index db71b13e786c..393e3a0ce470 100644
  
      DEFINES["MIPS32_LE"] = True
 diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_generator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_generator_gn/moz.build
-index 2ec77e5170f0..20a02cc02752 100644
+index 5f89c5fb33ad..23e0dcd377fa 100644
 --- third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_generator_gn/moz.build
 +++ third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_generator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -64689,6 +59346,7 @@ index 2ec77e5170f0..20a02cc02752 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -64697,23 +59355,18 @@ index 2ec77e5170f0..20a02cc02752 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -64732,10 +59385,6 @@ index 2ec77e5170f0..20a02cc02752 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -64743,10 +59392,6 @@ index 2ec77e5170f0..20a02cc02752 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -64754,7 +59399,6 @@ index 2ec77e5170f0..20a02cc02752 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -64762,10 +59406,6 @@ index 2ec77e5170f0..20a02cc02752 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -64778,10 +59418,6 @@ index 2ec77e5170f0..20a02cc02752 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -64819,7 +59455,7 @@ index 2ec77e5170f0..20a02cc02752 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -64877,10 +59513,10 @@ index 2ec77e5170f0..20a02cc02752 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -64891,10 +59527,10 @@ index 2ec77e5170f0..20a02cc02752 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -64906,18 +59542,10 @@ index 2ec77e5170f0..20a02cc02752 100644
  
  Library("congestion_control_feedback_generator_gn")
 diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
-index fe512fc45b91..bc6627a86e52 100644
+index 44a231954c82..bf00b83cbc62 100644
 --- third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -64925,6 +59553,7 @@ index fe512fc45b91..bc6627a86e52 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -64933,23 +59562,18 @@ index fe512fc45b91..bc6627a86e52 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -55,114 +68,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,93 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -64968,10 +59592,6 @@ index fe512fc45b91..bc6627a86e52 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -64979,10 +59599,6 @@ index fe512fc45b91..bc6627a86e52 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -64990,7 +59606,6 @@ index fe512fc45b91..bc6627a86e52 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -64998,10 +59613,6 @@ index fe512fc45b91..bc6627a86e52 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -65014,10 +59625,6 @@ index fe512fc45b91..bc6627a86e52 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -65055,7 +59662,7 @@ index fe512fc45b91..bc6627a86e52 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -170,82 +76,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -149,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -65113,10 +59720,10 @@ index fe512fc45b91..bc6627a86e52 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -65127,10 +59734,10 @@ index fe512fc45b91..bc6627a86e52 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -65142,7 +59749,7 @@ index fe512fc45b91..bc6627a86e52 100644
  
  Library("remote_bitrate_estimator_gn")
 diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/rtp_transport_feedback_generator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/rtp_transport_feedback_generator_gn/moz.build
-index c2e7377ddfd4..4e66ff5db13a 100644
+index 72f3f6d79b1f..319c8f69ecf6 100644
 --- third_party/libwebrtc/modules/remote_bitrate_estimator/rtp_transport_feedback_generator_gn/moz.build
 +++ third_party/libwebrtc/modules/remote_bitrate_estimator/rtp_transport_feedback_generator_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -65153,6 +59760,7 @@ index c2e7377ddfd4..4e66ff5db13a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -65161,13 +59769,12 @@ index c2e7377ddfd4..4e66ff5db13a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65206,7 +59813,6 @@ index c2e7377ddfd4..4e66ff5db13a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -65263,7 +59869,7 @@ index c2e7377ddfd4..4e66ff5db13a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -65289,7 +59895,7 @@ index c2e7377ddfd4..4e66ff5db13a 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -65331,18 +59937,10 @@ index c2e7377ddfd4..4e66ff5db13a 100644
 -
  Library("rtp_transport_feedback_generator_gn")
 diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/transport_sequence_number_feedback_generator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/transport_sequence_number_feedback_generator_gn/moz.build
-index ef714742ae33..1bb93172f690 100644
+index e445120c239a..add7af188efb 100644
 --- third_party/libwebrtc/modules/remote_bitrate_estimator/transport_sequence_number_feedback_generator_gn/moz.build
 +++ third_party/libwebrtc/modules/remote_bitrate_estimator/transport_sequence_number_feedback_generator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -65350,6 +59948,7 @@ index ef714742ae33..1bb93172f690 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -65358,23 +59957,18 @@ index ef714742ae33..1bb93172f690 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -65393,10 +59987,6 @@ index ef714742ae33..1bb93172f690 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -65404,10 +59994,6 @@ index ef714742ae33..1bb93172f690 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -65415,7 +60001,6 @@ index ef714742ae33..1bb93172f690 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -65423,10 +60008,6 @@ index ef714742ae33..1bb93172f690 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -65439,10 +60020,6 @@ index ef714742ae33..1bb93172f690 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -65480,7 +60057,7 @@ index ef714742ae33..1bb93172f690 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -65538,10 +60115,10 @@ index ef714742ae33..1bb93172f690 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -65552,10 +60129,10 @@ index ef714742ae33..1bb93172f690 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -65567,18 +60144,10 @@ index ef714742ae33..1bb93172f690 100644
  
  Library("transport_sequence_number_feedback_generator_gn")
 diff --git third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
-index a9e95be32c67..58a2fad51751 100644
+index 863003cc6dba..f373e77842eb 100644
 --- third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
 +++ third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -65586,6 +60155,7 @@ index a9e95be32c67..58a2fad51751 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -65594,23 +60164,18 @@ index a9e95be32c67..58a2fad51751 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -65625,10 +60190,6 @@ index a9e95be32c67..58a2fad51751 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -65636,10 +60197,6 @@ index a9e95be32c67..58a2fad51751 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -65647,7 +60204,6 @@ index a9e95be32c67..58a2fad51751 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -65655,10 +60211,6 @@ index a9e95be32c67..58a2fad51751 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -65671,10 +60223,6 @@ index a9e95be32c67..58a2fad51751 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -65705,7 +60253,7 @@ index a9e95be32c67..58a2fad51751 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -65763,10 +60311,10 @@ index a9e95be32c67..58a2fad51751 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -65777,10 +60325,10 @@ index a9e95be32c67..58a2fad51751 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -65792,18 +60340,10 @@ index a9e95be32c67..58a2fad51751 100644
  
  Library("leb128_gn")
 diff --git third_party/libwebrtc/modules/rtp_rtcp/ntp_time_util_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/ntp_time_util_gn/moz.build
-index 71a7444f6edd..704888734d11 100644
+index fb98c4bc6b0a..059bd85c05f4 100644
 --- third_party/libwebrtc/modules/rtp_rtcp/ntp_time_util_gn/moz.build
 +++ third_party/libwebrtc/modules/rtp_rtcp/ntp_time_util_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -65811,6 +60351,7 @@ index 71a7444f6edd..704888734d11 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -65819,23 +60360,18 @@ index 71a7444f6edd..704888734d11 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -65854,10 +60390,6 @@ index 71a7444f6edd..704888734d11 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -65865,10 +60397,6 @@ index 71a7444f6edd..704888734d11 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -65876,7 +60404,6 @@ index 71a7444f6edd..704888734d11 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -65884,10 +60411,6 @@ index 71a7444f6edd..704888734d11 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -65900,10 +60423,6 @@ index 71a7444f6edd..704888734d11 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -65941,7 +60460,7 @@ index 71a7444f6edd..704888734d11 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -65999,10 +60518,10 @@ index 71a7444f6edd..704888734d11 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -66013,10 +60532,10 @@ index 71a7444f6edd..704888734d11 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -66028,18 +60547,10 @@ index 71a7444f6edd..704888734d11 100644
  
  Library("ntp_time_util_gn")
 diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
-index 4d06f22b32e5..190a6e1710c9 100644
+index fdec383ccab9..3abb078532e3 100644
 --- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
 +++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -66047,6 +60558,7 @@ index 4d06f22b32e5..190a6e1710c9 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -66055,23 +60567,18 @@ index 4d06f22b32e5..190a6e1710c9 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -90,114 +103,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -90,93 +99,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -66090,10 +60597,6 @@ index 4d06f22b32e5..190a6e1710c9 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -66101,10 +60604,6 @@ index 4d06f22b32e5..190a6e1710c9 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -66112,7 +60611,6 @@ index 4d06f22b32e5..190a6e1710c9 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -66120,10 +60618,6 @@ index 4d06f22b32e5..190a6e1710c9 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -66136,10 +60630,6 @@ index 4d06f22b32e5..190a6e1710c9 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -66177,7 +60667,7 @@ index 4d06f22b32e5..190a6e1710c9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -205,82 +111,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -184,82 +107,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -66264,18 +60754,10 @@ index 4d06f22b32e5..190a6e1710c9 100644
  
  Library("rtp_rtcp_format_gn")
 diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
-index b7451abdb35b..0e5b16913861 100644
+index 3a7e03c6c39a..f22cc7aee488 100644
 --- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
 +++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -66283,6 +60765,7 @@ index b7451abdb35b..0e5b16913861 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -66291,23 +60774,18 @@ index b7451abdb35b..0e5b16913861 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -100,115 +113,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -100,94 +109,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -66327,10 +60805,6 @@ index b7451abdb35b..0e5b16913861 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -66338,10 +60812,6 @@ index b7451abdb35b..0e5b16913861 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -66349,7 +60819,6 @@ index b7451abdb35b..0e5b16913861 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -66357,10 +60826,6 @@ index b7451abdb35b..0e5b16913861 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -66373,10 +60838,6 @@ index b7451abdb35b..0e5b16913861 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -66414,7 +60875,7 @@ index b7451abdb35b..0e5b16913861 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -216,82 +121,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -195,82 +117,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -66501,18 +60962,10 @@ index b7451abdb35b..0e5b16913861 100644
  
  Library("rtp_rtcp_gn")
 diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
-index aa8cff1debbf..b2fb4ea1f57b 100644
+index e9dd4a5fb67c..95494a301fdf 100644
 --- third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
 +++ third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -66520,6 +60973,7 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -66528,23 +60982,18 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -66563,10 +61012,6 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -66574,10 +61019,6 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -66585,7 +61026,6 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -66593,10 +61033,6 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -66609,10 +61045,6 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -66650,7 +61082,7 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -66708,10 +61140,10 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -66722,10 +61154,10 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -66737,7 +61169,7 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
  
  Library("rtp_video_header_gn")
 diff --git third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
-index 44fe26802729..b9454797a98d 100644
+index 4e3b42f6558b..ad4e476910dc 100644
 --- third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
 +++ third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -66748,6 +61180,7 @@ index 44fe26802729..b9454797a98d 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -66756,13 +61189,12 @@ index 44fe26802729..b9454797a98d 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,83 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66797,7 +61229,6 @@ index 44fe26802729..b9454797a98d 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -66847,7 +61278,7 @@ index 44fe26802729..b9454797a98d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -66934,7 +61365,7 @@ index 44fe26802729..b9454797a98d 100644
  
  Library("fft_gn")
 diff --git third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
-index dbc294fa96ab..9a429e728f39 100644
+index 92205c179088..f2769d4fd4d2 100644
 --- third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
 +++ third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -66945,6 +61376,7 @@ index dbc294fa96ab..9a429e728f39 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -66953,13 +61385,12 @@ index dbc294fa96ab..9a429e728f39 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,83 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66994,7 +61425,6 @@ index dbc294fa96ab..9a429e728f39 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -67044,7 +61474,7 @@ index dbc294fa96ab..9a429e728f39 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -67131,7 +61561,7 @@ index dbc294fa96ab..9a429e728f39 100644
  
  Library("g711_3p_gn")
 diff --git third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
-index d88730be83ca..eb0e3d9776c2 100644
+index 18a478d539ee..af5dea7e19d3 100644
 --- third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
 +++ third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -67142,6 +61572,7 @@ index d88730be83ca..eb0e3d9776c2 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -67150,13 +61581,12 @@ index d88730be83ca..eb0e3d9776c2 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -50,83 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,82 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67191,7 +61621,6 @@ index d88730be83ca..eb0e3d9776c2 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -67241,7 +61670,7 @@ index d88730be83ca..eb0e3d9776c2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -134,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -67328,7 +61757,7 @@ index d88730be83ca..eb0e3d9776c2 100644
  
  Library("g722_3p_gn")
 diff --git third_party/libwebrtc/modules/utility/utility_gn/moz.build third_party/libwebrtc/modules/utility/utility_gn/moz.build
-index 747a68987a76..91501607fb33 100644
+index 39011ae5e091..422703862311 100644
 --- third_party/libwebrtc/modules/utility/utility_gn/moz.build
 +++ third_party/libwebrtc/modules/utility/utility_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -67339,6 +61768,7 @@ index 747a68987a76..91501607fb33 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -67347,23 +61777,18 @@ index 747a68987a76..91501607fb33 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,90 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -67400,7 +61825,6 @@ index 747a68987a76..91501607fb33 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -67450,7 +61874,7 @@ index 747a68987a76..91501607fb33 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -67476,7 +61900,7 @@ index 747a68987a76..91501607fb33 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -166,52 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -161,52 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -67530,18 +61954,10 @@ index 747a68987a76..91501607fb33 100644
 -
  Library("utility_gn")
 diff --git third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
-index 8ec96d9a4a86..5d4869cd7f86 100644
+index ed3ef3b74c07..d03874fab0d2 100644
 --- third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
 +++ third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
-@@ -14,16 +14,29 @@ if not CONFIG["MOZ_SYSTEM_PIPEWIRE"]:
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -18,12 +18,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -67549,6 +61965,7 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -67557,13 +61974,12 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -39,6 +52,10 @@ LOCAL_INCLUDES += [
+@@ -39,6 +48,10 @@ LOCAL_INCLUDES += [
  ]
  
  UNIFIED_SOURCES += [
@@ -67574,17 +61990,13 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
      "/third_party/libwebrtc/modules/video_capture/video_capture_options.cc"
  ]
  
-@@ -51,187 +68,14 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,166 +64,14 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -67603,10 +62015,6 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -67614,10 +62022,6 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -67625,7 +62029,6 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -67640,10 +62043,6 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -67663,10 +62062,6 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -67741,7 +62136,7 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
 -
 -    DEFINES["MIPS32_LE"] = True
 -    DEFINES["MIPS_FPU_LE"] = True
-     DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+-    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -    LOCAL_INCLUDES += [
@@ -67758,13 +62153,13 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
 -
 -if CONFIG["TARGET_CPU"] == "mips64":
 -
--    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+     DEFINES["WEBRTC_USE_PIPEWIRE"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["__ARM_NEON__"] = "1"
  
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
-@@ -245,44 +89,11 @@ if CONFIG["TARGET_CPU"] == "mips64":
+@@ -224,44 +85,11 @@ if CONFIG["TARGET_CPU"] == "mips64":
          "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
      ]
  
@@ -67812,7 +62207,7 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
  
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
-@@ -296,10 +107,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+@@ -275,10 +103,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
          "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
      ]
  
@@ -67824,7 +62219,7 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
  
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
-@@ -313,14 +123,14 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+@@ -292,14 +119,14 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
          "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
      ]
  
@@ -67841,7 +62236,7 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
  
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
-@@ -334,10 +144,10 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -313,10 +140,10 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
          "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
      ]
  
@@ -67855,18 +62250,10 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
 diff --git third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
-index 8e6a20c413c2..3dce7e24b7f2 100644
+index 7d2cb6e37fb9..d773975e789d 100644
 --- third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
 +++ third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -67874,6 +62261,7 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -67882,23 +62270,18 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -50,114 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -67917,10 +62300,6 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -67928,10 +62307,6 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -67939,7 +62314,6 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -67947,10 +62321,6 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -67963,10 +62333,6 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -68004,7 +62370,7 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -165,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -68062,10 +62428,10 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -68076,10 +62442,10 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -68091,18 +62457,10 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
  
  Library("video_capture_module_gn")
 diff --git third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
-index 09852f9680d2..0eeb8f20f052 100644
+index 1e7b10688f3e..0c9e69f6d9ce 100644
 --- third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -68110,6 +62468,7 @@ index 09852f9680d2..0eeb8f20f052 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -68118,23 +62477,18 @@ index 09852f9680d2..0eeb8f20f052 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -68153,10 +62507,6 @@ index 09852f9680d2..0eeb8f20f052 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -68164,10 +62514,6 @@ index 09852f9680d2..0eeb8f20f052 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -68175,7 +62521,6 @@ index 09852f9680d2..0eeb8f20f052 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -68183,10 +62528,6 @@ index 09852f9680d2..0eeb8f20f052 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -68199,10 +62540,6 @@ index 09852f9680d2..0eeb8f20f052 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -68240,7 +62577,7 @@ index 09852f9680d2..0eeb8f20f052 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -68298,10 +62635,10 @@ index 09852f9680d2..0eeb8f20f052 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -68312,10 +62649,10 @@ index 09852f9680d2..0eeb8f20f052 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -68327,7 +62664,7 @@ index 09852f9680d2..0eeb8f20f052 100644
  
  Library("chain_diff_calculator_gn")
 diff --git third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
-index 18490a99922e..cd478d1ab4e0 100644
+index 05cfb2a8de36..730f9581e95a 100644
 --- third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -68338,6 +62675,7 @@ index 18490a99922e..cd478d1ab4e0 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -68346,13 +62684,12 @@ index 18490a99922e..cd478d1ab4e0 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68391,7 +62728,6 @@ index 18490a99922e..cd478d1ab4e0 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -68441,7 +62777,7 @@ index 18490a99922e..cd478d1ab4e0 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -68467,7 +62803,7 @@ index 18490a99922e..cd478d1ab4e0 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -68509,18 +62845,10 @@ index 18490a99922e..cd478d1ab4e0 100644
 -
  Library("codec_globals_headers_gn")
 diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
-index 6a1fce1d5dfe..c4489b1da4a4 100644
+index 1f07c3406aa5..ce5dd4056087 100644
 --- third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -68528,6 +62856,7 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -68536,23 +62865,18 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -68571,10 +62895,6 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -68582,10 +62902,6 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -68593,7 +62909,6 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -68601,10 +62916,6 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -68617,10 +62928,6 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -68658,7 +62965,7 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -68716,10 +63023,10 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -68730,10 +63037,10 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -68745,18 +63052,10 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
  
  Library("av1_svc_config_gn")
 diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build
-index bb6f0eeaffb8..cba1557d956e 100644
+index c1c8b0a7c64e..858945cd9a2e 100644
 --- third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build
-@@ -12,16 +12,29 @@ if CONFIG["MOZ_SYSTEM_AV1"]:
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,12 +16,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -68764,6 +63063,7 @@ index bb6f0eeaffb8..cba1557d956e 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -68772,23 +63072,18 @@ index bb6f0eeaffb8..cba1557d956e 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -53,114 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,93 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -68807,10 +63102,6 @@ index bb6f0eeaffb8..cba1557d956e 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -68818,10 +63109,6 @@ index bb6f0eeaffb8..cba1557d956e 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -68829,7 +63116,6 @@ index bb6f0eeaffb8..cba1557d956e 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -68837,10 +63123,6 @@ index bb6f0eeaffb8..cba1557d956e 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -68853,10 +63135,6 @@ index bb6f0eeaffb8..cba1557d956e 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -68894,7 +63172,7 @@ index bb6f0eeaffb8..cba1557d956e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -168,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -147,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -68952,10 +63230,10 @@ index bb6f0eeaffb8..cba1557d956e 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -68966,10 +63244,10 @@ index bb6f0eeaffb8..cba1557d956e 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -68981,18 +63259,10 @@ index bb6f0eeaffb8..cba1557d956e 100644
  
  Library("dav1d_decoder_gn")
 diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
-index 64865e705dc2..b510d6294cbc 100644
+index 1b1bb0aebb9f..de9c51fe107e 100644
 --- third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
-@@ -12,16 +12,29 @@ if CONFIG["MOZ_SYSTEM_AV1"]:
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,12 +16,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -69000,6 +63270,7 @@ index 64865e705dc2..b510d6294cbc 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -69008,23 +63279,18 @@ index 64865e705dc2..b510d6294cbc 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,94 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -69038,15 +63304,12 @@ index 64865e705dc2..b510d6294cbc 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
+-        "GLESv2",
 -        "log"
 -    ]
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -69054,10 +63317,6 @@ index 64865e705dc2..b510d6294cbc 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -69065,7 +63324,6 @@ index 64865e705dc2..b510d6294cbc 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -69073,10 +63331,6 @@ index 64865e705dc2..b510d6294cbc 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -69089,10 +63343,6 @@ index 64865e705dc2..b510d6294cbc 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -69130,7 +63380,7 @@ index 64865e705dc2..b510d6294cbc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -69188,10 +63438,10 @@ index 64865e705dc2..b510d6294cbc 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -69202,10 +63452,10 @@ index 64865e705dc2..b510d6294cbc 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -69217,18 +63467,10 @@ index 64865e705dc2..b510d6294cbc 100644
  
  Library("aom_av1_encoder_gn")
 diff --git third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
-index c7e6879e9c9b..a9e5d531c7f8 100644
+index 3d9b5c87e574..d9dd5185ae93 100644
 --- third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -69236,6 +63478,7 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -69244,23 +63487,18 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -69279,10 +63517,6 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -69290,10 +63524,6 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -69301,7 +63531,6 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -69309,10 +63538,6 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -69325,10 +63550,6 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -69366,7 +63587,7 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -69424,10 +63645,10 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -69438,10 +63659,10 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -69453,18 +63674,10 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
  
  Library("encoded_frame_gn")
 diff --git third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
-index 6ed61e2ed514..c6e8ae200597 100644
+index c6f81b4ed4d4..b4bfea458e5c 100644
 --- third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -69472,6 +63685,7 @@ index 6ed61e2ed514..c6e8ae200597 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -69480,23 +63694,18 @@ index 6ed61e2ed514..c6e8ae200597 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -69515,10 +63724,6 @@ index 6ed61e2ed514..c6e8ae200597 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -69526,10 +63731,6 @@ index 6ed61e2ed514..c6e8ae200597 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -69537,7 +63738,6 @@ index 6ed61e2ed514..c6e8ae200597 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -69545,10 +63745,6 @@ index 6ed61e2ed514..c6e8ae200597 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -69561,10 +63757,6 @@ index 6ed61e2ed514..c6e8ae200597 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -69602,7 +63794,7 @@ index 6ed61e2ed514..c6e8ae200597 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -69660,10 +63852,10 @@ index 6ed61e2ed514..c6e8ae200597 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -69674,10 +63866,10 @@ index 6ed61e2ed514..c6e8ae200597 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -69689,18 +63881,10 @@ index 6ed61e2ed514..c6e8ae200597 100644
  
  Library("frame_dependencies_calculator_gn")
 diff --git third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
-index 553ce31ed2dd..8ae9b6a7a492 100644
+index 251b15e896bf..3d298942614e 100644
 --- third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -69708,6 +63892,7 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -69716,23 +63901,18 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -69751,10 +63931,6 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -69762,10 +63938,6 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -69773,7 +63945,6 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -69781,10 +63952,6 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -69797,10 +63964,6 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -69838,7 +64001,7 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -69896,24 +64059,231 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
 -    CXXFLAGS += [
 -        "-msse2"
 -    ]
 -
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
++if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+ Library("frame_helpers_gn")
+diff --git third_party/libwebrtc/modules/video_coding/frame_sampler_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_sampler_gn/moz.build
+index 0b9bedb1d288..aeb9164b7b97 100644
+--- third_party/libwebrtc/modules/video_coding/frame_sampler_gn/moz.build
++++ third_party/libwebrtc/modules/video_coding/frame_sampler_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+ FINAL_LIBRARY = "xul"
+ 
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+ 
+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
+-if CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["ANDROID"] = True
+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
+-    DEFINES["HAVE_SYS_UIO_H"] = True
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-    DEFINES["NOMINMAX"] = True
+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
+-    DEFINES["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
+-    DEFINES["WIN32"] = True
+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+-    DEFINES["WINVER"] = "0x0A00"
+-    DEFINES["_ATL_NO_OPENGL"] = True
+-    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
+-    DEFINES["_CRT_RAND_S"] = True
+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
+-    DEFINES["_HAS_NODISCARD"] = True
+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_SECURE_ATL"] = True
+-    DEFINES["_UNICODE"] = True
+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
+-    DEFINES["_WINDOWS"] = True
+-    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
+-    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
++    DEFINES["_DEBUG"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "aarch64":
+ 
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+     DEFINES["WEBRTC_HAS_NEON"] = True
+     DEFINES["__ARM_NEON__"] = "1"
+ 
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["TARGET_CPU"] == "loongarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
 -
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+ if CONFIG["TARGET_CPU"] == "mips32":
+ 
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "x86":
+ 
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
      CXXFLAGS += [
          "-msse2"
      ]
  
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -69923,20 +64293,12 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("frame_helpers_gn")
+ Library("frame_sampler_gn")
 diff --git third_party/libwebrtc/modules/video_coding/h264_sprop_parameter_sets_gn/moz.build third_party/libwebrtc/modules/video_coding/h264_sprop_parameter_sets_gn/moz.build
-index eb7fb47746e0..e76ba8ac7cd1 100644
+index d71cb5796e1d..a13914a39e24 100644
 --- third_party/libwebrtc/modules/video_coding/h264_sprop_parameter_sets_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/h264_sprop_parameter_sets_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -69944,6 +64306,7 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -69952,23 +64315,18 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -69987,10 +64345,6 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -69998,10 +64352,6 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -70009,7 +64359,6 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -70017,10 +64366,6 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -70033,10 +64378,6 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -70074,7 +64415,7 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -70132,10 +64473,10 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -70146,10 +64487,10 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -70161,18 +64502,10 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
  
  Library("h264_sprop_parameter_sets_gn")
 diff --git third_party/libwebrtc/modules/video_coding/h26x_packet_buffer_gn/moz.build third_party/libwebrtc/modules/video_coding/h26x_packet_buffer_gn/moz.build
-index 34122a4e87a4..d13e4278cbe3 100644
+index e672f30de7f8..a6581971c3ff 100644
 --- third_party/libwebrtc/modules/video_coding/h26x_packet_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/h26x_packet_buffer_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -70180,6 +64513,7 @@ index 34122a4e87a4..d13e4278cbe3 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -70188,23 +64522,18 @@ index 34122a4e87a4..d13e4278cbe3 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -70223,10 +64552,6 @@ index 34122a4e87a4..d13e4278cbe3 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -70234,10 +64559,6 @@ index 34122a4e87a4..d13e4278cbe3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -70245,7 +64566,6 @@ index 34122a4e87a4..d13e4278cbe3 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -70253,10 +64573,6 @@ index 34122a4e87a4..d13e4278cbe3 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -70269,10 +64585,6 @@ index 34122a4e87a4..d13e4278cbe3 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -70310,7 +64622,7 @@ index 34122a4e87a4..d13e4278cbe3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -70368,10 +64680,10 @@ index 34122a4e87a4..d13e4278cbe3 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -70382,10 +64694,10 @@ index 34122a4e87a4..d13e4278cbe3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -70397,18 +64709,10 @@ index 34122a4e87a4..d13e4278cbe3 100644
  
  Library("h26x_packet_buffer_gn")
 diff --git third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
-index 4cca5934baed..0d44d1ae0915 100644
+index 4d6c27a8cc9f..0f47848b2873 100644
 --- third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -70416,6 +64720,7 @@ index 4cca5934baed..0d44d1ae0915 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -70424,23 +64729,18 @@ index 4cca5934baed..0d44d1ae0915 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -70459,10 +64759,6 @@ index 4cca5934baed..0d44d1ae0915 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -70470,10 +64766,6 @@ index 4cca5934baed..0d44d1ae0915 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -70481,7 +64773,6 @@ index 4cca5934baed..0d44d1ae0915 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -70489,10 +64780,6 @@ index 4cca5934baed..0d44d1ae0915 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -70505,10 +64792,6 @@ index 4cca5934baed..0d44d1ae0915 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -70546,7 +64829,7 @@ index 4cca5934baed..0d44d1ae0915 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -70604,10 +64887,10 @@ index 4cca5934baed..0d44d1ae0915 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -70618,10 +64901,10 @@ index 4cca5934baed..0d44d1ae0915 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -70633,18 +64916,10 @@ index 4cca5934baed..0d44d1ae0915 100644
  
  Library("nack_requester_gn")
 diff --git third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
-index 7cc5fe1a9bde..f8552b642dea 100644
+index 7583fd14da48..250ae7177cda 100644
 --- third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -70652,6 +64927,7 @@ index 7cc5fe1a9bde..f8552b642dea 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -70660,23 +64936,18 @@ index 7cc5fe1a9bde..f8552b642dea 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -70695,10 +64966,6 @@ index 7cc5fe1a9bde..f8552b642dea 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -70706,10 +64973,6 @@ index 7cc5fe1a9bde..f8552b642dea 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -70717,7 +64980,6 @@ index 7cc5fe1a9bde..f8552b642dea 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -70725,10 +64987,6 @@ index 7cc5fe1a9bde..f8552b642dea 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -70741,10 +64999,6 @@ index 7cc5fe1a9bde..f8552b642dea 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -70782,7 +65036,7 @@ index 7cc5fe1a9bde..f8552b642dea 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -70840,10 +65094,10 @@ index 7cc5fe1a9bde..f8552b642dea 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -70854,10 +65108,10 @@ index 7cc5fe1a9bde..f8552b642dea 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -70869,18 +65123,10 @@ index 7cc5fe1a9bde..f8552b642dea 100644
  
  Library("packet_buffer_gn")
 diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
-index badcb68f6737..15b76f1c0da7 100644
+index 16a769513750..d073b9ad375e 100644
 --- third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -70888,6 +65134,7 @@ index badcb68f6737..15b76f1c0da7 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -70896,23 +65143,18 @@ index badcb68f6737..15b76f1c0da7 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -70931,10 +65173,6 @@ index badcb68f6737..15b76f1c0da7 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -70942,10 +65180,6 @@ index badcb68f6737..15b76f1c0da7 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -70953,7 +65187,6 @@ index badcb68f6737..15b76f1c0da7 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -70961,10 +65194,6 @@ index badcb68f6737..15b76f1c0da7 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -70977,10 +65206,6 @@ index badcb68f6737..15b76f1c0da7 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -71018,7 +65243,7 @@ index badcb68f6737..15b76f1c0da7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -71076,10 +65301,10 @@ index badcb68f6737..15b76f1c0da7 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -71090,10 +65315,10 @@ index badcb68f6737..15b76f1c0da7 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -71105,18 +65330,10 @@ index badcb68f6737..15b76f1c0da7 100644
  
  Library("scalability_mode_util_gn")
 diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
-index b96bece0f04e..99b1fa03fb5b 100644
+index 5540aa87f9c9..3ab93bb4ad62 100644
 --- third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -71124,6 +65341,7 @@ index b96bece0f04e..99b1fa03fb5b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -71132,23 +65350,18 @@ index b96bece0f04e..99b1fa03fb5b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -53,114 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,93 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -71167,10 +65380,6 @@ index b96bece0f04e..99b1fa03fb5b 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -71178,10 +65387,6 @@ index b96bece0f04e..99b1fa03fb5b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -71189,7 +65394,6 @@ index b96bece0f04e..99b1fa03fb5b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -71197,10 +65401,6 @@ index b96bece0f04e..99b1fa03fb5b 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -71213,10 +65413,6 @@ index b96bece0f04e..99b1fa03fb5b 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -71254,7 +65450,7 @@ index b96bece0f04e..99b1fa03fb5b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -168,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -147,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -71312,10 +65508,10 @@ index b96bece0f04e..99b1fa03fb5b 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -71326,10 +65522,10 @@ index b96bece0f04e..99b1fa03fb5b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -71341,18 +65537,10 @@ index b96bece0f04e..99b1fa03fb5b 100644
  
  Library("scalability_structures_gn")
 diff --git third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
-index d40294966654..67deb7449935 100644
+index adbdcd25b8ac..eef0f099b359 100644
 --- third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -71360,6 +65548,7 @@ index d40294966654..67deb7449935 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -71368,23 +65557,18 @@ index d40294966654..67deb7449935 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -71403,10 +65587,6 @@ index d40294966654..67deb7449935 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -71414,10 +65594,6 @@ index d40294966654..67deb7449935 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -71425,7 +65601,6 @@ index d40294966654..67deb7449935 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -71433,10 +65608,6 @@ index d40294966654..67deb7449935 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -71449,10 +65620,6 @@ index d40294966654..67deb7449935 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -71483,7 +65650,7 @@ index d40294966654..67deb7449935 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -71570,18 +65737,10 @@ index d40294966654..67deb7449935 100644
  
  Library("scalable_video_controller_gn")
 diff --git third_party/libwebrtc/modules/video_coding/svc/simulcast_to_svc_converter_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/simulcast_to_svc_converter_gn/moz.build
-index 5118ad8887ff..5a330718a6d6 100644
+index f58ee6d17f4f..a2bb00a16786 100644
 --- third_party/libwebrtc/modules/video_coding/svc/simulcast_to_svc_converter_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/svc/simulcast_to_svc_converter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -71589,6 +65748,7 @@ index 5118ad8887ff..5a330718a6d6 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -71597,23 +65757,18 @@ index 5118ad8887ff..5a330718a6d6 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -71633,10 +65788,6 @@ index 5118ad8887ff..5a330718a6d6 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -71644,10 +65795,6 @@ index 5118ad8887ff..5a330718a6d6 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -71655,7 +65802,6 @@ index 5118ad8887ff..5a330718a6d6 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -71663,10 +65809,6 @@ index 5118ad8887ff..5a330718a6d6 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -71679,10 +65821,6 @@ index 5118ad8887ff..5a330718a6d6 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -71720,7 +65858,7 @@ index 5118ad8887ff..5a330718a6d6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -71778,10 +65916,10 @@ index 5118ad8887ff..5a330718a6d6 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -71792,10 +65930,10 @@ index 5118ad8887ff..5a330718a6d6 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -71807,18 +65945,10 @@ index 5118ad8887ff..5a330718a6d6 100644
  
  Library("simulcast_to_svc_converter_gn")
 diff --git third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
-index 81a9f87adcea..bcf7384bb9fb 100644
+index 3429ebfbe312..544297c36cfe 100644
 --- third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -71826,6 +65956,7 @@ index 81a9f87adcea..bcf7384bb9fb 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -71834,23 +65965,18 @@ index 81a9f87adcea..bcf7384bb9fb 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -71869,10 +65995,6 @@ index 81a9f87adcea..bcf7384bb9fb 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -71880,10 +66002,6 @@ index 81a9f87adcea..bcf7384bb9fb 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -71891,7 +66009,6 @@ index 81a9f87adcea..bcf7384bb9fb 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -71899,10 +66016,6 @@ index 81a9f87adcea..bcf7384bb9fb 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -71915,10 +66028,6 @@ index 81a9f87adcea..bcf7384bb9fb 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -71956,7 +66065,7 @@ index 81a9f87adcea..bcf7384bb9fb 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -72014,10 +66123,10 @@ index 81a9f87adcea..bcf7384bb9fb 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -72028,10 +66137,10 @@ index 81a9f87adcea..bcf7384bb9fb 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -72043,18 +66152,10 @@ index 81a9f87adcea..bcf7384bb9fb 100644
  
  Library("svc_rate_allocator_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build
-index 896f0a068468..7982fdbd11b0 100644
+index 27c38ed7b639..bf60f4bd2dc5 100644
 --- third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -72062,6 +66163,7 @@ index 896f0a068468..7982fdbd11b0 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -72070,23 +66172,18 @@ index 896f0a068468..7982fdbd11b0 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -72105,10 +66202,6 @@ index 896f0a068468..7982fdbd11b0 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -72116,10 +66209,6 @@ index 896f0a068468..7982fdbd11b0 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -72127,7 +66216,6 @@ index 896f0a068468..7982fdbd11b0 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -72135,10 +66223,6 @@ index 896f0a068468..7982fdbd11b0 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -72151,10 +66235,6 @@ index 896f0a068468..7982fdbd11b0 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -72185,7 +66265,7 @@ index 896f0a068468..7982fdbd11b0 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -72272,18 +66352,10 @@ index 896f0a068468..7982fdbd11b0 100644
  
  Library("decode_time_percentile_filter_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
-index 5cb93affcf11..b8ca3ea9ff03 100644
+index c84fe43bf7ce..06e4fdb58172 100644
 --- third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -72291,6 +66363,7 @@ index 5cb93affcf11..b8ca3ea9ff03 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -72299,23 +66372,18 @@ index 5cb93affcf11..b8ca3ea9ff03 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -72334,10 +66402,6 @@ index 5cb93affcf11..b8ca3ea9ff03 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -72345,10 +66409,6 @@ index 5cb93affcf11..b8ca3ea9ff03 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -72356,7 +66416,6 @@ index 5cb93affcf11..b8ca3ea9ff03 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -72364,10 +66423,6 @@ index 5cb93affcf11..b8ca3ea9ff03 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -72380,10 +66435,6 @@ index 5cb93affcf11..b8ca3ea9ff03 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -72414,7 +66465,7 @@ index 5cb93affcf11..b8ca3ea9ff03 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -72501,18 +66552,10 @@ index 5cb93affcf11..b8ca3ea9ff03 100644
  
  Library("frame_delay_variation_kalman_filter_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build
-index 2f25723192bb..171a70e310c7 100644
+index d33868bac4b2..2cae7d1663d2 100644
 --- third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -72520,6 +66563,7 @@ index 2f25723192bb..171a70e310c7 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -72528,23 +66572,18 @@ index 2f25723192bb..171a70e310c7 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -72563,10 +66602,6 @@ index 2f25723192bb..171a70e310c7 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -72574,10 +66609,6 @@ index 2f25723192bb..171a70e310c7 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -72585,7 +66616,6 @@ index 2f25723192bb..171a70e310c7 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -72593,10 +66623,6 @@ index 2f25723192bb..171a70e310c7 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -72609,10 +66635,6 @@ index 2f25723192bb..171a70e310c7 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -72643,7 +66665,7 @@ index 2f25723192bb..171a70e310c7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -72730,18 +66752,10 @@ index 2f25723192bb..171a70e310c7 100644
  
  Library("inter_frame_delay_variation_calculator_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
-index 01a5cbfaacb4..8bb43a2f8b3d 100644
+index 9f08b514eb3f..63970d48a4ff 100644
 --- third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -72749,6 +66763,7 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -72757,23 +66772,18 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -72792,10 +66802,6 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -72803,10 +66809,6 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -72814,7 +66816,6 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -72822,10 +66823,6 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -72838,10 +66835,6 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -72879,7 +66872,7 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -72937,10 +66930,10 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -72951,10 +66944,10 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -72966,18 +66959,10 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
  
  Library("jitter_estimator_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
-index 163aec282266..54552a3a74fb 100644
+index 092bdff85b3c..3ec4af4c6cbe 100644
 --- third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -72985,6 +66970,7 @@ index 163aec282266..54552a3a74fb 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -72993,23 +66979,18 @@ index 163aec282266..54552a3a74fb 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -73028,10 +67009,6 @@ index 163aec282266..54552a3a74fb 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73039,10 +67016,6 @@ index 163aec282266..54552a3a74fb 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -73050,7 +67023,6 @@ index 163aec282266..54552a3a74fb 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73058,10 +67030,6 @@ index 163aec282266..54552a3a74fb 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -73074,10 +67042,6 @@ index 163aec282266..54552a3a74fb 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -73108,7 +67072,7 @@ index 163aec282266..54552a3a74fb 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -73195,18 +67159,10 @@ index 163aec282266..54552a3a74fb 100644
  
  Library("rtt_filter_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
-index 7aaf581a3d26..cea6896013de 100644
+index 9de0f87aa8ec..8d9fcf670160 100644
 --- third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -73214,6 +67170,7 @@ index 7aaf581a3d26..cea6896013de 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -73222,23 +67179,18 @@ index 7aaf581a3d26..cea6896013de 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -73257,10 +67209,6 @@ index 7aaf581a3d26..cea6896013de 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73268,10 +67216,6 @@ index 7aaf581a3d26..cea6896013de 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -73279,7 +67223,6 @@ index 7aaf581a3d26..cea6896013de 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73287,10 +67230,6 @@ index 7aaf581a3d26..cea6896013de 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -73303,10 +67242,6 @@ index 7aaf581a3d26..cea6896013de 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -73344,7 +67279,7 @@ index 7aaf581a3d26..cea6896013de 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -73402,10 +67337,10 @@ index 7aaf581a3d26..cea6896013de 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -73416,10 +67351,10 @@ index 7aaf581a3d26..cea6896013de 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -73431,18 +67366,10 @@ index 7aaf581a3d26..cea6896013de 100644
  
  Library("timestamp_extrapolator_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
-index b5d03bf28abf..50b7a418a899 100644
+index 496eb2282038..226b3928e1e8 100644
 --- third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -73450,6 +67377,7 @@ index b5d03bf28abf..50b7a418a899 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -73458,23 +67386,18 @@ index b5d03bf28abf..50b7a418a899 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -73493,10 +67416,6 @@ index b5d03bf28abf..50b7a418a899 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73504,10 +67423,6 @@ index b5d03bf28abf..50b7a418a899 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -73515,7 +67430,6 @@ index b5d03bf28abf..50b7a418a899 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73523,10 +67437,6 @@ index b5d03bf28abf..50b7a418a899 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -73539,10 +67449,6 @@ index b5d03bf28abf..50b7a418a899 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -73580,7 +67486,7 @@ index b5d03bf28abf..50b7a418a899 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -73638,10 +67544,10 @@ index b5d03bf28abf..50b7a418a899 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -73652,10 +67558,10 @@ index b5d03bf28abf..50b7a418a899 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -73667,18 +67573,10 @@ index b5d03bf28abf..50b7a418a899 100644
  
  Library("timing_module_gn")
 diff --git third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
-index f290fb2a0fff..55937e920a1b 100644
+index a39517365ba9..49f00b43c0d7 100644
 --- third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -73686,6 +67584,7 @@ index f290fb2a0fff..55937e920a1b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -73694,23 +67593,18 @@ index f290fb2a0fff..55937e920a1b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,114 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -73729,10 +67623,6 @@ index f290fb2a0fff..55937e920a1b 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73740,10 +67630,6 @@ index f290fb2a0fff..55937e920a1b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -73751,7 +67637,6 @@ index f290fb2a0fff..55937e920a1b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73759,10 +67644,6 @@ index f290fb2a0fff..55937e920a1b 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -73775,10 +67656,6 @@ index f290fb2a0fff..55937e920a1b 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -73816,7 +67693,7 @@ index f290fb2a0fff..55937e920a1b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -163,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -73874,10 +67751,10 @@ index f290fb2a0fff..55937e920a1b 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -73888,10 +67765,10 @@ index f290fb2a0fff..55937e920a1b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -73903,18 +67780,10 @@ index f290fb2a0fff..55937e920a1b 100644
  
  Library("video_codec_interface_gn")
 diff --git third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
-index 11ecb8ae48e1..e3b395a01ef8 100644
+index 44792bb4ce07..2fc63265c596 100644
 --- third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -73922,6 +67791,7 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -73930,23 +67800,18 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -59,115 +72,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -59,94 +68,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -73966,10 +67831,6 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73977,10 +67838,6 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -73988,7 +67845,6 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73996,10 +67852,6 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -74012,10 +67864,6 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -74053,7 +67901,7 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -175,82 +80,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -154,82 +76,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -74111,10 +67959,10 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -74125,10 +67973,10 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -74140,18 +67988,10 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
  
  Library("video_coding_gn")
 diff --git third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
-index 23978645a548..745135543e16 100644
+index 3942f92586f6..0636656c36d1 100644
 --- third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -74159,6 +67999,7 @@ index 23978645a548..745135543e16 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -74167,23 +68008,18 @@ index 23978645a548..745135543e16 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -58,115 +71,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -58,94 +67,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -74203,10 +68039,6 @@ index 23978645a548..745135543e16 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -74214,10 +68046,6 @@ index 23978645a548..745135543e16 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -74225,7 +68053,6 @@ index 23978645a548..745135543e16 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -74233,10 +68060,6 @@ index 23978645a548..745135543e16 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -74249,10 +68072,6 @@ index 23978645a548..745135543e16 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -74290,7 +68109,7 @@ index 23978645a548..745135543e16 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -174,82 +79,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -153,82 +75,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -74348,10 +68167,10 @@ index 23978645a548..745135543e16 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -74362,10 +68181,10 @@ index 23978645a548..745135543e16 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -74377,18 +68196,10 @@ index 23978645a548..745135543e16 100644
  
  Library("video_coding_utility_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
-index e7966f60377b..e23460458ed9 100644
+index 17a993bfc02c..aa23c6c09134 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -74396,6 +68207,7 @@ index e7966f60377b..e23460458ed9 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -74404,23 +68216,18 @@ index e7966f60377b..e23460458ed9 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -51,115 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,94 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -74440,10 +68247,6 @@ index e7966f60377b..e23460458ed9 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -74451,10 +68254,6 @@ index e7966f60377b..e23460458ed9 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -74462,7 +68261,6 @@ index e7966f60377b..e23460458ed9 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -74470,10 +68268,6 @@ index e7966f60377b..e23460458ed9 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -74486,10 +68280,6 @@ index e7966f60377b..e23460458ed9 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -74527,7 +68317,7 @@ index e7966f60377b..e23460458ed9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -167,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -146,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -74585,10 +68375,10 @@ index e7966f60377b..e23460458ed9 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -74599,10 +68389,10 @@ index e7966f60377b..e23460458ed9 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -74614,18 +68404,10 @@ index e7966f60377b..e23460458ed9 100644
  
  Library("webrtc_h264_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
-index d71a26d07efc..013d0af5e8f4 100644
+index 1646d8078da0..a96575721cb6 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
-@@ -12,16 +12,29 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,12 +16,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -74633,6 +68415,7 @@ index d71a26d07efc..013d0af5e8f4 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -74641,23 +68424,18 @@ index d71a26d07efc..013d0af5e8f4 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,107 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,86 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -74676,10 +68454,6 @@ index d71a26d07efc..013d0af5e8f4 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -74687,10 +68461,6 @@ index d71a26d07efc..013d0af5e8f4 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -74698,7 +68468,6 @@ index d71a26d07efc..013d0af5e8f4 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -74706,10 +68475,6 @@ index d71a26d07efc..013d0af5e8f4 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -74722,10 +68487,6 @@ index d71a26d07efc..013d0af5e8f4 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -74756,7 +68517,7 @@ index d71a26d07efc..013d0af5e8f4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -157,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -74843,18 +68604,10 @@ index d71a26d07efc..013d0af5e8f4 100644
  
  Library("webrtc_libvpx_interface_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-index c19e440232b4..e826bc9f0596 100644
+index 0fc3d55cad43..9ed831f4be8b 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-@@ -12,16 +12,29 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,12 +16,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -74862,6 +68615,7 @@ index c19e440232b4..e826bc9f0596 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -74870,23 +68624,18 @@ index c19e440232b4..e826bc9f0596 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -52,115 +65,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,94 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -74906,10 +68655,6 @@ index c19e440232b4..e826bc9f0596 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -74917,10 +68662,6 @@ index c19e440232b4..e826bc9f0596 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -74928,7 +68669,6 @@ index c19e440232b4..e826bc9f0596 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -74936,10 +68676,6 @@ index c19e440232b4..e826bc9f0596 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -74952,10 +68688,6 @@ index c19e440232b4..e826bc9f0596 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -74993,7 +68725,7 @@ index c19e440232b4..e826bc9f0596 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -168,82 +73,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -147,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -75051,10 +68783,10 @@ index c19e440232b4..e826bc9f0596 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -75065,10 +68797,10 @@ index c19e440232b4..e826bc9f0596 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -75080,18 +68812,10 @@ index c19e440232b4..e826bc9f0596 100644
  
  Library("webrtc_vp8_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
-index 731d28fe29fa..8771b6cfa66b 100644
+index 264dd08bc9a5..b0719d66ae1f 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -75099,6 +68823,7 @@ index 731d28fe29fa..8771b6cfa66b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -75107,23 +68832,18 @@ index 731d28fe29fa..8771b6cfa66b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -75142,10 +68862,6 @@ index 731d28fe29fa..8771b6cfa66b 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -75153,10 +68869,6 @@ index 731d28fe29fa..8771b6cfa66b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -75164,7 +68876,6 @@ index 731d28fe29fa..8771b6cfa66b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -75172,10 +68883,6 @@ index 731d28fe29fa..8771b6cfa66b 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -75188,10 +68895,6 @@ index 731d28fe29fa..8771b6cfa66b 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -75222,7 +68925,7 @@ index 731d28fe29fa..8771b6cfa66b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -75309,18 +69012,10 @@ index 731d28fe29fa..8771b6cfa66b 100644
  
  Library("webrtc_vp8_scalability_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
-index e9f43541065d..347db215e01d 100644
+index c3f86866b4e4..940bd6044109 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -75328,6 +69023,7 @@ index e9f43541065d..347db215e01d 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -75336,23 +69032,18 @@ index e9f43541065d..347db215e01d 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -51,115 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,94 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -75372,10 +69063,6 @@ index e9f43541065d..347db215e01d 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -75383,10 +69070,6 @@ index e9f43541065d..347db215e01d 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -75394,7 +69077,6 @@ index e9f43541065d..347db215e01d 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -75402,10 +69084,6 @@ index e9f43541065d..347db215e01d 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -75418,10 +69096,6 @@ index e9f43541065d..347db215e01d 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -75459,7 +69133,7 @@ index e9f43541065d..347db215e01d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -167,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -146,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -75517,10 +69191,10 @@ index e9f43541065d..347db215e01d 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -75531,10 +69205,10 @@ index e9f43541065d..347db215e01d 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -75546,18 +69220,10 @@ index e9f43541065d..347db215e01d 100644
  
  Library("webrtc_vp8_temporal_layers_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-index c428c10ef3b6..0d272d5b971a 100644
+index 92d397f83465..c72091405763 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-@@ -12,16 +12,29 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,12 +16,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -75565,6 +69231,7 @@ index c428c10ef3b6..0d272d5b971a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -75573,23 +69240,18 @@ index c428c10ef3b6..0d272d5b971a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -54,115 +67,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,94 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -75609,10 +69271,6 @@ index c428c10ef3b6..0d272d5b971a 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -75620,10 +69278,6 @@ index c428c10ef3b6..0d272d5b971a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -75631,7 +69285,6 @@ index c428c10ef3b6..0d272d5b971a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -75639,10 +69292,6 @@ index c428c10ef3b6..0d272d5b971a 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -75655,10 +69304,6 @@ index c428c10ef3b6..0d272d5b971a 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -75696,7 +69341,7 @@ index c428c10ef3b6..0d272d5b971a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -170,82 +75,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -149,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -75754,10 +69399,10 @@ index c428c10ef3b6..0d272d5b971a 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -75768,10 +69413,10 @@ index c428c10ef3b6..0d272d5b971a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -75783,18 +69428,10 @@ index c428c10ef3b6..0d272d5b971a 100644
  
  Library("webrtc_vp9_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
-index b2f437e70e0e..4775059772a4 100644
+index efec0c59e146..c41bffcdf583 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -75802,6 +69439,7 @@ index b2f437e70e0e..4775059772a4 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -75810,23 +69448,18 @@ index b2f437e70e0e..4775059772a4 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -75845,10 +69478,6 @@ index b2f437e70e0e..4775059772a4 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -75856,10 +69485,6 @@ index b2f437e70e0e..4775059772a4 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -75867,7 +69492,6 @@ index b2f437e70e0e..4775059772a4 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -75875,10 +69499,6 @@ index b2f437e70e0e..4775059772a4 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -75891,10 +69511,6 @@ index b2f437e70e0e..4775059772a4 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -75932,7 +69548,7 @@ index b2f437e70e0e..4775059772a4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -75990,10 +69606,10 @@ index b2f437e70e0e..4775059772a4 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -76004,10 +69620,10 @@ index b2f437e70e0e..4775059772a4 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -76019,10 +69635,10 @@ index b2f437e70e0e..4775059772a4 100644
  
  Library("webrtc_vp9_helpers_gn")
 diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build
-index bf06d4c2bb47..93a8e11a140e 100644
+index a91b2002fc6f..7795b213903b 100644
 --- third_party/libwebrtc/moz.build
 +++ third_party/libwebrtc/moz.build
-@@ -291,6 +291,8 @@ DIRS += [
+@@ -292,6 +292,8 @@ DIRS += [
      "/third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn",
      "/third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn",
      "/third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn",
@@ -76031,7 +69647,7 @@ index bf06d4c2bb47..93a8e11a140e 100644
      "/third_party/libwebrtc/modules/module_api_gn",
      "/third_party/libwebrtc/modules/module_api_public_gn",
      "/third_party/libwebrtc/modules/module_fec_api_gn",
-@@ -516,138 +518,30 @@ DIRS += [
+@@ -517,138 +519,30 @@ DIRS += [
      "/third_party/libwebrtc/webrtc_gn"
  ]
  
@@ -76174,7 +69790,7 @@ index bf06d4c2bb47..93a8e11a140e 100644
  
      DIRS += [
          "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
-@@ -655,13 +549,11 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -656,13 +550,11 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
          "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
          "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
          "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
@@ -76189,7 +69805,7 @@ index bf06d4c2bb47..93a8e11a140e 100644
  
      DIRS += [
          "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
-@@ -669,73 +561,6 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+@@ -670,73 +562,6 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
          "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
          "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
          "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
@@ -76264,7 +69880,7 @@ index bf06d4c2bb47..93a8e11a140e 100644
 -        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
 -    ]
 diff --git third_party/libwebrtc/net/dcsctp/common/internal_types_gn/moz.build third_party/libwebrtc/net/dcsctp/common/internal_types_gn/moz.build
-index e948e7063568..cb82eed45dbd 100644
+index a2ef7098a26f..1e8a475473f4 100644
 --- third_party/libwebrtc/net/dcsctp/common/internal_types_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/common/internal_types_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -76275,6 +69891,7 @@ index e948e7063568..cb82eed45dbd 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -76283,13 +69900,12 @@ index e948e7063568..cb82eed45dbd 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76328,7 +69944,6 @@ index e948e7063568..cb82eed45dbd 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -76378,7 +69993,7 @@ index e948e7063568..cb82eed45dbd 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -76404,7 +70019,7 @@ index e948e7063568..cb82eed45dbd 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -76446,7 +70061,7 @@ index e948e7063568..cb82eed45dbd 100644
 -
  Library("internal_types_gn")
 diff --git third_party/libwebrtc/net/dcsctp/common/math_gn/moz.build third_party/libwebrtc/net/dcsctp/common/math_gn/moz.build
-index fb147e0954d8..7cf07c682496 100644
+index 6be46fd27bf6..400de7c7e0e2 100644
 --- third_party/libwebrtc/net/dcsctp/common/math_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/common/math_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -76457,6 +70072,7 @@ index fb147e0954d8..7cf07c682496 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -76465,13 +70081,12 @@ index fb147e0954d8..7cf07c682496 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76506,7 +70121,6 @@ index fb147e0954d8..7cf07c682496 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -76556,7 +70170,7 @@ index fb147e0954d8..7cf07c682496 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -76582,7 +70196,7 @@ index fb147e0954d8..7cf07c682496 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -76624,7 +70238,7 @@ index fb147e0954d8..7cf07c682496 100644
 -
  Library("math_gn")
 diff --git third_party/libwebrtc/net/dcsctp/common/sequence_numbers_gn/moz.build third_party/libwebrtc/net/dcsctp/common/sequence_numbers_gn/moz.build
-index 345f7a7a11dd..9059a5797011 100644
+index 4a44c05a257b..c073abe0d419 100644
 --- third_party/libwebrtc/net/dcsctp/common/sequence_numbers_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/common/sequence_numbers_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -76635,6 +70249,7 @@ index 345f7a7a11dd..9059a5797011 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -76643,13 +70258,12 @@ index 345f7a7a11dd..9059a5797011 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76688,7 +70302,6 @@ index 345f7a7a11dd..9059a5797011 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -76738,7 +70351,7 @@ index 345f7a7a11dd..9059a5797011 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -76764,7 +70377,7 @@ index 345f7a7a11dd..9059a5797011 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -76806,7 +70419,7 @@ index 345f7a7a11dd..9059a5797011 100644
 -
  Library("sequence_numbers_gn")
 diff --git third_party/libwebrtc/net/dcsctp/packet/bounded_io_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/bounded_io_gn/moz.build
-index f17dec091b41..61070979f313 100644
+index 35f9304a8ad6..9bc9113555e5 100644
 --- third_party/libwebrtc/net/dcsctp/packet/bounded_io_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/packet/bounded_io_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -76817,6 +70430,7 @@ index f17dec091b41..61070979f313 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -76825,13 +70439,12 @@ index f17dec091b41..61070979f313 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76870,7 +70483,6 @@ index f17dec091b41..61070979f313 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -76920,7 +70532,7 @@ index f17dec091b41..61070979f313 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -76946,7 +70558,7 @@ index f17dec091b41..61070979f313 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -76988,18 +70600,10 @@ index f17dec091b41..61070979f313 100644
 -
  Library("bounded_io_gn")
 diff --git third_party/libwebrtc/net/dcsctp/packet/chunk_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/chunk_gn/moz.build
-index 32a1cdfe66a6..6e89be08d86f 100644
+index 24a6a24e0850..21dfb53299c9 100644
 --- third_party/libwebrtc/net/dcsctp/packet/chunk_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/packet/chunk_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -77007,6 +70611,7 @@ index 32a1cdfe66a6..6e89be08d86f 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -77015,23 +70620,18 @@ index 32a1cdfe66a6..6e89be08d86f 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -63,114 +76,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -63,93 +72,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -77050,10 +70650,6 @@ index 32a1cdfe66a6..6e89be08d86f 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -77061,10 +70657,6 @@ index 32a1cdfe66a6..6e89be08d86f 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -77072,7 +70664,6 @@ index 32a1cdfe66a6..6e89be08d86f 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -77080,10 +70671,6 @@ index 32a1cdfe66a6..6e89be08d86f 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -77096,10 +70683,6 @@ index 32a1cdfe66a6..6e89be08d86f 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -77137,7 +70720,7 @@ index 32a1cdfe66a6..6e89be08d86f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -178,82 +84,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -157,82 +80,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -77195,10 +70778,10 @@ index 32a1cdfe66a6..6e89be08d86f 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -77209,10 +70792,10 @@ index 32a1cdfe66a6..6e89be08d86f 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -77224,18 +70807,10 @@ index 32a1cdfe66a6..6e89be08d86f 100644
  
  Library("chunk_gn")
 diff --git third_party/libwebrtc/net/dcsctp/packet/chunk_validators_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/chunk_validators_gn/moz.build
-index f303325e987b..f4e26f620052 100644
+index 9f8072ccbb75..7af95f92aa07 100644
 --- third_party/libwebrtc/net/dcsctp/packet/chunk_validators_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/packet/chunk_validators_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -77243,6 +70818,7 @@ index f303325e987b..f4e26f620052 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -77251,23 +70827,18 @@ index f303325e987b..f4e26f620052 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -77286,10 +70857,6 @@ index f303325e987b..f4e26f620052 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -77297,10 +70864,6 @@ index f303325e987b..f4e26f620052 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -77308,7 +70871,6 @@ index f303325e987b..f4e26f620052 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -77316,10 +70878,6 @@ index f303325e987b..f4e26f620052 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -77332,10 +70890,6 @@ index f303325e987b..f4e26f620052 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -77373,7 +70927,7 @@ index f303325e987b..f4e26f620052 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -77431,10 +70985,10 @@ index f303325e987b..f4e26f620052 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -77445,10 +70999,10 @@ index f303325e987b..f4e26f620052 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -77460,18 +71014,10 @@ index f303325e987b..f4e26f620052 100644
  
  Library("chunk_validators_gn")
 diff --git third_party/libwebrtc/net/dcsctp/packet/crc32c_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/crc32c_gn/moz.build
-index b3453a6570d4..db239f833136 100644
+index 5d73b1db51a4..b41b8efa0ee2 100644
 --- third_party/libwebrtc/net/dcsctp/packet/crc32c_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/packet/crc32c_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -77479,6 +71025,7 @@ index b3453a6570d4..db239f833136 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -77487,23 +71034,18 @@ index b3453a6570d4..db239f833136 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -77522,10 +71064,6 @@ index b3453a6570d4..db239f833136 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -77533,10 +71071,6 @@ index b3453a6570d4..db239f833136 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -77544,7 +71078,6 @@ index b3453a6570d4..db239f833136 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -77552,10 +71085,6 @@ index b3453a6570d4..db239f833136 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -77568,10 +71097,6 @@ index b3453a6570d4..db239f833136 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -77602,7 +71127,7 @@ index b3453a6570d4..db239f833136 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -77689,7 +71214,7 @@ index b3453a6570d4..db239f833136 100644
  
  Library("crc32c_gn")
 diff --git third_party/libwebrtc/net/dcsctp/packet/data_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/data_gn/moz.build
-index 3ef5d5be2245..b91e78705eae 100644
+index 1c7b585c2926..6c8a16c55f90 100644
 --- third_party/libwebrtc/net/dcsctp/packet/data_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/packet/data_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -77700,6 +71225,7 @@ index 3ef5d5be2245..b91e78705eae 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -77708,13 +71234,12 @@ index 3ef5d5be2245..b91e78705eae 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77753,7 +71278,6 @@ index 3ef5d5be2245..b91e78705eae 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -77803,7 +71327,7 @@ index 3ef5d5be2245..b91e78705eae 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -77829,7 +71353,7 @@ index 3ef5d5be2245..b91e78705eae 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -77871,18 +71395,10 @@ index 3ef5d5be2245..b91e78705eae 100644
 -
  Library("data_gn")
 diff --git third_party/libwebrtc/net/dcsctp/packet/error_cause_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/error_cause_gn/moz.build
-index 1d3785220850..ec47f54be732 100644
+index b905fa35f1fe..0746b390cdbd 100644
 --- third_party/libwebrtc/net/dcsctp/packet/error_cause_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/packet/error_cause_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -77890,6 +71406,7 @@ index 1d3785220850..ec47f54be732 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -77898,23 +71415,18 @@ index 1d3785220850..ec47f54be732 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -59,114 +72,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -59,93 +68,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -77933,10 +71445,6 @@ index 1d3785220850..ec47f54be732 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -77944,10 +71452,6 @@ index 1d3785220850..ec47f54be732 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -77955,7 +71459,6 @@ index 1d3785220850..ec47f54be732 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -77963,10 +71466,6 @@ index 1d3785220850..ec47f54be732 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -77979,10 +71478,6 @@ index 1d3785220850..ec47f54be732 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -78020,7 +71515,7 @@ index 1d3785220850..ec47f54be732 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -174,82 +80,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -153,82 +76,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -78078,10 +71573,10 @@ index 1d3785220850..ec47f54be732 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -78092,10 +71587,10 @@ index 1d3785220850..ec47f54be732 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -78107,18 +71602,10 @@ index 1d3785220850..ec47f54be732 100644
  
  Library("error_cause_gn")
 diff --git third_party/libwebrtc/net/dcsctp/packet/parameter_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/parameter_gn/moz.build
-index e5a260ffa359..4a9be3392a92 100644
+index 287f439c6c0f..a7fcad364e6e 100644
 --- third_party/libwebrtc/net/dcsctp/packet/parameter_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/packet/parameter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -78126,6 +71613,7 @@ index e5a260ffa359..4a9be3392a92 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -78134,23 +71622,18 @@ index e5a260ffa359..4a9be3392a92 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -57,114 +70,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -57,93 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -78169,10 +71652,6 @@ index e5a260ffa359..4a9be3392a92 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -78180,10 +71659,6 @@ index e5a260ffa359..4a9be3392a92 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -78191,7 +71666,6 @@ index e5a260ffa359..4a9be3392a92 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -78199,10 +71673,6 @@ index e5a260ffa359..4a9be3392a92 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -78215,10 +71685,6 @@ index e5a260ffa359..4a9be3392a92 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -78256,7 +71722,7 @@ index e5a260ffa359..4a9be3392a92 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -172,82 +78,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -151,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -78314,10 +71780,10 @@ index e5a260ffa359..4a9be3392a92 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -78328,10 +71794,10 @@ index e5a260ffa359..4a9be3392a92 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -78343,18 +71809,10 @@ index e5a260ffa359..4a9be3392a92 100644
  
  Library("parameter_gn")
 diff --git third_party/libwebrtc/net/dcsctp/packet/sctp_packet_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/sctp_packet_gn/moz.build
-index 497644154760..c751dbbcf49b 100644
+index 58f18e34123b..d40508c6cbb6 100644
 --- third_party/libwebrtc/net/dcsctp/packet/sctp_packet_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/packet/sctp_packet_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -78362,6 +71820,7 @@ index 497644154760..c751dbbcf49b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -78370,23 +71829,18 @@ index 497644154760..c751dbbcf49b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -78405,10 +71859,6 @@ index 497644154760..c751dbbcf49b 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -78416,10 +71866,6 @@ index 497644154760..c751dbbcf49b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -78427,7 +71873,6 @@ index 497644154760..c751dbbcf49b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -78435,10 +71880,6 @@ index 497644154760..c751dbbcf49b 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -78451,10 +71892,6 @@ index 497644154760..c751dbbcf49b 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -78492,7 +71929,7 @@ index 497644154760..c751dbbcf49b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -78550,10 +71987,10 @@ index 497644154760..c751dbbcf49b 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -78564,10 +72001,10 @@ index 497644154760..c751dbbcf49b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -78579,18 +72016,10 @@ index 497644154760..c751dbbcf49b 100644
  
  Library("sctp_packet_gn")
 diff --git third_party/libwebrtc/net/dcsctp/packet/tlv_trait_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/tlv_trait_gn/moz.build
-index 64e98c0ca8fb..3d1be257fd74 100644
+index 102e2a7ffedc..01ec317b6b9e 100644
 --- third_party/libwebrtc/net/dcsctp/packet/tlv_trait_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/packet/tlv_trait_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -78598,6 +72027,7 @@ index 64e98c0ca8fb..3d1be257fd74 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -78606,23 +72036,18 @@ index 64e98c0ca8fb..3d1be257fd74 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -78641,10 +72066,6 @@ index 64e98c0ca8fb..3d1be257fd74 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -78652,10 +72073,6 @@ index 64e98c0ca8fb..3d1be257fd74 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -78663,7 +72080,6 @@ index 64e98c0ca8fb..3d1be257fd74 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -78671,10 +72087,6 @@ index 64e98c0ca8fb..3d1be257fd74 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -78687,10 +72099,6 @@ index 64e98c0ca8fb..3d1be257fd74 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -78728,7 +72136,7 @@ index 64e98c0ca8fb..3d1be257fd74 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -78786,10 +72194,10 @@ index 64e98c0ca8fb..3d1be257fd74 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -78800,10 +72208,10 @@ index 64e98c0ca8fb..3d1be257fd74 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -78815,18 +72223,10 @@ index 64e98c0ca8fb..3d1be257fd74 100644
  
  Library("tlv_trait_gn")
 diff --git third_party/libwebrtc/net/dcsctp/public/factory_gn/moz.build third_party/libwebrtc/net/dcsctp/public/factory_gn/moz.build
-index 5afb501a0c06..d9b4e05ede8e 100644
+index ec8ad25e6576..88e84b3e84a8 100644
 --- third_party/libwebrtc/net/dcsctp/public/factory_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/public/factory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -78834,6 +72234,7 @@ index 5afb501a0c06..d9b4e05ede8e 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -78842,23 +72243,18 @@ index 5afb501a0c06..d9b4e05ede8e 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -78877,10 +72273,6 @@ index 5afb501a0c06..d9b4e05ede8e 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -78888,10 +72280,6 @@ index 5afb501a0c06..d9b4e05ede8e 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -78899,7 +72287,6 @@ index 5afb501a0c06..d9b4e05ede8e 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -78907,10 +72294,6 @@ index 5afb501a0c06..d9b4e05ede8e 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -78923,10 +72306,6 @@ index 5afb501a0c06..d9b4e05ede8e 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -78964,7 +72343,7 @@ index 5afb501a0c06..d9b4e05ede8e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -79022,10 +72401,10 @@ index 5afb501a0c06..d9b4e05ede8e 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -79036,10 +72415,10 @@ index 5afb501a0c06..d9b4e05ede8e 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -79051,18 +72430,10 @@ index 5afb501a0c06..d9b4e05ede8e 100644
  
  Library("factory_gn")
 diff --git third_party/libwebrtc/net/dcsctp/public/socket_gn/moz.build third_party/libwebrtc/net/dcsctp/public/socket_gn/moz.build
-index 2ceda860f068..f857b7e881b6 100644
+index f6bde482dd40..db4159f8c467 100644
 --- third_party/libwebrtc/net/dcsctp/public/socket_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/public/socket_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -79070,6 +72441,7 @@ index 2ceda860f068..f857b7e881b6 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -79078,23 +72450,18 @@ index 2ceda860f068..f857b7e881b6 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -79113,10 +72480,6 @@ index 2ceda860f068..f857b7e881b6 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -79124,10 +72487,6 @@ index 2ceda860f068..f857b7e881b6 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -79135,7 +72494,6 @@ index 2ceda860f068..f857b7e881b6 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -79143,10 +72501,6 @@ index 2ceda860f068..f857b7e881b6 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -79159,10 +72513,6 @@ index 2ceda860f068..f857b7e881b6 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -79193,7 +72543,7 @@ index 2ceda860f068..f857b7e881b6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -79280,7 +72630,7 @@ index 2ceda860f068..f857b7e881b6 100644
  
  Library("socket_gn")
 diff --git third_party/libwebrtc/net/dcsctp/public/types_gn/moz.build third_party/libwebrtc/net/dcsctp/public/types_gn/moz.build
-index 084e64708b47..e2eaa506a512 100644
+index ec5c0d8b1d8e..b63c73c26ce7 100644
 --- third_party/libwebrtc/net/dcsctp/public/types_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/public/types_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -79291,6 +72641,7 @@ index 084e64708b47..e2eaa506a512 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -79299,13 +72650,12 @@ index 084e64708b47..e2eaa506a512 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79344,7 +72694,6 @@ index 084e64708b47..e2eaa506a512 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -79394,7 +72743,7 @@ index 084e64708b47..e2eaa506a512 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -79420,7 +72769,7 @@ index 084e64708b47..e2eaa506a512 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -79462,18 +72811,10 @@ index 084e64708b47..e2eaa506a512 100644
 -
  Library("types_gn")
 diff --git third_party/libwebrtc/net/dcsctp/rx/data_tracker_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/data_tracker_gn/moz.build
-index bb12bb01f5b3..7be6e26f56f8 100644
+index 2f36a17ef96e..42cdf1668378 100644
 --- third_party/libwebrtc/net/dcsctp/rx/data_tracker_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/rx/data_tracker_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -79481,6 +72822,7 @@ index bb12bb01f5b3..7be6e26f56f8 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -79489,23 +72831,18 @@ index bb12bb01f5b3..7be6e26f56f8 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -79524,10 +72861,6 @@ index bb12bb01f5b3..7be6e26f56f8 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -79535,10 +72868,6 @@ index bb12bb01f5b3..7be6e26f56f8 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -79546,7 +72875,6 @@ index bb12bb01f5b3..7be6e26f56f8 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -79554,10 +72882,6 @@ index bb12bb01f5b3..7be6e26f56f8 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -79570,10 +72894,6 @@ index bb12bb01f5b3..7be6e26f56f8 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -79611,7 +72931,7 @@ index bb12bb01f5b3..7be6e26f56f8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -79669,10 +72989,10 @@ index bb12bb01f5b3..7be6e26f56f8 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -79683,10 +73003,10 @@ index bb12bb01f5b3..7be6e26f56f8 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -79698,18 +73018,10 @@ index bb12bb01f5b3..7be6e26f56f8 100644
  
  Library("data_tracker_gn")
 diff --git third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams_gn/moz.build
-index 7379d0595fd1..29075c722d09 100644
+index 01fdbebef3f1..78750a2c45d7 100644
 --- third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -79717,6 +73029,7 @@ index 7379d0595fd1..29075c722d09 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -79725,23 +73038,18 @@ index 7379d0595fd1..29075c722d09 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -79760,10 +73068,6 @@ index 7379d0595fd1..29075c722d09 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -79771,10 +73075,6 @@ index 7379d0595fd1..29075c722d09 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -79782,7 +73082,6 @@ index 7379d0595fd1..29075c722d09 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -79790,10 +73089,6 @@ index 7379d0595fd1..29075c722d09 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -79806,10 +73101,6 @@ index 7379d0595fd1..29075c722d09 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -79847,7 +73138,7 @@ index 7379d0595fd1..29075c722d09 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -79905,10 +73196,10 @@ index 7379d0595fd1..29075c722d09 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -79919,10 +73210,10 @@ index 7379d0595fd1..29075c722d09 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -79934,18 +73225,10 @@ index 7379d0595fd1..29075c722d09 100644
  
  Library("interleaved_reassembly_streams_gn")
 diff --git third_party/libwebrtc/net/dcsctp/rx/reassembly_queue_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/reassembly_queue_gn/moz.build
-index f0f07f920293..ee0b8fa5952b 100644
+index abb5e61463bb..ca8b574b754c 100644
 --- third_party/libwebrtc/net/dcsctp/rx/reassembly_queue_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/rx/reassembly_queue_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -79953,6 +73236,7 @@ index f0f07f920293..ee0b8fa5952b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -79961,23 +73245,18 @@ index f0f07f920293..ee0b8fa5952b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -79996,10 +73275,6 @@ index f0f07f920293..ee0b8fa5952b 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -80007,10 +73282,6 @@ index f0f07f920293..ee0b8fa5952b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -80018,7 +73289,6 @@ index f0f07f920293..ee0b8fa5952b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -80026,10 +73296,6 @@ index f0f07f920293..ee0b8fa5952b 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -80042,10 +73308,6 @@ index f0f07f920293..ee0b8fa5952b 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -80083,7 +73345,7 @@ index f0f07f920293..ee0b8fa5952b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -80141,10 +73403,10 @@ index f0f07f920293..ee0b8fa5952b 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -80155,10 +73417,10 @@ index f0f07f920293..ee0b8fa5952b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -80170,7 +73432,7 @@ index f0f07f920293..ee0b8fa5952b 100644
  
  Library("reassembly_queue_gn")
 diff --git third_party/libwebrtc/net/dcsctp/rx/reassembly_streams_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/reassembly_streams_gn/moz.build
-index 5057e44341e3..8c1f046755a3 100644
+index 5c644b5665bd..d1b59bdd2da1 100644
 --- third_party/libwebrtc/net/dcsctp/rx/reassembly_streams_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/rx/reassembly_streams_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -80181,6 +73443,7 @@ index 5057e44341e3..8c1f046755a3 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -80189,13 +73452,12 @@ index 5057e44341e3..8c1f046755a3 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80234,7 +73496,6 @@ index 5057e44341e3..8c1f046755a3 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -80291,7 +73552,7 @@ index 5057e44341e3..8c1f046755a3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -80317,7 +73578,7 @@ index 5057e44341e3..8c1f046755a3 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -80359,18 +73620,10 @@ index 5057e44341e3..8c1f046755a3 100644
 -
  Library("reassembly_streams_gn")
 diff --git third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams_gn/moz.build
-index a2c6dca5eb60..80e4fb36c493 100644
+index b60265ff2dec..10b2024e6c32 100644
 --- third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -80378,6 +73631,7 @@ index a2c6dca5eb60..80e4fb36c493 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -80386,23 +73640,18 @@ index a2c6dca5eb60..80e4fb36c493 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -80421,10 +73670,6 @@ index a2c6dca5eb60..80e4fb36c493 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -80432,10 +73677,6 @@ index a2c6dca5eb60..80e4fb36c493 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -80443,7 +73684,6 @@ index a2c6dca5eb60..80e4fb36c493 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -80451,10 +73691,6 @@ index a2c6dca5eb60..80e4fb36c493 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -80467,10 +73703,6 @@ index a2c6dca5eb60..80e4fb36c493 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -80508,7 +73740,7 @@ index a2c6dca5eb60..80e4fb36c493 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -80566,10 +73798,10 @@ index a2c6dca5eb60..80e4fb36c493 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -80580,10 +73812,10 @@ index a2c6dca5eb60..80e4fb36c493 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -80595,7 +73827,7 @@ index a2c6dca5eb60..80e4fb36c493 100644
  
  Library("traditional_reassembly_streams_gn")
 diff --git third_party/libwebrtc/net/dcsctp/socket/context_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/context_gn/moz.build
-index c1b83a46abe3..14cd41f96e4f 100644
+index c5353dc2fcc8..34abeccb759b 100644
 --- third_party/libwebrtc/net/dcsctp/socket/context_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/socket/context_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -80606,6 +73838,7 @@ index c1b83a46abe3..14cd41f96e4f 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -80614,13 +73847,12 @@ index c1b83a46abe3..14cd41f96e4f 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80659,7 +73891,6 @@ index c1b83a46abe3..14cd41f96e4f 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -80716,7 +73947,7 @@ index c1b83a46abe3..14cd41f96e4f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -80742,7 +73973,7 @@ index c1b83a46abe3..14cd41f96e4f 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -80784,18 +74015,10 @@ index c1b83a46abe3..14cd41f96e4f 100644
 -
  Library("context_gn")
 diff --git third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_gn/moz.build
-index 29a04e5ca135..0cf2728346df 100644
+index bc87aa461b0d..4ae0b2d6bff5 100644
 --- third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -80803,6 +74026,7 @@ index 29a04e5ca135..0cf2728346df 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -80811,23 +74035,18 @@ index 29a04e5ca135..0cf2728346df 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,114 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -80846,10 +74065,6 @@ index 29a04e5ca135..0cf2728346df 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -80857,10 +74072,6 @@ index 29a04e5ca135..0cf2728346df 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -80868,7 +74079,6 @@ index 29a04e5ca135..0cf2728346df 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -80876,10 +74086,6 @@ index 29a04e5ca135..0cf2728346df 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -80892,10 +74098,6 @@ index 29a04e5ca135..0cf2728346df 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -80933,7 +74135,7 @@ index 29a04e5ca135..0cf2728346df 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -163,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -80991,10 +74193,10 @@ index 29a04e5ca135..0cf2728346df 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -81005,10 +74207,10 @@ index 29a04e5ca135..0cf2728346df 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -81020,18 +74222,10 @@ index 29a04e5ca135..0cf2728346df 100644
  
  Library("dcsctp_socket_gn")
 diff --git third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler_gn/moz.build
-index 66c34162b8dc..fdf1bbb890a5 100644
+index 4106ee13d217..a3f8705427b1 100644
 --- third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -81039,6 +74233,7 @@ index 66c34162b8dc..fdf1bbb890a5 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -81047,23 +74242,18 @@ index 66c34162b8dc..fdf1bbb890a5 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -81082,10 +74272,6 @@ index 66c34162b8dc..fdf1bbb890a5 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -81093,10 +74279,6 @@ index 66c34162b8dc..fdf1bbb890a5 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -81104,7 +74286,6 @@ index 66c34162b8dc..fdf1bbb890a5 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -81112,10 +74293,6 @@ index 66c34162b8dc..fdf1bbb890a5 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -81128,10 +74305,6 @@ index 66c34162b8dc..fdf1bbb890a5 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -81169,7 +74342,7 @@ index 66c34162b8dc..fdf1bbb890a5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -81227,10 +74400,10 @@ index 66c34162b8dc..fdf1bbb890a5 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -81241,10 +74414,10 @@ index 66c34162b8dc..fdf1bbb890a5 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -81256,18 +74429,10 @@ index 66c34162b8dc..fdf1bbb890a5 100644
  
  Library("heartbeat_handler_gn")
 diff --git third_party/libwebrtc/net/dcsctp/socket/packet_sender_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/packet_sender_gn/moz.build
-index 00f7f6e1def2..c31b3ee4cc2d 100644
+index c900f2fd9491..70830cfb07de 100644
 --- third_party/libwebrtc/net/dcsctp/socket/packet_sender_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/socket/packet_sender_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -81275,6 +74440,7 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -81283,23 +74449,18 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -81318,10 +74479,6 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -81329,10 +74486,6 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -81340,7 +74493,6 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -81348,10 +74500,6 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -81364,10 +74512,6 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -81405,7 +74549,7 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -81463,10 +74607,10 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -81477,10 +74621,10 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -81492,18 +74636,10 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
  
  Library("packet_sender_gn")
 diff --git third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler_gn/moz.build
-index 3b8899da3266..5532a14e5bda 100644
+index 737f639236a3..e5f4c3f7489a 100644
 --- third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -81511,6 +74647,7 @@ index 3b8899da3266..5532a14e5bda 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -81519,23 +74656,18 @@ index 3b8899da3266..5532a14e5bda 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -81554,10 +74686,6 @@ index 3b8899da3266..5532a14e5bda 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -81565,10 +74693,6 @@ index 3b8899da3266..5532a14e5bda 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -81576,7 +74700,6 @@ index 3b8899da3266..5532a14e5bda 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -81584,10 +74707,6 @@ index 3b8899da3266..5532a14e5bda 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -81600,10 +74719,6 @@ index 3b8899da3266..5532a14e5bda 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -81641,7 +74756,7 @@ index 3b8899da3266..5532a14e5bda 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -81699,10 +74814,10 @@ index 3b8899da3266..5532a14e5bda 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -81713,10 +74828,10 @@ index 3b8899da3266..5532a14e5bda 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -81728,18 +74843,10 @@ index 3b8899da3266..5532a14e5bda 100644
  
  Library("stream_reset_handler_gn")
 diff --git third_party/libwebrtc/net/dcsctp/socket/transmission_control_block_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/transmission_control_block_gn/moz.build
-index ef3e5cdff066..5b3a5af9aba8 100644
+index f9cd1cdea19c..96f1c1bf0f2c 100644
 --- third_party/libwebrtc/net/dcsctp/socket/transmission_control_block_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/socket/transmission_control_block_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -81747,6 +74854,7 @@ index ef3e5cdff066..5b3a5af9aba8 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -81755,23 +74863,18 @@ index ef3e5cdff066..5b3a5af9aba8 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -81790,10 +74893,6 @@ index ef3e5cdff066..5b3a5af9aba8 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -81801,10 +74900,6 @@ index ef3e5cdff066..5b3a5af9aba8 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -81812,7 +74907,6 @@ index ef3e5cdff066..5b3a5af9aba8 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -81820,10 +74914,6 @@ index ef3e5cdff066..5b3a5af9aba8 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -81836,10 +74926,6 @@ index ef3e5cdff066..5b3a5af9aba8 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -81877,7 +74963,7 @@ index ef3e5cdff066..5b3a5af9aba8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -81935,10 +75021,10 @@ index ef3e5cdff066..5b3a5af9aba8 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -81949,10 +75035,10 @@ index ef3e5cdff066..5b3a5af9aba8 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -81964,18 +75050,10 @@ index ef3e5cdff066..5b3a5af9aba8 100644
  
  Library("transmission_control_block_gn")
 diff --git third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout_gn/moz.build third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout_gn/moz.build
-index c42f501ab5b8..17aff1a85181 100644
+index 6fcab1231d30..5c9317afe4d3 100644
 --- third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -81983,6 +75061,7 @@ index c42f501ab5b8..17aff1a85181 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -81991,23 +75070,18 @@ index c42f501ab5b8..17aff1a85181 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -82026,10 +75100,6 @@ index c42f501ab5b8..17aff1a85181 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82037,10 +75107,6 @@ index c42f501ab5b8..17aff1a85181 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -82048,7 +75114,6 @@ index c42f501ab5b8..17aff1a85181 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82056,10 +75121,6 @@ index c42f501ab5b8..17aff1a85181 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -82072,10 +75133,6 @@ index c42f501ab5b8..17aff1a85181 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -82113,7 +75170,7 @@ index c42f501ab5b8..17aff1a85181 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -82171,10 +75228,10 @@ index c42f501ab5b8..17aff1a85181 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -82185,10 +75242,10 @@ index c42f501ab5b8..17aff1a85181 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -82200,18 +75257,10 @@ index c42f501ab5b8..17aff1a85181 100644
  
  Library("task_queue_timeout_gn")
 diff --git third_party/libwebrtc/net/dcsctp/timer/timer_gn/moz.build third_party/libwebrtc/net/dcsctp/timer/timer_gn/moz.build
-index 1739ac8b4ef0..410e23eda3c3 100644
+index df73a1896e86..719a013e1786 100644
 --- third_party/libwebrtc/net/dcsctp/timer/timer_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/timer/timer_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -82219,6 +75268,7 @@ index 1739ac8b4ef0..410e23eda3c3 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -82227,23 +75277,18 @@ index 1739ac8b4ef0..410e23eda3c3 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -82262,10 +75307,6 @@ index 1739ac8b4ef0..410e23eda3c3 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82273,10 +75314,6 @@ index 1739ac8b4ef0..410e23eda3c3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -82284,7 +75321,6 @@ index 1739ac8b4ef0..410e23eda3c3 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82292,10 +75328,6 @@ index 1739ac8b4ef0..410e23eda3c3 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -82308,10 +75340,6 @@ index 1739ac8b4ef0..410e23eda3c3 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -82342,7 +75370,7 @@ index 1739ac8b4ef0..410e23eda3c3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -82429,18 +75457,10 @@ index 1739ac8b4ef0..410e23eda3c3 100644
  
  Library("timer_gn")
 diff --git third_party/libwebrtc/net/dcsctp/tx/outstanding_data_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/outstanding_data_gn/moz.build
-index e85dc4592bf1..c2c7420b0893 100644
+index df2340a8c348..3451c619b955 100644
 --- third_party/libwebrtc/net/dcsctp/tx/outstanding_data_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/tx/outstanding_data_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -82448,6 +75468,7 @@ index e85dc4592bf1..c2c7420b0893 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -82456,23 +75477,18 @@ index e85dc4592bf1..c2c7420b0893 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -82491,10 +75507,6 @@ index e85dc4592bf1..c2c7420b0893 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82502,10 +75514,6 @@ index e85dc4592bf1..c2c7420b0893 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -82513,7 +75521,6 @@ index e85dc4592bf1..c2c7420b0893 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82521,10 +75528,6 @@ index e85dc4592bf1..c2c7420b0893 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -82537,10 +75540,6 @@ index e85dc4592bf1..c2c7420b0893 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -82578,7 +75577,7 @@ index e85dc4592bf1..c2c7420b0893 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -82636,10 +75635,10 @@ index e85dc4592bf1..c2c7420b0893 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -82650,10 +75649,10 @@ index e85dc4592bf1..c2c7420b0893 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -82665,18 +75664,10 @@ index e85dc4592bf1..c2c7420b0893 100644
  
  Library("outstanding_data_gn")
 diff --git third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter_gn/moz.build
-index e1ae0824a880..672690c7125d 100644
+index 24095b9b7822..89c34a2b8d23 100644
 --- third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -82684,6 +75675,7 @@ index e1ae0824a880..672690c7125d 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -82692,23 +75684,18 @@ index e1ae0824a880..672690c7125d 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -82727,10 +75714,6 @@ index e1ae0824a880..672690c7125d 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82738,10 +75721,6 @@ index e1ae0824a880..672690c7125d 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -82749,7 +75728,6 @@ index e1ae0824a880..672690c7125d 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82757,10 +75735,6 @@ index e1ae0824a880..672690c7125d 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -82773,10 +75747,6 @@ index e1ae0824a880..672690c7125d 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -82814,7 +75784,7 @@ index e1ae0824a880..672690c7125d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -82872,10 +75842,10 @@ index e1ae0824a880..672690c7125d 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -82886,10 +75856,10 @@ index e1ae0824a880..672690c7125d 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -82901,18 +75871,10 @@ index e1ae0824a880..672690c7125d 100644
  
  Library("retransmission_error_counter_gn")
 diff --git third_party/libwebrtc/net/dcsctp/tx/retransmission_queue_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/retransmission_queue_gn/moz.build
-index 543fd767cc65..292597d1de09 100644
+index d79764e11a90..2265d6f5a636 100644
 --- third_party/libwebrtc/net/dcsctp/tx/retransmission_queue_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/tx/retransmission_queue_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -82920,6 +75882,7 @@ index 543fd767cc65..292597d1de09 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -82928,23 +75891,18 @@ index 543fd767cc65..292597d1de09 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -82963,10 +75921,6 @@ index 543fd767cc65..292597d1de09 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82974,10 +75928,6 @@ index 543fd767cc65..292597d1de09 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -82985,7 +75935,6 @@ index 543fd767cc65..292597d1de09 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82993,10 +75942,6 @@ index 543fd767cc65..292597d1de09 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -83009,10 +75954,6 @@ index 543fd767cc65..292597d1de09 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -83050,7 +75991,7 @@ index 543fd767cc65..292597d1de09 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -83108,10 +76049,10 @@ index 543fd767cc65..292597d1de09 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -83122,10 +76063,10 @@ index 543fd767cc65..292597d1de09 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -83137,18 +76078,10 @@ index 543fd767cc65..292597d1de09 100644
  
  Library("retransmission_queue_gn")
 diff --git third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout_gn/moz.build
-index b0bd600462ba..7e3b4fdbd0a3 100644
+index 01617b6f94ad..4ea9e30a8326 100644
 --- third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -83156,6 +76089,7 @@ index b0bd600462ba..7e3b4fdbd0a3 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -83164,23 +76098,18 @@ index b0bd600462ba..7e3b4fdbd0a3 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -83199,10 +76128,6 @@ index b0bd600462ba..7e3b4fdbd0a3 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -83210,10 +76135,6 @@ index b0bd600462ba..7e3b4fdbd0a3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -83221,7 +76142,6 @@ index b0bd600462ba..7e3b4fdbd0a3 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -83229,10 +76149,6 @@ index b0bd600462ba..7e3b4fdbd0a3 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -83245,10 +76161,6 @@ index b0bd600462ba..7e3b4fdbd0a3 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -83279,7 +76191,7 @@ index b0bd600462ba..7e3b4fdbd0a3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -83366,18 +76278,10 @@ index b0bd600462ba..7e3b4fdbd0a3 100644
  
  Library("retransmission_timeout_gn")
 diff --git third_party/libwebrtc/net/dcsctp/tx/rr_send_queue_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/rr_send_queue_gn/moz.build
-index 828c2ae923b9..e612eaa591aa 100644
+index 2b0975a91d11..241a5bce6bed 100644
 --- third_party/libwebrtc/net/dcsctp/tx/rr_send_queue_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/tx/rr_send_queue_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -83385,6 +76289,7 @@ index 828c2ae923b9..e612eaa591aa 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -83393,23 +76298,18 @@ index 828c2ae923b9..e612eaa591aa 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -83428,10 +76328,6 @@ index 828c2ae923b9..e612eaa591aa 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -83439,10 +76335,6 @@ index 828c2ae923b9..e612eaa591aa 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -83450,7 +76342,6 @@ index 828c2ae923b9..e612eaa591aa 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -83458,10 +76349,6 @@ index 828c2ae923b9..e612eaa591aa 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -83474,10 +76361,6 @@ index 828c2ae923b9..e612eaa591aa 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -83515,7 +76398,7 @@ index 828c2ae923b9..e612eaa591aa 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -83573,10 +76456,10 @@ index 828c2ae923b9..e612eaa591aa 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -83587,10 +76470,10 @@ index 828c2ae923b9..e612eaa591aa 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -83602,7 +76485,7 @@ index 828c2ae923b9..e612eaa591aa 100644
  
  Library("rr_send_queue_gn")
 diff --git third_party/libwebrtc/net/dcsctp/tx/send_queue_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/send_queue_gn/moz.build
-index 5aab21126b8d..dc4ce43eaf02 100644
+index a30ad32cc439..bf96c2aa78be 100644
 --- third_party/libwebrtc/net/dcsctp/tx/send_queue_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/tx/send_queue_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -83613,6 +76496,7 @@ index 5aab21126b8d..dc4ce43eaf02 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -83621,13 +76505,12 @@ index 5aab21126b8d..dc4ce43eaf02 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -83666,7 +76549,6 @@ index 5aab21126b8d..dc4ce43eaf02 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -83723,7 +76605,7 @@ index 5aab21126b8d..dc4ce43eaf02 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -83749,7 +76631,7 @@ index 5aab21126b8d..dc4ce43eaf02 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -83791,18 +76673,10 @@ index 5aab21126b8d..dc4ce43eaf02 100644
 -
  Library("send_queue_gn")
 diff --git third_party/libwebrtc/net/dcsctp/tx/stream_scheduler_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/stream_scheduler_gn/moz.build
-index 229e9ffdb1d5..9dcd4136cd05 100644
+index 5452a33e24a7..391eee8efa91 100644
 --- third_party/libwebrtc/net/dcsctp/tx/stream_scheduler_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/tx/stream_scheduler_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -83810,6 +76684,7 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -83818,23 +76693,18 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -83853,10 +76723,6 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -83864,10 +76730,6 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -83875,7 +76737,6 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -83883,10 +76744,6 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -83899,10 +76756,6 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -83940,7 +76793,7 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -83998,10 +76851,10 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -84012,10 +76865,10 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -84027,18 +76880,10 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
  
  Library("stream_scheduler_gn")
 diff --git third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
-index 4680b8038c15..11a5835aa0ec 100644
+index 1a25bc4c9c08..88ed8df84a75 100644
 --- third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -84046,6 +76891,7 @@ index 4680b8038c15..11a5835aa0ec 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -84054,23 +76900,18 @@ index 4680b8038c15..11a5835aa0ec 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -84090,10 +76931,6 @@ index 4680b8038c15..11a5835aa0ec 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -84101,10 +76938,6 @@ index 4680b8038c15..11a5835aa0ec 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -84112,7 +76945,6 @@ index 4680b8038c15..11a5835aa0ec 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -84120,10 +76952,6 @@ index 4680b8038c15..11a5835aa0ec 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -84136,10 +76964,6 @@ index 4680b8038c15..11a5835aa0ec 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -84177,7 +77001,7 @@ index 4680b8038c15..11a5835aa0ec 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -84235,10 +77059,10 @@ index 4680b8038c15..11a5835aa0ec 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -84249,10 +77073,10 @@ index 4680b8038c15..11a5835aa0ec 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -84264,7 +77088,7 @@ index 4680b8038c15..11a5835aa0ec 100644
  
  Library("async_dns_resolver_gn")
 diff --git third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
-index 84ac167bbdb4..9add7df57b49 100644
+index be56799b7857..0297bad15075 100644
 --- third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -84275,6 +77099,7 @@ index 84ac167bbdb4..9add7df57b49 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -84283,13 +77108,12 @@ index 84ac167bbdb4..9add7df57b49 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84324,7 +77148,6 @@ index 84ac167bbdb4..9add7df57b49 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -84374,7 +77197,7 @@ index 84ac167bbdb4..9add7df57b49 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -84400,7 +77223,7 @@ index 84ac167bbdb4..9add7df57b49 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -84442,18 +77265,10 @@ index 84ac167bbdb4..9add7df57b49 100644
 -
  Library("async_packet_socket_gn")
 diff --git third_party/libwebrtc/rtc_base/base64_gn/moz.build third_party/libwebrtc/rtc_base/base64_gn/moz.build
-index d5290ba156ee..438d28335bbf 100644
+index d726a432a8f7..171770ac0390 100644
 --- third_party/libwebrtc/rtc_base/base64_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/base64_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -84461,6 +77276,7 @@ index d5290ba156ee..438d28335bbf 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -84469,23 +77285,18 @@ index d5290ba156ee..438d28335bbf 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -84504,10 +77315,6 @@ index d5290ba156ee..438d28335bbf 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -84515,10 +77322,6 @@ index d5290ba156ee..438d28335bbf 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -84526,7 +77329,6 @@ index d5290ba156ee..438d28335bbf 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -84534,10 +77336,6 @@ index d5290ba156ee..438d28335bbf 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -84550,10 +77348,6 @@ index d5290ba156ee..438d28335bbf 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -84584,7 +77378,7 @@ index d5290ba156ee..438d28335bbf 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -84671,18 +77465,10 @@ index d5290ba156ee..438d28335bbf 100644
  
  Library("base64_gn")
 diff --git third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
-index 80ddb0225604..9bcacaba76c6 100644
+index 50cb2ab77aea..710d01f74d07 100644
 --- third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -84690,6 +77476,7 @@ index 80ddb0225604..9bcacaba76c6 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -84698,23 +77485,18 @@ index 80ddb0225604..9bcacaba76c6 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -84733,10 +77515,6 @@ index 80ddb0225604..9bcacaba76c6 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -84744,10 +77522,6 @@ index 80ddb0225604..9bcacaba76c6 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -84755,7 +77529,6 @@ index 80ddb0225604..9bcacaba76c6 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -84763,10 +77536,6 @@ index 80ddb0225604..9bcacaba76c6 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -84779,10 +77548,6 @@ index 80ddb0225604..9bcacaba76c6 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -84813,7 +77578,7 @@ index 80ddb0225604..9bcacaba76c6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -84900,18 +77665,10 @@ index 80ddb0225604..9bcacaba76c6 100644
  
  Library("bit_buffer_gn")
 diff --git third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
-index 827aea8164d8..48d6a8a83d35 100644
+index b9f2220d4f48..6924940a7cf4 100644
 --- third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -84919,6 +77676,7 @@ index 827aea8164d8..48d6a8a83d35 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -84927,23 +77685,18 @@ index 827aea8164d8..48d6a8a83d35 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -84962,10 +77715,6 @@ index 827aea8164d8..48d6a8a83d35 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -84973,10 +77722,6 @@ index 827aea8164d8..48d6a8a83d35 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -84984,7 +77729,6 @@ index 827aea8164d8..48d6a8a83d35 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -84992,10 +77736,6 @@ index 827aea8164d8..48d6a8a83d35 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -85008,10 +77748,6 @@ index 827aea8164d8..48d6a8a83d35 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -85049,7 +77785,7 @@ index 827aea8164d8..48d6a8a83d35 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -85107,10 +77843,10 @@ index 827aea8164d8..48d6a8a83d35 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -85121,10 +77857,10 @@ index 827aea8164d8..48d6a8a83d35 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -85136,18 +77872,10 @@ index 827aea8164d8..48d6a8a83d35 100644
  
  Library("bitrate_tracker_gn")
 diff --git third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
-index 22951bbe63d7..f7117ae3f008 100644
+index 26817ca09a7d..226a24f7107e 100644
 --- third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -85155,6 +77883,7 @@ index 22951bbe63d7..f7117ae3f008 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -85163,23 +77892,18 @@ index 22951bbe63d7..f7117ae3f008 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -85198,10 +77922,6 @@ index 22951bbe63d7..f7117ae3f008 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -85209,10 +77929,6 @@ index 22951bbe63d7..f7117ae3f008 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -85220,7 +77936,6 @@ index 22951bbe63d7..f7117ae3f008 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -85228,10 +77943,6 @@ index 22951bbe63d7..f7117ae3f008 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -85244,10 +77955,6 @@ index 22951bbe63d7..f7117ae3f008 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -85278,7 +77985,7 @@ index 22951bbe63d7..f7117ae3f008 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -85365,7 +78072,7 @@ index 22951bbe63d7..f7117ae3f008 100644
  
  Library("bitstream_reader_gn")
 diff --git third_party/libwebrtc/rtc_base/buffer_gn/moz.build third_party/libwebrtc/rtc_base/buffer_gn/moz.build
-index 1fcfe7639127..fb81a8672641 100644
+index a454fcb0ee69..2925b692abfc 100644
 --- third_party/libwebrtc/rtc_base/buffer_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/buffer_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -85376,6 +78083,7 @@ index 1fcfe7639127..fb81a8672641 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -85384,13 +78092,12 @@ index 1fcfe7639127..fb81a8672641 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -85429,7 +78136,6 @@ index 1fcfe7639127..fb81a8672641 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -85479,7 +78185,7 @@ index 1fcfe7639127..fb81a8672641 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -85505,7 +78211,7 @@ index 1fcfe7639127..fb81a8672641 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -85547,18 +78253,10 @@ index 1fcfe7639127..fb81a8672641 100644
 -
  Library("buffer_gn")
 diff --git third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
-index a3061b52e1c5..e0c40a228e26 100644
+index 23d723da5d0b..0cf3653ec23b 100644
 --- third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -85566,6 +78264,7 @@ index a3061b52e1c5..e0c40a228e26 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -85574,23 +78273,18 @@ index a3061b52e1c5..e0c40a228e26 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -85609,10 +78303,6 @@ index a3061b52e1c5..e0c40a228e26 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -85620,10 +78310,6 @@ index a3061b52e1c5..e0c40a228e26 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -85631,7 +78317,6 @@ index a3061b52e1c5..e0c40a228e26 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -85639,10 +78324,6 @@ index a3061b52e1c5..e0c40a228e26 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -85655,10 +78336,6 @@ index a3061b52e1c5..e0c40a228e26 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -85689,7 +78366,7 @@ index a3061b52e1c5..e0c40a228e26 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -85776,7 +78453,7 @@ index a3061b52e1c5..e0c40a228e26 100644
  
  Library("byte_buffer_gn")
 diff --git third_party/libwebrtc/rtc_base/byte_order_gn/moz.build third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
-index 1545308124ab..a3ec3a3d626b 100644
+index 74f384c22bb6..0e5f9e105309 100644
 --- third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -85787,6 +78464,7 @@ index 1545308124ab..a3ec3a3d626b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -85795,13 +78473,12 @@ index 1545308124ab..a3ec3a3d626b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -85836,7 +78513,6 @@ index 1545308124ab..a3ec3a3d626b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -85886,7 +78562,7 @@ index 1545308124ab..a3ec3a3d626b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -85912,7 +78588,7 @@ index 1545308124ab..a3ec3a3d626b 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -85954,18 +78630,10 @@ index 1545308124ab..a3ec3a3d626b 100644
 -
  Library("byte_order_gn")
 diff --git third_party/libwebrtc/rtc_base/checks_gn/moz.build third_party/libwebrtc/rtc_base/checks_gn/moz.build
-index 8d87d4d8216f..e4f306a32de0 100644
+index 8e1b70c997d0..3f23845f5297 100644
 --- third_party/libwebrtc/rtc_base/checks_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/checks_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -85973,6 +78641,7 @@ index 8d87d4d8216f..e4f306a32de0 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -85981,23 +78650,18 @@ index 8d87d4d8216f..e4f306a32de0 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -86016,10 +78680,6 @@ index 8d87d4d8216f..e4f306a32de0 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -86027,10 +78687,6 @@ index 8d87d4d8216f..e4f306a32de0 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -86038,7 +78694,6 @@ index 8d87d4d8216f..e4f306a32de0 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -86046,10 +78701,6 @@ index 8d87d4d8216f..e4f306a32de0 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -86062,10 +78713,6 @@ index 8d87d4d8216f..e4f306a32de0 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -86096,7 +78743,7 @@ index 8d87d4d8216f..e4f306a32de0 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -86183,7 +78830,7 @@ index 8d87d4d8216f..e4f306a32de0 100644
  
  Library("checks_gn")
 diff --git third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
-index 7bdfd334c9eb..fb7482f075fd 100644
+index 88cee7f44516..76da6d251187 100644
 --- third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -86194,6 +78841,7 @@ index 7bdfd334c9eb..fb7482f075fd 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -86202,13 +78850,12 @@ index 7bdfd334c9eb..fb7482f075fd 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86243,7 +78890,6 @@ index 7bdfd334c9eb..fb7482f075fd 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -86293,7 +78939,7 @@ index 7bdfd334c9eb..fb7482f075fd 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -86319,7 +78965,7 @@ index 7bdfd334c9eb..fb7482f075fd 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -86361,18 +79007,10 @@ index 7bdfd334c9eb..fb7482f075fd 100644
 -
  Library("compile_assert_c_gn")
 diff --git third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
-index bc4699b03b1f..e81adae3ae48 100644
+index c7bd4f21f6e3..ebd7d2e99290 100644
 --- third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -86380,6 +79018,7 @@ index bc4699b03b1f..e81adae3ae48 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -86388,23 +79027,18 @@ index bc4699b03b1f..e81adae3ae48 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -86423,10 +79057,6 @@ index bc4699b03b1f..e81adae3ae48 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -86434,10 +79064,6 @@ index bc4699b03b1f..e81adae3ae48 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -86445,7 +79071,6 @@ index bc4699b03b1f..e81adae3ae48 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -86453,10 +79078,6 @@ index bc4699b03b1f..e81adae3ae48 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -86469,10 +79090,6 @@ index bc4699b03b1f..e81adae3ae48 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -86503,7 +79120,7 @@ index bc4699b03b1f..e81adae3ae48 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -86590,7 +79207,7 @@ index bc4699b03b1f..e81adae3ae48 100644
  
  Library("flat_containers_internal_gn")
 diff --git third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
-index 110a2268825e..f5df159ef2c1 100644
+index a0c76957de3d..ccb70c641b40 100644
 --- third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -86601,6 +79218,7 @@ index 110a2268825e..f5df159ef2c1 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -86609,13 +79227,12 @@ index 110a2268825e..f5df159ef2c1 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86654,7 +79271,6 @@ index 110a2268825e..f5df159ef2c1 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -86704,7 +79320,7 @@ index 110a2268825e..f5df159ef2c1 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -86730,7 +79346,7 @@ index 110a2268825e..f5df159ef2c1 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -86772,7 +79388,7 @@ index 110a2268825e..f5df159ef2c1 100644
 -
  Library("flat_map_gn")
 diff --git third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
-index fb086fe47844..3033d814afa7 100644
+index 9705d844e9e6..c603c3162a19 100644
 --- third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -86783,6 +79399,7 @@ index fb086fe47844..3033d814afa7 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -86791,13 +79408,12 @@ index fb086fe47844..3033d814afa7 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86836,7 +79452,6 @@ index fb086fe47844..3033d814afa7 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -86886,7 +79501,7 @@ index fb086fe47844..3033d814afa7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -86912,7 +79527,7 @@ index fb086fe47844..3033d814afa7 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -86954,18 +79569,10 @@ index fb086fe47844..3033d814afa7 100644
 -
  Library("flat_set_gn")
 diff --git third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
-index 9f17e1be42ec..03f53c77a75a 100644
+index 7c795ea71573..f9d453b462bf 100644
 --- third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -86973,6 +79580,7 @@ index 9f17e1be42ec..03f53c77a75a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -86981,23 +79589,18 @@ index 9f17e1be42ec..03f53c77a75a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -87016,10 +79619,6 @@ index 9f17e1be42ec..03f53c77a75a 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -87027,10 +79626,6 @@ index 9f17e1be42ec..03f53c77a75a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -87038,7 +79633,6 @@ index 9f17e1be42ec..03f53c77a75a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -87046,10 +79640,6 @@ index 9f17e1be42ec..03f53c77a75a 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -87062,10 +79652,6 @@ index 9f17e1be42ec..03f53c77a75a 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -87096,7 +79682,7 @@ index 9f17e1be42ec..03f53c77a75a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -87183,18 +79769,10 @@ index 9f17e1be42ec..03f53c77a75a 100644
  
  Library("copy_on_write_buffer_gn")
 diff --git third_party/libwebrtc/rtc_base/cpu_info_gn/moz.build third_party/libwebrtc/rtc_base/cpu_info_gn/moz.build
-index 6a2345034a07..9dd328e92485 100644
+index 2b0cf4fb67b1..0e53770baf5f 100644
 --- third_party/libwebrtc/rtc_base/cpu_info_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/cpu_info_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -87202,6 +79780,7 @@ index 6a2345034a07..9dd328e92485 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -87210,23 +79789,18 @@ index 6a2345034a07..9dd328e92485 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -87245,10 +79819,6 @@ index 6a2345034a07..9dd328e92485 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -87256,10 +79826,6 @@ index 6a2345034a07..9dd328e92485 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -87267,7 +79833,6 @@ index 6a2345034a07..9dd328e92485 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -87275,10 +79840,6 @@ index 6a2345034a07..9dd328e92485 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -87291,10 +79852,6 @@ index 6a2345034a07..9dd328e92485 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -87332,7 +79889,7 @@ index 6a2345034a07..9dd328e92485 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -87390,10 +79947,10 @@ index 6a2345034a07..9dd328e92485 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -87404,10 +79961,10 @@ index 6a2345034a07..9dd328e92485 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -87419,18 +79976,10 @@ index 6a2345034a07..9dd328e92485 100644
  
  Library("cpu_info_gn")
 diff --git third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
-index f11f29619d5e..de25562cd255 100644
+index c032b1a986a3..3a591ec6e96c 100644
 --- third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -87438,6 +79987,7 @@ index f11f29619d5e..de25562cd255 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -87446,23 +79996,18 @@ index f11f29619d5e..de25562cd255 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -87481,10 +80026,6 @@ index f11f29619d5e..de25562cd255 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -87492,10 +80033,6 @@ index f11f29619d5e..de25562cd255 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -87503,7 +80040,6 @@ index f11f29619d5e..de25562cd255 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -87511,10 +80047,6 @@ index f11f29619d5e..de25562cd255 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -87527,10 +80059,6 @@ index f11f29619d5e..de25562cd255 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -87561,7 +80089,7 @@ index f11f29619d5e..de25562cd255 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -87648,18 +80176,10 @@ index f11f29619d5e..de25562cd255 100644
  
  Library("criticalsection_gn")
 diff --git third_party/libwebrtc/rtc_base/denormal_disabler_gn/moz.build third_party/libwebrtc/rtc_base/denormal_disabler_gn/moz.build
-index 32d3eabe7182..1716888a1540 100644
+index 266f0b403372..a7632439b491 100644
 --- third_party/libwebrtc/rtc_base/denormal_disabler_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/denormal_disabler_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -87667,6 +80187,7 @@ index 32d3eabe7182..1716888a1540 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -87675,23 +80196,18 @@ index 32d3eabe7182..1716888a1540 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -87710,10 +80226,6 @@ index 32d3eabe7182..1716888a1540 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -87721,10 +80233,6 @@ index 32d3eabe7182..1716888a1540 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -87732,7 +80240,6 @@ index 32d3eabe7182..1716888a1540 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -87740,10 +80247,6 @@ index 32d3eabe7182..1716888a1540 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -87756,10 +80259,6 @@ index 32d3eabe7182..1716888a1540 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -87790,7 +80289,7 @@ index 32d3eabe7182..1716888a1540 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -87877,7 +80376,7 @@ index 32d3eabe7182..1716888a1540 100644
  
  Library("denormal_disabler_gn")
 diff --git third_party/libwebrtc/rtc_base/divide_round_gn/moz.build third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
-index c45abd0214c2..5afb72a8871d 100644
+index f947044a70c5..cef2ec4afcd9 100644
 --- third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -87888,6 +80387,7 @@ index c45abd0214c2..5afb72a8871d 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -87896,13 +80396,12 @@ index c45abd0214c2..5afb72a8871d 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -87941,7 +80440,6 @@ index c45abd0214c2..5afb72a8871d 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -87991,7 +80489,7 @@ index c45abd0214c2..5afb72a8871d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -88017,7 +80515,7 @@ index c45abd0214c2..5afb72a8871d 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -88059,7 +80557,7 @@ index c45abd0214c2..5afb72a8871d 100644
 -
  Library("divide_round_gn")
 diff --git third_party/libwebrtc/rtc_base/dscp_gn/moz.build third_party/libwebrtc/rtc_base/dscp_gn/moz.build
-index 67fc0c9f2946..db5bc6af820e 100644
+index a21e8af3a982..d16a56b3c8be 100644
 --- third_party/libwebrtc/rtc_base/dscp_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/dscp_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -88070,6 +80568,7 @@ index 67fc0c9f2946..db5bc6af820e 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -88078,13 +80577,12 @@ index 67fc0c9f2946..db5bc6af820e 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -88119,7 +80617,6 @@ index 67fc0c9f2946..db5bc6af820e 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -88169,7 +80666,7 @@ index 67fc0c9f2946..db5bc6af820e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -88195,7 +80692,7 @@ index 67fc0c9f2946..db5bc6af820e 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -88237,18 +80734,10 @@ index 67fc0c9f2946..db5bc6af820e 100644
 -
  Library("dscp_gn")
 diff --git third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
-index 9871decbb1aa..e090fdcce24c 100644
+index d70f8d5bf102..0ed150dc70b7 100644
 --- third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -88256,6 +80745,7 @@ index 9871decbb1aa..e090fdcce24c 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -88264,23 +80754,18 @@ index 9871decbb1aa..e090fdcce24c 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -88299,10 +80784,6 @@ index 9871decbb1aa..e090fdcce24c 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -88310,10 +80791,6 @@ index 9871decbb1aa..e090fdcce24c 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -88321,7 +80798,6 @@ index 9871decbb1aa..e090fdcce24c 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -88329,10 +80805,6 @@ index 9871decbb1aa..e090fdcce24c 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -88345,10 +80817,6 @@ index 9871decbb1aa..e090fdcce24c 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -88386,7 +80854,7 @@ index 9871decbb1aa..e090fdcce24c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -88444,10 +80912,10 @@ index 9871decbb1aa..e090fdcce24c 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -88458,10 +80926,10 @@ index 9871decbb1aa..e090fdcce24c 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -88473,18 +80941,10 @@ index 9871decbb1aa..e090fdcce24c 100644
  
  Library("event_tracer_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
-index 6f3804964680..09ee866580b3 100644
+index d5ccba752185..1353fd9971e1 100644
 --- third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -88492,6 +80952,7 @@ index 6f3804964680..09ee866580b3 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -88500,23 +80961,18 @@ index 6f3804964680..09ee866580b3 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -88535,10 +80991,6 @@ index 6f3804964680..09ee866580b3 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -88546,10 +80998,6 @@ index 6f3804964680..09ee866580b3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -88557,7 +81005,6 @@ index 6f3804964680..09ee866580b3 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -88565,10 +81012,6 @@ index 6f3804964680..09ee866580b3 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -88581,10 +81024,6 @@ index 6f3804964680..09ee866580b3 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -88622,7 +81061,7 @@ index 6f3804964680..09ee866580b3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -88680,10 +81119,10 @@ index 6f3804964680..09ee866580b3 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -88694,10 +81133,10 @@ index 6f3804964680..09ee866580b3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -88709,18 +81148,10 @@ index 6f3804964680..09ee866580b3 100644
  
  Library("alr_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
-index bbf714b33195..15fcbde02d97 100644
+index cce401c6f0b3..55178aa20743 100644
 --- third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -88728,6 +81159,7 @@ index bbf714b33195..15fcbde02d97 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -88736,23 +81168,18 @@ index bbf714b33195..15fcbde02d97 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -88771,10 +81198,6 @@ index bbf714b33195..15fcbde02d97 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -88782,10 +81205,6 @@ index bbf714b33195..15fcbde02d97 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -88793,7 +81212,6 @@ index bbf714b33195..15fcbde02d97 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -88801,10 +81219,6 @@ index bbf714b33195..15fcbde02d97 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -88817,10 +81231,6 @@ index bbf714b33195..15fcbde02d97 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -88858,7 +81268,7 @@ index bbf714b33195..15fcbde02d97 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -88916,10 +81326,10 @@ index bbf714b33195..15fcbde02d97 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -88930,10 +81340,10 @@ index bbf714b33195..15fcbde02d97 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -88945,18 +81355,10 @@ index bbf714b33195..15fcbde02d97 100644
  
  Library("balanced_degradation_settings_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
-index 439ec1d4e7c9..52a1550b84d0 100644
+index ebeb77db3013..bf97dcb17792 100644
 --- third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -88964,6 +81366,7 @@ index 439ec1d4e7c9..52a1550b84d0 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -88972,23 +81375,18 @@ index 439ec1d4e7c9..52a1550b84d0 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -89007,10 +81405,6 @@ index 439ec1d4e7c9..52a1550b84d0 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89018,10 +81412,6 @@ index 439ec1d4e7c9..52a1550b84d0 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -89029,7 +81419,6 @@ index 439ec1d4e7c9..52a1550b84d0 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89037,10 +81426,6 @@ index 439ec1d4e7c9..52a1550b84d0 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -89053,10 +81438,6 @@ index 439ec1d4e7c9..52a1550b84d0 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -89094,7 +81475,7 @@ index 439ec1d4e7c9..52a1550b84d0 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -89152,10 +81533,10 @@ index 439ec1d4e7c9..52a1550b84d0 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -89166,10 +81547,10 @@ index 439ec1d4e7c9..52a1550b84d0 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -89181,18 +81562,10 @@ index 439ec1d4e7c9..52a1550b84d0 100644
  
  Library("encoder_info_settings_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
-index bf20d2672978..f694fc71932b 100644
+index c6806c13de0a..18300e83b968 100644
 --- third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -89200,6 +81573,7 @@ index bf20d2672978..f694fc71932b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -89208,23 +81582,18 @@ index bf20d2672978..f694fc71932b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -89243,10 +81612,6 @@ index bf20d2672978..f694fc71932b 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89254,10 +81619,6 @@ index bf20d2672978..f694fc71932b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -89265,7 +81626,6 @@ index bf20d2672978..f694fc71932b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89273,10 +81633,6 @@ index bf20d2672978..f694fc71932b 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -89289,10 +81645,6 @@ index bf20d2672978..f694fc71932b 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -89330,7 +81682,7 @@ index bf20d2672978..f694fc71932b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -89388,10 +81740,10 @@ index bf20d2672978..f694fc71932b 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -89402,10 +81754,10 @@ index bf20d2672978..f694fc71932b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -89417,18 +81769,10 @@ index bf20d2672978..f694fc71932b 100644
  
  Library("field_trial_parser_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
-index 3ab54cf6bd88..e7cba2997a14 100644
+index 75a2fd41366c..ea85ffff3111 100644
 --- third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -89436,6 +81780,7 @@ index 3ab54cf6bd88..e7cba2997a14 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -89444,23 +81789,18 @@ index 3ab54cf6bd88..e7cba2997a14 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -89479,10 +81819,6 @@ index 3ab54cf6bd88..e7cba2997a14 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89490,10 +81826,6 @@ index 3ab54cf6bd88..e7cba2997a14 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -89501,7 +81833,6 @@ index 3ab54cf6bd88..e7cba2997a14 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89509,10 +81840,6 @@ index 3ab54cf6bd88..e7cba2997a14 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -89525,10 +81852,6 @@ index 3ab54cf6bd88..e7cba2997a14 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -89566,7 +81889,7 @@ index 3ab54cf6bd88..e7cba2997a14 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -89624,10 +81947,10 @@ index 3ab54cf6bd88..e7cba2997a14 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -89638,10 +81961,10 @@ index 3ab54cf6bd88..e7cba2997a14 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -89653,18 +81976,10 @@ index 3ab54cf6bd88..e7cba2997a14 100644
  
  Library("keyframe_interval_settings_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
-index 07f12b5051b7..6dcc86225977 100644
+index 07a834739abc..6526a4d69c90 100644
 --- third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -89672,6 +81987,7 @@ index 07f12b5051b7..6dcc86225977 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -89680,23 +81996,18 @@ index 07f12b5051b7..6dcc86225977 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -89715,10 +82026,6 @@ index 07f12b5051b7..6dcc86225977 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89726,10 +82033,6 @@ index 07f12b5051b7..6dcc86225977 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -89737,7 +82040,6 @@ index 07f12b5051b7..6dcc86225977 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89745,10 +82047,6 @@ index 07f12b5051b7..6dcc86225977 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -89761,10 +82059,6 @@ index 07f12b5051b7..6dcc86225977 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -89802,7 +82096,7 @@ index 07f12b5051b7..6dcc86225977 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -89860,10 +82154,10 @@ index 07f12b5051b7..6dcc86225977 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -89874,10 +82168,10 @@ index 07f12b5051b7..6dcc86225977 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -89889,18 +82183,10 @@ index 07f12b5051b7..6dcc86225977 100644
  
  Library("min_video_bitrate_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
-index 79de1ae073a5..c92ecb38451c 100644
+index c804a04edc64..6270ba546b1f 100644
 --- third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -89908,6 +82194,7 @@ index 79de1ae073a5..c92ecb38451c 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -89916,23 +82203,18 @@ index 79de1ae073a5..c92ecb38451c 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -89951,10 +82233,6 @@ index 79de1ae073a5..c92ecb38451c 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89962,10 +82240,6 @@ index 79de1ae073a5..c92ecb38451c 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -89973,7 +82247,6 @@ index 79de1ae073a5..c92ecb38451c 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89981,10 +82254,6 @@ index 79de1ae073a5..c92ecb38451c 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -89997,10 +82266,6 @@ index 79de1ae073a5..c92ecb38451c 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -90038,7 +82303,7 @@ index 79de1ae073a5..c92ecb38451c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -90096,10 +82361,10 @@ index 79de1ae073a5..c92ecb38451c 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -90110,10 +82375,10 @@ index 79de1ae073a5..c92ecb38451c 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -90125,18 +82390,10 @@ index 79de1ae073a5..c92ecb38451c 100644
  
  Library("normalize_simulcast_size_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
-index de5ccaa7e596..8ea47b1f2a07 100644
+index 4b8ce6541aad..fca99f2e0a66 100644
 --- third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -90144,6 +82401,7 @@ index de5ccaa7e596..8ea47b1f2a07 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -90152,23 +82410,18 @@ index de5ccaa7e596..8ea47b1f2a07 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -90187,10 +82440,6 @@ index de5ccaa7e596..8ea47b1f2a07 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -90198,10 +82447,6 @@ index de5ccaa7e596..8ea47b1f2a07 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -90209,7 +82454,6 @@ index de5ccaa7e596..8ea47b1f2a07 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -90217,10 +82461,6 @@ index de5ccaa7e596..8ea47b1f2a07 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -90233,10 +82473,6 @@ index de5ccaa7e596..8ea47b1f2a07 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -90274,7 +82510,7 @@ index de5ccaa7e596..8ea47b1f2a07 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -90332,10 +82568,10 @@ index de5ccaa7e596..8ea47b1f2a07 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -90346,10 +82582,10 @@ index de5ccaa7e596..8ea47b1f2a07 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -90361,18 +82597,10 @@ index de5ccaa7e596..8ea47b1f2a07 100644
  
  Library("quality_scaler_settings_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
-index db3d8c8a188b..e3623185b4c1 100644
+index 0930ef0477bc..175e3ff531e2 100644
 --- third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -90380,6 +82608,7 @@ index db3d8c8a188b..e3623185b4c1 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -90388,23 +82617,18 @@ index db3d8c8a188b..e3623185b4c1 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -90423,10 +82647,6 @@ index db3d8c8a188b..e3623185b4c1 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -90434,10 +82654,6 @@ index db3d8c8a188b..e3623185b4c1 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -90445,7 +82661,6 @@ index db3d8c8a188b..e3623185b4c1 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -90453,10 +82668,6 @@ index db3d8c8a188b..e3623185b4c1 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -90469,10 +82680,6 @@ index db3d8c8a188b..e3623185b4c1 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -90510,7 +82717,7 @@ index db3d8c8a188b..e3623185b4c1 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -90568,10 +82775,10 @@ index db3d8c8a188b..e3623185b4c1 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -90582,10 +82789,10 @@ index db3d8c8a188b..e3623185b4c1 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -90597,18 +82804,10 @@ index db3d8c8a188b..e3623185b4c1 100644
  
  Library("quality_scaling_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
-index 7866b4a70a4f..6d8d954f0400 100644
+index be79eb29ffe7..092a2cb2d143 100644
 --- third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -90616,6 +82815,7 @@ index 7866b4a70a4f..6d8d954f0400 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -90624,23 +82824,18 @@ index 7866b4a70a4f..6d8d954f0400 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -90659,10 +82854,6 @@ index 7866b4a70a4f..6d8d954f0400 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -90670,10 +82861,6 @@ index 7866b4a70a4f..6d8d954f0400 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -90681,7 +82868,6 @@ index 7866b4a70a4f..6d8d954f0400 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -90689,10 +82875,6 @@ index 7866b4a70a4f..6d8d954f0400 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -90705,10 +82887,6 @@ index 7866b4a70a4f..6d8d954f0400 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -90746,7 +82924,7 @@ index 7866b4a70a4f..6d8d954f0400 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -90804,10 +82982,10 @@ index 7866b4a70a4f..6d8d954f0400 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -90818,10 +82996,10 @@ index 7866b4a70a4f..6d8d954f0400 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -90833,18 +83011,10 @@ index 7866b4a70a4f..6d8d954f0400 100644
  
  Library("rate_control_settings_gn")
 diff --git third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
-index c8c61429d38f..47b3096ae1da 100644
+index 6172f4d96dfa..ad4e108a796b 100644
 --- third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -90852,6 +83022,7 @@ index c8c61429d38f..47b3096ae1da 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -90860,23 +83031,18 @@ index c8c61429d38f..47b3096ae1da 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -90895,10 +83061,6 @@ index c8c61429d38f..47b3096ae1da 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -90906,10 +83068,6 @@ index c8c61429d38f..47b3096ae1da 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -90917,7 +83075,6 @@ index c8c61429d38f..47b3096ae1da 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -90925,10 +83082,6 @@ index c8c61429d38f..47b3096ae1da 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -90941,10 +83094,6 @@ index c8c61429d38f..47b3096ae1da 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -90982,7 +83131,7 @@ index c8c61429d38f..47b3096ae1da 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -91040,10 +83189,10 @@ index c8c61429d38f..47b3096ae1da 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -91054,10 +83203,10 @@ index c8c61429d38f..47b3096ae1da 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -91069,7 +83218,7 @@ index c8c61429d38f..47b3096ae1da 100644
  
  Library("frequency_tracker_gn")
 diff --git third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
-index 6e4858c05e1d..e01a08018962 100644
+index 82a66f9119cd..96a8ea39c266 100644
 --- third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -91080,6 +83229,7 @@ index 6e4858c05e1d..e01a08018962 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -91088,13 +83238,12 @@ index 6e4858c05e1d..e01a08018962 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91129,7 +83278,6 @@ index 6e4858c05e1d..e01a08018962 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -91179,7 +83327,7 @@ index 6e4858c05e1d..e01a08018962 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -91205,7 +83353,7 @@ index 6e4858c05e1d..e01a08018962 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -91247,18 +83395,10 @@ index 6e4858c05e1d..e01a08018962 100644
 -
  Library("gtest_prod_gn")
 diff --git third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
-index 4c82ebf4f1a4..9bb8130d8c7a 100644
+index 833688440249..f10a11715812 100644
 --- third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -91266,6 +83406,7 @@ index 4c82ebf4f1a4..9bb8130d8c7a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -91274,23 +83415,18 @@ index 4c82ebf4f1a4..9bb8130d8c7a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -91309,10 +83445,6 @@ index 4c82ebf4f1a4..9bb8130d8c7a 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -91320,10 +83452,6 @@ index 4c82ebf4f1a4..9bb8130d8c7a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -91331,7 +83459,6 @@ index 4c82ebf4f1a4..9bb8130d8c7a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -91339,10 +83466,6 @@ index 4c82ebf4f1a4..9bb8130d8c7a 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -91355,10 +83478,6 @@ index 4c82ebf4f1a4..9bb8130d8c7a 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -91389,7 +83508,7 @@ index 4c82ebf4f1a4..9bb8130d8c7a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -91477,10 +83596,10 @@ index 4c82ebf4f1a4..9bb8130d8c7a 100644
  Library("histogram_percentile_counter_gn")
 diff --git third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build
 deleted file mode 100644
-index 471d8a145443..000000000000
+index 7b10ad2fedfe..000000000000
 --- third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build
 +++ /dev/null
-@@ -1,99 +0,0 @@
+@@ -1,95 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -91492,10 +83611,6 @@ index 471d8a145443..000000000000
 -COMPILE_FLAGS["OS_INCLUDES"] = []
 -AllowCompilerWarnings()
 -
--CXXFLAGS += [
--    "-std=gnu++20"
--]
--
 -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
 -DEFINES["ANDROID"] = True
 -DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
@@ -91506,6 +83621,7 @@ index 471d8a145443..000000000000
 -DEFINES["WEBRTC_ANDROID"] = True
 -DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
 -DEFINES["WEBRTC_LINUX"] = True
 -DEFINES["WEBRTC_MOZILLA_BUILD"] = True
@@ -91513,7 +83629,6 @@ index 471d8a145443..000000000000
 -DEFINES["WEBRTC_POSIX"] = True
 -DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
 -DEFINES["_GNU_SOURCE"] = True
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 -DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
 -DEFINES["__STDC_CONSTANT_MACROS"] = True
 -DEFINES["__STDC_FORMAT_MACROS"] = True
@@ -91581,7 +83696,7 @@ index 471d8a145443..000000000000
 -
 -Library("ifaddrs_android_gn")
 diff --git third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
-index f18c322cef73..70cbdf4c62e1 100644
+index 6456e230bfa9..8d9f02cb22b4 100644
 --- third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -91592,6 +83707,7 @@ index f18c322cef73..70cbdf4c62e1 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -91600,13 +83716,12 @@ index f18c322cef73..70cbdf4c62e1 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91641,7 +83756,6 @@ index f18c322cef73..70cbdf4c62e1 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -91691,7 +83805,7 @@ index f18c322cef73..70cbdf4c62e1 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -91717,7 +83831,7 @@ index f18c322cef73..70cbdf4c62e1 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -91759,18 +83873,10 @@ index f18c322cef73..70cbdf4c62e1 100644
 -
  Library("ignore_wundef_gn")
 diff --git third_party/libwebrtc/rtc_base/ip_address_gn/moz.build third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
-index c67703077af9..8ff1adb6036f 100644
+index 202fd27525b6..77529d538252 100644
 --- third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -91778,6 +83884,7 @@ index c67703077af9..8ff1adb6036f 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -91786,23 +83893,18 @@ index c67703077af9..8ff1adb6036f 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -91822,10 +83924,6 @@ index c67703077af9..8ff1adb6036f 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -91833,10 +83931,6 @@ index c67703077af9..8ff1adb6036f 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -91844,7 +83938,6 @@ index c67703077af9..8ff1adb6036f 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -91852,10 +83945,6 @@ index c67703077af9..8ff1adb6036f 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -91868,10 +83957,6 @@ index c67703077af9..8ff1adb6036f 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -91908,7 +83993,7 @@ index c67703077af9..8ff1adb6036f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -91966,10 +84051,10 @@ index c67703077af9..8ff1adb6036f 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -91980,10 +84065,10 @@ index c67703077af9..8ff1adb6036f 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -91995,18 +84080,10 @@ index c67703077af9..8ff1adb6036f 100644
  
  Library("ip_address_gn")
 diff --git third_party/libwebrtc/rtc_base/logging_gn/moz.build third_party/libwebrtc/rtc_base/logging_gn/moz.build
-index 853c5bcada13..d16275ec7067 100644
+index 659c105eeb02..d4b59daa7d6f 100644
 --- third_party/libwebrtc/rtc_base/logging_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/logging_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -92015,6 +84092,7 @@ index 853c5bcada13..d16275ec7067 100644
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -92023,23 +84101,18 @@ index 853c5bcada13..d16275ec7067 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -92058,10 +84131,6 @@ index 853c5bcada13..d16275ec7067 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -92069,10 +84138,6 @@ index 853c5bcada13..d16275ec7067 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -92080,7 +84145,6 @@ index 853c5bcada13..d16275ec7067 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -92088,10 +84152,6 @@ index 853c5bcada13..d16275ec7067 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -92104,10 +84164,6 @@ index 853c5bcada13..d16275ec7067 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -92145,7 +84201,7 @@ index 853c5bcada13..d16275ec7067 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -92203,10 +84259,10 @@ index 853c5bcada13..d16275ec7067 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -92217,10 +84273,10 @@ index 853c5bcada13..d16275ec7067 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -92232,7 +84288,7 @@ index 853c5bcada13..d16275ec7067 100644
  
  Library("logging_gn")
 diff --git third_party/libwebrtc/rtc_base/macromagic_gn/moz.build third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
-index fc6e8f693b98..17687531d1c6 100644
+index c12cf66ea418..ca5ca6a0d967 100644
 --- third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -92243,6 +84299,7 @@ index fc6e8f693b98..17687531d1c6 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -92251,13 +84308,12 @@ index fc6e8f693b98..17687531d1c6 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92292,7 +84348,6 @@ index fc6e8f693b98..17687531d1c6 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -92342,7 +84397,7 @@ index fc6e8f693b98..17687531d1c6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -92368,7 +84423,7 @@ index fc6e8f693b98..17687531d1c6 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -92410,18 +84465,10 @@ index fc6e8f693b98..17687531d1c6 100644
 -
  Library("macromagic_gn")
 diff --git third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
-index 3c352afea7ec..6ad9b42d6dc4 100644
+index 764b220dcf8f..2a12495bcdf6 100644
 --- third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -92429,6 +84476,7 @@ index 3c352afea7ec..6ad9b42d6dc4 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -92437,23 +84485,18 @@ index 3c352afea7ec..6ad9b42d6dc4 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -92472,10 +84515,6 @@ index 3c352afea7ec..6ad9b42d6dc4 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -92483,10 +84522,6 @@ index 3c352afea7ec..6ad9b42d6dc4 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -92494,7 +84529,6 @@ index 3c352afea7ec..6ad9b42d6dc4 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -92502,10 +84536,6 @@ index 3c352afea7ec..6ad9b42d6dc4 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -92518,10 +84548,6 @@ index 3c352afea7ec..6ad9b42d6dc4 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -92552,7 +84578,7 @@ index 3c352afea7ec..6ad9b42d6dc4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -92639,7 +84665,7 @@ index 3c352afea7ec..6ad9b42d6dc4 100644
  
  Library("aligned_malloc_gn")
 diff --git third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
-index 7b6b50b9dd15..03d6e54acba9 100644
+index 0750ed9e64f9..e741274c96a3 100644
 --- third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -92650,6 +84676,7 @@ index 7b6b50b9dd15..03d6e54acba9 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -92658,13 +84685,12 @@ index 7b6b50b9dd15..03d6e54acba9 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92703,7 +84729,6 @@ index 7b6b50b9dd15..03d6e54acba9 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -92753,7 +84778,7 @@ index 7b6b50b9dd15..03d6e54acba9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -92779,7 +84804,7 @@ index 7b6b50b9dd15..03d6e54acba9 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -92821,7 +84846,7 @@ index 7b6b50b9dd15..03d6e54acba9 100644
 -
  Library("mod_ops_gn")
 diff --git third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
-index 8bf71a1ab9b2..084355af82e2 100644
+index 5461d491dff4..3f8532394ef4 100644
 --- third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -92832,6 +84857,7 @@ index 8bf71a1ab9b2..084355af82e2 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -92840,13 +84866,12 @@ index 8bf71a1ab9b2..084355af82e2 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92885,7 +84910,6 @@ index 8bf71a1ab9b2..084355af82e2 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -92935,7 +84959,7 @@ index 8bf71a1ab9b2..084355af82e2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -92961,7 +84985,7 @@ index 8bf71a1ab9b2..084355af82e2 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -93003,18 +85027,10 @@ index 8bf71a1ab9b2..084355af82e2 100644
 -
  Library("moving_max_counter_gn")
 diff --git third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
-index 250d021bf165..01e254bed37a 100644
+index 9ec122a9ce5f..27ce5039d3c6 100644
 --- third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -93022,6 +85038,7 @@ index 250d021bf165..01e254bed37a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -93030,23 +85047,18 @@ index 250d021bf165..01e254bed37a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -93066,10 +85078,6 @@ index 250d021bf165..01e254bed37a 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -93077,10 +85085,6 @@ index 250d021bf165..01e254bed37a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -93088,7 +85092,6 @@ index 250d021bf165..01e254bed37a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -93096,10 +85099,6 @@ index 250d021bf165..01e254bed37a 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -93112,10 +85111,6 @@ index 250d021bf165..01e254bed37a 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -93152,7 +85147,7 @@ index 250d021bf165..01e254bed37a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -93210,10 +85205,10 @@ index 250d021bf165..01e254bed37a 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -93224,10 +85219,10 @@ index 250d021bf165..01e254bed37a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -93239,18 +85234,10 @@ index 250d021bf165..01e254bed37a 100644
  
  Library("net_helpers_gn")
 diff --git third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
-index 6b3882c8e215..28cf9963eb6f 100644
+index d3b3da72d146..c44bd3b53ae0 100644
 --- third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -93258,6 +85245,7 @@ index 6b3882c8e215..28cf9963eb6f 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -93266,23 +85254,18 @@ index 6b3882c8e215..28cf9963eb6f 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -93297,10 +85280,6 @@ index 6b3882c8e215..28cf9963eb6f 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -93308,10 +85287,6 @@ index 6b3882c8e215..28cf9963eb6f 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -93319,7 +85294,6 @@ index 6b3882c8e215..28cf9963eb6f 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -93327,10 +85301,6 @@ index 6b3882c8e215..28cf9963eb6f 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -93343,10 +85313,6 @@ index 6b3882c8e215..28cf9963eb6f 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -93377,7 +85343,7 @@ index 6b3882c8e215..28cf9963eb6f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -93435,10 +85401,10 @@ index 6b3882c8e215..28cf9963eb6f 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -93449,10 +85415,10 @@ index 6b3882c8e215..28cf9963eb6f 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -93464,18 +85430,10 @@ index 6b3882c8e215..28cf9963eb6f 100644
  
  Library("sent_packet_gn")
 diff --git third_party/libwebrtc/rtc_base/network_constants_gn/moz.build third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
-index 64a02b49cd61..1fb29bdbddeb 100644
+index 31053e12ea4a..fe1e8a9ea932 100644
 --- third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -93483,6 +85441,7 @@ index 64a02b49cd61..1fb29bdbddeb 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -93491,23 +85450,18 @@ index 64a02b49cd61..1fb29bdbddeb 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -93526,10 +85480,6 @@ index 64a02b49cd61..1fb29bdbddeb 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -93537,10 +85487,6 @@ index 64a02b49cd61..1fb29bdbddeb 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -93548,7 +85494,6 @@ index 64a02b49cd61..1fb29bdbddeb 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -93556,10 +85501,6 @@ index 64a02b49cd61..1fb29bdbddeb 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -93572,10 +85513,6 @@ index 64a02b49cd61..1fb29bdbddeb 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -93606,7 +85543,7 @@ index 64a02b49cd61..1fb29bdbddeb 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -93693,18 +85630,10 @@ index 64a02b49cd61..1fb29bdbddeb 100644
  
  Library("network_constants_gn")
 diff --git third_party/libwebrtc/rtc_base/network_route_gn/moz.build third_party/libwebrtc/rtc_base/network_route_gn/moz.build
-index 90b5bcd80497..2a5e0afd12ea 100644
+index 06557cf9497d..db90cbe755bb 100644
 --- third_party/libwebrtc/rtc_base/network_route_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/network_route_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -93712,6 +85641,7 @@ index 90b5bcd80497..2a5e0afd12ea 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -93720,23 +85650,18 @@ index 90b5bcd80497..2a5e0afd12ea 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -93755,10 +85680,6 @@ index 90b5bcd80497..2a5e0afd12ea 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -93766,10 +85687,6 @@ index 90b5bcd80497..2a5e0afd12ea 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -93777,7 +85694,6 @@ index 90b5bcd80497..2a5e0afd12ea 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -93785,10 +85701,6 @@ index 90b5bcd80497..2a5e0afd12ea 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -93801,10 +85713,6 @@ index 90b5bcd80497..2a5e0afd12ea 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -93835,7 +85743,7 @@ index 90b5bcd80497..2a5e0afd12ea 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -93922,18 +85830,10 @@ index 90b5bcd80497..2a5e0afd12ea 100644
  
  Library("network_route_gn")
 diff --git third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
-index d36a784ba3f9..6da644bc60af 100644
+index beffd8445b78..693b43b106dc 100644
 --- third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -93941,6 +85841,7 @@ index d36a784ba3f9..6da644bc60af 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -93949,23 +85850,18 @@ index d36a784ba3f9..6da644bc60af 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -93985,10 +85881,6 @@ index d36a784ba3f9..6da644bc60af 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -93996,10 +85888,6 @@ index d36a784ba3f9..6da644bc60af 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -94007,7 +85895,6 @@ index d36a784ba3f9..6da644bc60af 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -94015,10 +85902,6 @@ index d36a784ba3f9..6da644bc60af 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -94031,10 +85914,6 @@ index d36a784ba3f9..6da644bc60af 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -94072,7 +85951,7 @@ index d36a784ba3f9..6da644bc60af 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -94130,10 +86009,10 @@ index d36a784ba3f9..6da644bc60af 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -94144,10 +86023,10 @@ index d36a784ba3f9..6da644bc60af 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -94159,7 +86038,7 @@ index d36a784ba3f9..6da644bc60af 100644
  
  Library("null_socket_server_gn")
 diff --git third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
-index 43975dc4d3dd..054a6b377ce4 100644
+index df5836570385..150831277c97 100644
 --- third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -94170,6 +86049,7 @@ index 43975dc4d3dd..054a6b377ce4 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -94178,13 +86058,12 @@ index 43975dc4d3dd..054a6b377ce4 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94223,7 +86102,6 @@ index 43975dc4d3dd..054a6b377ce4 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -94273,7 +86151,7 @@ index 43975dc4d3dd..054a6b377ce4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -94299,7 +86177,7 @@ index 43975dc4d3dd..054a6b377ce4 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -94341,18 +86219,10 @@ index 43975dc4d3dd..054a6b377ce4 100644
 -
  Library("one_time_event_gn")
 diff --git third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
-index 2f3cc276bd06..2b3a860c4426 100644
+index 9df9a5970796..96b61f54cadd 100644
 --- third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -94360,6 +86230,7 @@ index 2f3cc276bd06..2b3a860c4426 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -94368,23 +86239,18 @@ index 2f3cc276bd06..2b3a860c4426 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -94403,10 +86269,6 @@ index 2f3cc276bd06..2b3a860c4426 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -94414,10 +86276,6 @@ index 2f3cc276bd06..2b3a860c4426 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -94425,7 +86283,6 @@ index 2f3cc276bd06..2b3a860c4426 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -94433,10 +86290,6 @@ index 2f3cc276bd06..2b3a860c4426 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -94449,10 +86302,6 @@ index 2f3cc276bd06..2b3a860c4426 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -94490,7 +86339,7 @@ index 2f3cc276bd06..2b3a860c4426 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -94548,10 +86397,10 @@ index 2f3cc276bd06..2b3a860c4426 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -94562,10 +86411,10 @@ index 2f3cc276bd06..2b3a860c4426 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -94577,18 +86426,10 @@ index 2f3cc276bd06..2b3a860c4426 100644
  
  Library("platform_thread_gn")
 diff --git third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
-index 835c1fbf08b6..b38ba39f3d4e 100644
+index 483fc3f4157a..de5e498e7276 100644
 --- third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -94596,6 +86437,7 @@ index 835c1fbf08b6..b38ba39f3d4e 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -94604,23 +86446,18 @@ index 835c1fbf08b6..b38ba39f3d4e 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -94639,10 +86476,6 @@ index 835c1fbf08b6..b38ba39f3d4e 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -94650,10 +86483,6 @@ index 835c1fbf08b6..b38ba39f3d4e 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -94661,7 +86490,6 @@ index 835c1fbf08b6..b38ba39f3d4e 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -94669,10 +86497,6 @@ index 835c1fbf08b6..b38ba39f3d4e 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -94685,10 +86509,6 @@ index 835c1fbf08b6..b38ba39f3d4e 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -94719,7 +86539,7 @@ index 835c1fbf08b6..b38ba39f3d4e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -94806,7 +86626,7 @@ index 835c1fbf08b6..b38ba39f3d4e 100644
  
  Library("platform_thread_types_gn")
 diff --git third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
-index 9067fc0643a5..293ec660b38f 100644
+index 978991e022cc..9b750326f9fd 100644
 --- third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -94817,6 +86637,7 @@ index 9067fc0643a5..293ec660b38f 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -94825,13 +86646,12 @@ index 9067fc0643a5..293ec660b38f 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94866,7 +86686,6 @@ index 9067fc0643a5..293ec660b38f 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -94916,7 +86735,7 @@ index 9067fc0643a5..293ec660b38f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -94942,7 +86761,7 @@ index 9067fc0643a5..293ec660b38f 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -94984,18 +86803,10 @@ index 9067fc0643a5..293ec660b38f 100644
 -
  Library("protobuf_utils_gn")
 diff --git third_party/libwebrtc/rtc_base/race_checker_gn/moz.build third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
-index e7748ce732f6..1500b41661b3 100644
+index 40f116cdf02f..fd5b113818a0 100644
 --- third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -95003,6 +86814,7 @@ index e7748ce732f6..1500b41661b3 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -95011,23 +86823,18 @@ index e7748ce732f6..1500b41661b3 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -95046,10 +86853,6 @@ index e7748ce732f6..1500b41661b3 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -95057,10 +86860,6 @@ index e7748ce732f6..1500b41661b3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -95068,7 +86867,6 @@ index e7748ce732f6..1500b41661b3 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -95076,10 +86874,6 @@ index e7748ce732f6..1500b41661b3 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -95092,10 +86886,6 @@ index e7748ce732f6..1500b41661b3 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -95126,7 +86916,7 @@ index e7748ce732f6..1500b41661b3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -95213,18 +87003,10 @@ index e7748ce732f6..1500b41661b3 100644
  
  Library("race_checker_gn")
 diff --git third_party/libwebrtc/rtc_base/random_gn/moz.build third_party/libwebrtc/rtc_base/random_gn/moz.build
-index 7c69b2b2baca..a7a696a78544 100644
+index 91128f649d33..994b0123cb5b 100644
 --- third_party/libwebrtc/rtc_base/random_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/random_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -95232,6 +87014,7 @@ index 7c69b2b2baca..a7a696a78544 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -95240,23 +87023,18 @@ index 7c69b2b2baca..a7a696a78544 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -95275,10 +87053,6 @@ index 7c69b2b2baca..a7a696a78544 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -95286,10 +87060,6 @@ index 7c69b2b2baca..a7a696a78544 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -95297,7 +87067,6 @@ index 7c69b2b2baca..a7a696a78544 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -95305,10 +87074,6 @@ index 7c69b2b2baca..a7a696a78544 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -95321,10 +87086,6 @@ index 7c69b2b2baca..a7a696a78544 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -95355,7 +87116,7 @@ index 7c69b2b2baca..a7a696a78544 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -95442,18 +87203,10 @@ index 7c69b2b2baca..a7a696a78544 100644
  
  Library("random_gn")
 diff --git third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
-index 999ecfa5ee3a..da43fa0b57f5 100644
+index e41ea09b0ea2..4599539f7bbd 100644
 --- third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -95461,6 +87214,7 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -95469,23 +87223,18 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -95504,10 +87253,6 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -95515,10 +87260,6 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -95526,7 +87267,6 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -95534,10 +87274,6 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -95550,10 +87286,6 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -95591,7 +87323,7 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -95649,10 +87381,10 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -95663,10 +87395,10 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -95678,18 +87410,10 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
  
  Library("rate_limiter_gn")
 diff --git third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
-index 42f252ca7732..18ff4d3a3f9e 100644
+index 71d485c13568..a544f01597c0 100644
 --- third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -95697,6 +87421,7 @@ index 42f252ca7732..18ff4d3a3f9e 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -95705,23 +87430,18 @@ index 42f252ca7732..18ff4d3a3f9e 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -95740,10 +87460,6 @@ index 42f252ca7732..18ff4d3a3f9e 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -95751,10 +87467,6 @@ index 42f252ca7732..18ff4d3a3f9e 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -95762,7 +87474,6 @@ index 42f252ca7732..18ff4d3a3f9e 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -95770,10 +87481,6 @@ index 42f252ca7732..18ff4d3a3f9e 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -95786,10 +87493,6 @@ index 42f252ca7732..18ff4d3a3f9e 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -95827,7 +87530,7 @@ index 42f252ca7732..18ff4d3a3f9e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -95885,10 +87588,10 @@ index 42f252ca7732..18ff4d3a3f9e 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -95899,10 +87602,10 @@ index 42f252ca7732..18ff4d3a3f9e 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -95914,18 +87617,10 @@ index 42f252ca7732..18ff4d3a3f9e 100644
  
  Library("rate_statistics_gn")
 diff --git third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
-index 4634400c423d..5b89c75b3058 100644
+index 75698c8db945..c4fea54c2bff 100644
 --- third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -95933,6 +87628,7 @@ index 4634400c423d..5b89c75b3058 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -95941,23 +87637,18 @@ index 4634400c423d..5b89c75b3058 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -95976,10 +87667,6 @@ index 4634400c423d..5b89c75b3058 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -95987,10 +87674,6 @@ index 4634400c423d..5b89c75b3058 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -95998,7 +87681,6 @@ index 4634400c423d..5b89c75b3058 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -96006,10 +87688,6 @@ index 4634400c423d..5b89c75b3058 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -96022,10 +87700,6 @@ index 4634400c423d..5b89c75b3058 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -96063,7 +87737,7 @@ index 4634400c423d..5b89c75b3058 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -96121,10 +87795,10 @@ index 4634400c423d..5b89c75b3058 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -96135,10 +87809,10 @@ index 4634400c423d..5b89c75b3058 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -96150,7 +87824,7 @@ index 4634400c423d..5b89c75b3058 100644
  
  Library("rate_tracker_gn")
 diff --git third_party/libwebrtc/rtc_base/refcount_gn/moz.build third_party/libwebrtc/rtc_base/refcount_gn/moz.build
-index 2ec4b4c993a9..08ec8bc2590a 100644
+index 310f48f6fe48..7967acbb2978 100644
 --- third_party/libwebrtc/rtc_base/refcount_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/refcount_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -96161,6 +87835,7 @@ index 2ec4b4c993a9..08ec8bc2590a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -96169,13 +87844,12 @@ index 2ec4b4c993a9..08ec8bc2590a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -96210,7 +87884,6 @@ index 2ec4b4c993a9..08ec8bc2590a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -96260,7 +87933,7 @@ index 2ec4b4c993a9..08ec8bc2590a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -96286,7 +87959,7 @@ index 2ec4b4c993a9..08ec8bc2590a 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -96328,7 +88001,7 @@ index 2ec4b4c993a9..08ec8bc2590a 100644
 -
  Library("refcount_gn")
 diff --git third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
-index 71eaf72b7101..c3f335cd189d 100644
+index 8e1ad3270d6a..c1de16b7663d 100644
 --- third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -96339,6 +88012,7 @@ index 71eaf72b7101..c3f335cd189d 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -96347,13 +88021,12 @@ index 71eaf72b7101..c3f335cd189d 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -96392,7 +88065,6 @@ index 71eaf72b7101..c3f335cd189d 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -96442,7 +88114,7 @@ index 71eaf72b7101..c3f335cd189d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -96468,7 +88140,7 @@ index 71eaf72b7101..c3f335cd189d 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -96510,18 +88182,10 @@ index 71eaf72b7101..c3f335cd189d 100644
 -
  Library("rolling_accumulator_gn")
 diff --git third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
-index 12fadc1f9a42..e514f45c4c65 100644
+index 5a2ddf7b5535..52f42d277da4 100644
 --- third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -96529,6 +88193,7 @@ index 12fadc1f9a42..e514f45c4c65 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -96537,23 +88202,18 @@ index 12fadc1f9a42..e514f45c4c65 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -96572,10 +88232,6 @@ index 12fadc1f9a42..e514f45c4c65 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -96583,10 +88239,6 @@ index 12fadc1f9a42..e514f45c4c65 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -96594,7 +88246,6 @@ index 12fadc1f9a42..e514f45c4c65 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -96602,10 +88253,6 @@ index 12fadc1f9a42..e514f45c4c65 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -96618,10 +88265,6 @@ index 12fadc1f9a42..e514f45c4c65 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -96652,7 +88295,7 @@ index 12fadc1f9a42..e514f45c4c65 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -96739,18 +88382,10 @@ index 12fadc1f9a42..e514f45c4c65 100644
  
  Library("rtc_event_gn")
 diff --git third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
-index c720119a5c89..15f92340b6dc 100644
+index 31383355abe5..41f7c59fb1c4 100644
 --- third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -96758,6 +88393,7 @@ index c720119a5c89..15f92340b6dc 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -96766,23 +88402,18 @@ index c720119a5c89..15f92340b6dc 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,107 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,86 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -96801,10 +88432,6 @@ index c720119a5c89..15f92340b6dc 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -96812,10 +88439,6 @@ index c720119a5c89..15f92340b6dc 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -96823,7 +88446,6 @@ index c720119a5c89..15f92340b6dc 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -96831,10 +88453,6 @@ index c720119a5c89..15f92340b6dc 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -96847,10 +88465,6 @@ index c720119a5c89..15f92340b6dc 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -96881,7 +88495,7 @@ index c720119a5c89..15f92340b6dc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -156,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -135,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -96968,18 +88582,10 @@ index c720119a5c89..15f92340b6dc 100644
  
  Library("rtc_numerics_gn")
 diff --git third_party/libwebrtc/rtc_base/rtp_to_ntp_estimator_gn/moz.build third_party/libwebrtc/rtc_base/rtp_to_ntp_estimator_gn/moz.build
-index e0671e93a97e..4a51313a1e7c 100644
+index 6f2a3c9ce63d..ee9aa8bf7c35 100644
 --- third_party/libwebrtc/rtc_base/rtp_to_ntp_estimator_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rtp_to_ntp_estimator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -96987,6 +88593,7 @@ index e0671e93a97e..4a51313a1e7c 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -96995,23 +88602,18 @@ index e0671e93a97e..4a51313a1e7c 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -97030,10 +88632,6 @@ index e0671e93a97e..4a51313a1e7c 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -97041,10 +88639,6 @@ index e0671e93a97e..4a51313a1e7c 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -97052,7 +88646,6 @@ index e0671e93a97e..4a51313a1e7c 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -97060,10 +88653,6 @@ index e0671e93a97e..4a51313a1e7c 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -97076,10 +88665,6 @@ index e0671e93a97e..4a51313a1e7c 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -97117,7 +88702,7 @@ index e0671e93a97e..4a51313a1e7c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -97175,10 +88760,10 @@ index e0671e93a97e..4a51313a1e7c 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -97189,10 +88774,10 @@ index e0671e93a97e..4a51313a1e7c 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -97204,7 +88789,7 @@ index e0671e93a97e..4a51313a1e7c 100644
  
  Library("rtp_to_ntp_estimator_gn")
 diff --git third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
-index 8412e5d46abd..3d944f71708e 100644
+index 1fccec1b3d1d..7a289dcd81cb 100644
 --- third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -97215,6 +88800,7 @@ index 8412e5d46abd..3d944f71708e 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -97223,13 +88809,12 @@ index 8412e5d46abd..3d944f71708e 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -97264,7 +88849,6 @@ index 8412e5d46abd..3d944f71708e 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -97314,7 +88898,7 @@ index 8412e5d46abd..3d944f71708e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -97340,7 +88924,7 @@ index 8412e5d46abd..3d944f71708e 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -97382,7 +88966,7 @@ index 8412e5d46abd..3d944f71708e 100644
 -
  Library("safe_compare_gn")
 diff --git third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
-index b9b5685168cd..6e907c03078e 100644
+index 4b1fe52dbb29..37d087dca314 100644
 --- third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -97393,6 +88977,7 @@ index b9b5685168cd..6e907c03078e 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -97401,13 +88986,12 @@ index b9b5685168cd..6e907c03078e 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -97446,7 +89030,6 @@ index b9b5685168cd..6e907c03078e 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -97496,7 +89079,7 @@ index b9b5685168cd..6e907c03078e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -97522,7 +89105,7 @@ index b9b5685168cd..6e907c03078e 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -97564,7 +89147,7 @@ index b9b5685168cd..6e907c03078e 100644
 -
  Library("safe_conversions_gn")
 diff --git third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
-index 9e7f9b007a04..4387f10d4765 100644
+index 19c9d560e6b0..b02b90eb7f8a 100644
 --- third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -97575,6 +89158,7 @@ index 9e7f9b007a04..4387f10d4765 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -97583,13 +89167,12 @@ index 9e7f9b007a04..4387f10d4765 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -97628,7 +89211,6 @@ index 9e7f9b007a04..4387f10d4765 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -97678,7 +89260,7 @@ index 9e7f9b007a04..4387f10d4765 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -97704,7 +89286,7 @@ index 9e7f9b007a04..4387f10d4765 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -97746,18 +89328,10 @@ index 9e7f9b007a04..4387f10d4765 100644
 -
  Library("safe_minmax_gn")
 diff --git third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
-index 6ebef4d853b2..7f44a48ec748 100644
+index 2d6ffc700392..5657837196da 100644
 --- third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -97765,6 +89339,7 @@ index 6ebef4d853b2..7f44a48ec748 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -97773,23 +89348,18 @@ index 6ebef4d853b2..7f44a48ec748 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -97808,10 +89378,6 @@ index 6ebef4d853b2..7f44a48ec748 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -97819,10 +89385,6 @@ index 6ebef4d853b2..7f44a48ec748 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -97830,7 +89392,6 @@ index 6ebef4d853b2..7f44a48ec748 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -97838,10 +89399,6 @@ index 6ebef4d853b2..7f44a48ec748 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -97854,10 +89411,6 @@ index 6ebef4d853b2..7f44a48ec748 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -97888,7 +89441,7 @@ index 6ebef4d853b2..7f44a48ec748 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -97975,7 +89528,7 @@ index 6ebef4d853b2..7f44a48ec748 100644
  
  Library("sample_counter_gn")
 diff --git third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
-index ff05e2ced54e..635fdb7ef8cb 100644
+index 89ba6be7893d..65fc7a6bdcca 100644
 --- third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -97986,6 +89539,7 @@ index ff05e2ced54e..635fdb7ef8cb 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -97994,13 +89548,12 @@ index ff05e2ced54e..635fdb7ef8cb 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -98035,7 +89588,6 @@ index ff05e2ced54e..635fdb7ef8cb 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -98085,7 +89637,7 @@ index ff05e2ced54e..635fdb7ef8cb 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -98111,7 +89663,7 @@ index ff05e2ced54e..635fdb7ef8cb 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -98153,18 +89705,10 @@ index ff05e2ced54e..635fdb7ef8cb 100644
 -
  Library("sanitizer_gn")
 diff --git third_party/libwebrtc/rtc_base/socket_address_gn/moz.build third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
-index 4e7011e90027..b217d69de204 100644
+index 41f48aed0ade..0a3d78361f9c 100644
 --- third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -98172,6 +89716,7 @@ index 4e7011e90027..b217d69de204 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -98180,23 +89725,18 @@ index 4e7011e90027..b217d69de204 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -98216,10 +89756,6 @@ index 4e7011e90027..b217d69de204 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -98227,10 +89763,6 @@ index 4e7011e90027..b217d69de204 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -98238,7 +89770,6 @@ index 4e7011e90027..b217d69de204 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -98246,10 +89777,6 @@ index 4e7011e90027..b217d69de204 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -98262,10 +89789,6 @@ index 4e7011e90027..b217d69de204 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -98303,7 +89826,7 @@ index 4e7011e90027..b217d69de204 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -98361,10 +89884,10 @@ index 4e7011e90027..b217d69de204 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -98375,10 +89898,10 @@ index 4e7011e90027..b217d69de204 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -98390,7 +89913,7 @@ index 4e7011e90027..b217d69de204 100644
  
  Library("socket_address_gn")
 diff --git third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
-index d5451f5fa8df..18a7964355d5 100644
+index 7bb549d27ba9..4a07e285ccb1 100644
 --- third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -98401,6 +89924,7 @@ index d5451f5fa8df..18a7964355d5 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -98409,13 +89933,12 @@ index d5451f5fa8df..18a7964355d5 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -98455,7 +89978,6 @@ index d5451f5fa8df..18a7964355d5 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -98512,7 +90034,7 @@ index d5451f5fa8df..18a7964355d5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -98538,7 +90060,7 @@ index d5451f5fa8df..18a7964355d5 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -98580,18 +90102,10 @@ index d5451f5fa8df..18a7964355d5 100644
 -
  Library("socket_factory_gn")
 diff --git third_party/libwebrtc/rtc_base/socket_gn/moz.build third_party/libwebrtc/rtc_base/socket_gn/moz.build
-index 389d1784c6a7..1b424e8ed744 100644
+index d2ec55c32168..cccc8cb30d11 100644
 --- third_party/libwebrtc/rtc_base/socket_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/socket_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -98599,6 +90113,7 @@ index 389d1784c6a7..1b424e8ed744 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -98607,23 +90122,18 @@ index 389d1784c6a7..1b424e8ed744 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -98643,10 +90153,6 @@ index 389d1784c6a7..1b424e8ed744 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -98654,10 +90160,6 @@ index 389d1784c6a7..1b424e8ed744 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -98665,7 +90167,6 @@ index 389d1784c6a7..1b424e8ed744 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -98673,10 +90174,6 @@ index 389d1784c6a7..1b424e8ed744 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -98689,10 +90186,6 @@ index 389d1784c6a7..1b424e8ed744 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -98730,7 +90223,7 @@ index 389d1784c6a7..1b424e8ed744 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -98788,10 +90281,10 @@ index 389d1784c6a7..1b424e8ed744 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -98802,10 +90295,10 @@ index 389d1784c6a7..1b424e8ed744 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -98817,7 +90310,7 @@ index 389d1784c6a7..1b424e8ed744 100644
  
  Library("socket_gn")
 diff --git third_party/libwebrtc/rtc_base/socket_server_gn/moz.build third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
-index 4ca8dd7726b9..44180730ad13 100644
+index ac5a10fa4495..4d79666d6d70 100644
 --- third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -98828,6 +90321,7 @@ index 4ca8dd7726b9..44180730ad13 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -98836,13 +90330,12 @@ index 4ca8dd7726b9..44180730ad13 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -98882,7 +90375,6 @@ index 4ca8dd7726b9..44180730ad13 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -98939,7 +90431,7 @@ index 4ca8dd7726b9..44180730ad13 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -98965,7 +90457,7 @@ index 4ca8dd7726b9..44180730ad13 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -99007,7 +90499,7 @@ index 4ca8dd7726b9..44180730ad13 100644
 -
  Library("socket_server_gn")
 diff --git third_party/libwebrtc/rtc_base/ssl_adapter_gn/moz.build third_party/libwebrtc/rtc_base/ssl_adapter_gn/moz.build
-index 15aad07e729f..21e14c44e232 100644
+index d8170674c353..c2cf27cc74ea 100644
 --- third_party/libwebrtc/rtc_base/ssl_adapter_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/ssl_adapter_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -99018,6 +90510,7 @@ index 15aad07e729f..21e14c44e232 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -99026,13 +90519,12 @@ index 15aad07e729f..21e14c44e232 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -99067,7 +90559,6 @@ index 15aad07e729f..21e14c44e232 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -99117,7 +90608,7 @@ index 15aad07e729f..21e14c44e232 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -99143,7 +90634,7 @@ index 15aad07e729f..21e14c44e232 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -99185,18 +90676,10 @@ index 15aad07e729f..21e14c44e232 100644
 -
  Library("ssl_adapter_gn")
 diff --git third_party/libwebrtc/rtc_base/stringutils_gn/moz.build third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
-index 9894df29155b..2a11ffc34329 100644
+index 138bd260049f..204742c0f9e7 100644
 --- third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -99204,6 +90687,7 @@ index 9894df29155b..2a11ffc34329 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -99212,23 +90696,18 @@ index 9894df29155b..2a11ffc34329 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -50,107 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,86 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -99247,10 +90726,6 @@ index 9894df29155b..2a11ffc34329 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -99258,10 +90733,6 @@ index 9894df29155b..2a11ffc34329 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -99269,7 +90740,6 @@ index 9894df29155b..2a11ffc34329 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -99277,10 +90747,6 @@ index 9894df29155b..2a11ffc34329 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -99293,10 +90759,6 @@ index 9894df29155b..2a11ffc34329 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -99327,7 +90789,7 @@ index 9894df29155b..2a11ffc34329 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -158,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -99414,7 +90876,7 @@ index 9894df29155b..2a11ffc34329 100644
  
  Library("stringutils_gn")
 diff --git third_party/libwebrtc/rtc_base/strong_alias_gn/moz.build third_party/libwebrtc/rtc_base/strong_alias_gn/moz.build
-index a3f31a7a6fdf..8c09540fd98d 100644
+index 6eaec231f687..274bcc3ee6a5 100644
 --- third_party/libwebrtc/rtc_base/strong_alias_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/strong_alias_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -99425,6 +90887,7 @@ index a3f31a7a6fdf..8c09540fd98d 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -99433,13 +90896,12 @@ index a3f31a7a6fdf..8c09540fd98d 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -99474,7 +90936,6 @@ index a3f31a7a6fdf..8c09540fd98d 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -99524,7 +90985,7 @@ index a3f31a7a6fdf..8c09540fd98d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -99550,7 +91011,7 @@ index a3f31a7a6fdf..8c09540fd98d 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -99592,7 +91053,7 @@ index a3f31a7a6fdf..8c09540fd98d 100644
 -
  Library("strong_alias_gn")
 diff --git third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
-index 725c011556d5..0870b6d3f753 100644
+index 45f5b0fe25db..94b1bec9ec91 100644
 --- third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -99603,6 +91064,7 @@ index 725c011556d5..0870b6d3f753 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -99611,13 +91073,12 @@ index 725c011556d5..0870b6d3f753 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -99656,7 +91117,6 @@ index 725c011556d5..0870b6d3f753 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -99706,7 +91166,7 @@ index 725c011556d5..0870b6d3f753 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -99732,7 +91192,7 @@ index 725c011556d5..0870b6d3f753 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -99774,7 +91234,7 @@ index 725c011556d5..0870b6d3f753 100644
 -
  Library("swap_queue_gn")
 diff --git third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
-index d37b0d0d971d..d83739dcb266 100644
+index ddf62c785a8b..38c55315511d 100644
 --- third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -99785,6 +91245,7 @@ index d37b0d0d971d..d83739dcb266 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -99793,13 +91254,12 @@ index d37b0d0d971d..d83739dcb266 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -99838,7 +91298,6 @@ index d37b0d0d971d..d83739dcb266 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -99888,7 +91347,7 @@ index d37b0d0d971d..d83739dcb266 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -99914,7 +91373,7 @@ index d37b0d0d971d..d83739dcb266 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -99956,18 +91415,10 @@ index d37b0d0d971d..d83739dcb266 100644
 -
  Library("mutex_gn")
 diff --git third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
-index 54de498e463f..abb84d91436b 100644
+index 49fefc605d17..837261699c1f 100644
 --- third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -99975,6 +91426,7 @@ index 54de498e463f..abb84d91436b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -99983,23 +91435,18 @@ index 54de498e463f..abb84d91436b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -100018,10 +91465,6 @@ index 54de498e463f..abb84d91436b 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -100029,10 +91472,6 @@ index 54de498e463f..abb84d91436b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -100040,7 +91479,6 @@ index 54de498e463f..abb84d91436b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -100048,10 +91486,6 @@ index 54de498e463f..abb84d91436b 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -100064,10 +91498,6 @@ index 54de498e463f..abb84d91436b 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -100098,7 +91528,7 @@ index 54de498e463f..abb84d91436b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -100185,18 +91615,10 @@ index 54de498e463f..abb84d91436b 100644
  
  Library("sequence_checker_internal_gn")
 diff --git third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
-index 5131b384449d..5ef7f00d6d94 100644
+index a23ba76960b9..7bc90e8a38bc 100644
 --- third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -100204,6 +91626,7 @@ index 5131b384449d..5ef7f00d6d94 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -100212,23 +91635,18 @@ index 5131b384449d..5ef7f00d6d94 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -100243,10 +91661,6 @@ index 5131b384449d..5ef7f00d6d94 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -100254,10 +91668,6 @@ index 5131b384449d..5ef7f00d6d94 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -100265,7 +91675,6 @@ index 5131b384449d..5ef7f00d6d94 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -100273,10 +91682,6 @@ index 5131b384449d..5ef7f00d6d94 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -100289,10 +91694,6 @@ index 5131b384449d..5ef7f00d6d94 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -100323,7 +91724,7 @@ index 5131b384449d..5ef7f00d6d94 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -100381,10 +91782,10 @@ index 5131b384449d..5ef7f00d6d94 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -100395,10 +91796,10 @@ index 5131b384449d..5ef7f00d6d94 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -100410,18 +91811,10 @@ index 5131b384449d..5ef7f00d6d94 100644
  
  Library("yield_gn")
 diff --git third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
-index 5fb11b5a4bb7..029670a84ab9 100644
+index bbfc46863f7e..7a3a8c9d8392 100644
 --- third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -100429,6 +91822,7 @@ index 5fb11b5a4bb7..029670a84ab9 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -100437,23 +91831,18 @@ index 5fb11b5a4bb7..029670a84ab9 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -100472,10 +91861,6 @@ index 5fb11b5a4bb7..029670a84ab9 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -100483,10 +91868,6 @@ index 5fb11b5a4bb7..029670a84ab9 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -100494,7 +91875,6 @@ index 5fb11b5a4bb7..029670a84ab9 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -100502,10 +91882,6 @@ index 5fb11b5a4bb7..029670a84ab9 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -100518,10 +91894,6 @@ index 5fb11b5a4bb7..029670a84ab9 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -100552,7 +91924,7 @@ index 5fb11b5a4bb7..029670a84ab9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -100639,7 +92011,7 @@ index 5fb11b5a4bb7..029670a84ab9 100644
  
  Library("yield_policy_gn")
 diff --git third_party/libwebrtc/rtc_base/system/arch_gn/moz.build third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
-index ba6494df25bc..eb72cb65f99a 100644
+index 545f0a4b0e51..aaccd7613890 100644
 --- third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -100650,6 +92022,7 @@ index ba6494df25bc..eb72cb65f99a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -100658,13 +92031,12 @@ index ba6494df25bc..eb72cb65f99a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -100699,7 +92071,6 @@ index ba6494df25bc..eb72cb65f99a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -100749,7 +92120,7 @@ index ba6494df25bc..eb72cb65f99a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -100775,7 +92146,7 @@ index ba6494df25bc..eb72cb65f99a 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -100818,10 +92189,10 @@ index ba6494df25bc..eb72cb65f99a 100644
  Library("arch_gn")
 diff --git third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build
 deleted file mode 100644
-index 089c08ecf102..000000000000
+index 6941a44d7273..000000000000
 --- third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build
 +++ /dev/null
-@@ -1,75 +0,0 @@
+@@ -1,74 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -100840,6 +92211,7 @@ index 089c08ecf102..000000000000
 -DEFINES["WEBRTC_ARCH_ARM"] = True
 -DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_HAS_NEON"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
 -DEFINES["WEBRTC_LINUX"] = True
@@ -100848,7 +92220,6 @@ index 089c08ecf102..000000000000
 -DEFINES["WEBRTC_POSIX"] = True
 -DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
 -DEFINES["_GNU_SOURCE"] = True
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 -DEFINES["__STDC_CONSTANT_MACROS"] = True
 -DEFINES["__STDC_FORMAT_MACROS"] = True
 -
@@ -100892,14 +92263,13 @@ index 089c08ecf102..000000000000
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["USE_UDEV"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -
 -Library("asm_defines_gn")
 diff --git third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build
 deleted file mode 100644
-index 1da48987d8c3..000000000000
+index eb25c5bb304e..000000000000
 --- third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build
 +++ /dev/null
 @@ -1,69 +0,0 @@
@@ -100923,13 +92293,13 @@ index 1da48987d8c3..000000000000
 -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
 -DEFINES["RTC_ENABLE_VP9"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
 -DEFINES["WEBRTC_MAC"] = True
 -DEFINES["WEBRTC_MOZILLA_BUILD"] = True
 -DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
 -DEFINES["WEBRTC_POSIX"] = True
 -DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 -DEFINES["__STDC_CONSTANT_MACROS"] = True
 -DEFINES["__STDC_FORMAT_MACROS"] = True
 -
@@ -100973,18 +92343,10 @@ index 1da48987d8c3..000000000000
 -
 -Library("cocoa_threading_gn")
 diff --git third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
-index 2e4e1d69d436..44faa970f9fa 100644
+index 63fa2b96e6b0..10e16e536ab8 100644
 --- third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -100992,6 +92354,7 @@ index 2e4e1d69d436..44faa970f9fa 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -101000,23 +92363,18 @@ index 2e4e1d69d436..44faa970f9fa 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -101035,10 +92393,6 @@ index 2e4e1d69d436..44faa970f9fa 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -101046,10 +92400,6 @@ index 2e4e1d69d436..44faa970f9fa 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -101057,7 +92407,6 @@ index 2e4e1d69d436..44faa970f9fa 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -101065,10 +92414,6 @@ index 2e4e1d69d436..44faa970f9fa 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -101081,10 +92426,6 @@ index 2e4e1d69d436..44faa970f9fa 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -101115,7 +92456,7 @@ index 2e4e1d69d436..44faa970f9fa 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -101203,7 +92544,7 @@ index 2e4e1d69d436..44faa970f9fa 100644
  Library("file_wrapper_gn")
 diff --git third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build
 deleted file mode 100644
-index 6f7acfe97c19..000000000000
+index 96aeffe5015f..000000000000
 --- third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build
 +++ /dev/null
 @@ -1,69 +0,0 @@
@@ -101227,13 +92568,13 @@ index 6f7acfe97c19..000000000000
 -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
 -DEFINES["RTC_ENABLE_VP9"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
 -DEFINES["WEBRTC_MAC"] = True
 -DEFINES["WEBRTC_MOZILLA_BUILD"] = True
 -DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
 -DEFINES["WEBRTC_POSIX"] = True
 -DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 -DEFINES["__STDC_CONSTANT_MACROS"] = True
 -DEFINES["__STDC_FORMAT_MACROS"] = True
 -
@@ -101277,7 +92618,7 @@ index 6f7acfe97c19..000000000000
 -
 -Library("gcd_helpers_gn")
 diff --git third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
-index a631f13a179d..0d1fb75179ef 100644
+index 09e048b3a0a9..9de0ab6e74a2 100644
 --- third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -101288,6 +92629,7 @@ index a631f13a179d..0d1fb75179ef 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -101296,13 +92638,12 @@ index a631f13a179d..0d1fb75179ef 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -101337,7 +92678,6 @@ index a631f13a179d..0d1fb75179ef 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -101387,7 +92727,7 @@ index a631f13a179d..0d1fb75179ef 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -101413,7 +92753,7 @@ index a631f13a179d..0d1fb75179ef 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -101455,7 +92795,7 @@ index a631f13a179d..0d1fb75179ef 100644
 -
  Library("ignore_warnings_gn")
 diff --git third_party/libwebrtc/rtc_base/system/inline_gn/moz.build third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
-index fed5d2d9dd25..e918460b84fe 100644
+index 8d7e24fe9ae8..353d3dbece53 100644
 --- third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -101466,6 +92806,7 @@ index fed5d2d9dd25..e918460b84fe 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -101474,13 +92815,12 @@ index fed5d2d9dd25..e918460b84fe 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -101515,7 +92855,6 @@ index fed5d2d9dd25..e918460b84fe 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -101565,7 +92904,7 @@ index fed5d2d9dd25..e918460b84fe 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -101591,7 +92930,7 @@ index fed5d2d9dd25..e918460b84fe 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -101633,7 +92972,7 @@ index fed5d2d9dd25..e918460b84fe 100644
 -
  Library("inline_gn")
 diff --git third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
-index ac54e7b6810d..176b44667775 100644
+index 47f76b807d12..7632cd32cd36 100644
 --- third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -101644,6 +92983,7 @@ index ac54e7b6810d..176b44667775 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -101652,13 +92992,12 @@ index ac54e7b6810d..176b44667775 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -101693,7 +93032,6 @@ index ac54e7b6810d..176b44667775 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -101743,7 +93081,7 @@ index ac54e7b6810d..176b44667775 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -101769,7 +93107,7 @@ index ac54e7b6810d..176b44667775 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -101811,7 +93149,7 @@ index ac54e7b6810d..176b44667775 100644
 -
  Library("no_unique_address_gn")
 diff --git third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
-index 28109964edf2..be0f987a9fa0 100644
+index b5447466b541..80be20f613c2 100644
 --- third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -101822,6 +93160,7 @@ index 28109964edf2..be0f987a9fa0 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -101830,13 +93169,12 @@ index 28109964edf2..be0f987a9fa0 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -101871,7 +93209,6 @@ index 28109964edf2..be0f987a9fa0 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -101921,7 +93258,7 @@ index 28109964edf2..be0f987a9fa0 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -101947,7 +93284,7 @@ index 28109964edf2..be0f987a9fa0 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -101989,7 +93326,7 @@ index 28109964edf2..be0f987a9fa0 100644
 -
  Library("rtc_export_gn")
 diff --git third_party/libwebrtc/rtc_base/system/unused_gn/moz.build third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
-index fc470fbc0fb4..5deb07a2a80a 100644
+index 5348c6d421f6..aa077e5ab912 100644
 --- third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -102000,6 +93337,7 @@ index fc470fbc0fb4..5deb07a2a80a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -102008,13 +93346,12 @@ index fc470fbc0fb4..5deb07a2a80a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -102049,7 +93386,6 @@ index fc470fbc0fb4..5deb07a2a80a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -102099,7 +93435,7 @@ index fc470fbc0fb4..5deb07a2a80a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -102125,7 +93461,7 @@ index fc470fbc0fb4..5deb07a2a80a 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -102167,7 +93503,7 @@ index fc470fbc0fb4..5deb07a2a80a 100644
 -
  Library("unused_gn")
 diff --git third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
-index 2d2eeaea1294..0acf53f14d5e 100644
+index d2bdd0c2e561..851d3877f698 100644
 --- third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -102178,6 +93514,7 @@ index 2d2eeaea1294..0acf53f14d5e 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -102186,13 +93523,12 @@ index 2d2eeaea1294..0acf53f14d5e 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -102227,7 +93563,6 @@ index 2d2eeaea1294..0acf53f14d5e 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -102277,7 +93612,7 @@ index 2d2eeaea1294..0acf53f14d5e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -102303,7 +93638,7 @@ index 2d2eeaea1294..0acf53f14d5e 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -102345,18 +93680,10 @@ index 2d2eeaea1294..0acf53f14d5e 100644
 -
  Library("warn_current_thread_is_deadlocked_gn")
 diff --git third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
-index 6968afccd46e..8dcf86ee10b7 100644
+index 611cef5f0aa9..7ac103b14652 100644
 --- third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -102364,6 +93691,7 @@ index 6968afccd46e..8dcf86ee10b7 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -102372,23 +93700,18 @@ index 6968afccd46e..8dcf86ee10b7 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -102407,10 +93730,6 @@ index 6968afccd46e..8dcf86ee10b7 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -102418,10 +93737,6 @@ index 6968afccd46e..8dcf86ee10b7 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -102429,7 +93744,6 @@ index 6968afccd46e..8dcf86ee10b7 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -102437,10 +93751,6 @@ index 6968afccd46e..8dcf86ee10b7 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -102453,10 +93763,6 @@ index 6968afccd46e..8dcf86ee10b7 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -102494,7 +93800,7 @@ index 6968afccd46e..8dcf86ee10b7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -102552,10 +93858,10 @@ index 6968afccd46e..8dcf86ee10b7 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -102566,10 +93872,10 @@ index 6968afccd46e..8dcf86ee10b7 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -102581,18 +93887,10 @@ index 6968afccd46e..8dcf86ee10b7 100644
  
  Library("repeating_task_gn")
 diff --git third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
-index 16b9830a183a..b42f955e4115 100644
+index 4fdd6ceba1cf..cf57b774f7c7 100644
 --- third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -102600,6 +93898,7 @@ index 16b9830a183a..b42f955e4115 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -102608,23 +93907,18 @@ index 16b9830a183a..b42f955e4115 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -102639,10 +93933,6 @@ index 16b9830a183a..b42f955e4115 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -102650,10 +93940,6 @@ index 16b9830a183a..b42f955e4115 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -102661,7 +93947,6 @@ index 16b9830a183a..b42f955e4115 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -102669,10 +93954,6 @@ index 16b9830a183a..b42f955e4115 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -102685,10 +93966,6 @@ index 16b9830a183a..b42f955e4115 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -102719,7 +93996,7 @@ index 16b9830a183a..b42f955e4115 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -102777,10 +94054,10 @@ index 16b9830a183a..b42f955e4115 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -102791,10 +94068,10 @@ index 16b9830a183a..b42f955e4115 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -102806,18 +94083,10 @@ index 16b9830a183a..b42f955e4115 100644
  
  Library("sigslot_gn")
 diff --git third_party/libwebrtc/rtc_base/threading_gn/moz.build third_party/libwebrtc/rtc_base/threading_gn/moz.build
-index d168d3a09470..98b262c45bf9 100644
+index 4365ae46ca4c..12f8868a8704 100644
 --- third_party/libwebrtc/rtc_base/threading_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/threading_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -102825,6 +94094,7 @@ index d168d3a09470..98b262c45bf9 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -102833,23 +94103,18 @@ index d168d3a09470..98b262c45bf9 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,131 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,110 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -102873,10 +94138,6 @@ index d168d3a09470..98b262c45bf9 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -102888,10 +94149,6 @@ index d168d3a09470..98b262c45bf9 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -102899,7 +94156,6 @@ index d168d3a09470..98b262c45bf9 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -102911,10 +94167,6 @@ index d168d3a09470..98b262c45bf9 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -102927,10 +94179,6 @@ index d168d3a09470..98b262c45bf9 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -102972,7 +94220,7 @@ index d168d3a09470..98b262c45bf9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -181,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -160,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -103059,18 +94307,10 @@ index d168d3a09470..98b262c45bf9 100644
  
  Library("threading_gn")
 diff --git third_party/libwebrtc/rtc_base/timeutils_gn/moz.build third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
-index a4a5f263e03c..a9960db995e8 100644
+index 4b8acb938c23..d445327106b5 100644
 --- third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -103078,6 +94318,7 @@ index a4a5f263e03c..a9960db995e8 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_EXCLUDE_SYSTEM_TIME"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
@@ -103087,23 +94328,18 @@ index a4a5f263e03c..a9960db995e8 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,114 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -103122,10 +94358,6 @@ index a4a5f263e03c..a9960db995e8 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -103133,10 +94365,6 @@ index a4a5f263e03c..a9960db995e8 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -103144,7 +94372,6 @@ index a4a5f263e03c..a9960db995e8 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -103152,10 +94379,6 @@ index a4a5f263e03c..a9960db995e8 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -103168,10 +94391,6 @@ index a4a5f263e03c..a9960db995e8 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -103209,7 +94428,7 @@ index a4a5f263e03c..a9960db995e8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -163,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -103267,10 +94486,10 @@ index a4a5f263e03c..a9960db995e8 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -103281,10 +94500,10 @@ index a4a5f263e03c..a9960db995e8 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -103296,7 +94515,7 @@ index a4a5f263e03c..a9960db995e8 100644
  
  Library("timeutils_gn")
 diff --git third_party/libwebrtc/rtc_base/type_traits_gn/moz.build third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
-index ea897f3b3845..11ce35fdc349 100644
+index 70461b8aa319..2acfd98eda8a 100644
 --- third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -103307,6 +94526,7 @@ index ea897f3b3845..11ce35fdc349 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -103315,13 +94535,12 @@ index ea897f3b3845..11ce35fdc349 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -103356,7 +94575,6 @@ index ea897f3b3845..11ce35fdc349 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -103406,7 +94624,7 @@ index ea897f3b3845..11ce35fdc349 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -103432,7 +94650,7 @@ index ea897f3b3845..11ce35fdc349 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -103474,7 +94692,7 @@ index ea897f3b3845..11ce35fdc349 100644
 -
  Library("type_traits_gn")
 diff --git third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
-index 621fccf9d167..9cda58f5bf98 100644
+index 65eeebb09ea9..c37beeccab19 100644
 --- third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -103485,6 +94703,7 @@ index 621fccf9d167..9cda58f5bf98 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -103493,13 +94712,12 @@ index 621fccf9d167..9cda58f5bf98 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -103534,7 +94752,6 @@ index 621fccf9d167..9cda58f5bf98 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -103584,7 +94801,7 @@ index 621fccf9d167..9cda58f5bf98 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -103610,7 +94827,7 @@ index 621fccf9d167..9cda58f5bf98 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -103652,7 +94869,7 @@ index 621fccf9d167..9cda58f5bf98 100644
 -
  Library("unique_id_generator_gn")
 diff --git third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
-index da71deee59ac..7942ee7a0e00 100644
+index f33182ae409a..6b9bd21729b4 100644
 --- third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -103663,6 +94880,7 @@ index da71deee59ac..7942ee7a0e00 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -103671,13 +94889,12 @@ index da71deee59ac..7942ee7a0e00 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -103716,7 +94933,6 @@ index da71deee59ac..7942ee7a0e00 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -103766,7 +94982,7 @@ index da71deee59ac..7942ee7a0e00 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -103792,7 +95008,7 @@ index da71deee59ac..7942ee7a0e00 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -103834,18 +95050,10 @@ index da71deee59ac..7942ee7a0e00 100644
 -
  Library("unit_base_gn")
 diff --git third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
-index 1e0c3cb0a7a5..a68f8eae3284 100644
+index ab5a9a7c184c..ba80c70caacb 100644
 --- third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -103853,6 +95061,7 @@ index 1e0c3cb0a7a5..a68f8eae3284 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -103861,23 +95070,18 @@ index 1e0c3cb0a7a5..a68f8eae3284 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -103896,10 +95100,6 @@ index 1e0c3cb0a7a5..a68f8eae3284 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -103907,10 +95107,6 @@ index 1e0c3cb0a7a5..a68f8eae3284 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -103918,7 +95114,6 @@ index 1e0c3cb0a7a5..a68f8eae3284 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -103926,10 +95121,6 @@ index 1e0c3cb0a7a5..a68f8eae3284 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -103942,10 +95133,6 @@ index 1e0c3cb0a7a5..a68f8eae3284 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -103976,7 +95163,7 @@ index 1e0c3cb0a7a5..a68f8eae3284 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -104064,10 +95251,10 @@ index 1e0c3cb0a7a5..a68f8eae3284 100644
  Library("weak_ptr_gn")
 diff --git third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build
 deleted file mode 100644
-index cd55c0c4b4b9..000000000000
+index 6fefcd32d2ce..000000000000
 --- third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build
 +++ /dev/null
-@@ -1,95 +0,0 @@
+@@ -1,91 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -104079,10 +95266,6 @@ index cd55c0c4b4b9..000000000000
 -COMPILE_FLAGS["OS_INCLUDES"] = []
 -AllowCompilerWarnings()
 -
--CXXFLAGS += [
--    "-std:c++20"
--]
--
 -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
 -DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -DEFINES["NOMINMAX"] = True
@@ -104095,6 +95278,7 @@ index cd55c0c4b4b9..000000000000
 -DEFINES["UNICODE"] = True
 -DEFINES["USE_AURA"] = "1"
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
 -DEFINES["WEBRTC_MOZILLA_BUILD"] = True
 -DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -104111,7 +95295,6 @@ index cd55c0c4b4b9..000000000000
 -DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
 -DEFINES["_HAS_EXCEPTIONS"] = "0"
 -DEFINES["_HAS_NODISCARD"] = True
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 -DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
 -DEFINES["_SECURE_ATL"] = True
 -DEFINES["_UNICODE"] = True
@@ -104165,10 +95348,10 @@ index cd55c0c4b4b9..000000000000
 -Library("create_direct3d_device_gn")
 diff --git third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build
 deleted file mode 100644
-index 79ff472a7687..000000000000
+index e47a0e579d4a..000000000000
 --- third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build
 +++ /dev/null
-@@ -1,95 +0,0 @@
+@@ -1,91 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -104180,10 +95363,6 @@ index 79ff472a7687..000000000000
 -COMPILE_FLAGS["OS_INCLUDES"] = []
 -AllowCompilerWarnings()
 -
--CXXFLAGS += [
--    "-std:c++20"
--]
--
 -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
 -DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -DEFINES["NOMINMAX"] = True
@@ -104196,6 +95375,7 @@ index 79ff472a7687..000000000000
 -DEFINES["UNICODE"] = True
 -DEFINES["USE_AURA"] = "1"
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
 -DEFINES["WEBRTC_MOZILLA_BUILD"] = True
 -DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -104212,7 +95392,6 @@ index 79ff472a7687..000000000000
 -DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
 -DEFINES["_HAS_EXCEPTIONS"] = "0"
 -DEFINES["_HAS_NODISCARD"] = True
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 -DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
 -DEFINES["_SECURE_ATL"] = True
 -DEFINES["_UNICODE"] = True
@@ -104266,10 +95445,10 @@ index 79ff472a7687..000000000000
 -Library("get_activation_factory_gn")
 diff --git third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build
 deleted file mode 100644
-index 5a69bc248233..000000000000
+index 348b1af0ac91..000000000000
 --- third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build
 +++ /dev/null
-@@ -1,95 +0,0 @@
+@@ -1,91 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -104281,10 +95460,6 @@ index 5a69bc248233..000000000000
 -COMPILE_FLAGS["OS_INCLUDES"] = []
 -AllowCompilerWarnings()
 -
--CXXFLAGS += [
--    "-std:c++20"
--]
--
 -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
 -DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -DEFINES["NOMINMAX"] = True
@@ -104297,6 +95472,7 @@ index 5a69bc248233..000000000000
 -DEFINES["UNICODE"] = True
 -DEFINES["USE_AURA"] = "1"
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
 -DEFINES["WEBRTC_MOZILLA_BUILD"] = True
 -DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -104313,7 +95489,6 @@ index 5a69bc248233..000000000000
 -DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
 -DEFINES["_HAS_EXCEPTIONS"] = "0"
 -DEFINES["_HAS_NODISCARD"] = True
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 -DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
 -DEFINES["_SECURE_ATL"] = True
 -DEFINES["_UNICODE"] = True
@@ -104367,10 +95542,10 @@ index 5a69bc248233..000000000000
 -Library("hstring_gn")
 diff --git third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build
 deleted file mode 100644
-index 1b6458e538a7..000000000000
+index 0d55a7962fdf..000000000000
 --- third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build
 +++ /dev/null
-@@ -1,95 +0,0 @@
+@@ -1,91 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -104382,10 +95557,6 @@ index 1b6458e538a7..000000000000
 -COMPILE_FLAGS["OS_INCLUDES"] = []
 -AllowCompilerWarnings()
 -
--CXXFLAGS += [
--    "-std:c++20"
--]
--
 -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
 -DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -DEFINES["NOMINMAX"] = True
@@ -104398,6 +95569,7 @@ index 1b6458e538a7..000000000000
 -DEFINES["UNICODE"] = True
 -DEFINES["USE_AURA"] = "1"
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
 -DEFINES["WEBRTC_MOZILLA_BUILD"] = True
 -DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -104414,7 +95586,6 @@ index 1b6458e538a7..000000000000
 -DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
 -DEFINES["_HAS_EXCEPTIONS"] = "0"
 -DEFINES["_HAS_NODISCARD"] = True
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 -DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
 -DEFINES["_SECURE_ATL"] = True
 -DEFINES["_UNICODE"] = True
@@ -104468,10 +95639,10 @@ index 1b6458e538a7..000000000000
 -Library("windows_version_gn")
 diff --git third_party/libwebrtc/rtc_base/win32_gn/moz.build third_party/libwebrtc/rtc_base/win32_gn/moz.build
 deleted file mode 100644
-index 3a9a4aa749ca..000000000000
+index 449ccd350e31..000000000000
 --- third_party/libwebrtc/rtc_base/win32_gn/moz.build
 +++ /dev/null
-@@ -1,102 +0,0 @@
+@@ -1,98 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -104483,10 +95654,6 @@ index 3a9a4aa749ca..000000000000
 -COMPILE_FLAGS["OS_INCLUDES"] = []
 -AllowCompilerWarnings()
 -
--CXXFLAGS += [
--    "-std:c++20"
--]
--
 -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
 -DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -DEFINES["NOMINMAX"] = True
@@ -104499,6 +95666,7 @@ index 3a9a4aa749ca..000000000000
 -DEFINES["UNICODE"] = True
 -DEFINES["USE_AURA"] = "1"
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
 -DEFINES["WEBRTC_MOZILLA_BUILD"] = True
 -DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -104516,7 +95684,6 @@ index 3a9a4aa749ca..000000000000
 -DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
 -DEFINES["_HAS_EXCEPTIONS"] = "0"
 -DEFINES["_HAS_NODISCARD"] = True
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 -DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
 -DEFINES["_SECURE_ATL"] = True
 -DEFINES["_UNICODE"] = True
@@ -104575,18 +95742,10 @@ index 3a9a4aa749ca..000000000000
 -
 -Library("win32_gn")
 diff --git third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
-index 89a3b9b196cb..99a72c73a234 100644
+index 4255663efd35..50a0a0266df0 100644
 --- third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -104594,6 +95753,7 @@ index 89a3b9b196cb..99a72c73a234 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -104602,23 +95762,18 @@ index 89a3b9b196cb..99a72c73a234 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -104637,10 +95792,6 @@ index 89a3b9b196cb..99a72c73a234 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -104648,10 +95799,6 @@ index 89a3b9b196cb..99a72c73a234 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -104659,7 +95806,6 @@ index 89a3b9b196cb..99a72c73a234 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -104667,10 +95813,6 @@ index 89a3b9b196cb..99a72c73a234 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -104683,10 +95825,6 @@ index 89a3b9b196cb..99a72c73a234 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -104717,7 +95855,7 @@ index 89a3b9b196cb..99a72c73a234 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -104805,7 +95943,7 @@ index 89a3b9b196cb..99a72c73a234 100644
  Library("zero_memory_gn")
 diff --git third_party/libwebrtc/sdk/base_objc_gn/moz.build third_party/libwebrtc/sdk/base_objc_gn/moz.build
 deleted file mode 100644
-index 9b01dffe9772..000000000000
+index 096fecb4c418..000000000000
 --- third_party/libwebrtc/sdk/base_objc_gn/moz.build
 +++ /dev/null
 @@ -1,82 +0,0 @@
@@ -104833,13 +95971,13 @@ index 9b01dffe9772..000000000000
 -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
 -DEFINES["RTC_ENABLE_VP9"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
 -DEFINES["WEBRTC_MAC"] = True
 -DEFINES["WEBRTC_MOZILLA_BUILD"] = True
 -DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
 -DEFINES["WEBRTC_POSIX"] = True
 -DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 -DEFINES["__STDC_CONSTANT_MACROS"] = True
 -DEFINES["__STDC_FORMAT_MACROS"] = True
 -
@@ -104893,7 +96031,7 @@ index 9b01dffe9772..000000000000
 -Library("base_objc_gn")
 diff --git third_party/libwebrtc/sdk/helpers_objc_gn/moz.build third_party/libwebrtc/sdk/helpers_objc_gn/moz.build
 deleted file mode 100644
-index 7e8e518da889..000000000000
+index 3a84d3e3c208..000000000000
 --- third_party/libwebrtc/sdk/helpers_objc_gn/moz.build
 +++ /dev/null
 @@ -1,77 +0,0 @@
@@ -104921,13 +96059,13 @@ index 7e8e518da889..000000000000
 -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
 -DEFINES["RTC_ENABLE_VP9"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
 -DEFINES["WEBRTC_MAC"] = True
 -DEFINES["WEBRTC_MOZILLA_BUILD"] = True
 -DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
 -DEFINES["WEBRTC_POSIX"] = True
 -DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 -DEFINES["__STDC_CONSTANT_MACROS"] = True
 -DEFINES["__STDC_FORMAT_MACROS"] = True
 -
@@ -104976,7 +96114,7 @@ index 7e8e518da889..000000000000
 -Library("helpers_objc_gn")
 diff --git third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build
 deleted file mode 100644
-index 82bb50767500..000000000000
+index fa087172c452..000000000000
 --- third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build
 +++ /dev/null
 @@ -1,72 +0,0 @@
@@ -105000,13 +96138,13 @@ index 82bb50767500..000000000000
 -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
 -DEFINES["RTC_ENABLE_VP9"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
 -DEFINES["WEBRTC_MAC"] = True
 -DEFINES["WEBRTC_MOZILLA_BUILD"] = True
 -DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
 -DEFINES["WEBRTC_POSIX"] = True
 -DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 -DEFINES["__STDC_CONSTANT_MACROS"] = True
 -DEFINES["__STDC_FORMAT_MACROS"] = True
 -
@@ -105054,7 +96192,7 @@ index 82bb50767500..000000000000
 -Library("videocapture_objc_gn")
 diff --git third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build
 deleted file mode 100644
-index 96823fe3a0c6..000000000000
+index 64809b92e3e7..000000000000
 --- third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build
 +++ /dev/null
 @@ -1,75 +0,0 @@
@@ -105078,13 +96216,13 @@ index 96823fe3a0c6..000000000000
 -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
 -DEFINES["RTC_ENABLE_VP9"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
 -DEFINES["WEBRTC_MAC"] = True
 -DEFINES["WEBRTC_MOZILLA_BUILD"] = True
 -DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
 -DEFINES["WEBRTC_POSIX"] = True
 -DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 -DEFINES["__STDC_CONSTANT_MACROS"] = True
 -DEFINES["__STDC_FORMAT_MACROS"] = True
 -
@@ -105134,18 +96272,10 @@ index 96823fe3a0c6..000000000000
 -
 -Library("videoframebuffer_objc_gn")
 diff --git third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
-index 7b22c5d83d57..e30f866c3be3 100644
+index 8181131fd636..82f015feb950 100644
 --- third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
 +++ third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -105153,6 +96283,7 @@ index 7b22c5d83d57..e30f866c3be3 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -105161,23 +96292,18 @@ index 7b22c5d83d57..e30f866c3be3 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -105196,10 +96322,6 @@ index 7b22c5d83d57..e30f866c3be3 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -105207,10 +96329,6 @@ index 7b22c5d83d57..e30f866c3be3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -105218,7 +96336,6 @@ index 7b22c5d83d57..e30f866c3be3 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -105226,10 +96343,6 @@ index 7b22c5d83d57..e30f866c3be3 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -105242,10 +96355,6 @@ index 7b22c5d83d57..e30f866c3be3 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -105283,7 +96392,7 @@ index 7b22c5d83d57..e30f866c3be3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -105341,10 +96450,10 @@ index 7b22c5d83d57..e30f866c3be3 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -105355,10 +96464,10 @@ index 7b22c5d83d57..e30f866c3be3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -105370,18 +96479,10 @@ index 7b22c5d83d57..e30f866c3be3 100644
  
  Library("field_trial_gn")
 diff --git third_party/libwebrtc/system_wrappers/metrics_gn/moz.build third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
-index 5efcf4737574..cc9bc9ac01fc 100644
+index 3e1292f36a2a..a9b4f9f9fd1e 100644
 --- third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
 +++ third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -105389,6 +96490,7 @@ index 5efcf4737574..cc9bc9ac01fc 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -105397,23 +96499,18 @@ index 5efcf4737574..cc9bc9ac01fc 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -105432,10 +96529,6 @@ index 5efcf4737574..cc9bc9ac01fc 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -105443,10 +96536,6 @@ index 5efcf4737574..cc9bc9ac01fc 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -105454,7 +96543,6 @@ index 5efcf4737574..cc9bc9ac01fc 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -105462,10 +96550,6 @@ index 5efcf4737574..cc9bc9ac01fc 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -105478,10 +96562,6 @@ index 5efcf4737574..cc9bc9ac01fc 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -105512,7 +96592,7 @@ index 5efcf4737574..cc9bc9ac01fc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -105599,18 +96679,10 @@ index 5efcf4737574..cc9bc9ac01fc 100644
  
  Library("metrics_gn")
 diff --git third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
-index 0b73327eca60..4f3ad6b76fa3 100644
+index 46a6c47b9195..e4744c0609ef 100644
 --- third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
 +++ third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -105618,6 +96690,7 @@ index 0b73327eca60..4f3ad6b76fa3 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -105626,23 +96699,18 @@ index 0b73327eca60..4f3ad6b76fa3 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -105661,10 +96729,6 @@ index 0b73327eca60..4f3ad6b76fa3 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -105672,10 +96736,6 @@ index 0b73327eca60..4f3ad6b76fa3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -105683,7 +96743,6 @@ index 0b73327eca60..4f3ad6b76fa3 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -105691,10 +96750,6 @@ index 0b73327eca60..4f3ad6b76fa3 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -105707,10 +96762,6 @@ index 0b73327eca60..4f3ad6b76fa3 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -105748,7 +96799,7 @@ index 0b73327eca60..4f3ad6b76fa3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -105806,10 +96857,10 @@ index 0b73327eca60..4f3ad6b76fa3 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -105820,10 +96871,10 @@ index 0b73327eca60..4f3ad6b76fa3 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -105835,7 +96886,7 @@ index 0b73327eca60..4f3ad6b76fa3 100644
  
  Library("system_wrappers_gn")
 diff --git third_party/libwebrtc/test/rtp_test_utils_gn/moz.build third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
-index 1bccfd79c93a..898ece1e2007 100644
+index 2e86a77b581e..9eae6e64d62d 100644
 --- third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
 +++ third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -105846,6 +96897,7 @@ index 1bccfd79c93a..898ece1e2007 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -105854,13 +96906,12 @@ index 1bccfd79c93a..898ece1e2007 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -105900,7 +96951,6 @@ index 1bccfd79c93a..898ece1e2007 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -105957,7 +97007,7 @@ index 1bccfd79c93a..898ece1e2007 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -105983,7 +97033,7 @@ index 1bccfd79c93a..898ece1e2007 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -106026,10 +97076,10 @@ index 1bccfd79c93a..898ece1e2007 100644
  Library("rtp_test_utils_gn")
 diff --git third_party/libwebrtc/third_party/cpu_features/ndk_compat_gn/moz.build third_party/libwebrtc/third_party/cpu_features/ndk_compat_gn/moz.build
 deleted file mode 100644
-index 75b2e8878e03..000000000000
+index b7d9cb6142bd..000000000000
 --- third_party/libwebrtc/third_party/cpu_features/ndk_compat_gn/moz.build
 +++ /dev/null
-@@ -1,48 +0,0 @@
+@@ -1,47 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -106045,7 +97095,6 @@ index 75b2e8878e03..000000000000
 -DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -DEFINES["HAVE_SYS_UIO_H"] = True
 -DEFINES["_GNU_SOURCE"] = True
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 -DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
 -DEFINES["__STDC_CONSTANT_MACROS"] = True
 -DEFINES["__STDC_FORMAT_MACROS"] = True
@@ -106079,10 +97128,10 @@ index 75b2e8878e03..000000000000
 -
 -Library("ndk_compat_gn")
 diff --git third_party/libwebrtc/third_party/crc32c/crc32c_arm64_gn/moz.build third_party/libwebrtc/third_party/crc32c/crc32c_arm64_gn/moz.build
-index 2d36986a05c5..d4f34c6e8a54 100644
+index a0d1e7a84956..6b30b605cef1 100644
 --- third_party/libwebrtc/third_party/crc32c/crc32c_arm64_gn/moz.build
 +++ third_party/libwebrtc/third_party/crc32c/crc32c_arm64_gn/moz.build
-@@ -14,7 +14,16 @@ DEFINES["CRC32C_TESTS_BUILT_WITH_GLOG"] = "0"
+@@ -14,6 +14,15 @@ DEFINES["CRC32C_TESTS_BUILT_WITH_GLOG"] = "0"
  DEFINES["HAVE_ARM64_CRC32C"] = "0"
  DEFINES["HAVE_BUILTIN_PREFETCH"] = "1"
  DEFINES["HAVE_SSE42"] = "0"
@@ -106093,13 +97142,12 @@ index 2d36986a05c5..d4f34c6e8a54 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -43,108 +52,24 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,107 +51,24 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -106132,7 +97180,6 @@ index 2d36986a05c5..d4f34c6e8a54 100644
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["USE_UDEV"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -106209,7 +97256,7 @@ index 2d36986a05c5..d4f34c6e8a54 100644
  
  if CONFIG["TARGET_CPU"] == "ppc64":
  
-@@ -156,56 +81,14 @@ if CONFIG["TARGET_CPU"] == "riscv64":
+@@ -154,56 +80,14 @@ if CONFIG["TARGET_CPU"] == "riscv64":
  
  if CONFIG["TARGET_CPU"] == "x86":
  
@@ -106270,10 +97317,10 @@ index 2d36986a05c5..d4f34c6e8a54 100644
  
  Library("crc32c_arm64_gn")
 diff --git third_party/libwebrtc/third_party/crc32c/crc32c_gn/moz.build third_party/libwebrtc/third_party/crc32c/crc32c_gn/moz.build
-index a8e6c035310f..ac8e004a6f78 100644
+index 31ce063d9097..a7185ebcf11d 100644
 --- third_party/libwebrtc/third_party/crc32c/crc32c_gn/moz.build
 +++ third_party/libwebrtc/third_party/crc32c/crc32c_gn/moz.build
-@@ -14,7 +14,16 @@ DEFINES["CRC32C_TESTS_BUILT_WITH_GLOG"] = "0"
+@@ -14,6 +14,15 @@ DEFINES["CRC32C_TESTS_BUILT_WITH_GLOG"] = "0"
  DEFINES["HAVE_ARM64_CRC32C"] = "0"
  DEFINES["HAVE_BUILTIN_PREFETCH"] = "1"
  DEFINES["HAVE_SSE42"] = "0"
@@ -106284,13 +97331,12 @@ index a8e6c035310f..ac8e004a6f78 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -44,108 +53,24 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,107 +52,24 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -106323,7 +97369,6 @@ index a8e6c035310f..ac8e004a6f78 100644
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["USE_UDEV"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -106400,7 +97445,7 @@ index a8e6c035310f..ac8e004a6f78 100644
  
  if CONFIG["TARGET_CPU"] == "ppc64":
  
-@@ -157,56 +82,14 @@ if CONFIG["TARGET_CPU"] == "riscv64":
+@@ -155,56 +81,14 @@ if CONFIG["TARGET_CPU"] == "riscv64":
  
  if CONFIG["TARGET_CPU"] == "x86":
  
@@ -106461,10 +97506,10 @@ index a8e6c035310f..ac8e004a6f78 100644
  
  Library("crc32c_gn")
 diff --git third_party/libwebrtc/third_party/crc32c/crc32c_internal_headers_gn/moz.build third_party/libwebrtc/third_party/crc32c/crc32c_internal_headers_gn/moz.build
-index 3ef8dc583670..5420160d3ab5 100644
+index 35330ec53ea7..0ab76c5c37a9 100644
 --- third_party/libwebrtc/third_party/crc32c/crc32c_internal_headers_gn/moz.build
 +++ third_party/libwebrtc/third_party/crc32c/crc32c_internal_headers_gn/moz.build
-@@ -9,7 +9,14 @@
+@@ -9,6 +9,14 @@
  COMPILE_FLAGS["OS_INCLUDES"] = []
  AllowCompilerWarnings()
  
@@ -106473,13 +97518,13 @@ index 3ef8dc583670..5420160d3ab5 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
- 
++
  FINAL_LIBRARY = "xul"
  
-@@ -32,121 +39,10 @@ if not CONFIG["MOZ_DEBUG"]:
+ 
+@@ -30,120 +38,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -106506,7 +97551,6 @@ index 3ef8dc583670..5420160d3ab5 100644
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["USE_UDEV"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -106603,10 +97647,10 @@ index 3ef8dc583670..5420160d3ab5 100644
 -
  Library("crc32c_internal_headers_gn")
 diff --git third_party/libwebrtc/third_party/crc32c/crc32c_sse42_gn/moz.build third_party/libwebrtc/third_party/crc32c/crc32c_sse42_gn/moz.build
-index 57e79a7f9e44..b855a3042e28 100644
+index b166c70f47e2..dd67af212e47 100644
 --- third_party/libwebrtc/third_party/crc32c/crc32c_sse42_gn/moz.build
 +++ third_party/libwebrtc/third_party/crc32c/crc32c_sse42_gn/moz.build
-@@ -14,7 +14,16 @@ DEFINES["CRC32C_TESTS_BUILT_WITH_GLOG"] = "0"
+@@ -14,6 +14,15 @@ DEFINES["CRC32C_TESTS_BUILT_WITH_GLOG"] = "0"
  DEFINES["HAVE_ARM64_CRC32C"] = "0"
  DEFINES["HAVE_BUILTIN_PREFETCH"] = "1"
  DEFINES["HAVE_SSE42"] = "0"
@@ -106617,13 +97661,12 @@ index 57e79a7f9e44..b855a3042e28 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -43,108 +52,24 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,107 +51,24 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -106656,7 +97699,6 @@ index 57e79a7f9e44..b855a3042e28 100644
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["USE_UDEV"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -106733,7 +97775,7 @@ index 57e79a7f9e44..b855a3042e28 100644
  
  if CONFIG["TARGET_CPU"] == "ppc64":
  
-@@ -156,56 +81,14 @@ if CONFIG["TARGET_CPU"] == "riscv64":
+@@ -154,56 +80,14 @@ if CONFIG["TARGET_CPU"] == "riscv64":
  
  if CONFIG["TARGET_CPU"] == "x86":
  
@@ -106794,7 +97836,7 @@ index 57e79a7f9e44..b855a3042e28 100644
  
  Library("crc32c_sse42_gn")
 diff --git third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build
-index d7dd3e349440..6839dc4717fa 100644
+index 535f30143955..9b3a8baecfa4 100644
 --- third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build
 +++ third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -106805,6 +97847,7 @@ index d7dd3e349440..6839dc4717fa 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -106813,13 +97856,12 @@ index d7dd3e349440..6839dc4717fa 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -44,83 +53,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,82 +53,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -106854,7 +97896,6 @@ index d7dd3e349440..6839dc4717fa 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -106904,7 +97945,7 @@ index d7dd3e349440..6839dc4717fa 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -128,25 +61,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -127,25 +61,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -106930,7 +97971,7 @@ index d7dd3e349440..6839dc4717fa 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -156,40 +74,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,40 +74,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -106972,7 +98013,7 @@ index d7dd3e349440..6839dc4717fa 100644
 -
  Library("dav1d_gn")
 diff --git third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build
-index 26d729aa4816..9a021575ec73 100644
+index 12c3f72b5b06..f4cc587c8a36 100644
 --- third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build
 +++ third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -106983,6 +98024,7 @@ index 26d729aa4816..9a021575ec73 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -106991,13 +98033,12 @@ index 26d729aa4816..9a021575ec73 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107032,7 +98073,6 @@ index 26d729aa4816..9a021575ec73 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -107082,7 +98122,7 @@ index 26d729aa4816..9a021575ec73 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -107108,7 +98148,7 @@ index 26d729aa4816..9a021575ec73 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -107150,10 +98190,10 @@ index 26d729aa4816..9a021575ec73 100644
 -
  Library("aom_gn")
 diff --git third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
-index 6f10f838698a..d7ba52dc8024 100644
+index e2c9ea11a576..2a72b5041e77 100644
 --- third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
 +++ third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
-@@ -13,20 +13,16 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,20 +13,17 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -107163,6 +98203,7 @@ index 6f10f838698a..d7ba52dc8024 100644
 -DEFINES["USE_UDEV"] = True
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
 -DEFINES["WEBRTC_LINUX"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
@@ -107170,12 +98211,11 @@ index 6f10f838698a..d7ba52dc8024 100644
  DEFINES["WEBRTC_POSIX"] = True
  DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
  DEFINES["_FILE_OFFSET_BITS"] = "64"
--DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -DEFINES["_GNU_SOURCE"] = True
  DEFINES["_LARGEFILE64_SOURCE"] = True
  DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-@@ -65,12 +61,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+ DEFINES["__STDC_CONSTANT_MACROS"] = True
+@@ -64,12 +61,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -107189,7 +98229,7 @@ index 6f10f838698a..d7ba52dc8024 100644
  
      DEFINES["MIPS32_LE"] = True
 diff --git third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
-index 5ccdff9910f0..746852255f4e 100644
+index d4cfc3821ac8..defbc3e51a23 100644
 --- third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
 +++ third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -107200,6 +98240,7 @@ index 5ccdff9910f0..746852255f4e 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -107208,13 +98249,12 @@ index 5ccdff9910f0..746852255f4e 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -44,83 +53,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,82 +53,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107249,7 +98289,6 @@ index 5ccdff9910f0..746852255f4e 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -107299,7 +98338,7 @@ index 5ccdff9910f0..746852255f4e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -128,25 +61,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -127,25 +61,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -107325,7 +98364,7 @@ index 5ccdff9910f0..746852255f4e 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -156,40 +74,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,40 +74,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -107367,10 +98406,10 @@ index 5ccdff9910f0..746852255f4e 100644
 -
  Library("yuv_gn")
 diff --git third_party/libwebrtc/third_party/opus/opus_gn/moz.build third_party/libwebrtc/third_party/opus/opus_gn/moz.build
-index 2540ef87e331..66d74b90d631 100644
+index bfeaa56b05af..d8e71c4280d9 100644
 --- third_party/libwebrtc/third_party/opus/opus_gn/moz.build
 +++ third_party/libwebrtc/third_party/opus/opus_gn/moz.build
-@@ -9,7 +9,14 @@
+@@ -9,6 +9,14 @@
  COMPILE_FLAGS["OS_INCLUDES"] = []
  AllowCompilerWarnings()
  
@@ -107379,13 +98418,13 @@ index 2540ef87e331..66d74b90d631 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
- 
++
  FINAL_LIBRARY = "xul"
  
-@@ -32,121 +39,10 @@ if not CONFIG["MOZ_DEBUG"]:
+ 
+@@ -30,120 +38,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107412,7 +98451,6 @@ index 2540ef87e331..66d74b90d631 100644
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["USE_UDEV"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -107509,10 +98547,10 @@ index 2540ef87e331..66d74b90d631 100644
 -
  Library("opus_gn")
 diff --git third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
-index ad14c77a3fe2..fe9a03bdf63c 100644
+index fa6a7850dc2f..328baf0e1eac 100644
 --- third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
 +++ third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
-@@ -9,7 +9,14 @@
+@@ -9,6 +9,14 @@
  COMPILE_FLAGS["OS_INCLUDES"] = []
  AllowCompilerWarnings()
  
@@ -107521,13 +98559,13 @@ index ad14c77a3fe2..fe9a03bdf63c 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
- 
++
  FINAL_LIBRARY = "xul"
  
-@@ -36,96 +43,23 @@ if not CONFIG["MOZ_DEBUG"]:
+ 
+@@ -34,95 +42,23 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107554,7 +98592,6 @@ index ad14c77a3fe2..fe9a03bdf63c 100644
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["USE_UDEV"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -107625,7 +98662,7 @@ index ad14c77a3fe2..fe9a03bdf63c 100644
  
  if CONFIG["TARGET_CPU"] == "ppc64":
  
-@@ -135,50 +69,10 @@ if CONFIG["TARGET_CPU"] == "riscv64":
+@@ -132,50 +68,10 @@ if CONFIG["TARGET_CPU"] == "riscv64":
  
      DEFINES["PFFFT_SIMD_DISABLE"] = True
  
@@ -107678,10 +98715,10 @@ index ad14c77a3fe2..fe9a03bdf63c 100644
 -
  Library("pffft_gn")
 diff --git third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
-index fc239a9d7eae..541de9c16824 100644
+index 11dbf4942190..d44acce8cafa 100644
 --- third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
 +++ third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
-@@ -9,7 +9,14 @@
+@@ -9,6 +9,14 @@
  COMPILE_FLAGS["OS_INCLUDES"] = []
  AllowCompilerWarnings()
  
@@ -107690,13 +98727,13 @@ index fc239a9d7eae..541de9c16824 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
- 
++
  FINAL_LIBRARY = "xul"
  
-@@ -36,137 +43,16 @@ if not CONFIG["MOZ_DEBUG"]:
+ 
+@@ -34,136 +42,16 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107723,7 +98760,6 @@ index fc239a9d7eae..541de9c16824 100644
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["USE_UDEV"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -107837,18 +98873,10 @@ index fc239a9d7eae..541de9c16824 100644
 -
  Library("rnn_vad_gn")
 diff --git third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
-index 3fdd6f82a882..d8565e99f4fc 100644
+index 63fce4361b2b..dad5ed7fa01c 100644
 --- third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
 +++ third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -107856,6 +98884,7 @@ index 3fdd6f82a882..d8565e99f4fc 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -107864,23 +98893,18 @@ index 3fdd6f82a882..d8565e99f4fc 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -54,115 +67,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,94 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -107900,10 +98924,6 @@ index 3fdd6f82a882..d8565e99f4fc 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -107911,10 +98931,6 @@ index 3fdd6f82a882..d8565e99f4fc 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -107922,7 +98938,6 @@ index 3fdd6f82a882..d8565e99f4fc 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -107930,10 +98945,6 @@ index 3fdd6f82a882..d8565e99f4fc 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -107946,10 +98957,6 @@ index 3fdd6f82a882..d8565e99f4fc 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -107987,7 +98994,7 @@ index 3fdd6f82a882..d8565e99f4fc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -170,82 +75,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -149,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -108045,10 +99052,10 @@ index 3fdd6f82a882..d8565e99f4fc 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -108059,10 +99066,10 @@ index 3fdd6f82a882..d8565e99f4fc 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -108074,18 +99081,10 @@ index 3fdd6f82a882..d8565e99f4fc 100644
  
  Library("video_adaptation_gn")
 diff --git third_party/libwebrtc/video/config/encoder_config_gn/moz.build third_party/libwebrtc/video/config/encoder_config_gn/moz.build
-index 865900b598de..0fc614829ce7 100644
+index 74145a92544d..22716e70e484 100644
 --- third_party/libwebrtc/video/config/encoder_config_gn/moz.build
 +++ third_party/libwebrtc/video/config/encoder_config_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -108093,6 +99092,7 @@ index 865900b598de..0fc614829ce7 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -108101,23 +99101,18 @@ index 865900b598de..0fc614829ce7 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -108136,10 +99131,6 @@ index 865900b598de..0fc614829ce7 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -108147,10 +99138,6 @@ index 865900b598de..0fc614829ce7 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -108158,7 +99145,6 @@ index 865900b598de..0fc614829ce7 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -108166,10 +99152,6 @@ index 865900b598de..0fc614829ce7 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -108182,10 +99164,6 @@ index 865900b598de..0fc614829ce7 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -108223,7 +99201,7 @@ index 865900b598de..0fc614829ce7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -108281,10 +99259,10 @@ index 865900b598de..0fc614829ce7 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -108295,10 +99273,10 @@ index 865900b598de..0fc614829ce7 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -108310,18 +99288,10 @@ index 865900b598de..0fc614829ce7 100644
  
  Library("encoder_config_gn")
 diff --git third_party/libwebrtc/video/config/streams_config_gn/moz.build third_party/libwebrtc/video/config/streams_config_gn/moz.build
-index 9275bcc0855a..9bfb207645ac 100644
+index 8bce9bd5ba2a..e266ecab0cd5 100644
 --- third_party/libwebrtc/video/config/streams_config_gn/moz.build
 +++ third_party/libwebrtc/video/config/streams_config_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -108329,6 +99299,7 @@ index 9275bcc0855a..9bfb207645ac 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -108337,23 +99308,18 @@ index 9275bcc0855a..9bfb207645ac 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,115 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -108373,10 +99339,6 @@ index 9275bcc0855a..9bfb207645ac 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -108384,10 +99346,6 @@ index 9275bcc0855a..9bfb207645ac 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -108395,7 +99353,6 @@ index 9275bcc0855a..9bfb207645ac 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -108403,10 +99360,6 @@ index 9275bcc0855a..9bfb207645ac 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -108419,10 +99372,6 @@ index 9275bcc0855a..9bfb207645ac 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -108460,7 +99409,7 @@ index 9275bcc0855a..9bfb207645ac 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -163,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -108518,10 +99467,10 @@ index 9275bcc0855a..9bfb207645ac 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -108532,10 +99481,10 @@ index 9275bcc0855a..9bfb207645ac 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -108547,18 +99496,10 @@ index 9275bcc0855a..9bfb207645ac 100644
  
  Library("streams_config_gn")
 diff --git third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build
-index eab5fabcf870..8bedde4c3fa7 100644
+index 5a77553e544c..0a93ce3fe690 100644
 --- third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build
 +++ third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -108566,6 +99507,7 @@ index eab5fabcf870..8bedde4c3fa7 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -108574,23 +99516,18 @@ index eab5fabcf870..8bedde4c3fa7 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -108609,10 +99546,6 @@ index eab5fabcf870..8bedde4c3fa7 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -108620,10 +99553,6 @@ index eab5fabcf870..8bedde4c3fa7 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -108631,7 +99560,6 @@ index eab5fabcf870..8bedde4c3fa7 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -108639,10 +99567,6 @@ index eab5fabcf870..8bedde4c3fa7 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -108655,10 +99579,6 @@ index eab5fabcf870..8bedde4c3fa7 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -108696,7 +99616,7 @@ index eab5fabcf870..8bedde4c3fa7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -108754,260 +99674,24 @@ index eab5fabcf870..8bedde4c3fa7 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
--
      CXXFLAGS += [
          "-msse2"
      ]
  
--    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["TARGET_CPU"] == "x86_64":
- 
--    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
- Library("corruption_classifier_gn")
-diff --git third_party/libwebrtc/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build third_party/libwebrtc/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build
-index 9faf5b89eb15..1d6aa6fbe092 100644
---- third_party/libwebrtc/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build
-+++ third_party/libwebrtc/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
- DEFINES["RTC_ENABLE_VP9"] = True
-+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_OZONE"] = "1"
-+DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-+DEFINES["WEBRTC_POSIX"] = True
- DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
-+DEFINES["_FILE_OFFSET_BITS"] = "64"
-+DEFINES["_LARGEFILE64_SOURCE"] = True
-+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-+DEFINES["__STDC_CONSTANT_MACROS"] = True
-+DEFINES["__STDC_FORMAT_MACROS"] = True
- 
- FINAL_LIBRARY = "xul"
- 
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
- if CONFIG["MOZ_DEBUG"] == "1":
- 
-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
--
--if CONFIG["OS_TARGET"] == "Android":
--
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
--    DEFINES["ANDROID"] = True
--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
--    DEFINES["HAVE_SYS_UIO_H"] = True
--    DEFINES["WEBRTC_ANDROID"] = True
--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
--    DEFINES["WEBRTC_LINUX"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_GNU_SOURCE"] = True
--    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--    OS_LIBS += [
--        "log"
--    ]
--
--if CONFIG["OS_TARGET"] == "Darwin":
--
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
--    DEFINES["WEBRTC_MAC"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "Linux":
--
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["USE_GLIB"] = "1"
--    DEFINES["USE_OZONE"] = "1"
--    DEFINES["USE_UDEV"] = True
--    DEFINES["WEBRTC_LINUX"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "OpenBSD":
--
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
--    DEFINES["USE_GLIB"] = "1"
--    DEFINES["USE_OZONE"] = "1"
--    DEFINES["WEBRTC_BSD"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "WINNT":
--
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
--    DEFINES["NOMINMAX"] = True
--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
--    DEFINES["PSAPI_VERSION"] = "2"
--    DEFINES["RTC_ENABLE_WIN_WGC"] = True
--    DEFINES["UNICODE"] = True
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["WEBRTC_WIN"] = True
--    DEFINES["WIN32"] = True
--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
--    DEFINES["WINVER"] = "0x0A00"
--    DEFINES["_ATL_NO_OPENGL"] = True
--    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
--    DEFINES["_CRT_RAND_S"] = True
--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
--    DEFINES["_HAS_EXCEPTIONS"] = "0"
--    DEFINES["_HAS_NODISCARD"] = True
--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_SECURE_ATL"] = True
--    DEFINES["_UNICODE"] = True
--    DEFINES["_WIN32_WINNT"] = "0x0A00"
--    DEFINES["_WINDOWS"] = True
--    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
--    DEFINES["__STD_C"] = True
--
--    OS_LIBS += [
--        "crypt32",
--        "iphlpapi",
--        "secur32",
--        "winmm"
--    ]
-+    DEFINES["_DEBUG"] = True
- 
- if CONFIG["TARGET_CPU"] == "aarch64":
- 
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
-     DEFINES["WEBRTC_HAS_NEON"] = True
-     DEFINES["__ARM_NEON__"] = "1"
- 
--if CONFIG["TARGET_CPU"] == "arm":
--
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
--    DEFINES["WEBRTC_ARCH_ARM"] = True
--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
--    DEFINES["WEBRTC_HAS_NEON"] = True
--
--if CONFIG["TARGET_CPU"] == "loongarch64":
--
--    DEFINES["_GNU_SOURCE"] = True
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
- if CONFIG["TARGET_CPU"] == "mips32":
- 
-     DEFINES["MIPS32_LE"] = True
-     DEFINES["MIPS_FPU_LE"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
--if CONFIG["TARGET_CPU"] == "mips64":
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
 -
 -    DEFINES["_GNU_SOURCE"] = True
- 
- if CONFIG["TARGET_CPU"] == "x86":
- 
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
--if CONFIG["TARGET_CPU"] == "x86_64":
--
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 -
--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
--
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
 -    CXXFLAGS += [
 -        "-msse2"
 -    ]
 -
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
--
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -109017,20 +99701,12 @@ index 9faf5b89eb15..1d6aa6fbe092 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("frame_instrumentation_evaluation_gn")
+ Library("corruption_classifier_gn")
 diff --git third_party/libwebrtc/video/corruption_detection/frame_instrumentation_generator_gn/moz.build third_party/libwebrtc/video/corruption_detection/frame_instrumentation_generator_gn/moz.build
-index 2fbcadb4ae1c..3ce701b2ec90 100644
+index c97eea9edd89..dc3563b3626c 100644
 --- third_party/libwebrtc/video/corruption_detection/frame_instrumentation_generator_gn/moz.build
 +++ third_party/libwebrtc/video/corruption_detection/frame_instrumentation_generator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -109038,6 +99714,7 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -109046,23 +99723,18 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -109082,10 +99754,6 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -109093,10 +99761,6 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -109104,7 +99768,6 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -109112,10 +99775,6 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -109128,10 +99787,6 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -109169,7 +99824,7 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -109227,10 +99882,10 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -109241,10 +99896,10 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -109256,18 +99911,10 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
  
  Library("frame_instrumentation_generator_gn")
 diff --git third_party/libwebrtc/video/corruption_detection/generic_mapping_functions_gn/moz.build third_party/libwebrtc/video/corruption_detection/generic_mapping_functions_gn/moz.build
-index 677bd777b01a..43a2ce5228f6 100644
+index 35e4e34af56e..6e62859f71aa 100644
 --- third_party/libwebrtc/video/corruption_detection/generic_mapping_functions_gn/moz.build
 +++ third_party/libwebrtc/video/corruption_detection/generic_mapping_functions_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -109275,6 +99922,7 @@ index 677bd777b01a..43a2ce5228f6 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -109283,23 +99931,18 @@ index 677bd777b01a..43a2ce5228f6 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -109318,10 +99961,6 @@ index 677bd777b01a..43a2ce5228f6 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -109329,10 +99968,6 @@ index 677bd777b01a..43a2ce5228f6 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -109340,7 +99975,6 @@ index 677bd777b01a..43a2ce5228f6 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -109348,10 +99982,6 @@ index 677bd777b01a..43a2ce5228f6 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -109364,10 +99994,6 @@ index 677bd777b01a..43a2ce5228f6 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -109405,7 +100031,7 @@ index 677bd777b01a..43a2ce5228f6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -109463,10 +100089,10 @@ index 677bd777b01a..43a2ce5228f6 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -109477,10 +100103,10 @@ index 677bd777b01a..43a2ce5228f6 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -109492,18 +100118,10 @@ index 677bd777b01a..43a2ce5228f6 100644
  
  Library("generic_mapping_functions_gn")
 diff --git third_party/libwebrtc/video/corruption_detection/halton_frame_sampler_gn/moz.build third_party/libwebrtc/video/corruption_detection/halton_frame_sampler_gn/moz.build
-index 319099e20e84..1a0daac76922 100644
+index 37c645c71910..01010a22e813 100644
 --- third_party/libwebrtc/video/corruption_detection/halton_frame_sampler_gn/moz.build
 +++ third_party/libwebrtc/video/corruption_detection/halton_frame_sampler_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -109511,6 +100129,7 @@ index 319099e20e84..1a0daac76922 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -109519,23 +100138,18 @@ index 319099e20e84..1a0daac76922 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -109554,10 +100168,6 @@ index 319099e20e84..1a0daac76922 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -109565,10 +100175,6 @@ index 319099e20e84..1a0daac76922 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -109576,7 +100182,6 @@ index 319099e20e84..1a0daac76922 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -109584,10 +100189,6 @@ index 319099e20e84..1a0daac76922 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -109600,10 +100201,6 @@ index 319099e20e84..1a0daac76922 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -109641,7 +100238,7 @@ index 319099e20e84..1a0daac76922 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -109699,10 +100296,10 @@ index 319099e20e84..1a0daac76922 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -109713,10 +100310,10 @@ index 319099e20e84..1a0daac76922 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -109728,18 +100325,10 @@ index 319099e20e84..1a0daac76922 100644
  
  Library("halton_frame_sampler_gn")
 diff --git third_party/libwebrtc/video/corruption_detection/halton_sequence_gn/moz.build third_party/libwebrtc/video/corruption_detection/halton_sequence_gn/moz.build
-index 9726cf7d3756..85bd3bdd3734 100644
+index 1c216e73bcbc..bd61c3dcb4fe 100644
 --- third_party/libwebrtc/video/corruption_detection/halton_sequence_gn/moz.build
 +++ third_party/libwebrtc/video/corruption_detection/halton_sequence_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -109747,6 +100336,7 @@ index 9726cf7d3756..85bd3bdd3734 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -109755,23 +100345,18 @@ index 9726cf7d3756..85bd3bdd3734 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -109790,10 +100375,6 @@ index 9726cf7d3756..85bd3bdd3734 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -109801,10 +100382,6 @@ index 9726cf7d3756..85bd3bdd3734 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -109812,7 +100389,6 @@ index 9726cf7d3756..85bd3bdd3734 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -109820,10 +100396,6 @@ index 9726cf7d3756..85bd3bdd3734 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -109836,10 +100408,6 @@ index 9726cf7d3756..85bd3bdd3734 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -109870,7 +100438,7 @@ index 9726cf7d3756..85bd3bdd3734 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -109957,18 +100525,10 @@ index 9726cf7d3756..85bd3bdd3734 100644
  
  Library("halton_sequence_gn")
 diff --git third_party/libwebrtc/video/corruption_detection/video_frame_sampler_gn/moz.build third_party/libwebrtc/video/corruption_detection/video_frame_sampler_gn/moz.build
-index 8c7d63b72a90..f07e23927292 100644
+index 6c81ca519e96..53a0aecf15a7 100644
 --- third_party/libwebrtc/video/corruption_detection/video_frame_sampler_gn/moz.build
 +++ third_party/libwebrtc/video/corruption_detection/video_frame_sampler_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -109976,6 +100536,7 @@ index 8c7d63b72a90..f07e23927292 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -109984,23 +100545,18 @@ index 8c7d63b72a90..f07e23927292 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -110019,10 +100575,6 @@ index 8c7d63b72a90..f07e23927292 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -110030,10 +100582,6 @@ index 8c7d63b72a90..f07e23927292 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -110041,7 +100589,6 @@ index 8c7d63b72a90..f07e23927292 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -110049,10 +100596,6 @@ index 8c7d63b72a90..f07e23927292 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -110065,10 +100608,6 @@ index 8c7d63b72a90..f07e23927292 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -110106,7 +100645,7 @@ index 8c7d63b72a90..f07e23927292 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -110164,10 +100703,10 @@ index 8c7d63b72a90..f07e23927292 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -110178,10 +100717,10 @@ index 8c7d63b72a90..f07e23927292 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -110193,18 +100732,10 @@ index 8c7d63b72a90..f07e23927292 100644
  
  Library("video_frame_sampler_gn")
 diff --git third_party/libwebrtc/video/decode_synchronizer_gn/moz.build third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
-index e5ace8e4fd24..6328ecb27e8a 100644
+index 8d00bc66d4d7..37dd43f219d7 100644
 --- third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
 +++ third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -110212,6 +100743,7 @@ index e5ace8e4fd24..6328ecb27e8a 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -110220,23 +100752,18 @@ index e5ace8e4fd24..6328ecb27e8a 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -110255,10 +100782,6 @@ index e5ace8e4fd24..6328ecb27e8a 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -110266,10 +100789,6 @@ index e5ace8e4fd24..6328ecb27e8a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -110277,7 +100796,6 @@ index e5ace8e4fd24..6328ecb27e8a 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -110285,10 +100803,6 @@ index e5ace8e4fd24..6328ecb27e8a 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -110301,10 +100815,6 @@ index e5ace8e4fd24..6328ecb27e8a 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -110342,7 +100852,7 @@ index e5ace8e4fd24..6328ecb27e8a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -110400,10 +100910,10 @@ index e5ace8e4fd24..6328ecb27e8a 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -110414,10 +100924,10 @@ index e5ace8e4fd24..6328ecb27e8a 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -110429,18 +100939,10 @@ index e5ace8e4fd24..6328ecb27e8a 100644
  
  Library("decode_synchronizer_gn")
 diff --git third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
-index 1eb084c24914..569219f68829 100644
+index 0764c59c2ae1..76d308fbc122 100644
 --- third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
 +++ third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -110448,6 +100950,7 @@ index 1eb084c24914..569219f68829 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -110456,23 +100959,18 @@ index 1eb084c24914..569219f68829 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -110491,10 +100989,6 @@ index 1eb084c24914..569219f68829 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -110502,10 +100996,6 @@ index 1eb084c24914..569219f68829 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -110513,7 +101003,6 @@ index 1eb084c24914..569219f68829 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -110521,10 +101010,6 @@ index 1eb084c24914..569219f68829 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -110537,10 +101022,6 @@ index 1eb084c24914..569219f68829 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -110578,7 +101059,7 @@ index 1eb084c24914..569219f68829 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -110636,10 +101117,10 @@ index 1eb084c24914..569219f68829 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -110650,10 +101131,10 @@ index 1eb084c24914..569219f68829 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -110665,7 +101146,7 @@ index 1eb084c24914..569219f68829 100644
  
  Library("frame_cadence_adapter_gn")
 diff --git third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
-index 0b4bfc8a1ae8..f6086ea6f0de 100644
+index ebfa0cf8e98b..083623da19ed 100644
 --- third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
 +++ third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -110676,6 +101157,7 @@ index 0b4bfc8a1ae8..f6086ea6f0de 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -110684,13 +101166,12 @@ index 0b4bfc8a1ae8..f6086ea6f0de 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -110729,7 +101210,6 @@ index 0b4bfc8a1ae8..f6086ea6f0de 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -110786,7 +101266,7 @@ index 0b4bfc8a1ae8..f6086ea6f0de 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -110812,7 +101292,7 @@ index 0b4bfc8a1ae8..f6086ea6f0de 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -110854,18 +101334,10 @@ index 0b4bfc8a1ae8..f6086ea6f0de 100644
 -
  Library("frame_decode_scheduler_gn")
 diff --git third_party/libwebrtc/video/frame_decode_timing_gn/moz.build third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
-index d7c80a733fd3..56cb34a1dc91 100644
+index dff6817185a6..a6391ed1d6d9 100644
 --- third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
 +++ third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -110873,6 +101345,7 @@ index d7c80a733fd3..56cb34a1dc91 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -110881,23 +101354,18 @@ index d7c80a733fd3..56cb34a1dc91 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -110916,10 +101384,6 @@ index d7c80a733fd3..56cb34a1dc91 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -110927,10 +101391,6 @@ index d7c80a733fd3..56cb34a1dc91 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -110938,7 +101398,6 @@ index d7c80a733fd3..56cb34a1dc91 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -110946,10 +101405,6 @@ index d7c80a733fd3..56cb34a1dc91 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -110962,10 +101417,6 @@ index d7c80a733fd3..56cb34a1dc91 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -111003,7 +101454,7 @@ index d7c80a733fd3..56cb34a1dc91 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -111061,10 +101512,10 @@ index d7c80a733fd3..56cb34a1dc91 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -111075,10 +101526,10 @@ index d7c80a733fd3..56cb34a1dc91 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -111090,18 +101541,10 @@ index d7c80a733fd3..56cb34a1dc91 100644
  
  Library("frame_decode_timing_gn")
 diff --git third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
-index 12f88753ca39..65d2fa878456 100644
+index 227df191f979..60e92d4b43b8 100644
 --- third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
 +++ third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -111109,6 +101552,7 @@ index 12f88753ca39..65d2fa878456 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -111117,23 +101561,18 @@ index 12f88753ca39..65d2fa878456 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -111153,10 +101592,6 @@ index 12f88753ca39..65d2fa878456 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -111164,10 +101599,6 @@ index 12f88753ca39..65d2fa878456 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -111175,7 +101606,6 @@ index 12f88753ca39..65d2fa878456 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -111183,10 +101613,6 @@ index 12f88753ca39..65d2fa878456 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -111199,10 +101625,6 @@ index 12f88753ca39..65d2fa878456 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -111240,7 +101662,7 @@ index 12f88753ca39..65d2fa878456 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -111298,10 +101720,10 @@ index 12f88753ca39..65d2fa878456 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -111312,10 +101734,10 @@ index 12f88753ca39..65d2fa878456 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -111327,18 +101749,10 @@ index 12f88753ca39..65d2fa878456 100644
  
  Library("frame_dumping_decoder_gn")
 diff --git third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build
-index 811efba89652..1fa679c578b7 100644
+index 8d0c58f78dc2..e80fc74c8dfc 100644
 --- third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build
 +++ third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -111346,6 +101760,7 @@ index 811efba89652..1fa679c578b7 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -111354,23 +101769,18 @@ index 811efba89652..1fa679c578b7 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -111390,10 +101800,6 @@ index 811efba89652..1fa679c578b7 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -111401,10 +101807,6 @@ index 811efba89652..1fa679c578b7 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -111412,7 +101814,6 @@ index 811efba89652..1fa679c578b7 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -111420,10 +101821,6 @@ index 811efba89652..1fa679c578b7 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -111436,10 +101833,6 @@ index 811efba89652..1fa679c578b7 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -111477,7 +101870,7 @@ index 811efba89652..1fa679c578b7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -111535,10 +101928,10 @@ index 811efba89652..1fa679c578b7 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -111549,10 +101942,10 @@ index 811efba89652..1fa679c578b7 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -111564,18 +101957,10 @@ index 811efba89652..1fa679c578b7 100644
  
  Library("frame_dumping_encoder_gn")
 diff --git third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
-index 4055e4dc4653..8ce066226533 100644
+index 4635e7a8e62f..0611183c55ca 100644
 --- third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
 +++ third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -111583,6 +101968,7 @@ index 4055e4dc4653..8ce066226533 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -111591,23 +101977,18 @@ index 4055e4dc4653..8ce066226533 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -111626,10 +102007,6 @@ index 4055e4dc4653..8ce066226533 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -111637,10 +102014,6 @@ index 4055e4dc4653..8ce066226533 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -111648,7 +102021,6 @@ index 4055e4dc4653..8ce066226533 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -111656,10 +102028,6 @@ index 4055e4dc4653..8ce066226533 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -111672,10 +102040,6 @@ index 4055e4dc4653..8ce066226533 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -111713,7 +102077,7 @@ index 4055e4dc4653..8ce066226533 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -111771,10 +102135,10 @@ index 4055e4dc4653..8ce066226533 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -111785,10 +102149,10 @@ index 4055e4dc4653..8ce066226533 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -111800,18 +102164,10 @@ index 4055e4dc4653..8ce066226533 100644
  
  Library("incoming_video_stream_gn")
 diff --git third_party/libwebrtc/video/render/video_render_frames_gn/moz.build third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
-index 2af35e613160..a78a18cf5e01 100644
+index d0063c8e73d3..a4d236fc549c 100644
 --- third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
 +++ third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -111819,6 +102175,7 @@ index 2af35e613160..a78a18cf5e01 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -111827,23 +102184,18 @@ index 2af35e613160..a78a18cf5e01 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -111862,10 +102214,6 @@ index 2af35e613160..a78a18cf5e01 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -111873,10 +102221,6 @@ index 2af35e613160..a78a18cf5e01 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -111884,7 +102228,6 @@ index 2af35e613160..a78a18cf5e01 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -111892,10 +102235,6 @@ index 2af35e613160..a78a18cf5e01 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -111908,10 +102247,6 @@ index 2af35e613160..a78a18cf5e01 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -111949,7 +102284,7 @@ index 2af35e613160..a78a18cf5e01 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -112007,10 +102342,10 @@ index 2af35e613160..a78a18cf5e01 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -112021,10 +102356,10 @@ index 2af35e613160..a78a18cf5e01 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -112036,18 +102371,10 @@ index 2af35e613160..a78a18cf5e01 100644
  
  Library("video_render_frames_gn")
 diff --git third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
-index dc552260ed86..ee34a129be13 100644
+index ab2e1394bc6f..17b977e8823b 100644
 --- third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
 +++ third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -112055,6 +102382,7 @@ index dc552260ed86..ee34a129be13 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -112063,23 +102391,18 @@ index dc552260ed86..ee34a129be13 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -112098,10 +102421,6 @@ index dc552260ed86..ee34a129be13 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -112109,10 +102428,6 @@ index dc552260ed86..ee34a129be13 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -112120,7 +102435,6 @@ index dc552260ed86..ee34a129be13 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -112128,10 +102442,6 @@ index dc552260ed86..ee34a129be13 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -112144,10 +102454,6 @@ index dc552260ed86..ee34a129be13 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -112185,7 +102491,7 @@ index dc552260ed86..ee34a129be13 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -112243,10 +102549,10 @@ index dc552260ed86..ee34a129be13 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -112257,10 +102563,10 @@ index dc552260ed86..ee34a129be13 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -112272,18 +102578,10 @@ index dc552260ed86..ee34a129be13 100644
  
  Library("task_queue_frame_decode_scheduler_gn")
 diff --git third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
-index 3b6c61cda5ce..af781f74d81b 100644
+index a18e7c809be4..15326cffbbdd 100644
 --- third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
 +++ third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -112291,6 +102589,7 @@ index 3b6c61cda5ce..af781f74d81b 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -112299,23 +102598,18 @@ index 3b6c61cda5ce..af781f74d81b 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -112330,10 +102624,6 @@ index 3b6c61cda5ce..af781f74d81b 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -112341,10 +102631,6 @@ index 3b6c61cda5ce..af781f74d81b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -112352,7 +102638,6 @@ index 3b6c61cda5ce..af781f74d81b 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -112360,10 +102645,6 @@ index 3b6c61cda5ce..af781f74d81b 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -112376,10 +102657,6 @@ index 3b6c61cda5ce..af781f74d81b 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -112410,7 +102687,7 @@ index 3b6c61cda5ce..af781f74d81b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -112468,10 +102745,10 @@ index 3b6c61cda5ce..af781f74d81b 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -112482,10 +102759,10 @@ index 3b6c61cda5ce..af781f74d81b 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -112497,18 +102774,10 @@ index 3b6c61cda5ce..af781f74d81b 100644
  
  Library("unique_timestamp_counter_gn")
 diff --git third_party/libwebrtc/video/video_gn/moz.build third_party/libwebrtc/video/video_gn/moz.build
-index 20305674dedd..1525bb334eb9 100644
+index bf9570a50f61..852d85724b5a 100644
 --- third_party/libwebrtc/video/video_gn/moz.build
 +++ third_party/libwebrtc/video/video_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -112516,6 +102785,7 @@ index 20305674dedd..1525bb334eb9 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -112524,23 +102794,18 @@ index 20305674dedd..1525bb334eb9 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -65,115 +78,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -65,94 +74,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -112560,10 +102825,6 @@ index 20305674dedd..1525bb334eb9 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -112571,10 +102832,6 @@ index 20305674dedd..1525bb334eb9 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -112582,7 +102839,6 @@ index 20305674dedd..1525bb334eb9 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -112590,10 +102846,6 @@ index 20305674dedd..1525bb334eb9 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -112606,10 +102858,6 @@ index 20305674dedd..1525bb334eb9 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -112647,7 +102895,7 @@ index 20305674dedd..1525bb334eb9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -181,82 +86,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -160,82 +82,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -112705,10 +102953,10 @@ index 20305674dedd..1525bb334eb9 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -112719,10 +102967,10 @@ index 20305674dedd..1525bb334eb9 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -112734,18 +102982,10 @@ index 20305674dedd..1525bb334eb9 100644
  
  Library("video_gn")
 diff --git third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build
-index bc2d0a143361..c6e4d36f8444 100644
+index 5b7cfa965acb..870f098f8f00 100644
 --- third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build
 +++ third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -112753,6 +102993,7 @@ index bc2d0a143361..c6e4d36f8444 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -112761,23 +103002,18 @@ index bc2d0a143361..c6e4d36f8444 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -112796,10 +103032,6 @@ index bc2d0a143361..c6e4d36f8444 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -112807,10 +103039,6 @@ index bc2d0a143361..c6e4d36f8444 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -112818,7 +103046,6 @@ index bc2d0a143361..c6e4d36f8444 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -112826,10 +103053,6 @@ index bc2d0a143361..c6e4d36f8444 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -112842,10 +103065,6 @@ index bc2d0a143361..c6e4d36f8444 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -112883,7 +103102,7 @@ index bc2d0a143361..c6e4d36f8444 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -112941,10 +103160,10 @@ index bc2d0a143361..c6e4d36f8444 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -112955,10 +103174,10 @@ index bc2d0a143361..c6e4d36f8444 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -112970,18 +103189,10 @@ index bc2d0a143361..c6e4d36f8444 100644
  
  Library("video_receive_stream_timeout_tracker_gn")
 diff --git third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
-index f52787a08fce..253db3b836e7 100644
+index 546b31db87d2..c8a455a621d5 100644
 --- third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
 +++ third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -112989,6 +103200,7 @@ index f52787a08fce..253db3b836e7 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -112997,23 +103209,18 @@ index f52787a08fce..253db3b836e7 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -113033,10 +103240,6 @@ index f52787a08fce..253db3b836e7 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -113044,10 +103247,6 @@ index f52787a08fce..253db3b836e7 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -113055,7 +103254,6 @@ index f52787a08fce..253db3b836e7 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -113063,10 +103261,6 @@ index f52787a08fce..253db3b836e7 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -113079,10 +103273,6 @@ index f52787a08fce..253db3b836e7 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -113120,7 +103310,7 @@ index f52787a08fce..253db3b836e7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -113178,10 +103368,10 @@ index f52787a08fce..253db3b836e7 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -113192,10 +103382,10 @@ index f52787a08fce..253db3b836e7 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -113207,18 +103397,10 @@ index f52787a08fce..253db3b836e7 100644
  
  Library("video_stream_buffer_controller_gn")
 diff --git third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
-index 25ef4221b6be..09291af07481 100644
+index 361043fbfbf9..ef4b2d0642b2 100644
 --- third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
 +++ third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+CXXFLAGS += [
-+    "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -113226,6 +103408,7 @@ index 25ef4221b6be..09291af07481 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -113234,23 +103417,18 @@ index 25ef4221b6be..09291af07481 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -54,115 +67,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,94 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
 -
 -if CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
@@ -113270,10 +103448,6 @@ index 25ef4221b6be..09291af07481 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["WEBRTC_MAC"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -113281,10 +103455,6 @@ index 25ef4221b6be..09291af07481 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
@@ -113292,7 +103462,6 @@ index 25ef4221b6be..09291af07481 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -113300,10 +103469,6 @@ index 25ef4221b6be..09291af07481 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    CXXFLAGS += [
--        "-std=gnu++20"
--    ]
--
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["WEBRTC_BSD"] = True
@@ -113316,10 +103481,6 @@ index 25ef4221b6be..09291af07481 100644
 -
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
--    CXXFLAGS += [
--        "-std:c++20"
--    ]
--
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -113357,7 +103518,7 @@ index 25ef4221b6be..09291af07481 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -170,82 +75,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -149,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -113415,10 +103576,10 @@ index 25ef4221b6be..09291af07481 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -113429,10 +103590,10 @@ index 25ef4221b6be..09291af07481 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -113444,7 +103605,7 @@ index 25ef4221b6be..09291af07481 100644
  
  Library("video_stream_encoder_impl_gn")
 diff --git third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
-index 89ad79e33a09..17f77a8bcf9e 100644
+index 2fde9b415646..e25edf163bd7 100644
 --- third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
 +++ third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -113455,6 +103616,7 @@ index 89ad79e33a09..17f77a8bcf9e 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -113463,13 +103625,12 @@ index 89ad79e33a09..17f77a8bcf9e 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -113508,7 +103669,6 @@ index 89ad79e33a09..17f77a8bcf9e 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -113565,7 +103725,7 @@ index 89ad79e33a09..17f77a8bcf9e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -113591,7 +103751,7 @@ index 89ad79e33a09..17f77a8bcf9e 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -113633,7 +103793,7 @@ index 89ad79e33a09..17f77a8bcf9e 100644
 -
  Library("video_stream_encoder_interface_gn")
 diff --git third_party/libwebrtc/webrtc_gn/moz.build third_party/libwebrtc/webrtc_gn/moz.build
-index 42667b424826..dc7270acb50d 100644
+index ba124401bf6a..1340bec6cba0 100644
 --- third_party/libwebrtc/webrtc_gn/moz.build
 +++ third_party/libwebrtc/webrtc_gn/moz.build
 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -113644,6 +103804,7 @@ index 42667b424826..dc7270acb50d 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -113652,13 +103813,12 @@ index 42667b424826..dc7270acb50d 100644
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,118 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,117 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -113703,7 +103863,6 @@ index 42667b424826..dc7270acb50d 100644
 -    DEFINES["WEBRTC_LINUX"] = True
 -    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -113778,7 +103937,7 @@ index 42667b424826..dc7270acb50d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -161,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -160,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -113804,7 +103963,7 @@ index 42667b424826..dc7270acb50d 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -189,27 +72,7 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -188,27 +72,7 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -113833,7 +103992,7 @@ index 42667b424826..dc7270acb50d 100644
  
      OS_LIBS += [
          "X11",
-@@ -221,20 +84,4 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+@@ -220,20 +84,4 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
          "Xrender"
      ]
  
diff --git a/mail/thunderbird/files/patch-python_sites_mach.txt b/mail/thunderbird/files/patch-python_sites_mach.txt
index 706f285b0731..cc59e963c2de 100644
--- a/mail/thunderbird/files/patch-python_sites_mach.txt
+++ b/mail/thunderbird/files/patch-python_sites_mach.txt
@@ -1,4 +1,4 @@
-commit 10ee367cbe7ff5a19acfcfe3bfb75a49671e4132
+commit 9978044775efea5d7c16949bc4755ce4681fb2f8
 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
 
     bump psutil (same as ports)
@@ -6,13 +6,15 @@ Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
     5.9.x breaks mach
 
 diff --git python/sites/mach.txt python/sites/mach.txt
-index 6e3db1c848f7..10ba12c2f13b 100644
+index 4769fe11257e..e77870ec4f42 100644
 --- python/sites/mach.txt
 +++ python/sites/mach.txt
-@@ -108,5 +108,5 @@ pypi-optional:glean-sdk==63.1.0:telemetry will not be collected
+@@ -62,7 +62,7 @@ pypi-optional:orjson>=3.10:json operations will be slower in various tools
  # Mach gracefully handles the case where `psutil` is unavailable.
  # We aren't (yet) able to pin packages in automation, so we have to
  # support down to the oldest locally-installed version (5.4.2).
--pypi-optional:psutil>=5.4.2,<=5.9.4:telemetry will be missing some data
-+pypi-optional:psutil>=5.4.2,<=7.0.0:telemetry will be missing some data
+-pypi-optional:psutil>=5.4.2:telemetry will be missing some data
++pypi-optional:psutil>=5.4.2,<=7.2.0:telemetry will be missing some data
+ pypi-optional:rtoml>=0.11.0:toml operations will be slower in various tools
  pypi-optional:zstandard>=0.11.1,<=0.24.0:zstd archives will not be possible to extract
+ vendored-fallback:pyyaml:third_party/python/pyyaml/lib/:faster native loading is disabled
author	Christoph Moench-Tegeder <cmt@FreeBSD.org>	2026-01-09 20:06:48 +0100
committer	Christoph Moench-Tegeder <cmt@FreeBSD.org>	2026-01-09 20:09:56 +0100
commit	7e3548213205448b0f7a6a4a7cd935695a96ed86 (patch)
tree	4d5f94de875148172ed64b7fd5ae9ee1f6ec58c1
parent	e056c1fc5fbfac0d7cca5f93e92a9dfe72e5484e (diff)