From 414d4d2334ba86be3a7a4d3da932d9f184cdea87 Mon Sep 17 00:00:00 2001
From: Sandor Molnar <smolnar@mozilla.com>
Date: Thu, 21 Nov 2024 02:45:43 +0200
Subject: [PATCH] Backed out 29 changesets (bug 1783255, bug 1921154) for
 causing mda crashes. CLOSED TREE

Backed out changeset 1427b958663e (bug 1783255)
Backed out changeset 91435e12b44e (bug 1921154)
Backed out changeset 11c909152c70 (bug 1921154)
Backed out changeset a85534abf9ab (bug 1921154)
Backed out changeset 9395729cc913 (bug 1921154)
Backed out changeset 9be2fffdccaf (bug 1921154)
Backed out changeset f304a5ad665f (bug 1921154)
Backed out changeset 326446796499 (bug 1921154)
Backed out changeset 3a33f398597a (bug 1921154)
Backed out changeset 75dc45c6411e (bug 1921154)
Backed out changeset 1fa214699aaf (bug 1921154)
Backed out changeset 1154e63e8261 (bug 1921154)
Backed out changeset d5b3e7a3936b (bug 1921154)
Backed out changeset cbde111cc9a0 (bug 1921154)
Backed out changeset cb482a3d1e25 (bug 1921154)
Backed out changeset 701c1767a08d (bug 1921154)
Backed out changeset b46efeafe0b8 (bug 1921154)
Backed out changeset 3ad63cd1b72f (bug 1921154)
Backed out changeset 6349ba73e4b7 (bug 1921154)
Backed out changeset cabfa788ef46 (bug 1921154)
Backed out changeset 8626f01397d0 (bug 1921154)
Backed out changeset d5ef2c812c1b (bug 1921154)
Backed out changeset 69b0cd01c3cb (bug 1921154)
Backed out changeset da18f0c34497 (bug 1921154)
Backed out changeset e4668f4df24f (bug 1921154)
Backed out changeset fef404e8c0ce (bug 1921154)
Backed out changeset a9dc02427dc4 (bug 1921154)
Backed out changeset 3381b9c705d1 (bug 1921154)
Backed out changeset e4dd58ab0966 (bug 1921154)
---
 config/system-headers.mozbuild                |   2 -
 dom/chrome-webidl/moz.build                   |   5 -
 dom/media/webrtc/jsapi/PeerConnectionImpl.cpp |  25 +-
 dom/media/webrtc/jsapi/RTCRtpTransceiver.cpp  |  77 +++--
 .../webrtc/jsapi/WebrtcGlobalInformation.cpp  |   1 -
 dom/media/webrtc/jsep/JsepCodecDescription.h  | 116 --------
 dom/media/webrtc/jsep/JsepTrack.cpp           |   6 -
 dom/media/webrtc/libwebrtcglue/CodecConfig.h  |  80 +++---
 .../webrtc/libwebrtcglue/VideoConduit.cpp     |  23 --
 dom/media/webrtc/libwebrtcglue/VideoConduit.h |   2 -
 .../libwebrtcglue/WebrtcVideoCodecFactory.cpp |  17 +-
 .../webrtc/sdp/RsdparsaSdpAttributeList.cpp   |  16 --
 dom/media/webrtc/sdp/RsdparsaSdpInc.h         |  12 -
 dom/media/webrtc/sdp/SdpAttribute.cpp         |   1 -
 dom/media/webrtc/sdp/SdpAttribute.h           |  57 ----
 .../webrtc/sdp/SipccSdpAttributeList.cpp      |  16 --
 .../webrtc/sdp/rsdparsa_capi/src/attribute.rs |  23 --
 dom/media/webrtc/tests/mochitests/head.js     |  26 +-
 .../mochitests/mochitest_peerconnection.toml  |   3 -
 dom/media/webrtc/tests/mochitests/pc.js       |   6 -
 dom/media/webrtc/tests/mochitests/sdpUtils.js |  10 +-
 dom/media/webrtc/tests/mochitests/stats.js    |  33 +--
 .../webrtc/tests/mochitests/templates.js      |  15 -
 .../test_peerConnection_basicAV1Video.html    |  25 --
 .../test_peerConnection_basicScreenshare.html |  42 +--
 ...eerConnection_codecNegotiationFailure.html |   3 +-
 .../test_peerConnection_getParameters.html    |   6 +-
 .../test_peerConnection_videoCodecs.html      |  10 -
 .../WebrtcGlobalInformation.webidl            |   1 -
 dom/webidl/moz.build                          |   1 +
 .../signaling/gtest/jsep_session_unittest.cpp |  50 +---
 .../signaling/gtest/jsep_track_unittest.cpp   | 141 +++++----
 .../webrtc/signaling/gtest/sdp_unittests.cpp  | 119 --------
 .../gtest/videoconduit_unittests.cpp          |  32 +--
 modules/libpref/init/StaticPrefList.yaml      |  16 --
 .../decodingInfo-webrtc.any.js.ini            |   3 -
 .../encodingInfo-webrtc.any.js.ini            |   2 -
 third_party/libwebrtc/BUILD.gn                |   4 -
 .../moz.build                                 | 232 ---------------
 .../moz.build                                 | 209 --------------
 .../moz.build                                 | 213 --------------
 .../moz.build                                 | 214 --------------
 .../moz.build                                 | 214 --------------
 .../moz.build                                 | 214 --------------
 third_party/libwebrtc/media/BUILD.gn          |  24 +-
 .../libwebrtc/media/audio_source_gn/moz.build | 198 -------------
 .../libwebrtc/media/media_engine_gn/moz.build | 214 --------------
 .../media/rid_description_gn/moz.build        |  18 --
 .../media/rtc_audio_video_gn/moz.build        | 268 ------------------
 .../rtc_internal_video_codecs_gn/moz.build    | 233 ---------------
 .../libwebrtc/media/rtc_media_gn/moz.build    | 219 --------------
 .../audio_device_impl_gn/moz.build            | 198 -------------
 .../codecs/av1/dav1d_decoder_gn/moz.build     | 231 ---------------
 .../codecs/av1/libaom_av1_encoder.cc          |   5 +-
 .../av1/libaom_av1_encoder_gn/moz.build       | 231 ---------------
 .../video_coding/webrtc_h264_gn/moz.build     | 237 ----------------
 third_party/libwebrtc/moz.build               |  18 --
 third_party/libwebrtc/rtc_base/BUILD.gn       |  42 ++-
 .../libwebrtc/rtc_base/ssl_gn/moz.build       | 198 -------------
 .../third_party/dav1d/dav1d_gn/moz.build      | 200 -------------
 .../third_party/libaom/libaom_gn/moz.build    | 198 -------------
 .../libaom/source/libaom/aom/aom_codec.h      |  22 --
 .../libaom/source/libaom/aom/aom_encoder.h    |  22 --
 .../libaom/source/libaom/aom/aomcx.h          |  22 --
 third_party/libwebrtc/webrtc.gni              |   4 +-
 third_party/sipcc/ccsdp.h                     |   1 -
 third_party/sipcc/sdp_access.c                |   4 -
 third_party/sipcc/sdp_attr.c                  |  19 +-
 third_party/sipcc/sdp_main.c                  |   4 +-
 third_party/sipcc/sipcc_sdp.h                 |  10 -
 toolkit/content/aboutwebrtc/aboutWebrtc.mjs   |  15 +-
 71 files changed, 225 insertions(+), 4953 deletions(-)
 delete mode 100644 dom/media/webrtc/tests/mochitests/test_peerConnection_basicAV1Video.html
 rename dom/{chrome-webidl => webidl}/WebrtcGlobalInformation.webidl (98%)
 delete mode 100644 third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
 delete mode 100644 third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
 delete mode 100644 third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build
 delete mode 100644 third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
 delete mode 100644 third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
 delete mode 100644 third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
 delete mode 100644 third_party/libwebrtc/media/audio_source_gn/moz.build
 delete mode 100644 third_party/libwebrtc/media/media_engine_gn/moz.build
 delete mode 100644 third_party/libwebrtc/media/rtc_audio_video_gn/moz.build
 delete mode 100644 third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
 delete mode 100644 third_party/libwebrtc/media/rtc_media_gn/moz.build
 delete mode 100644 third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build
 delete mode 100644 third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build
 delete mode 100644 third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
 delete mode 100644 third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
 delete mode 100644 third_party/libwebrtc/rtc_base/ssl_gn/moz.build
 delete mode 100644 third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build
 delete mode 100644 third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build
 delete mode 100644 third_party/libwebrtc/third_party/libaom/source/libaom/aom/aom_codec.h
 delete mode 100644 third_party/libwebrtc/third_party/libaom/source/libaom/aom/aom_encoder.h
 delete mode 100644 third_party/libwebrtc/third_party/libaom/source/libaom/aom/aomcx.h

diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
index 635ad37e04e8..f1c61ccc52cf 100644
--- a/config/system-headers.mozbuild
+++ b/config/system-headers.mozbuild
@@ -1030,9 +1030,7 @@ system_headers = [
     "aom/aom_image.h",
     "aom/aomdx.h",
     "aom/aomcx.h",
-    "aom/aom_codec.h",
     "aom/aom_decoder.h",
-    "aom/aom_encoder.h",
 ]
 
 if CONFIG["MOZ_X11"]:
diff --git a/dom/chrome-webidl/moz.build b/dom/chrome-webidl/moz.build
index bd62b2090a3d..54c40cdab9e6 100644
--- a/dom/chrome-webidl/moz.build
+++ b/dom/chrome-webidl/moz.build
@@ -135,8 +135,3 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
     WEBIDL_FILES += [
         "WindowsJumpListShortcutDescription.webidl",
     ]
-
-if CONFIG["MOZ_WEBRTC"]:
-    WEBIDL_FILES += [
-        "WebrtcGlobalInformation.webidl",
-    ]
diff --git a/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp b/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp
index 235d5dde8ff7..50c4dd642818 100644
--- a/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp
+++ b/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp
@@ -637,7 +637,6 @@ class ConfigureCodec {
         mH264Enabled(false),
         mVP9Enabled(true),
         mVP9Preferred(false),
-        mAV1Enabled(StaticPrefs::media_webrtc_codec_video_av1_enabled()),
         mH264Level(13),   // minimum suggested for WebRTC spec
         mH264MaxBr(0),    // Unlimited
         mH264MaxMbps(0),  // Unlimited
@@ -752,8 +751,6 @@ class ConfigureCodec {
           }
           videoCodec.mConstraints.maxFs = mVP8MaxFs;
           videoCodec.mConstraints.maxFps = Some(mVP8MaxFr);
-        } else if (videoCodec.mName == "AV1") {
-          videoCodec.mEnabled = mAV1Enabled;
         }
 
         if (mUseTmmbr) {
@@ -779,7 +776,6 @@ class ConfigureCodec {
   bool mH264Enabled;
   bool mVP9Enabled;
   bool mVP9Preferred;
-  bool mAV1Enabled;
   int32_t mH264Level;
   int32_t mH264MaxBr;
   int32_t mH264MaxMbps;
@@ -814,9 +810,6 @@ nsresult PeerConnectionImpl::ConfigureJsepSessionCodecs() {
 
   // We use this to sort the list of codecs once everything is configured
   CompareCodecPriority comparator;
-  if (StaticPrefs::media_webrtc_codec_video_av1_experimental_preferred()) {
-    comparator.SetPreferredCodec(nsCString("av1"));
-  }
   // Sort by priority
   mJsepSession->SortCodecs(comparator);
   return NS_OK;
@@ -2185,6 +2178,8 @@ void PeerConnectionImpl::SendWarningToConsole(const nsCString& aWarning) {
 void PeerConnectionImpl::GetDefaultVideoCodecs(
     std::vector<UniquePtr<JsepCodecDescription>>& aSupportedCodecs,
     bool aUseRtx) {
+  const bool disableBaseline = Preferences::GetBool(
+      "media.navigator.video.disable_h264_baseline", false);
   // Supported video codecs.
   // Note: order here implies priority for building offers!
   aSupportedCodecs.emplace_back(
@@ -2196,9 +2191,6 @@ void PeerConnectionImpl::GetDefaultVideoCodecs(
   aSupportedCodecs.emplace_back(
       JsepVideoCodecDescription::CreateDefaultH264_0(aUseRtx));
 
-  const bool disableBaseline = Preferences::GetBool(
-      "media.navigator.video.disable_h264_baseline", false);
-
   // Only add Baseline if it hasn't been disabled.
   if (!disableBaseline) {
     aSupportedCodecs.emplace_back(
@@ -2207,24 +2199,11 @@ void PeerConnectionImpl::GetDefaultVideoCodecs(
         JsepVideoCodecDescription::CreateDefaultH264Baseline_0(aUseRtx));
   }
 
-  if (WebrtcVideoConduit::HasAv1() &&
-      StaticPrefs::media_webrtc_codec_video_av1_enabled()) {
-    aSupportedCodecs.emplace_back(
-        JsepVideoCodecDescription::CreateDefaultAV1(aUseRtx));
-  }
-
   aSupportedCodecs.emplace_back(
       JsepVideoCodecDescription::CreateDefaultUlpFec());
   aSupportedCodecs.emplace_back(
       JsepApplicationCodecDescription::CreateDefault());
   aSupportedCodecs.emplace_back(JsepVideoCodecDescription::CreateDefaultRed());
-
-  CompareCodecPriority comparator;
-  if (StaticPrefs::media_webrtc_codec_video_av1_experimental_preferred()) {
-    comparator.SetPreferredCodec(nsCString("av1"));
-  }
-  std::stable_sort(aSupportedCodecs.begin(), aSupportedCodecs.end(),
-                   comparator);
 }
 
 void PeerConnectionImpl::GetDefaultAudioCodecs(
diff --git a/dom/media/webrtc/jsapi/RTCRtpTransceiver.cpp b/dom/media/webrtc/jsapi/RTCRtpTransceiver.cpp
index 799812ac9d35..e505dd2305fb 100644
--- a/dom/media/webrtc/jsapi/RTCRtpTransceiver.cpp
+++ b/dom/media/webrtc/jsapi/RTCRtpTransceiver.cpp
@@ -797,18 +797,16 @@ auto RTCRtpTransceiver::GetActivePayloadTypes() const
                      });
 }
 
-static auto JsepCodecDescToVideoCodecConfig(
-    const JsepVideoCodecDescription& aCodec) -> Maybe<VideoCodecConfig> {
+static void JsepCodecDescToVideoCodecConfig(
+    const JsepVideoCodecDescription& aCodec, Maybe<VideoCodecConfig>* aConfig) {
   uint16_t pt;
 
-  Maybe<VideoCodecConfig> config;
   // TODO(bug 1761272): Getting the pt for a JsepVideoCodecDescription should be
   // infallible.
-  // Bug 1920249, yes please.
   if (NS_WARN_IF(!aCodec.GetPtAsInt(&pt))) {
     MOZ_MTLOG(ML_ERROR, "Invalid payload type: " << aCodec.mDefaultPt);
     MOZ_ASSERT(false);
-    return Nothing();
+    return;
   }
 
   UniquePtr<VideoCodecConfigH264> h264Config;
@@ -823,45 +821,35 @@ static auto JsepCodecDescToVideoCodecConfig(
         static_cast<int>(aCodec.mPacketizationMode);
     h264Config->profile_level_id = static_cast<int>(aCodec.mProfileLevelId);
     h264Config->tias_bw = 0;  // TODO(bug 1403206)
-    config = Some(VideoCodecConfig::CreateH264Config(pt, aCodec.mConstraints,
-                                                     *h264Config));
   }
 
-  if (aCodec.mName == "AV1") {
-    config = Some(VideoCodecConfig::CreateAv1Config(pt, aCodec.mConstraints,
-                                                    aCodec.mAv1Config));
-  }
+  *aConfig = Some(VideoCodecConfig(pt, aCodec.mName, aCodec.mConstraints,
+                                   h264Config.get()));
 
-  if (config.isNothing()) {
-    // TODO bug 1920249, let's just pass in the JsepCodecConfig
-    config = Some(VideoCodecConfig(pt, aCodec.mName, aCodec.mConstraints));
-  }
-
-  config->mAckFbTypes = aCodec.mAckFbTypes;
-  config->mNackFbTypes = aCodec.mNackFbTypes;
-  config->mCcmFbTypes = aCodec.mCcmFbTypes;
-  config->mRembFbSet = aCodec.RtcpFbRembIsSet();
-  config->mFECFbSet = aCodec.mFECEnabled;
-  config->mTransportCCFbSet = aCodec.RtcpFbTransportCCIsSet();
+  (*aConfig)->mAckFbTypes = aCodec.mAckFbTypes;
+  (*aConfig)->mNackFbTypes = aCodec.mNackFbTypes;
+  (*aConfig)->mCcmFbTypes = aCodec.mCcmFbTypes;
+  (*aConfig)->mRembFbSet = aCodec.RtcpFbRembIsSet();
+  (*aConfig)->mFECFbSet = aCodec.mFECEnabled;
+  (*aConfig)->mTransportCCFbSet = aCodec.RtcpFbTransportCCIsSet();
   if (aCodec.mFECEnabled) {
     uint16_t pt;
     if (SdpHelper::GetPtAsInt(aCodec.mREDPayloadType, &pt)) {
-      config->mREDPayloadType = pt;
+      (*aConfig)->mREDPayloadType = pt;
     }
     if (SdpHelper::GetPtAsInt(aCodec.mULPFECPayloadType, &pt)) {
-      config->mULPFECPayloadType = pt;
+      (*aConfig)->mULPFECPayloadType = pt;
     }
     if (SdpHelper::GetPtAsInt(aCodec.mREDRTXPayloadType, &pt)) {
-      config->mREDRTXPayloadType = pt;
+      (*aConfig)->mREDRTXPayloadType = pt;
     }
   }
   if (aCodec.mRtxEnabled) {
     uint16_t pt;
     if (SdpHelper::GetPtAsInt(aCodec.mRtxPayloadType, &pt)) {
-      config->mRTXPayloadType = pt;
+      (*aConfig)->mRTXPayloadType = pt;
     }
   }
-  return config;
 }
 
 // TODO: Maybe move this someplace else?
@@ -875,23 +863,24 @@ void RTCRtpTransceiver::NegotiatedDetailsToVideoCodecConfigs(
         MOZ_ASSERT(false, "Codec is not video! This is a JSEP bug.");
         return;
       }
+      Maybe<VideoCodecConfig> config;
       const JsepVideoCodecDescription& video =
           static_cast<const JsepVideoCodecDescription&>(*codec);
 
-      JsepCodecDescToVideoCodecConfig(video).apply(
-          [&](VideoCodecConfig config) {
-            config.mTias = aDetails.GetTias();
-            for (size_t i = 0; i < aDetails.GetEncodingCount(); ++i) {
-              const JsepTrackEncoding& jsepEncoding(aDetails.GetEncoding(i));
-              if (jsepEncoding.HasFormat(video.mDefaultPt)) {
-                VideoCodecConfig::Encoding encoding;
-                encoding.rid = jsepEncoding.mRid;
-                config.mEncodings.push_back(encoding);
-              }
-            }
+      JsepCodecDescToVideoCodecConfig(video, &config);
 
-            aConfigs->push_back(std::move(config));
-          });
+      config->mTias = aDetails.GetTias();
+
+      for (size_t i = 0; i < aDetails.GetEncodingCount(); ++i) {
+        const JsepTrackEncoding& jsepEncoding(aDetails.GetEncoding(i));
+        if (jsepEncoding.HasFormat(video.mDefaultPt)) {
+          VideoCodecConfig::Encoding encoding;
+          encoding.rid = jsepEncoding.mRid;
+          config->mEncodings.push_back(encoding);
+        }
+      }
+
+      aConfigs->push_back(std::move(*config));
     }
   }
 }
@@ -924,11 +913,9 @@ void RTCRtpTransceiver::ToDomRtpCodec(const JsepCodecDescription& aCodec,
     if (params != nullptr) {
       std::ostringstream paramsString;
       params->Serialize(paramsString);
-      if (!paramsString.str().empty()) {
-        nsTString<char16_t> fmtp;
-        fmtp.AssignASCII(paramsString.str());
-        aDomCodec->mSdpFmtpLine.Construct(fmtp);
-      }
+      nsTString<char16_t> fmtp;
+      fmtp.AssignASCII(paramsString.str());
+      aDomCodec->mSdpFmtpLine.Construct(fmtp);
     }
   }
 }
diff --git a/dom/media/webrtc/jsapi/WebrtcGlobalInformation.cpp b/dom/media/webrtc/jsapi/WebrtcGlobalInformation.cpp
index 0727a580be70..d6dedd23a9fc 100644
--- a/dom/media/webrtc/jsapi/WebrtcGlobalInformation.cpp
+++ b/dom/media/webrtc/jsapi/WebrtcGlobalInformation.cpp
@@ -253,7 +253,6 @@ void WebrtcGlobalInformation::GetStatsHistorySince(
 void WebrtcGlobalInformation::GetMediaContext(
     const GlobalObject& aGlobal, WebrtcGlobalMediaContext& aContext) {
   aContext.mHasH264Hardware = WebrtcVideoConduit::HasH264Hardware();
-  aContext.mHasAv1 = WebrtcVideoConduit::HasAv1();
 }
 
 using StatsPromiseArray =
diff --git a/dom/media/webrtc/jsep/JsepCodecDescription.h b/dom/media/webrtc/jsep/JsepCodecDescription.h
index 52167848ce8f..f6ad134503f1 100644
--- a/dom/media/webrtc/jsep/JsepCodecDescription.h
+++ b/dom/media/webrtc/jsep/JsepCodecDescription.h
@@ -6,7 +6,6 @@
 #define _JSEPCODECDESCRIPTION_H_
 
 #include <cmath>
-#include <set>
 #include <string>
 #include "sdp/SdpMediaSection.h"
 #include "sdp/SdpHelper.h"
@@ -401,18 +400,6 @@ class JsepVideoCodecDescription : public JsepCodecDescription {
 
   SdpMediaSection::MediaType Type() const override { return type; }
 
-  static UniquePtr<JsepVideoCodecDescription> CreateDefaultAV1(bool aUseRtx) {
-    auto codec = MakeUnique<JsepVideoCodecDescription>("99", "AV1", 90000);
-    // Defaults for mandatory params
-    codec->mConstraints.maxFs = 12288;  // Enough for 2048x1536
-    codec->mConstraints.maxFps = Some(60);
-    codec->mAv1Config.mProfile = Nothing();
-    if (aUseRtx) {
-      codec->EnableRtx("100");
-    }
-    return codec;
-  }
-
   static UniquePtr<JsepVideoCodecDescription> CreateDefaultVP8(bool aUseRtx) {
     auto codec = MakeUnique<JsepVideoCodecDescription>("120", "VP8", 90000);
     // Defaults for mandatory params
@@ -560,17 +547,6 @@ class JsepVideoCodecDescription : public JsepCodecDescription {
         vp8Params.max_fr = 60;
       }
       aFmtp.reset(vp8Params.Clone());
-    } else if (mName == "AV1") {
-      auto av1Params = SdpFmtpAttributeList::Av1Parameters();
-      if (aFmtp) {
-        MOZ_RELEASE_ASSERT(aFmtp->codec_type == SdpRtpmapAttributeList::kAV1);
-        av1Params =
-            static_cast<const SdpFmtpAttributeList::Av1Parameters&>(*aFmtp);
-        av1Params.profile = mAv1Config.mProfile;
-        av1Params.levelIdx = mAv1Config.mLevelIdx;
-        av1Params.tier = mAv1Config.mTier;
-      }
-      aFmtp.reset(av1Params.Clone());
     }
   }
 
@@ -652,12 +628,6 @@ class JsepVideoCodecDescription : public JsepCodecDescription {
         ApplyConfigToFmtp(vp8Params);
         msection.SetFmtp(SdpFmtpAttributeList::Fmtp(mDefaultPt, *vp8Params));
       }
-    } else if (mName == "AV1") {
-      UniquePtr<SdpFmtpAttributeList::Parameters> av1Params =
-          MakeUnique<SdpFmtpAttributeList::Av1Parameters>(
-              GetAv1Parameters(mDefaultPt, msection));
-      ApplyConfigToFmtp(av1Params);
-      msection.SetFmtp(SdpFmtpAttributeList::Fmtp(mDefaultPt, *av1Params));
     }
 
     if (mRtxEnabled && mDirection == sdp::kRecv) {
@@ -782,22 +752,6 @@ class JsepVideoCodecDescription : public JsepCodecDescription {
     return result;
   }
 
-  SdpFmtpAttributeList::Av1Parameters GetAv1Parameters(
-      const std::string& pt, const SdpMediaSection& msection) const {
-    SdpRtpmapAttributeList::CodecType expectedType(
-        SdpRtpmapAttributeList::kAV1);
-
-    // Will contain defaults if nothing else
-    SdpFmtpAttributeList::Av1Parameters result;
-    const auto* params = msection.FindFmtp(pt);
-
-    if (params && params->codec_type == expectedType) {
-      result = static_cast<const SdpFmtpAttributeList::Av1Parameters&>(*params);
-    }
-
-    return result;
-  }
-
   void NegotiateRtcpFb(const SdpMediaSection& remoteMsection,
                        SdpRtcpFbAttributeList::Type type,
                        std::vector<std::string>* supportedTypes) {
@@ -838,33 +792,6 @@ class JsepVideoCodecDescription : public JsepCodecDescription {
     NegotiateRtcpFb(remote, &mOtherFbTypes);
   }
 
-  // Some parameters are hierarchical, meaning that a lower value reflects a
-  // lower capability.  In these cases, we want the sender to use the lower of
-  // the two values. There is also an implied default value which may be higher
-  // than the signalled value.
-  template <typename T>
-  static auto NegotiateHierarchicalParam(const sdp::Direction direction,
-                                         const Maybe<T>& localParam,
-                                         const Maybe<T>& remoteParam,
-                                         const T& defaultValue) -> Maybe<T> {
-    const auto maybe_min = [&](const Maybe<T>& a,
-                               const Maybe<T>& b) -> Maybe<T> {
-      auto val = std::min(a.valueOr(defaultValue), b.valueOr(defaultValue));
-      if (val == defaultValue) {
-        // Are we using defaultValue because we fell back on it, or because it
-        // was actually signaled?
-        if (a != Some(defaultValue) && b != Some(defaultValue)) {
-          return Nothing();
-        }
-      }
-      return Some(val);
-    };
-    if (direction == sdp::kSend) {
-      return maybe_min(localParam, remoteParam);
-    }
-    return localParam;
-  }
-
   virtual bool Negotiate(const std::string& pt,
                          const SdpMediaSection& remoteMsection,
                          bool remoteIsOffer,
@@ -910,29 +837,6 @@ class JsepVideoCodecDescription : public JsepCodecDescription {
           mConstraints.maxFps = Some(vp8Params.max_fr);
         }
       }
-    } else if (mName == "AV1") {
-      using Av1Params = SdpFmtpAttributeList::Av1Parameters;
-      Av1Params av1Params(GetAv1Parameters(mDefaultPt, remoteMsection));
-
-      Maybe<SdpFmtpAttributeList::Av1Parameters> localParams =
-          localMsection.isSome()
-              ? Some(GetAv1Parameters(mDefaultPt, *localMsection))
-              : Nothing();
-      auto localProfile =
-          localParams.isSome() ? localParams.value().profile : Nothing();
-      auto localLevelIdx =
-          localParams.isSome() ? localParams.value().levelIdx : Nothing();
-      auto tier = localParams.isSome() ? localParams.value().tier : Nothing();
-
-      av1Params.profile = NegotiateHierarchicalParam(
-          mDirection, localProfile, av1Params.profile,
-          Av1Params::kDefaultProfile);
-      av1Params.levelIdx = NegotiateHierarchicalParam(
-          mDirection, localLevelIdx, av1Params.levelIdx,
-          Av1Params::kDefaultLevelIdx);
-      av1Params.tier = NegotiateHierarchicalParam(
-          mDirection, tier, av1Params.tier, Av1Params::kDefaultTier);
-      mAv1Config = Av1Config(av1Params);
     }
 
     if (mRtxEnabled && (mDirection == sdp::kSend || remoteIsOffer)) {
@@ -1187,26 +1091,6 @@ class JsepVideoCodecDescription : public JsepCodecDescription {
   uint32_t mProfileLevelId;
   uint32_t mPacketizationMode;
   std::string mSpropParameterSets;
-
-  // AV1-specific stuff
-  struct Av1Config {
-    Maybe<uint8_t> mProfile = Nothing();
-    Maybe<uint8_t> mLevelIdx = Nothing();
-    Maybe<uint8_t> mTier = Nothing();
-    Av1Config() = default;
-    explicit Av1Config(const SdpFmtpAttributeList::Av1Parameters& aParams)
-        : mProfile(aParams.profile),
-          mLevelIdx(aParams.levelIdx),
-          mTier(aParams.tier) {}
-    auto ProfileOrDefault() const -> uint8_t { return mProfile.valueOr(0); }
-    auto LevelIdxDefault() const -> uint8_t { return mLevelIdx.valueOr(5); }
-    auto TierOrDefault() const -> uint8_t { return mTier.valueOr(0); }
-    auto operator==(const Av1Config& aOther) const -> bool {
-      return ProfileOrDefault() == aOther.ProfileOrDefault() &&
-             LevelIdxDefault() == aOther.LevelIdxDefault() &&
-             TierOrDefault() == aOther.TierOrDefault();
-    }
-  } mAv1Config;
 };
 
 class JsepApplicationCodecDescription : public JsepCodecDescription {
diff --git a/dom/media/webrtc/jsep/JsepTrack.cpp b/dom/media/webrtc/jsep/JsepTrack.cpp
index 90dbd8e235aa..1ca1e4c94ea6 100644
--- a/dom/media/webrtc/jsep/JsepTrack.cpp
+++ b/dom/media/webrtc/jsep/JsepTrack.cpp
@@ -480,12 +480,6 @@ void JsepTrack::MaybeStoreCodecToLog(const std::string& codec,
 std::vector<UniquePtr<JsepCodecDescription>> JsepTrack::NegotiateCodecs(
     const SdpMediaSection& remote, bool remoteIsOffer,
     Maybe<const SdpMediaSection&> local) {
-  // See Bug 1927371 - :ng
-  // This also effects the ordering of codecs in RTCRTPSender::GetParameters,
-  // but occurs after the initial local description codec ordering is
-  // established in the SDP. We should protect against this in the future by
-  // applying the same ordering logic to the initial local description.
-
   std::vector<UniquePtr<JsepCodecDescription>> negotiatedCodecs;
   std::vector<UniquePtr<JsepCodecDescription>> newPrototypeCodecs;
   // "Pseudo codecs" include things that aren't actually stand-alone codecs (ie;
diff --git a/dom/media/webrtc/libwebrtcglue/CodecConfig.h b/dom/media/webrtc/libwebrtcglue/CodecConfig.h
index 6b14915dc663..023ea987832d 100644
--- a/dom/media/webrtc/libwebrtcglue/CodecConfig.h
+++ b/dom/media/webrtc/libwebrtcglue/CodecConfig.h
@@ -10,7 +10,6 @@
 #include <vector>
 
 #include "common/EncodingConstraints.h"
-#include "jsep/JsepCodecDescription.h"
 
 namespace mozilla {
 
@@ -108,17 +107,16 @@ class VideoCodecConfig {
   std::vector<std::string> mCcmFbTypes;
   // Don't pass mOtherFbTypes from JsepVideoCodecDescription because we'd have
   // to drag SdpRtcpFbAttributeList::Feedback along too.
-  bool mRembFbSet = false;
-  bool mFECFbSet = false;
-  bool mTransportCCFbSet = false;
+  bool mRembFbSet;
+  bool mFECFbSet;
+  bool mTransportCCFbSet;
 
-  // TODO Bug 1920249 maybe types for these?
-  int mULPFECPayloadType = -1;
-  int mREDPayloadType = -1;
-  int mREDRTXPayloadType = -1;
-  int mRTXPayloadType = -1;
+  int mULPFECPayloadType;
+  int mREDPayloadType;
+  int mREDRTXPayloadType;
+  int mRTXPayloadType;
 
-  uint32_t mTias = 0;
+  uint32_t mTias;
   EncodingConstraints mEncodingConstraints;
   struct Encoding {
     std::string rid;
@@ -132,13 +130,10 @@ class VideoCodecConfig {
   };
   std::vector<Encoding> mEncodings;
   std::string mSpropParameterSets;
-  // Bug 1920249 stick these in a struct
-  uint8_t mProfile = 0x42;
-  uint8_t mConstraints = 0xE0;
-  uint8_t mLevel = 0x0C;
-  uint8_t mPacketizationMode = 1;
-  // Bug 1920249 have the codec-specific stuff in a std::variant or something
-  Maybe<JsepVideoCodecDescription::Av1Config> mAv1Config;
+  uint8_t mProfile;
+  uint8_t mConstraints;
+  uint8_t mLevel;
+  uint8_t mPacketizationMode;
   // TODO: add external negotiated SPS/PPS
 
   // TODO(bug 1744116): Use = default here
@@ -158,36 +153,35 @@ class VideoCodecConfig {
            mSpropParameterSets == aRhs.mSpropParameterSets &&
            mProfile == aRhs.mProfile && mConstraints == aRhs.mConstraints &&
            mLevel == aRhs.mLevel &&
-           mPacketizationMode == aRhs.mPacketizationMode &&
-           mAv1Config == aRhs.mAv1Config;
-  }
-
-  static VideoCodecConfig CreateAv1Config(
-      int pt, const EncodingConstraints& constraints,
-      const JsepVideoCodecDescription::Av1Config& av1) {
-    VideoCodecConfig config(pt, "AV1", constraints);
-    config.mAv1Config = Some(av1);
-    return config;
-  }
-
-  static auto CreateH264Config(int pt, const EncodingConstraints& constraints,
-                               const VideoCodecConfigH264& h264)
-      -> VideoCodecConfig {
-    VideoCodecConfig config(pt, "H264", constraints);
-    // Bug 1920249 don't store these computed values which are used 1 time.
-    config.mProfile = (h264.profile_level_id & 0x00FF0000) >> 16;
-    config.mConstraints = (h264.profile_level_id & 0x0000FF00) >> 8;
-    config.mLevel = (h264.profile_level_id & 0x000000FF);
-    config.mPacketizationMode = h264.packetization_mode;
-    config.mSpropParameterSets = h264.sprop_parameter_sets;
-    return config;
+           mPacketizationMode == aRhs.mPacketizationMode;
   }
 
   VideoCodecConfig(int type, std::string name,
-                   const EncodingConstraints& constraints)
+                   const EncodingConstraints& constraints,
+                   const struct VideoCodecConfigH264* h264 = nullptr)
       : mType(type),
-        mName(std::move(name)),
-        mEncodingConstraints(constraints) {}
+        mName(name),
+        mRembFbSet(false),
+        mFECFbSet(false),
+        mTransportCCFbSet(false),
+        mULPFECPayloadType(-1),
+        mREDPayloadType(-1),
+        mREDRTXPayloadType(-1),
+        mRTXPayloadType(-1),
+        mTias(0),
+        mEncodingConstraints(constraints),
+        mProfile(0x42),
+        mConstraints(0xE0),
+        mLevel(0x0C),
+        mPacketizationMode(1) {
+    if (h264) {
+      mProfile = (h264->profile_level_id & 0x00FF0000) >> 16;
+      mConstraints = (h264->profile_level_id & 0x0000FF00) >> 8;
+      mLevel = (h264->profile_level_id & 0x000000FF);
+      mPacketizationMode = h264->packetization_mode;
+      mSpropParameterSets = h264->sprop_parameter_sets;
+    }
+  }
 
   bool ResolutionEquals(const VideoCodecConfig& aConfig) const {
     if (mEncodings.size() != aConfig.mEncodings.size()) {
diff --git a/dom/media/webrtc/libwebrtcglue/VideoConduit.cpp b/dom/media/webrtc/libwebrtcglue/VideoConduit.cpp
index 1895a12fde12..50a8a41c8af8 100644
--- a/dom/media/webrtc/libwebrtcglue/VideoConduit.cpp
+++ b/dom/media/webrtc/libwebrtcglue/VideoConduit.cpp
@@ -179,7 +179,6 @@ webrtc::VideoCodecType SupportedCodecType(webrtc::VideoCodecType aType) {
     case webrtc::VideoCodecType::kVideoCodecVP8:
     case webrtc::VideoCodecType::kVideoCodecVP9:
     case webrtc::VideoCodecType::kVideoCodecH264:
-    case webrtc::VideoCodecType::kVideoCodecAV1:
       return aType;
     default:
       return webrtc::VideoCodecType::kVideoCodecGeneric;
@@ -206,20 +205,6 @@ ConfigureVideoEncoderSettings(const VideoCodecConfig& aConfig,
     codec_default_denoising = !denoising;
   }
 
-  using Av1Config = JsepVideoCodecDescription::Av1Config;
-  aConfig.mAv1Config.apply([&](const Av1Config& config) {
-    MOZ_ASSERT(aConfig.mName == kAv1CodecName);
-    config.mProfile.apply([&](uint8_t value) {
-      aParameters[kAv1FmtpProfile] = std::to_string(value);
-    });
-    config.mLevelIdx.apply([&](uint8_t value) {
-      aParameters[kAv1FmtpLevelIdx] = std::to_string(value);
-    });
-    config.mTier.apply([&](uint8_t value) {
-      aParameters[kAv1FmtpTier] = std::to_string(value);
-    });
-  });
-
   if (aConfig.mName == kH264CodecName) {
     aParameters[kH264FmtpPacketizationMode] =
         std::to_string(aConfig.mPacketizationMode);
@@ -2095,14 +2080,6 @@ bool WebrtcVideoConduit::HasH264Hardware() {
          status == nsIGfxInfo::FEATURE_STATUS_OK;
 }
 
-bool WebrtcVideoConduit::HasAv1() {
-#if defined(MOZ_AV1)
-  return true;
-#else
-  return false;
-#endif
-}
-
 Maybe<int> WebrtcVideoConduit::ActiveSendPayloadType() const {
   MOZ_ASSERT(mCallThread->IsOnCurrentThread());
 
diff --git a/dom/media/webrtc/libwebrtcglue/VideoConduit.h b/dom/media/webrtc/libwebrtcglue/VideoConduit.h
index 5a6a9b88bd30..bb15cd35a9b1 100644
--- a/dom/media/webrtc/libwebrtcglue/VideoConduit.h
+++ b/dom/media/webrtc/libwebrtcglue/VideoConduit.h
@@ -69,8 +69,6 @@ class WebrtcVideoConduit
  public:
   // Returns true when both encoder and decoder are HW accelerated.
   static bool HasH264Hardware();
-  // Returns true when AV1 is supported in the build.
-  static bool HasAv1();
 
   Maybe<int> ActiveSendPayloadType() const override;
   Maybe<int> ActiveRecvPayloadType() const override;
diff --git a/dom/media/webrtc/libwebrtcglue/WebrtcVideoCodecFactory.cpp b/dom/media/webrtc/libwebrtcglue/WebrtcVideoCodecFactory.cpp
index d310a971e4a5..5c43b2ba7918 100644
--- a/dom/media/webrtc/libwebrtcglue/WebrtcVideoCodecFactory.cpp
+++ b/dom/media/webrtc/libwebrtcglue/WebrtcVideoCodecFactory.cpp
@@ -15,8 +15,6 @@
 #include "api/video_codecs/video_codec.h"
 #include "api/video_codecs/video_encoder_software_fallback_wrapper.h"
 #include "media/engine/simulcast_encoder_adapter.h"
-#include "modules/video_coding/codecs/av1/libaom_av1_encoder.h"
-#include "modules/video_coding/codecs/av1/dav1d_decoder.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "modules/video_coding/codecs/vp9/include/vp9.h"
 
@@ -53,9 +51,7 @@ std::unique_ptr<webrtc::VideoDecoder> WebrtcVideoDecoderFactory::Create(
     case webrtc::VideoCodecType::kVideoCodecVP9:
       decoder = webrtc::VP9Decoder::Create();
       break;
-    case webrtc::VideoCodecType::kVideoCodecAV1:
-      decoder = webrtc::CreateDav1dDecoder();
-      break;
+
     default:
       break;
   }
@@ -70,8 +66,6 @@ std::unique_ptr<webrtc::VideoEncoder> WebrtcVideoEncoderFactory::Create(
   }
   auto type = webrtc::PayloadStringToCodecType(aFormat.name);
   switch (type) {
-    // Bug 1932065 - Add simulcast support for AV1
-    // e.g.: case webrtc::VideoCodecType::kVideoCodecAV1:
     case webrtc::VideoCodecType::kVideoCodecVP8:
       // XXX We might be able to use the simulcast proxy for more codecs, but
       // that requires testing.
@@ -88,7 +82,6 @@ bool WebrtcVideoEncoderFactory::InternalFactory::Supports(
     case webrtc::VideoCodecType::kVideoCodecVP8:
     case webrtc::VideoCodecType::kVideoCodecVP9:
     case webrtc::VideoCodecType::kVideoCodecH264:
-    case webrtc::VideoCodecType::kVideoCodecAV1:
       return true;
     default:
       return false;
@@ -128,9 +121,7 @@ WebrtcVideoEncoderFactory::InternalFactory::Create(
       case webrtc::VideoCodecType::kVideoCodecVP9:
         encoder = webrtc::CreateVp9Encoder(aEnv);
         break;
-      case webrtc::VideoCodecType::kVideoCodecAV1:
-        encoder = webrtc::CreateLibaomAv1Encoder(aEnv);
-        break;
+
       default:
         break;
     }
@@ -165,8 +156,8 @@ WebrtcVideoEncoderFactory::InternalFactory::Create(
       platformEncoder = createPlatformEncoder();
       encoder = createWebRTCEncoder();
       if (encoder && platformEncoder) {
-        return webrtc::CreateVideoEncoderSoftwareFallbackWrapper(
-            aEnv, std::move(encoder), std::move(platformEncoder), false);
+        return webrtc::CreateVideoEncoderSoftwareFallbackWrapper(aEnv,
+            std::move(encoder), std::move(platformEncoder), false);
       }
       if (platformEncoder) {
         NS_WARNING(nsPrintfCString("No WebRTC encoder to fall back to for "
diff --git a/dom/media/webrtc/sdp/RsdparsaSdpAttributeList.cpp b/dom/media/webrtc/sdp/RsdparsaSdpAttributeList.cpp
index e70457687a50..c1625922a325 100644
--- a/dom/media/webrtc/sdp/RsdparsaSdpAttributeList.cpp
+++ b/dom/media/webrtc/sdp/RsdparsaSdpAttributeList.cpp
@@ -4,7 +4,6 @@
  * 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/. */
 
-#include "SdpAttribute.h"
 #include "nsCRT.h"
 
 #include "sdp/RsdparsaSdpAttributeList.h"
@@ -797,21 +796,6 @@ void RsdparsaSdpAttributeList::LoadFmtp(RustAttributeList* attributeList) {
 
       fmtpParameters.reset(
           new SdpFmtpAttributeList::RtxParameters(rtxParameters));
-    } else if (codecName == "AV1") {
-      SdpFmtpAttributeList::Av1Parameters av1Parameters;
-
-      av1Parameters.profile = rustFmtpParameters.av1.has_profile
-                                  ? Some(rustFmtpParameters.av1.profile)
-                                  : Nothing();
-      av1Parameters.levelIdx = rustFmtpParameters.av1.has_level_idx
-                                   ? Some(rustFmtpParameters.av1.level_idx)
-                                   : Nothing();
-      av1Parameters.tier = rustFmtpParameters.av1.has_tier
-                               ? Some(rustFmtpParameters.av1.tier)
-                               : Nothing();
-      fmtpParameters.reset(
-          new SdpFmtpAttributeList::Av1Parameters(av1Parameters));
-
     } else {
       // The parameter set is unknown so skip it
       continue;
diff --git a/dom/media/webrtc/sdp/RsdparsaSdpInc.h b/dom/media/webrtc/sdp/RsdparsaSdpInc.h
index ce054f3c3fb6..1237d2fdadf0 100644
--- a/dom/media/webrtc/sdp/RsdparsaSdpInc.h
+++ b/dom/media/webrtc/sdp/RsdparsaSdpInc.h
@@ -194,15 +194,6 @@ struct RustSdpAttributeImageAttr {
   RustSdpAttributeImageAttrSetList recv;
 };
 
-struct RustAv1FmtpParameters {
-  uint8_t profile;
-  bool has_profile;
-  uint8_t level_idx;
-  bool has_level_idx;
-  uint8_t tier;
-  bool has_tier;
-};
-
 struct RustRtxFmtpParameters {
   uint8_t apt;
   bool has_rtx_time;
@@ -238,9 +229,6 @@ struct RustSdpAttributeFmtpParameters {
   // telephone-event
   StringView dtmf_tones;
 
-  // AV1
-  RustAv1FmtpParameters av1;
-
   // RTX
   RustRtxFmtpParameters rtx;
 
diff --git a/dom/media/webrtc/sdp/SdpAttribute.cpp b/dom/media/webrtc/sdp/SdpAttribute.cpp
index 76182fdb58ad..cacb25e6b15f 100644
--- a/dom/media/webrtc/sdp/SdpAttribute.cpp
+++ b/dom/media/webrtc/sdp/SdpAttribute.cpp
@@ -1102,7 +1102,6 @@ static bool ShouldSerializeChannels(SdpRtpmapAttributeList::CodecType type) {
     case SdpRtpmapAttributeList::kiLBC:
     case SdpRtpmapAttributeList::kiSAC:
     case SdpRtpmapAttributeList::kH264:
-    case SdpRtpmapAttributeList::kAV1:
     case SdpRtpmapAttributeList::kRed:
     case SdpRtpmapAttributeList::kUlpfec:
     case SdpRtpmapAttributeList::kTelephoneEvent:
diff --git a/dom/media/webrtc/sdp/SdpAttribute.h b/dom/media/webrtc/sdp/SdpAttribute.h
index 7828a78815db..9346e9ed1e31 100644
--- a/dom/media/webrtc/sdp/SdpAttribute.h
+++ b/dom/media/webrtc/sdp/SdpAttribute.h
@@ -1113,7 +1113,6 @@ class SdpRtpmapAttributeList : public SdpAttribute {
     kiLBC,
     kiSAC,
     kH264,
-    kAV1,
     kRed,
     kUlpfec,
     kTelephoneEvent,
@@ -1195,9 +1194,6 @@ inline std::ostream& operator<<(std::ostream& os,
     case SdpRtpmapAttributeList::kH264:
       os << "H264";
       break;
-    case SdpRtpmapAttributeList::kAV1:
-      os << "AV1";
-      break;
     case SdpRtpmapAttributeList::kRed:
       os << "red";
       break;
@@ -1265,59 +1261,6 @@ class SdpFmtpAttributeList : public SdpAttribute {
     std::vector<uint8_t> encodings;
   };
 
-  struct Av1Parameters : public Parameters {
-    // https://aomediacodec.github.io/av1-rtp-spec/#722-rid-restrictions-mapping-for-av1
-    Maybe<uint8_t> profile;
-    static constexpr uint8_t kDefaultProfile = 0;
-    Maybe<uint8_t> levelIdx;
-    static constexpr uint8_t kDefaultLevelIdx = 5;
-    Maybe<uint8_t> tier;
-    static constexpr uint8_t kDefaultTier = 0;
-
-    Av1Parameters() : Parameters(SdpRtpmapAttributeList::kAV1) {}
-    Av1Parameters(const Av1Parameters&) = default;
-
-    virtual ~Av1Parameters() = default;
-
-    virtual Parameters* Clone() const override {
-      return new Av1Parameters(*this);
-    }
-
-    // Returns the profile parameter if set, or the spec mandated default of 0.
-    auto profileValue() const -> uint8_t {
-      return profile.valueOr(kDefaultProfile);
-    }
-    // Returns the level-idx parameter if set, or the spec mandated default of
-    // 5.
-    auto levelIdxValue() const -> uint8_t {
-      return levelIdx.valueOr(kDefaultLevelIdx);
-    }
-    // Returns the tier parameter if set, or the spec mandated default of 0.
-    auto tierValue() const -> uint8_t { return tier.valueOr(kDefaultTier); }
-
-    virtual void Serialize(std::ostream& os) const override {
-      bool first = true;
-      profile.apply([&](const auto& profileV) {
-        os << "profile=" << static_cast<int>(profileV);
-        first = false;
-      });
-      levelIdx.apply([&](const auto& levelIdxV) {
-        os << (first ? "" : ";") << "level-idx=" << static_cast<int>(levelIdxV);
-        first = false;
-      });
-      tier.apply([&](const auto& tierV) {
-        os << (first ? "" : ";") << "tier=" << static_cast<int>(tierV);
-      });
-    }
-
-    virtual bool CompareEq(const Parameters& aOther) const override {
-      return aOther.codec_type == codec_type &&
-             static_cast<const Av1Parameters&>(aOther).profile == profile &&
-             static_cast<const Av1Parameters&>(aOther).levelIdx == levelIdx &&
-             static_cast<const Av1Parameters&>(aOther).tier == tier;
-    }
-  };
-
   class RtxParameters : public Parameters {
    public:
     uint8_t apt = 255;  // Valid payload types are 0 - 127, use 255 to represent
diff --git a/dom/media/webrtc/sdp/SipccSdpAttributeList.cpp b/dom/media/webrtc/sdp/SipccSdpAttributeList.cpp
index e4651802f2e6..b05993f96d29 100644
--- a/dom/media/webrtc/sdp/SipccSdpAttributeList.cpp
+++ b/dom/media/webrtc/sdp/SipccSdpAttributeList.cpp
@@ -345,8 +345,6 @@ SdpRtpmapAttributeList::CodecType SipccSdpAttributeList::GetCodecType(
     case RTP_H264_P0:
     case RTP_H264_P1:
       return SdpRtpmapAttributeList::kH264;
-    case RTP_AV1:
-      return SdpRtpmapAttributeList::kAV1;
     case RTP_OPUS:
       return SdpRtpmapAttributeList::kOpus;
     case RTP_VP8:
@@ -735,20 +733,6 @@ void SipccSdpAttributeList::LoadFmtp(sdp_t* sdp, uint16_t level) {
 
         parameters.reset(h264Parameters);
       } break;
-      case RTP_AV1: {
-        SdpFmtpAttributeList::Av1Parameters* av1Parameters(
-            new SdpFmtpAttributeList::Av1Parameters());
-        if (fmtp->profile > 0 && fmtp->profile <= UINT8_MAX) {
-          av1Parameters->profile = Some(static_cast<uint8_t>(fmtp->profile));
-        }
-        if (fmtp->av1_has_level_idx) {
-          av1Parameters->profile = Some(fmtp->av1_level_idx);
-        }
-        if (fmtp->av1_has_tier) {
-          av1Parameters->tier = Some(fmtp->av1_tier);
-        }
-        parameters.reset(av1Parameters);
-      } break;
       case RTP_VP9: {
         SdpFmtpAttributeList::VP8Parameters* vp9Parameters(
             new SdpFmtpAttributeList::VP8Parameters(
diff --git a/dom/media/webrtc/sdp/rsdparsa_capi/src/attribute.rs b/dom/media/webrtc/sdp/rsdparsa_capi/src/attribute.rs
index de4a0a037b80..82483f151f67 100644
--- a/dom/media/webrtc/sdp/rsdparsa_capi/src/attribute.rs
+++ b/dom/media/webrtc/sdp/rsdparsa_capi/src/attribute.rs
@@ -406,17 +406,6 @@ pub struct RustRtxFmtpParameters {
     pub rtx_time: u32,
 }
 
-#[repr(C)]
-#[derive(Clone, Copy)]
-pub struct RustAv1FmtpParameters {
-    pub profile: u8,
-    pub has_profile: bool,
-    pub level_idx: u8,
-    pub has_level_idx: bool,
-    pub tier: u8,
-    pub has_tier: bool,
-}
-
 #[repr(C)]
 #[derive(Clone, Copy)]
 pub struct RustSdpAttributeFmtpParameters {
@@ -448,9 +437,6 @@ pub struct RustSdpAttributeFmtpParameters {
     // telephone-event
     pub dtmf_tones: StringView,
 
-    // AV1
-    pub av1: RustAv1FmtpParameters,
-
     // RTX
     pub rtx: RustRtxFmtpParameters,
 
@@ -476,14 +462,6 @@ impl<'a> From<&'a SdpAttributeFmtpParameters> for RustSdpAttributeFmtpParameters
                 rtx_time: 0,
             }
         };
-        let av1 = RustAv1FmtpParameters {
-            profile: other.profile.unwrap_or(0),
-            has_profile: other.profile.is_some(),
-            level_idx: other.level_idx.unwrap_or(0),
-            has_level_idx: other.level_idx.is_some(),
-            tier: other.tier.unwrap_or(0),
-            has_tier: other.tier.is_some(),
-        };
 
         RustSdpAttributeFmtpParameters {
             packetization_mode: other.packetization_mode,
@@ -505,7 +483,6 @@ impl<'a> From<&'a SdpAttributeFmtpParameters> for RustSdpAttributeFmtpParameters
             minptime: other.minptime,
             maxptime: other.maxptime,
             dtmf_tones: StringView::from(other.dtmf_tones.as_str()),
-            av1,
             rtx,
             encodings: &other.encodings,
             unknown_tokens: &other.unknown_tokens,
diff --git a/dom/media/webrtc/tests/mochitests/head.js b/dom/media/webrtc/tests/mochitests/head.js
index de9078d7d741..c73499b52d62 100644
--- a/dom/media/webrtc/tests/mochitests/head.js
+++ b/dom/media/webrtc/tests/mochitests/head.js
@@ -458,35 +458,15 @@ function setupEnvironment() {
 
 // [TODO] remove after bug 1509012 is fixed.
 async function matchPlatformH264CodecPrefs() {
-  // Has hardware H.264 encoder support
-  const hardware =
+  const hasHW264Enc =
     SpecialPowers.getIntPref("media.webrtc.encoder_creation_strategy") == 1 &&
     (navigator.userAgent.includes("Android") ||
       navigator.userAgent.includes("Mac OS X"));
 
   await pushPrefs(
-    ["media.webrtc.encoder_creation_strategy", hardware ? 1 : 0],
-    ["media.navigator.mediadatadecoder_h264_enabled", hardware]
+    ["media.webrtc.encoder_creation_strategy", hasHW264Enc ? 1 : 0],
+    ["media.navigator.mediadatadecoder_h264_enabled", hasHW264Enc]
   );
-
-  const software = !navigator.userAgent.includes("Android");
-  return {
-    hardware,
-    software,
-    any: hardware || software,
-  };
-}
-
-async function matchPlatformAV1CodecPrefs() {
-  // Has hardware AV1 encoder support
-  const hardware = false;
-  const software = !navigator.userAgent.includes("Android");
-  await pushPrefs(["media.webrtc.codec.video.av1.enabled", software]);
-  return {
-    hardware,
-    software,
-    any: hardware || software,
-  };
 }
 
 async function runTestWhenReady(testFunc) {
diff --git a/dom/media/webrtc/tests/mochitests/mochitest_peerconnection.toml b/dom/media/webrtc/tests/mochitests/mochitest_peerconnection.toml
index d039ecfa04dd..2a93f5b249ef 100644
--- a/dom/media/webrtc/tests/mochitests/mochitest_peerconnection.toml
+++ b/dom/media/webrtc/tests/mochitests/mochitest_peerconnection.toml
@@ -68,9 +68,6 @@ prefs = [
 
 ["test_peerConnection_audioSynchronizationSourcesUnidirectional.html"]
 
-["test_peerConnection_basicAV1Video.html"]
-skip-if = ["os == 'android' && is_emulator"]  # No AV1 support on android emulator
-
 ["test_peerConnection_basicAudio.html"]
 
 ["test_peerConnection_basicAudioDynamicPtMissingRtpmap.html"]
diff --git a/dom/media/webrtc/tests/mochitests/pc.js b/dom/media/webrtc/tests/mochitests/pc.js
index e90c5f228f20..cd13be542606 100644
--- a/dom/media/webrtc/tests/mochitests/pc.js
+++ b/dom/media/webrtc/tests/mochitests/pc.js
@@ -72,7 +72,6 @@ function PeerConnectionTest(options) {
   options.is_remote = "is_remote" in options ? options.is_remote : true;
 
   options.h264 = "h264" in options ? options.h264 : false;
-  options.av1 = "av1" in options ? options.av1 : false;
   options.bundle = "bundle" in options ? options.bundle : true;
   options.rtcpmux = "rtcpmux" in options ? options.rtcpmux : true;
   options.opus = "opus" in options ? options.opus : true;
@@ -517,11 +516,6 @@ PeerConnectionTest.prototype.updateChainSteps = function () {
       PC_LOCAL_REMOVE_ALL_BUT_H264_FROM_OFFER,
     ]);
   }
-  if (this.testOptions.av1) {
-    this.chain.insertAfterEach("PC_LOCAL_CREATE_OFFER", [
-      PC_LOCAL_REMOVE_ALL_BUT_AV1_FROM_OFFER,
-    ]);
-  }
   if (!this.testOptions.bundle) {
     this.chain.insertAfterEach("PC_LOCAL_CREATE_OFFER", [
       PC_LOCAL_REMOVE_BUNDLE_FROM_OFFER,
diff --git a/dom/media/webrtc/tests/mochitests/sdpUtils.js b/dom/media/webrtc/tests/mochitests/sdpUtils.js
index 6d04df049dbc..d4dba00c6182 100644
--- a/dom/media/webrtc/tests/mochitests/sdpUtils.js
+++ b/dom/media/webrtc/tests/mochitests/sdpUtils.js
@@ -311,7 +311,6 @@ var sdputils = {
     info("Examining this SessionDescription: " + JSON.stringify(desc));
     info("offerConstraintsList: " + JSON.stringify(offerConstraintsList));
     info("offerOptions: " + JSON.stringify(offerOptions));
-    info("testOptions: " + JSON.stringify(testOptions));
     ok(desc, "SessionDescription is not null");
     is(desc.type, expectedType, "SessionDescription type is " + expectedType);
     ok(desc.sdp.length > 10, "SessionDescription body length is plausible");
@@ -372,14 +371,7 @@ var sdputils = {
             desc.sdp.includes("a=rtpmap:105 H264/90000"),
           "H.264 codec is present in SDP"
         );
-      }
-      if (testOptions.av1) {
-        ok(
-          desc.sdp.includes("a=rtpmap:99 AV1/90000"),
-          "AV1 codec is present in SDP"
-        );
-      }
-      if (!testOptions.h264 && !testOptions.av1) {
+      } else {
         ok(
           desc.sdp.includes("a=rtpmap:120 VP8/90000") ||
             desc.sdp.includes("a=rtpmap:121 VP9/90000"),
diff --git a/dom/media/webrtc/tests/mochitests/stats.js b/dom/media/webrtc/tests/mochitests/stats.js
index b2d11308847a..2c2d8d6532f7 100644
--- a/dom/media/webrtc/tests/mochitests/stats.js
+++ b/dom/media/webrtc/tests/mochitests/stats.js
@@ -183,8 +183,9 @@ const statsExpectedByType = {
       "transportId",
       "mimeType",
       "clockRate",
+      "sdpFmtpLine",
     ],
-    optional: ["codecType", "channels", "sdpFmtpLine"],
+    optional: ["codecType", "channels"],
     unimplemented: [],
     deprecated: [],
   },
@@ -900,10 +901,10 @@ function pedanticChecks(report) {
       //
 
       // qpSum
-      // This is supported for all of our vpx codecs and AV1 (on the encode
-      // side, see bug 1519590)
+      // This is supported for all of our vpx codecs (on the encode side, see
+      // bug 1519590)
       const mimeType = report.get(stat.codecId).mimeType;
-      if (mimeType.includes("VP") || mimeType.includes("AV1")) {
+      if (mimeType.includes("VP")) {
         ok(
           stat.qpSum >= 0,
           `${stat.type}.qpSum is a sane number (${stat.kind}) ` +
@@ -1126,9 +1127,6 @@ function pedanticChecks(report) {
             `codec.payloadType for H264 was ${stat.payloadType}, exp. 97, 126, 103, or 105`
           );
           break;
-        case "video/AV1":
-          is(stat.payloadType, 99, "codec.payloadType for AV1");
-          break;
         default:
           ok(
             false,
@@ -1151,10 +1149,7 @@ function pedanticChecks(report) {
 
       // sdpFmtpLine
       // (not technically mandated by spec, but expected here)
-      // AV1 has no required parameters, so don't require sdpFmtpLine for it.
-      if (stat.mimeType != "video/AV1") {
-        ok(stat.sdpFmtpLine, "codec.sdp FmtpLine is set");
-      }
+      ok(stat.sdpFmtpLine, "codec.sdpFmtpLine is set");
       const opusParams = [
         "maxplaybackrate",
         "maxaveragebitrate",
@@ -1177,21 +1172,9 @@ function pedanticChecks(report) {
         "max-br",
         "max-mbps",
       ];
-      // AV1 parameters:
-      //  https://aomediacodec.github.io/av1-rtp-spec/#721-mapping-of-media-subtype-parameters-to-sdp
-      const av1Params = ["profile", "level-idx", "tier"];
-      // Check that the parameters are as expected. AV1 may have no parameters.
-      for (const param of (stat.sdpFmtpLine || "").split(";")) {
+      for (const param of stat.sdpFmtpLine.split(";")) {
         const [key, value] = param.split("=");
-        if (stat.payloadType == 99) {
-          // AV1 might not have any parameters, if it does make sure they are as expected.
-          if (key) {
-            ok(
-              av1Params.includes(key),
-              `codec.sdpFmtpLine param ${key}=${value} for AV1`
-            );
-          }
-        } else if (stat.payloadType == 109) {
+        if (stat.payloadType == 109) {
           ok(
             opusParams.includes(key),
             `codec.sdpFmtpLine param ${key}=${value} for opus`
diff --git a/dom/media/webrtc/tests/mochitests/templates.js b/dom/media/webrtc/tests/mochitests/templates.js
index 8e84908a7edf..9f01983b3bcf 100644
--- a/dom/media/webrtc/tests/mochitests/templates.js
+++ b/dom/media/webrtc/tests/mochitests/templates.js
@@ -574,21 +574,6 @@ function PC_LOCAL_REMOVE_ALL_BUT_H264_FROM_OFFER(test) {
   info("Updated H264 only offer: " + JSON.stringify(test.originalOffer));
 }
 
-function PC_LOCAL_REMOVE_ALL_BUT_AV1_FROM_OFFER(test) {
-  isnot(
-    test.originalOffer.sdp.search("AV1/90000"),
-    -1,
-    "AV1 should be present in the SDP offer"
-  );
-  for (const codec of [103, 105, 120, 121, 126, 97]) {
-    test.originalOffer.sdp = sdputils.removeCodec(
-      test.originalOffer.sdp,
-      codec
-    );
-  }
-  info("Updated AV1 only offer: " + JSON.stringify(test.originalOffer));
-}
-
 function PC_LOCAL_REMOVE_BUNDLE_FROM_OFFER(test) {
   test.originalOffer.sdp = sdputils.removeBundle(test.originalOffer.sdp);
   info("Updated no bundle offer: " + JSON.stringify(test.originalOffer));
diff --git a/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAV1Video.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAV1Video.html
deleted file mode 100644
index 5b95a73eda1e..000000000000
--- a/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAV1Video.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <script type="application/javascript" src="pc.js"></script>
-</head>
-<body>
-<pre id="test">
-<script type="application/javascript">
-  createHTML({
-    bug: "TODO",
-    title: "Basic AV1 GMP video-only peer connection"
-  });
-
-  var test;
-  runNetworkTest(async function (options) {
-    options = options || { };
-    options.av1 = true;
-    test = new PeerConnectionTest(options);
-    test.setMediaConstraints([{video: true}], [{video: true}]);
-    return test.run();
-  });
-</script>
-</pre>
-</body>
-</html>
diff --git a/dom/media/webrtc/tests/mochitests/test_peerConnection_basicScreenshare.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicScreenshare.html
index f6aeb4e6f6cf..c307102a787a 100644
--- a/dom/media/webrtc/tests/mochitests/test_peerConnection_basicScreenshare.html
+++ b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicScreenshare.html
@@ -20,7 +20,6 @@
   async function testScreenshare(payloadType) {
     const options = {};
     options.h264 = payloadType == 97 || payloadType == 126 || payloadType == 103 || payloadType == 105;
-    options.av1 = payloadType == 99;
     const test = new PeerConnectionTest(options);
     const constraints = {
       video: { mediaSource: "screen" },
@@ -40,35 +39,20 @@
   runNetworkTest(async () => {
     await SpecialPowers.pushPrefEnv({ set: [["media.navigator.video.red_ulpfec_enabled", true]] });
     await SpecialPowers.pushPrefEnv({ set: [["media.navigator.video.disable_h264_baseline", false]] });
-    let hasH264 = await matchPlatformH264CodecPrefs();
-    let hasAv1 = await matchPlatformAV1CodecPrefs();
-    const allPts = await supportedVideoPayloadTypes();
-    const pts = {
-      pts: allPts,
-      take(pt) {
-        const result = this.pts.includes(pt);
-        this.pts = this.pts.filter(p => pt != p);
-        return result;
-      },
-      empty() {
-        return !this.pts.length;
-      },
-    };
-    ok(pts.take("120"), "VP8 is supported");
-    ok(pts.take("121"), "VP9 is supported");
-    if (hasAv1.any) {
-      ok(pts.take("99"), "AV1 is supported");
+    await matchPlatformH264CodecPrefs();
+    const pts = await supportedVideoPayloadTypes();
+    ok(pts.includes("120"), "VP8 is supported");
+    ok(pts.includes("121"), "VP9 is supported");
+    if (pts.length > 2) {
+      is(pts.length, 8, "Expected VP8, VP9, four variants of H264, ULPFEC, and RED");
+      ok(pts.includes("97"), "H264 with no packetization-mode is supported");
+      ok(pts.includes("126"), "H264 with packetization-mode=1 is supported");
+      ok(pts.includes("103"), "H264 Baseline with no packetization-mode is supported");
+      ok(pts.includes("105"), "H264 Baseline with packetization-mode=1 is supported");
+      ok(pts.includes("122"), "RED is supported");
+      ok(pts.includes("123"), "ULPFEC is supported");
     }
-    if (hasH264.any) {
-      ok(pts.take("97"), "H264 with no packetization-mode is supported");
-      ok(pts.take("126"), "H264 with packetization-mode=1 is supported");
-      ok(pts.take("103"), "H264 Baseline with no packetization-mode is supported");
-      ok(pts.take("105"), "H264 Baseline with packetization-mode=1 is supported");
-      ok(pts.take("122"), "RED is supported");
-      ok(pts.take("123"), "ULPFEC is supported");
-    }
-    ok(pts.empty(), `All supported codecs were tested. Untested codecs: ${JSON.stringify(pts.pts, null, 2)}`);
-    for (const pt of allPts) {
+    for (const pt of pts) {
       if (pt == "122" || pt == "123") {
         // ULPFEC and RED are meant to work combined with other codecs.
         // Forcing sdp with only one of them is not supported and will result in failures.
diff --git a/dom/media/webrtc/tests/mochitests/test_peerConnection_codecNegotiationFailure.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_codecNegotiationFailure.html
index 2c9845da8c09..819e13fe1b35 100644
--- a/dom/media/webrtc/tests/mochitests/test_peerConnection_codecNegotiationFailure.html
+++ b/dom/media/webrtc/tests/mochitests/test_peerConnection_codecNegotiationFailure.html
@@ -16,8 +16,7 @@
     return sdp
       .replaceAll('VP8', 'VEEEEEEEEP8')
       .replaceAll('VP9', 'VEEEEEEEEP9')
-      .replaceAll('H264', 'HERP264')
-      .replaceAll('AV1', 'HEYV1');
+      .replaceAll('H264', 'HERP264');
   }
 
   const tests = [
diff --git a/dom/media/webrtc/tests/mochitests/test_peerConnection_getParameters.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_getParameters.html
index ca9a87740410..e22c5ec5467b 100644
--- a/dom/media/webrtc/tests/mochitests/test_peerConnection_getParameters.html
+++ b/dom/media/webrtc/tests/mochitests/test_peerConnection_getParameters.html
@@ -32,8 +32,9 @@
   function checkCodecsAgainstSDP(codecs, msection) {
     const rtpParameters = SDPUtils.parseRtpParameters(msection);
     const {kind} = SDPUtils.parseMLine(msection);
-    is(codecs.length, rtpParameters.codecs.length);
+
     isnot(codecs.length, 0);
+    is(codecs.length, rtpParameters.codecs.length);
     for (let i = 0; i < codecs.length; ++i) {
       const observed = codecs[i];
       const fromSdp = rtpParameters.codecs[i];
@@ -131,7 +132,6 @@ a=fmtp:120 max-fs=12266;max-fr=40
 a=fmtp:124 apt=120
 a=fmtp:127 apt=126
 a=fmtp:98 apt=97
-a=fmtp:100 apt=99
 a=fmtp:119 apt=122
 a=ice-pwd:60840251a559417c253d68478b0020fb
 a=ice-ufrag:741347dd
@@ -258,7 +258,6 @@ a=setup:passive
         await pc1.setRemoteDescription(pc2.localDescription);
         {
           const {codecs} = pc1.getSenders()[0].getParameters();
-          info("pc1 codecs: " + JSON.stringify(codecs, null, 2));
           is(codecs.filter(c => c.mimeType.toLowerCase() == 'video/h264').length, 4);
           const sections = SDPUtils.splitSections(pc1.remoteDescription.sdp);
           checkCodecsAgainstSDP(codecs, sections[1]);
@@ -266,7 +265,6 @@ a=setup:passive
 
         {
           const {codecs} = pc2.getSenders()[0].getParameters();
-          info("pc2 codecs: " + JSON.stringify(codecs, null, 2));
           is(codecs.filter(c => c.mimeType.toLowerCase() == 'video/h264').length, 4);
           const sections = SDPUtils.splitSections(pc2.remoteDescription.sdp);
           checkCodecsAgainstSDP(codecs, sections[1]);
diff --git a/dom/media/webrtc/tests/mochitests/test_peerConnection_videoCodecs.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_videoCodecs.html
index 992cb99c223a..c50b0aabefef 100644
--- a/dom/media/webrtc/tests/mochitests/test_peerConnection_videoCodecs.html
+++ b/dom/media/webrtc/tests/mochitests/test_peerConnection_videoCodecs.html
@@ -46,8 +46,6 @@
         // We only set it now, or the framework would remove non-H264 codecs
         // for us.
         options.h264 = codec.name == "H264";
-        // Ditto for AV1.
-        options.av1 = codec.name == "AV1";
       },
     ]);
 
@@ -111,7 +109,6 @@
     { name: "H264", offset: 3 },
     { name: "H264", offset: 3, fmtpOverride: "a=fmtp:packetization-mode=0" },
     { name: "H264", offset: 3, fmtpOverride: "" },
-    { name: "AV1" },
   ];
 
   runNetworkTest(async (options) => {
@@ -139,13 +136,6 @@
             );
           }
         }
-        if (codec.name == "AV1" ) {
-          const hasAv1 = await matchPlatformAV1CodecPrefs();
-          if (!hasAv1.software && !hasAv1.hardware) {
-            info("Skipping AV1 test as no AV1 codec is available");
-            continue;
-          }
-        }
         await testVideoCodec(options, codec);
         await pushPrefs(
           ['media.webrtc.encoder_creation_strategy', enc],
diff --git a/dom/chrome-webidl/WebrtcGlobalInformation.webidl b/dom/webidl/WebrtcGlobalInformation.webidl
similarity index 98%
rename from dom/chrome-webidl/WebrtcGlobalInformation.webidl
rename to dom/webidl/WebrtcGlobalInformation.webidl
index 63d7a8237c8e..053a43d07a51 100644
--- a/dom/chrome-webidl/WebrtcGlobalInformation.webidl
+++ b/dom/webidl/WebrtcGlobalInformation.webidl
@@ -11,7 +11,6 @@ dictionary WebrtcGlobalStatisticsReport {
 
 dictionary WebrtcGlobalMediaContext {
   required boolean hasH264Hardware;
-  required boolean hasAv1;
 };
 
 callback WebrtcGlobalStatisticsCallback = undefined (WebrtcGlobalStatisticsReport reports);
diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
index fd808ab8e19a..e097bab8f3de 100644
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -1101,6 +1101,7 @@ if CONFIG["MOZ_WEBRTC"]:
         "RTCSessionDescription.webidl",
         "RTCStatsReport.webidl",
         "RTCTransformEvent.webidl",
+        "WebrtcGlobalInformation.webidl",
     ]
 
 if CONFIG["MOZ_WEBSPEECH"]:
diff --git a/media/webrtc/signaling/gtest/jsep_session_unittest.cpp b/media/webrtc/signaling/gtest/jsep_session_unittest.cpp
index 845c9356e9a2..f610cfafcaad 100644
--- a/media/webrtc/signaling/gtest/jsep_session_unittest.cpp
+++ b/media/webrtc/signaling/gtest/jsep_session_unittest.cpp
@@ -3291,7 +3291,7 @@ TEST_F(JsepSessionTest, ValidateOfferedVideoCodecParams) {
   const auto& video_attrs = video_section.GetAttributeList();
   ASSERT_EQ(SdpDirectionAttribute::kSendrecv, video_attrs.GetDirection());
 
-  ASSERT_EQ(17U, video_section.GetFormats().size());
+  ASSERT_EQ(15U, video_section.GetFormats().size());
   ASSERT_EQ("120", video_section.GetFormats()[0]);
   ASSERT_EQ("124", video_section.GetFormats()[1]);
   ASSERT_EQ("121", video_section.GetFormats()[2]);
@@ -3304,11 +3304,9 @@ TEST_F(JsepSessionTest, ValidateOfferedVideoCodecParams) {
   ASSERT_EQ("106", video_section.GetFormats()[9]);
   ASSERT_EQ("103", video_section.GetFormats()[10]);
   ASSERT_EQ("104", video_section.GetFormats()[11]);
-  ASSERT_EQ("99", video_section.GetFormats()[12]);
-  ASSERT_EQ("100", video_section.GetFormats()[13]);
-  ASSERT_EQ("123", video_section.GetFormats()[14]);
-  ASSERT_EQ("122", video_section.GetFormats()[15]);
-  ASSERT_EQ("119", video_section.GetFormats()[16]);
+  ASSERT_EQ("123", video_section.GetFormats()[12]);
+  ASSERT_EQ("122", video_section.GetFormats()[13]);
+  ASSERT_EQ("119", video_section.GetFormats()[14]);
 
   // Validate rtpmap
   ASSERT_TRUE(video_attrs.HasAttribute(SdpAttribute::kRtpmapAttribute));
@@ -3325,8 +3323,6 @@ TEST_F(JsepSessionTest, ValidateOfferedVideoCodecParams) {
   ASSERT_TRUE(rtpmaps.HasEntry("104"));
   ASSERT_TRUE(rtpmaps.HasEntry("97"));
   ASSERT_TRUE(rtpmaps.HasEntry("98"));
-  ASSERT_TRUE(rtpmaps.HasEntry("99"));
-  ASSERT_TRUE(rtpmaps.HasEntry("100"));
   ASSERT_TRUE(rtpmaps.HasEntry("123"));
   ASSERT_TRUE(rtpmaps.HasEntry("122"));
   ASSERT_TRUE(rtpmaps.HasEntry("119"));
@@ -3367,7 +3363,7 @@ TEST_F(JsepSessionTest, ValidateOfferedVideoCodecParams) {
   ASSERT_TRUE(video_attrs.HasAttribute(SdpAttribute::kFmtpAttribute));
   auto& fmtps = video_attrs.GetFmtp().mFmtps;
 
-  ASSERT_EQ(14U, fmtps.size());
+  ASSERT_EQ(13U, fmtps.size());
 
   // VP8
   const SdpFmtpAttributeList::Parameters* vp8_params =
@@ -3518,17 +3514,6 @@ TEST_F(JsepSessionTest, ValidateOfferedVideoCodecParams) {
 
   ASSERT_EQ((uint32_t)103, parsed_h264_baseline_0_rtx_params.apt);
 
-  // AV1 has no default FMTP parameters so there is no FMTP entry for AV1 in the
-  // test.
-  // AV1 RTX
-  const SdpFmtpAttributeList::Parameters* av1_rtx_params =
-      video_section.FindFmtp("100");
-  ASSERT_TRUE(av1_rtx_params);
-  ASSERT_EQ(SdpRtpmapAttributeList::kRtx, av1_rtx_params->codec_type);
-  const auto& parsed_av1_rtx_params =
-      *static_cast<const SdpFmtpAttributeList::RtxParameters*>(av1_rtx_params);
-  ASSERT_EQ((uint32_t)99, parsed_av1_rtx_params.apt);
-
   // red RTX
   const SdpFmtpAttributeList::Parameters* red_rtx_params =
       video_section.FindFmtp("119");
@@ -3658,7 +3643,7 @@ TEST_F(JsepSessionTest, ValidateNoFmtpLineForRedInOfferAndAnswer) {
   auto& video_attrs = video_section.GetAttributeList();
   ASSERT_EQ(SdpDirectionAttribute::kSendrecv, video_attrs.GetDirection());
 
-  ASSERT_EQ(17U, video_section.GetFormats().size());
+  ASSERT_EQ(15U, video_section.GetFormats().size());
   ASSERT_EQ("120", video_section.GetFormats()[0]);
   ASSERT_EQ("124", video_section.GetFormats()[1]);
   ASSERT_EQ("121", video_section.GetFormats()[2]);
@@ -3671,11 +3656,9 @@ TEST_F(JsepSessionTest, ValidateNoFmtpLineForRedInOfferAndAnswer) {
   ASSERT_EQ("106", video_section.GetFormats()[9]);
   ASSERT_EQ("103", video_section.GetFormats()[10]);
   ASSERT_EQ("104", video_section.GetFormats()[11]);
-  ASSERT_EQ("99", video_section.GetFormats()[12]);
-  ASSERT_EQ("100", video_section.GetFormats()[13]);
-  ASSERT_EQ("123", video_section.GetFormats()[14]);
-  ASSERT_EQ("122", video_section.GetFormats()[15]);
-  ASSERT_EQ("119", video_section.GetFormats()[16]);
+  ASSERT_EQ("123", video_section.GetFormats()[12]);
+  ASSERT_EQ("122", video_section.GetFormats()[13]);
+  ASSERT_EQ("119", video_section.GetFormats()[14]);
 
   // Validate rtpmap
   ASSERT_TRUE(video_attrs.HasAttribute(SdpAttribute::kRtpmapAttribute));
@@ -3692,8 +3675,6 @@ TEST_F(JsepSessionTest, ValidateNoFmtpLineForRedInOfferAndAnswer) {
   ASSERT_TRUE(rtpmaps.HasEntry("106"));
   ASSERT_TRUE(rtpmaps.HasEntry("103"));
   ASSERT_TRUE(rtpmaps.HasEntry("104"));
-  ASSERT_TRUE(rtpmaps.HasEntry("99"));
-  ASSERT_TRUE(rtpmaps.HasEntry("100"));
   ASSERT_TRUE(rtpmaps.HasEntry("123"));
   ASSERT_TRUE(rtpmaps.HasEntry("122"));
   ASSERT_TRUE(rtpmaps.HasEntry("119"));
@@ -3702,7 +3683,7 @@ TEST_F(JsepSessionTest, ValidateNoFmtpLineForRedInOfferAndAnswer) {
   ASSERT_TRUE(video_attrs.HasAttribute(SdpAttribute::kFmtpAttribute));
   auto& fmtps = video_attrs.GetFmtp().mFmtps;
 
-  ASSERT_EQ(14U, fmtps.size());
+  ASSERT_EQ(13U, fmtps.size());
   ASSERT_EQ("126", fmtps[0].format);
   ASSERT_EQ("97", fmtps[1].format);
   ASSERT_EQ("105", fmtps[2].format);
@@ -3715,8 +3696,7 @@ TEST_F(JsepSessionTest, ValidateNoFmtpLineForRedInOfferAndAnswer) {
   ASSERT_EQ("98", fmtps[9].format);
   ASSERT_EQ("106", fmtps[10].format);
   ASSERT_EQ("104", fmtps[11].format);
-  ASSERT_EQ("100", fmtps[12].format);
-  ASSERT_EQ("119", fmtps[13].format);
+  ASSERT_EQ("119", fmtps[12].format);
 
   SetLocalAnswer(answer);
   SetRemoteAnswer(answer);
@@ -3727,12 +3707,12 @@ TEST_F(JsepSessionTest, ValidateNoFmtpLineForRedInOfferAndAnswer) {
   ASSERT_FALSE(IsNull(offerTransceivers[1].mRecvTrack));
   ASSERT_TRUE(offerTransceivers[1].mSendTrack.GetNegotiatedDetails());
   ASSERT_TRUE(offerTransceivers[1].mRecvTrack.GetNegotiatedDetails());
-  ASSERT_EQ(9U, offerTransceivers[1]
+  ASSERT_EQ(8U, offerTransceivers[1]
                     .mSendTrack.GetNegotiatedDetails()
                     ->GetEncoding(0)
                     .GetCodecs()
                     .size());
-  ASSERT_EQ(9U, offerTransceivers[1]
+  ASSERT_EQ(8U, offerTransceivers[1]
                     .mRecvTrack.GetNegotiatedDetails()
                     ->GetEncoding(0)
                     .GetCodecs()
@@ -3744,12 +3724,12 @@ TEST_F(JsepSessionTest, ValidateNoFmtpLineForRedInOfferAndAnswer) {
   ASSERT_FALSE(IsNull(answerTransceivers[1].mRecvTrack));
   ASSERT_TRUE(answerTransceivers[1].mSendTrack.GetNegotiatedDetails());
   ASSERT_TRUE(answerTransceivers[1].mRecvTrack.GetNegotiatedDetails());
-  ASSERT_EQ(9U, answerTransceivers[1]
+  ASSERT_EQ(8U, answerTransceivers[1]
                     .mSendTrack.GetNegotiatedDetails()
                     ->GetEncoding(0)
                     .GetCodecs()
                     .size());
-  ASSERT_EQ(9U, answerTransceivers[1]
+  ASSERT_EQ(8U, answerTransceivers[1]
                     .mRecvTrack.GetNegotiatedDetails()
                     ->GetEncoding(0)
                     .GetCodecs()
diff --git a/media/webrtc/signaling/gtest/jsep_track_unittest.cpp b/media/webrtc/signaling/gtest/jsep_track_unittest.cpp
index 577ec09e90d6..b6fd1040da3b 100644
--- a/media/webrtc/signaling/gtest/jsep_track_unittest.cpp
+++ b/media/webrtc/signaling/gtest/jsep_track_unittest.cpp
@@ -67,7 +67,6 @@ class JsepTrackTest : public JsepTrackTestBase {
 
     results.emplace_back(JsepVideoCodecDescription::CreateDefaultVP8(false));
     results.emplace_back(JsepVideoCodecDescription::CreateDefaultH264_1(false));
-    results.emplace_back(JsepVideoCodecDescription::CreateDefaultAV1(false));
 
     if (addFecCodecs) {
       if (!preferRed) {
@@ -766,21 +765,21 @@ TEST_F(JsepTrackTest, VideoNegotationOffererFEC) {
   ASSERT_EQ(mAnswer->ToString().find("a=rtpmap:123 ulpfec"), std::string::npos);
 
   UniquePtr<JsepVideoCodecDescription> track;
-  ASSERT_TRUE((track = GetVideoCodec(mSendOff, 3, 0)));
+  ASSERT_TRUE((track = GetVideoCodec(mSendOff, 2, 0)));
   ASSERT_EQ("120", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mRecvOff, 5, 0)));
+  ASSERT_TRUE((track = GetVideoCodec(mRecvOff, 4, 0)));
   ASSERT_EQ("120", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mSendAns, 3, 0)));
+  ASSERT_TRUE((track = GetVideoCodec(mSendAns, 2, 0)));
   ASSERT_EQ("120", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mRecvAns, 3, 0)));
+  ASSERT_TRUE((track = GetVideoCodec(mRecvAns, 2, 0)));
   ASSERT_EQ("120", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mSendOff, 3, 1)));
+  ASSERT_TRUE((track = GetVideoCodec(mSendOff, 2, 1)));
   ASSERT_EQ("126", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mRecvOff, 5, 1)));
+  ASSERT_TRUE((track = GetVideoCodec(mRecvOff, 4, 1)));
   ASSERT_EQ("126", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mSendAns, 3, 1)));
+  ASSERT_TRUE((track = GetVideoCodec(mSendAns, 2, 1)));
   ASSERT_EQ("126", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mRecvAns, 3, 1)));
+  ASSERT_TRUE((track = GetVideoCodec(mRecvAns, 2, 1)));
   ASSERT_EQ("126", track->mDefaultPt);
 }
 
@@ -801,21 +800,21 @@ TEST_F(JsepTrackTest, VideoNegotationAnswererFEC) {
   ASSERT_EQ(mAnswer->ToString().find("a=rtpmap:123 ulpfec"), std::string::npos);
 
   UniquePtr<JsepVideoCodecDescription> track;
-  ASSERT_TRUE((track = GetVideoCodec(mSendOff, 3, 0)));
+  ASSERT_TRUE((track = GetVideoCodec(mSendOff, 2, 0)));
   ASSERT_EQ("120", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mRecvOff, 3, 0)));
+  ASSERT_TRUE((track = GetVideoCodec(mRecvOff, 2, 0)));
   ASSERT_EQ("120", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mSendAns, 3, 0)));
+  ASSERT_TRUE((track = GetVideoCodec(mSendAns, 2, 0)));
   ASSERT_EQ("120", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mRecvAns, 3, 0)));
+  ASSERT_TRUE((track = GetVideoCodec(mRecvAns, 2, 0)));
   ASSERT_EQ("120", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mSendOff, 3, 1)));
+  ASSERT_TRUE((track = GetVideoCodec(mSendOff, 2, 1)));
   ASSERT_EQ("126", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mRecvOff, 3, 1)));
+  ASSERT_TRUE((track = GetVideoCodec(mRecvOff, 2, 1)));
   ASSERT_EQ("126", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mSendAns, 3, 1)));
+  ASSERT_TRUE((track = GetVideoCodec(mSendAns, 2, 1)));
   ASSERT_EQ("126", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mRecvAns, 3, 1)));
+  ASSERT_TRUE((track = GetVideoCodec(mRecvAns, 2, 1)));
   ASSERT_EQ("126", track->mDefaultPt);
 }
 
@@ -836,13 +835,13 @@ TEST_F(JsepTrackTest, VideoNegotationOffererAnswererFEC) {
   ASSERT_NE(mAnswer->ToString().find("a=rtpmap:123 ulpfec"), std::string::npos);
 
   UniquePtr<JsepVideoCodecDescription> track;
-  ASSERT_TRUE((track = GetVideoCodec(mSendOff, 5)));
+  ASSERT_TRUE((track = GetVideoCodec(mSendOff, 4)));
   ASSERT_EQ("120", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mRecvOff, 5)));
+  ASSERT_TRUE((track = GetVideoCodec(mRecvOff, 4)));
   ASSERT_EQ("120", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mSendAns, 5)));
+  ASSERT_TRUE((track = GetVideoCodec(mSendAns, 4)));
   ASSERT_EQ("120", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mRecvAns, 5)));
+  ASSERT_TRUE((track = GetVideoCodec(mRecvAns, 4)));
   ASSERT_EQ("120", track->mDefaultPt);
 }
 
@@ -865,13 +864,13 @@ TEST_F(JsepTrackTest, VideoNegotationOffererAnswererFECPreferred) {
   UniquePtr<JsepVideoCodecDescription> track;
   // We should have 4 codecs, the first of which is VP8, because having a
   // pseudo codec come first is silly.
-  ASSERT_TRUE((track = GetVideoCodec(mSendOff, 5)));
+  ASSERT_TRUE((track = GetVideoCodec(mSendOff, 4)));
   ASSERT_EQ("120", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mRecvOff, 5)));
+  ASSERT_TRUE((track = GetVideoCodec(mRecvOff, 4)));
   ASSERT_EQ("120", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mSendAns, 5)));
+  ASSERT_TRUE((track = GetVideoCodec(mSendAns, 4)));
   ASSERT_EQ("120", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mRecvAns, 5)));
+  ASSERT_TRUE((track = GetVideoCodec(mRecvAns, 4)));
   ASSERT_EQ("120", track->mDefaultPt);
 }
 
@@ -879,10 +878,8 @@ TEST_F(JsepTrackTest, VideoNegotationOffererAnswererFECPreferred) {
 TEST_F(JsepTrackTest, VideoNegotationOffererAnswererFECMismatch) {
   mOffCodecs = MakeCodecs(true, true);
   mAnsCodecs = MakeCodecs(true);
-  // remove h264 & AV1 from answer codecs
+  // remove h264 from answer codecs
   ASSERT_EQ("H264", mAnsCodecs[3]->mName);
-  ASSERT_EQ("AV1", mAnsCodecs[4]->mName);
-  mAnsCodecs.erase(mAnsCodecs.begin() + 4);
   mAnsCodecs.erase(mAnsCodecs.begin() + 3);
 
   InitTracks(SdpMediaSection::kVideo);
@@ -902,7 +899,7 @@ TEST_F(JsepTrackTest, VideoNegotationOffererAnswererFECMismatch) {
   UniquePtr<JsepVideoCodecDescription> track;
   ASSERT_TRUE((track = GetVideoCodec(mSendOff, 3)));
   ASSERT_EQ("120", track->mDefaultPt);
-  ASSERT_TRUE((track = GetVideoCodec(mRecvOff, 5)));
+  ASSERT_TRUE((track = GetVideoCodec(mRecvOff, 4)));
   ASSERT_EQ("120", track->mDefaultPt);
   ASSERT_TRUE((track = GetVideoCodec(mSendAns, 3)));
   ASSERT_EQ("120", track->mDefaultPt);
@@ -916,9 +913,9 @@ TEST_F(JsepTrackTest, VideoNegotationOffererAnswererFECZeroVP9Codec) {
   vp9->mDefaultPt = "0";
   mOffCodecs.push_back(std::move(vp9));
 
-  ASSERT_EQ(9U, mOffCodecs.size());
+  ASSERT_EQ(8U, mOffCodecs.size());
   JsepVideoCodecDescription& red =
-      static_cast<JsepVideoCodecDescription&>(*mOffCodecs[5]);
+      static_cast<JsepVideoCodecDescription&>(*mOffCodecs[4]);
   ASSERT_EQ("red", red.mName);
 
   mAnsCodecs = MakeCodecs(true);
@@ -953,13 +950,13 @@ TEST_F(JsepTrackTest, VideoNegotiationOfferRemb) {
   CheckAnsEncodingCount(1);
 
   UniquePtr<JsepVideoCodecDescription> codec;
-  ASSERT_TRUE((codec = GetVideoCodec(mSendOff, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mSendOff, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 0U);
-  ASSERT_TRUE((codec = GetVideoCodec(mRecvAns, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mRecvAns, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 0U);
-  ASSERT_TRUE((codec = GetVideoCodec(mSendAns, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mSendAns, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 0U);
-  ASSERT_TRUE((codec = GetVideoCodec(mRecvOff, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mRecvOff, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 0U);
 }
 
@@ -980,13 +977,13 @@ TEST_F(JsepTrackTest, VideoNegotiationAnswerRemb) {
   CheckAnsEncodingCount(1);
 
   UniquePtr<JsepVideoCodecDescription> codec;
-  ASSERT_TRUE((codec = GetVideoCodec(mSendOff, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mSendOff, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 0U);
-  ASSERT_TRUE((codec = GetVideoCodec(mRecvAns, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mRecvAns, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 0U);
-  ASSERT_TRUE((codec = GetVideoCodec(mSendAns, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mSendAns, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 0U);
-  ASSERT_TRUE((codec = GetVideoCodec(mRecvOff, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mRecvOff, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 0U);
 }
 
@@ -1008,16 +1005,16 @@ TEST_F(JsepTrackTest, VideoNegotiationOfferAnswerRemb) {
   CheckAnsEncodingCount(1);
 
   UniquePtr<JsepVideoCodecDescription> codec;
-  ASSERT_TRUE((codec = GetVideoCodec(mSendOff, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mSendOff, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 1U);
   CheckOtherFbExists(*codec, SdpRtcpFbAttributeList::kRemb);
-  ASSERT_TRUE((codec = GetVideoCodec(mRecvAns, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mRecvAns, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 1U);
   CheckOtherFbExists(*codec, SdpRtcpFbAttributeList::kRemb);
-  ASSERT_TRUE((codec = GetVideoCodec(mSendAns, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mSendAns, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 1U);
   CheckOtherFbExists(*codec, SdpRtcpFbAttributeList::kRemb);
-  ASSERT_TRUE((codec = GetVideoCodec(mRecvOff, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mRecvOff, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 1U);
   CheckOtherFbExists(*codec, SdpRtcpFbAttributeList::kRemb);
 }
@@ -1039,13 +1036,13 @@ TEST_F(JsepTrackTest, VideoNegotiationOfferTransportCC) {
   CheckAnsEncodingCount(1);
 
   UniquePtr<JsepVideoCodecDescription> codec;
-  ASSERT_TRUE((codec = GetVideoCodec(mSendOff, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mSendOff, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 0U);
-  ASSERT_TRUE((codec = GetVideoCodec(mRecvAns, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mRecvAns, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 0U);
-  ASSERT_TRUE((codec = GetVideoCodec(mSendAns, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mSendAns, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 0U);
-  ASSERT_TRUE((codec = GetVideoCodec(mRecvOff, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mRecvOff, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 0U);
 }
 
@@ -1066,13 +1063,13 @@ TEST_F(JsepTrackTest, VideoNegotiationAnswerTransportCC) {
   CheckAnsEncodingCount(1);
 
   UniquePtr<JsepVideoCodecDescription> codec;
-  ASSERT_TRUE((codec = GetVideoCodec(mSendOff, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mSendOff, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 0U);
-  ASSERT_TRUE((codec = GetVideoCodec(mRecvAns, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mRecvAns, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 0U);
-  ASSERT_TRUE((codec = GetVideoCodec(mSendAns, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mSendAns, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 0U);
-  ASSERT_TRUE((codec = GetVideoCodec(mRecvOff, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mRecvOff, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 0U);
 }
 
@@ -1094,16 +1091,16 @@ TEST_F(JsepTrackTest, VideoNegotiationOfferAnswerTransportCC) {
   CheckAnsEncodingCount(1);
 
   UniquePtr<JsepVideoCodecDescription> codec;
-  ASSERT_TRUE((codec = GetVideoCodec(mSendOff, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mSendOff, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 1U);
   CheckOtherFbExists(*codec, SdpRtcpFbAttributeList::kTransportCC);
-  ASSERT_TRUE((codec = GetVideoCodec(mRecvAns, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mRecvAns, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 1U);
   CheckOtherFbExists(*codec, SdpRtcpFbAttributeList::kTransportCC);
-  ASSERT_TRUE((codec = GetVideoCodec(mSendAns, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mSendAns, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 1U);
   CheckOtherFbExists(*codec, SdpRtcpFbAttributeList::kTransportCC);
-  ASSERT_TRUE((codec = GetVideoCodec(mRecvOff, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mRecvOff, 2, 0)));
   ASSERT_EQ(codec->mOtherFbTypes.size(), 1U);
   CheckOtherFbExists(*codec, SdpRtcpFbAttributeList::kTransportCC);
 }
@@ -1495,7 +1492,7 @@ TEST_F(JsepTrackTest, RtcpFbWithPayloadTypeAsymmetry) {
   ASSERT_TRUE((codec = GetVideoCodec(mSendOff)));
   ASSERT_EQ("136", codec->mDefaultPt)
       << "Offerer should have seen answer asymmetry!";
-  ASSERT_TRUE((codec = GetVideoCodec(mRecvOff, 3, 0)));
+  ASSERT_TRUE((codec = GetVideoCodec(mRecvOff, 2, 0)));
   ASSERT_EQ("126", codec->mDefaultPt);
   ASSERT_EQ(expectedAckFbTypes, codec->mAckFbTypes);
   ASSERT_EQ(expectedNackFbTypes, codec->mNackFbTypes);
@@ -1621,35 +1618,35 @@ TEST_F(JsepTrackTest, VideoSdpFmtpLine) {
   // SanityCheck checks that the sdpFmtpLine for a local codec matches that of
   // the corresponding remote codec.
   UniquePtr<JsepVideoCodecDescription> codec;
-  EXPECT_TRUE((codec = GetVideoCodec(mSendOff, 5, 0)));
+  EXPECT_TRUE((codec = GetVideoCodec(mSendOff, 4, 0)));
   EXPECT_EQ("VP8", codec->mName);
   EXPECT_EQ("max-fs=12288;max-fr=60", codec->mSdpFmtpLine.valueOr("nothing"));
-  EXPECT_TRUE((codec = GetVideoCodec(mSendAns, 5, 0)));
+  EXPECT_TRUE((codec = GetVideoCodec(mSendAns, 4, 0)));
   EXPECT_EQ("VP8", codec->mName);
   EXPECT_EQ("max-fs=12288;max-fr=60", codec->mSdpFmtpLine.valueOr("nothing"));
 
-  EXPECT_TRUE((codec = GetVideoCodec(mSendOff, 5, 1)));
+  EXPECT_TRUE((codec = GetVideoCodec(mSendOff, 4, 1)));
   EXPECT_EQ("H264", codec->mName);
   EXPECT_EQ(
       "profile-level-id=42e01f;level-asymmetry-allowed=1;packetization-mode=1",
       codec->mSdpFmtpLine.valueOr("nothing"));
-  EXPECT_TRUE((codec = GetVideoCodec(mSendAns, 5, 1)));
+  EXPECT_TRUE((codec = GetVideoCodec(mSendAns, 4, 1)));
   EXPECT_EQ("H264", codec->mName);
   EXPECT_EQ(
       "profile-level-id=42e01f;level-asymmetry-allowed=1;packetization-mode=1",
       codec->mSdpFmtpLine.valueOr("nothing"));
 
-  EXPECT_TRUE((codec = GetVideoCodec(mSendOff, 5, 3)));
+  EXPECT_TRUE((codec = GetVideoCodec(mSendOff, 4, 2)));
   EXPECT_EQ("red", codec->mName);
   EXPECT_EQ("nothing", codec->mSdpFmtpLine.valueOr("nothing"));
-  EXPECT_TRUE((codec = GetVideoCodec(mSendAns, 5, 3)));
+  EXPECT_TRUE((codec = GetVideoCodec(mSendAns, 4, 2)));
   EXPECT_EQ("red", codec->mName);
   EXPECT_EQ("nothing", codec->mSdpFmtpLine.valueOr("nothing"));
 
-  EXPECT_TRUE((codec = GetVideoCodec(mSendOff, 5, 4)));
+  EXPECT_TRUE((codec = GetVideoCodec(mSendOff, 4, 3)));
   EXPECT_EQ("ulpfec", codec->mName);
   EXPECT_EQ("nothing", codec->mSdpFmtpLine.valueOr("nothing"));
-  EXPECT_TRUE((codec = GetVideoCodec(mSendAns, 5, 4)));
+  EXPECT_TRUE((codec = GetVideoCodec(mSendAns, 4, 3)));
   EXPECT_EQ("ulpfec", codec->mName);
   EXPECT_EQ("nothing", codec->mSdpFmtpLine.valueOr("nothing"));
 }
@@ -1697,37 +1694,37 @@ TEST_F(JsepTrackTest, NonDefaultVideoSdpFmtpLine) {
   // SanityCheck checks that the sdpFmtpLine for a local codec matches that of
   // the corresponding remote codec.
   UniquePtr<JsepVideoCodecDescription> codec;
-  EXPECT_TRUE((codec = GetVideoCodec(mSendOff, 5, 0)));
+  EXPECT_TRUE((codec = GetVideoCodec(mSendOff, 4, 0)));
   EXPECT_EQ("VP8", codec->mName);
   EXPECT_EQ("max-fs=32400;max-fr=60", codec->mSdpFmtpLine.valueOr("nothing"));
-  EXPECT_TRUE((codec = GetVideoCodec(mSendAns, 5, 0)));
+  EXPECT_TRUE((codec = GetVideoCodec(mSendAns, 4, 0)));
   EXPECT_EQ("VP8", codec->mName);
   EXPECT_EQ("max-fs=1200;max-fr=15", codec->mSdpFmtpLine.valueOr("nothing"));
 
-  EXPECT_TRUE((codec = GetVideoCodec(mSendOff, 5, 1)));
+  EXPECT_TRUE((codec = GetVideoCodec(mSendOff, 4, 1)));
   EXPECT_EQ("H264", codec->mName);
   EXPECT_EQ(
       "profile-level-id=42f00b;level-asymmetry-allowed=1;packetization-mode=1;"
       "max-mbps=1944000;max-fs=32400;max-cpb=800000;max-dpb=128000",
       codec->mSdpFmtpLine.valueOr("nothing"));
-  EXPECT_TRUE((codec = GetVideoCodec(mSendAns, 5, 1)));
+  EXPECT_TRUE((codec = GetVideoCodec(mSendAns, 4, 1)));
   EXPECT_EQ("H264", codec->mName);
   EXPECT_EQ(
       "profile-level-id=42e01f;level-asymmetry-allowed=1;packetization-mode=1;"
       "max-fs=1200;max-dpb=6400;max-br=1000",
       codec->mSdpFmtpLine.valueOr("nothing"));
 
-  EXPECT_TRUE((codec = GetVideoCodec(mSendOff, 5, 3)));
+  EXPECT_TRUE((codec = GetVideoCodec(mSendOff, 4, 2)));
   EXPECT_EQ("red", codec->mName);
   EXPECT_EQ("nothing", codec->mSdpFmtpLine.valueOr("nothing"));
-  EXPECT_TRUE((codec = GetVideoCodec(mSendAns, 5, 3)));
+  EXPECT_TRUE((codec = GetVideoCodec(mSendAns, 4, 2)));
   EXPECT_EQ("red", codec->mName);
   EXPECT_EQ("nothing", codec->mSdpFmtpLine.valueOr("nothing"));
 
-  EXPECT_TRUE((codec = GetVideoCodec(mSendOff, 5, 4)));
+  EXPECT_TRUE((codec = GetVideoCodec(mSendOff, 4, 3)));
   EXPECT_EQ("ulpfec", codec->mName);
   EXPECT_EQ("nothing", codec->mSdpFmtpLine.valueOr("nothing"));
-  EXPECT_TRUE((codec = GetVideoCodec(mSendAns, 5, 4)));
+  EXPECT_TRUE((codec = GetVideoCodec(mSendAns, 4, 3)));
   EXPECT_EQ("ulpfec", codec->mName);
   EXPECT_EQ("nothing", codec->mSdpFmtpLine.valueOr("nothing"));
 }
diff --git a/media/webrtc/signaling/gtest/sdp_unittests.cpp b/media/webrtc/signaling/gtest/sdp_unittests.cpp
index dbf5d3fe74a4..3b6cd4d3b4f3 100644
--- a/media/webrtc/signaling/gtest/sdp_unittests.cpp
+++ b/media/webrtc/signaling/gtest/sdp_unittests.cpp
@@ -1993,113 +1993,6 @@ MOZ_RUNINIT const std::vector<std::string> kBasicAudioVideoOfferLines = {
     "a=msid:noappdata",
     "a=bundle-only"};
 
-// SDP from a basic A/V apprtc call FFX/FFX
-MOZ_RUNINIT const std::vector<std::string> kBasicAV1AudioVideoOfferLines = {
-    "v=0",
-    "o=Mozilla-SIPUA-35.0a1 5184 0 IN IP4 0.0.0.0",
-    "s=SIP Call",
-    "c=IN IP4 224.0.0.1/100/12",
-    "t=0 0",
-    "a=dtls-message:client " BASE64_DTLS_HELLO,
-    "a=ice-ufrag:4a799b2e",
-    "a=ice-pwd:e4cc12a910f106a0a744719425510e17",
-    "a=ice-lite",
-    "a=ice-options:trickle foo",
-    "a=msid-semantic:WMS stream streama",
-    "a=msid-semantic:foo stream",
-    "a=fingerprint:sha-256 "
-    "DF:2E:AC:8A:FD:0A:8E:99:BF:5D:E8:3C:E7:FA:FB:08:3B:3C:54:1D:D7:D4:05:77:"
-    "A0:72:9B:14:08:6D:0F:4C",
-    "a=identity:" LONG_IDENTITY,
-    "a=group:BUNDLE first second",
-    "a=group:BUNDLE third",
-    "a=group:LS first third",
-    "m=audio 9 RTP/SAVPF 109 9 0 8 101",
-    "c=IN IP4 0.0.0.0",
-    "a=mid:first",
-    "a=rtpmap:109 opus/48000/2",
-    "a=fmtp:109 maxplaybackrate=32000;stereo=1",
-    "a=ptime:20",
-    "a=maxptime:20",
-    "a=rtpmap:9 G722/8000",
-    "a=rtpmap:0 PCMU/8000",
-    "a=rtpmap:8 PCMA/8000",
-    "a=rtpmap:101 telephone-event/8000",
-    "a=fmtp:101 0-15,66,32-34,67",
-    "a=ice-ufrag:00000000",
-    "a=ice-pwd:0000000000000000000000000000000",
-    "a=sendonly",
-    "a=extmap:1 urn:ietf:params:rtp-hdrext:ssrc-audio-level",
-    "a=setup:actpass",
-    "a=rtcp-mux",
-    "a=msid:stream track",
-    "a=candidate:0 1 UDP 2130379007 10.0.0.36 62453 typ host",
-    "a=candidate:2 1 UDP 1694236671 24.6.134.204 62453 typ srflx raddr "
-    "10.0.0.36 rport 62453",
-    "a=candidate:3 1 UDP 100401151 162.222.183.171 49761 typ relay raddr "
-    "162.222.183.171 rport 49761",
-    "a=candidate:6 1 UDP 16515071 162.222.183.171 51858 typ relay raddr "
-    "162.222.183.171 rport 51858",
-    "a=candidate:3 2 UDP 100401150 162.222.183.171 62454 typ relay raddr "
-    "162.222.183.171 rport 62454",
-    "a=candidate:2 2 UDP 1694236670 24.6.134.204 55428 typ srflx raddr "
-    "10.0.0.36 rport 55428",
-    "a=candidate:6 2 UDP 16515070 162.222.183.171 50340 typ relay raddr "
-    "162.222.183.171 rport 50340",
-    "a=candidate:0 2 UDP 2130379006 10.0.0.36 55428 typ host",
-    "a=rtcp:62454 IN IP4 162.222.183.171",
-    "a=end-of-candidates",
-    "a=ssrc:5150",
-    "m=video 9 RTP/SAVPF 99 122 123",
-    "c=IN IP6 ::1",
-    "a=fingerprint:sha-1 "
-    "DF:FA:FB:08:3B:3C:54:1D:D7:D4:05:77:A0:72:9B:14:08:6D:0F:4C",
-    "a=mid:second",
-    "a=rtpmap:98 AV1/90000",
-    "a=fmtp:98 profile=1;level-idx=1;tier=1;max-fs=3600;max-fr=30",
-    "a=rtpmap:122 red/90000",
-    "a=rtpmap:123 ulpfec/90000",
-    "a=fmtp:122 98/123",
-    "a=recvonly",
-    "a=rtcp-fb:98 nack",
-    "a=rtcp-fb:98 nack pli",
-    "a=rtcp-fb:98 ccm fir",
-    "a=rtcp-fb:121 nack",
-    "a=rtcp-fb:121 nack pli",
-    "a=rtcp-fb:121 ccm fir",
-    "a=setup:active",
-    "a=rtcp-mux",
-    "a=msid:streama tracka",
-    "a=msid:streamb trackb",
-    "a=candidate:0 1 UDP 2130379007 10.0.0.36 59530 typ host",
-    "a=candidate:0 2 UDP 2130379006 10.0.0.36 64378 typ host",
-    "a=candidate:2 2 UDP 1694236670 24.6.134.204 64378 typ srflx raddr "
-    "10.0.0.36 rport 64378",
-    "a=candidate:6 2 UDP 16515070 162.222.183.171 64941 typ relay raddr "
-    "162.222.183.171 rport 64941",
-    "a=candidate:6 1 UDP 16515071 162.222.183.171 64800 typ relay raddr "
-    "162.222.183.171 rport 64800",
-    "a=candidate:2 1 UDP 1694236671 24.6.134.204 59530 typ srflx raddr "
-    "10.0.0.36 rport 59530",
-    "a=candidate:3 1 UDP 100401151 162.222.183.171 62935 typ relay raddr "
-    "162.222.183.171 rport 62935",
-    "a=candidate:3 2 UDP 100401150 162.222.183.171 61026 typ relay raddr "
-    "162.222.183.171 rport 61026",
-    "a=rtcp:61026",
-    "a=end-of-candidates",
-    "a=ssrc:1111 foo",
-    "a=ssrc:1111 foo:bar",
-    "a=ssrc:1111 msid:1d0cdb4e-5934-4f0f-9f88-40392cb60d31 "
-    "315b086a-5cb6-4221-89de-caf0b038c79d",
-    "a=imageattr:120 send * recv *",
-    "a=imageattr:121 send [x=640,y=480] recv [x=640,y=480]",
-    "m=audio 9 RTP/SAVPF 0",
-    "a=mid:third",
-    "a=rtpmap:0 PCMU/8000",
-    "a=ice-options:foo bar",
-    "a=msid:noappdata",
-    "a=bundle-only"};
-
 static std::string joinSdp(const std::vector<std::string>& aSdp,
                            const std::string& aEndl) {
   std::ostringstream result;
@@ -2119,18 +2012,6 @@ MOZ_RUNINIT const std::string kBasicAudioVideoOfferLinefeedOnly =
 
 TEST_P(NewSdpTest, BasicAudioVideoSdpParse) { ParseSdp(kBasicAudioVideoOffer); }
 
-MOZ_RUNINIT const std::string kAv1AudioVideoOffer =
-    joinSdp(kBasicAudioVideoOfferLines, "\r\n");
-
-MOZ_RUNINIT const std::string kAv1AudioVideoOfferLinefeedOnly =
-    joinSdp(kBasicAudioVideoOfferLines, "\n");
-
-TEST_P(NewSdpTest, Av1AudioVideoSdpParse) { ParseSdp(kAv1AudioVideoOffer); }
-
-TEST_P(NewSdpTest, Av1AudioVideoSdpParseLinefeedOnly) {
-  ParseSdp(kAv1AudioVideoOfferLinefeedOnly);
-}
-
 TEST_P(NewSdpTest, CheckRemoveFmtp) {
   ParseSdp(kBasicAudioVideoOffer);
   ASSERT_TRUE(!!Sdp())
diff --git a/media/webrtc/signaling/gtest/videoconduit_unittests.cpp b/media/webrtc/signaling/gtest/videoconduit_unittests.cpp
index 89abb351414e..4dde583787c4 100644
--- a/media/webrtc/signaling/gtest/videoconduit_unittests.cpp
+++ b/media/webrtc/signaling/gtest/videoconduit_unittests.cpp
@@ -2310,8 +2310,7 @@ TEST_F(VideoConduitTest, TestVideoConfigurationH264) {
       h264.profile_level_id = profileLevelId1;
       strncpy(h264.sprop_parameter_sets, sprop1,
               sizeof(h264.sprop_parameter_sets) - 1);
-      auto codecConfig =
-          VideoCodecConfig::CreateH264Config(97, EncodingConstraints(), h264);
+      VideoCodecConfig codecConfig(97, "H264", EncodingConstraints(), &h264);
       codecConfig.mEncodings.emplace_back();
       aControl.mVideoSendCodec = Some(codecConfig);
       aControl.mVideoSendRtpRtcpConfig =
@@ -2332,8 +2331,7 @@ TEST_F(VideoConduitTest, TestVideoConfigurationH264) {
       h264.profile_level_id = profileLevelId2;
       strncpy(h264.sprop_parameter_sets, sprop2,
               sizeof(h264.sprop_parameter_sets) - 1);
-      auto codecConfig =
-          VideoCodecConfig::CreateH264Config(126, EncodingConstraints(), h264);
+      VideoCodecConfig codecConfig(126, "H264", EncodingConstraints(), &h264);
       codecConfig.mEncodings.emplace_back();
       aControl.mVideoSendCodec = Some(codecConfig);
     });
@@ -2346,30 +2344,4 @@ TEST_F(VideoConduitTest, TestVideoConfigurationH264) {
   }
 }
 
-TEST_F(VideoConduitTest, TestVideoConfigurationAV1) {
-  // Test that VideoConduit propagates AV1 configuration data properly.
-  {
-    mControl.Update([&](auto& aControl) {
-      aControl.mTransmitting = true;
-      auto av1Config = JsepVideoCodecDescription::Av1Config();
-
-      av1Config.mProfile = Some(2);
-      av1Config.mLevelIdx = Some(4);
-      av1Config.mTier = Some(1);
-      auto codecConfig = VideoCodecConfig::CreateAv1Config(
-          99, EncodingConstraints(), av1Config);
-      codecConfig.mEncodings.emplace_back();
-      aControl.mVideoSendCodec = Some(codecConfig);
-      aControl.mVideoSendRtpRtcpConfig =
-          Some(RtpRtcpConfig(webrtc::RtcpMode::kCompound));
-    });
-
-    ASSERT_TRUE(Call()->mVideoSendEncoderConfig);
-    auto& params = Call()->mVideoSendEncoderConfig->video_format.parameters;
-    EXPECT_EQ(params[cricket::kAv1FmtpProfile], "2");
-    EXPECT_EQ(params[cricket::kAv1FmtpLevelIdx], "4");
-    EXPECT_EQ(params[cricket::kAv1FmtpTier], "1");
-  }
-}
-
 }  // End namespace test.
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
index 06249c116a86..8e06afbc858d 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -11996,22 +11996,6 @@
 #endif
   mirror: always
 
-- name: media.webrtc.codec.video.av1.enabled
-  type: RelaxedAtomicBool
-#if defined(MOZ_AV1)
-  value: @IS_NIGHTLY_BUILD@
-#else
-  value: false
-#endif
-  mirror: always
-
-# If true, then AV1 will be used as the preferred codec for WebRTC video.
-# After the AV1 codec is enabled by default, this pref will be renamed.
-- name: media.webrtc.codec.video.av1.experimental_preferred
-  type: bool
-  value: false
-  mirror: always
-
 - name: media.webrtc.tls_tunnel_for_all_proxy
   type: bool
   value: true
diff --git a/testing/web-platform/meta/media-capabilities/decodingInfo-webrtc.any.js.ini b/testing/web-platform/meta/media-capabilities/decodingInfo-webrtc.any.js.ini
index fbcc808d5bc6..aaf431af30ed 100644
--- a/testing/web-platform/meta/media-capabilities/decodingInfo-webrtc.any.js.ini
+++ b/testing/web-platform/meta/media-capabilities/decodingInfo-webrtc.any.js.ini
@@ -37,9 +37,6 @@
   [Test that decodingInfo returns supported true for the codec audio/PCMA returned by RTCRtpReceiver.getCapabilities()]
     expected: FAIL
 
-  [Test that decodingInfo returns supported true for the codec video/AV1 returned by RTCRtpReceiver.getCapabilities()]
-    expected: FAIL
-
   [Test that decodingInfo returns supported true for the codec video/VP8; max-fs=12288;max-fr=60 returned by RTCRtpReceiver.getCapabilities()]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/media-capabilities/encodingInfo-webrtc.any.js.ini b/testing/web-platform/meta/media-capabilities/encodingInfo-webrtc.any.js.ini
index 0f591bb73d0e..752e523899e3 100644
--- a/testing/web-platform/meta/media-capabilities/encodingInfo-webrtc.any.js.ini
+++ b/testing/web-platform/meta/media-capabilities/encodingInfo-webrtc.any.js.ini
@@ -38,8 +38,6 @@
   [Test that encodingInfo returns supported true for the codec video/H264; profile-level-id=42001f;level-asymmetry-allowed=1 returned by RTCRtpSender.getCapabilities()]
     expected: FAIL
 
-  [Test that encodingInfo returns supported true for the codec video/AV1 returned by RTCRtpSender.getCapabilities()]
-    expected: FAIL
 
 [encodingInfo-webrtc.any.worker.html]
   [Test that encodingInfo returns a valid MediaCapabilitiesInfo objects]
diff --git a/third_party/libwebrtc/BUILD.gn b/third_party/libwebrtc/BUILD.gn
index dcbcb0075231..bd5d0922a197 100644
--- a/third_party/libwebrtc/BUILD.gn
+++ b/third_party/libwebrtc/BUILD.gn
@@ -532,9 +532,6 @@ if (!rtc_build_ssl) {
       "crypto",
       "ssl",
     ]
-    if (build_with_mozilla) {
-      libs = []
-    }
   }
 }
 
@@ -630,7 +627,6 @@ if (!build_with_chromium) {
         "api/environment:environment_factory",
         "api/video:video_frame",
         "api/video:video_rtp_headers",
-        "api/video_codecs:builtin_video_decoder_factory",
         "test:rtp_test_utils",
       ]
       # Added when we removed deps in other places to avoid building
diff --git a/third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build b/third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
deleted file mode 100644
index 4334202f11b5..000000000000
--- a/third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
+++ /dev/null
@@ -1,232 +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/.
-
-
-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-  ### DO NOT edit it by hand.                                       ###
-
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = 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_STRICT_FIELD_TRIALS"] = "0"
-
-FINAL_LIBRARY = "xul"
-
-
-LOCAL_INCLUDES += [
-    "!/ipc/ipdl/_ipdlheaders",
-    "!/third_party/libwebrtc/gen",
-    "/ipc/chromium/src",
-    "/third_party/abseil-cpp/",
-    "/third_party/libwebrtc/",
-    "/tools/profiler/public"
-]
-
-UNIFIED_SOURCES += [
-    "/third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory.cc"
-]
-
-if not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-    DEFINES["NDEBUG"] = True
-    DEFINES["NVALGRIND"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1":
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["ANDROID"] = True
-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_GNU_SOURCE"] = True
-    DEFINES["__STDC_CONSTANT_MACROS"] = True
-    DEFINES["__STDC_FORMAT_MACROS"] = True
-
-    OS_LIBS += [
-        "GLESv2",
-        "log"
-    ]
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-    DEFINES["WEBRTC_MAC"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-    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_NSS_CERTS"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_UDEV"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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
-
-    OS_LIBS += [
-        "rt"
-    ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-    DEFINES["USE_GLIB"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_X11"] = "1"
-    DEFINES["WEBRTC_BSD"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
-
-    OS_LIBS += [
-        "crypt32",
-        "iphlpapi",
-        "secur32",
-        "winmm"
-    ]
-
-if CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-
-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
-    OS_LIBS += [
-        "unwind"
-    ]
-
-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
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-
-    DEFINES["_GNU_SOURCE"] = True
-
-Library("builtin_video_decoder_factory_gn")
diff --git a/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build b/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
deleted file mode 100644
index 2a469a56b0b1..000000000000
--- a/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
+++ /dev/null
@@ -1,209 +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/.
-
-
-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-  ### DO NOT edit it by hand.                                       ###
-
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = 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_STRICT_FIELD_TRIALS"] = "0"
-
-FINAL_LIBRARY = "xul"
-
-
-LOCAL_INCLUDES += [
-    "!/ipc/ipdl/_ipdlheaders",
-    "!/third_party/libwebrtc/gen",
-    "/ipc/chromium/src",
-    "/third_party/abseil-cpp/",
-    "/third_party/libwebrtc/",
-    "/tools/profiler/public"
-]
-
-if not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-    DEFINES["NDEBUG"] = True
-    DEFINES["NVALGRIND"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1":
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["ANDROID"] = True
-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-    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_NSS_CERTS"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_UDEV"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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["USE_X11"] = "1"
-    DEFINES["WEBRTC_BSD"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
-
-    OS_LIBS += [
-        "crypt32",
-        "iphlpapi",
-        "secur32",
-        "winmm"
-    ]
-
-if CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-
-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
-    OS_LIBS += [
-        "unwind"
-    ]
-
-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("video_encoder_factory_template_gn")
diff --git a/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build b/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build
deleted file mode 100644
index 1fbefd3e1b1b..000000000000
--- a/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build
+++ /dev/null
@@ -1,213 +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/.
-
-
-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-  ### DO NOT edit it by hand.                                       ###
-
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = 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_STRICT_FIELD_TRIALS"] = "0"
-
-FINAL_LIBRARY = "xul"
-
-
-LOCAL_INCLUDES += [
-    "!/ipc/ipdl/_ipdlheaders",
-    "!/third_party/libwebrtc/gen",
-    "/ipc/chromium/src",
-    "/third_party/abseil-cpp/",
-    "/third_party/libwebrtc/",
-    "/tools/profiler/public"
-]
-
-if not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-    DEFINES["NDEBUG"] = True
-    DEFINES["NVALGRIND"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1":
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["ANDROID"] = True
-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-    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_NSS_CERTS"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_UDEV"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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
-
-    OS_LIBS += [
-        "rt"
-    ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-    DEFINES["USE_GLIB"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_X11"] = "1"
-    DEFINES["WEBRTC_BSD"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
-
-    OS_LIBS += [
-        "crypt32",
-        "iphlpapi",
-        "secur32",
-        "winmm"
-    ]
-
-if CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-
-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
-    OS_LIBS += [
-        "unwind"
-    ]
-
-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("video_encoder_factory_template_libaom_av1_adapter_gn")
diff --git a/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build b/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
deleted file mode 100644
index f285414fc561..000000000000
--- a/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
+++ /dev/null
@@ -1,214 +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/.
-
-
-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-  ### DO NOT edit it by hand.                                       ###
-
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = 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_STRICT_FIELD_TRIALS"] = "0"
-
-FINAL_LIBRARY = "xul"
-
-
-LOCAL_INCLUDES += [
-    "!/ipc/ipdl/_ipdlheaders",
-    "!/third_party/libwebrtc/gen",
-    "/ipc/chromium/src",
-    "/third_party/abseil-cpp/",
-    "/third_party/libwebrtc/",
-    "/tools/profiler/public"
-]
-
-if not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-    DEFINES["NDEBUG"] = True
-    DEFINES["NVALGRIND"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1":
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["ANDROID"] = True
-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_GNU_SOURCE"] = True
-    DEFINES["__STDC_CONSTANT_MACROS"] = True
-    DEFINES["__STDC_FORMAT_MACROS"] = True
-
-    OS_LIBS += [
-        "GLESv2",
-        "log"
-    ]
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-    DEFINES["WEBRTC_MAC"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-    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_NSS_CERTS"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_UDEV"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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
-
-    OS_LIBS += [
-        "rt"
-    ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-    DEFINES["USE_GLIB"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_X11"] = "1"
-    DEFINES["WEBRTC_BSD"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
-
-    OS_LIBS += [
-        "crypt32",
-        "iphlpapi",
-        "secur32",
-        "winmm"
-    ]
-
-if CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-
-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
-    OS_LIBS += [
-        "unwind"
-    ]
-
-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("video_encoder_factory_template_libvpx_vp8_adapter_gn")
diff --git a/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build b/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
deleted file mode 100644
index a618ccac0a1e..000000000000
--- a/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
+++ /dev/null
@@ -1,214 +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/.
-
-
-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-  ### DO NOT edit it by hand.                                       ###
-
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = 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_STRICT_FIELD_TRIALS"] = "0"
-
-FINAL_LIBRARY = "xul"
-
-
-LOCAL_INCLUDES += [
-    "!/ipc/ipdl/_ipdlheaders",
-    "!/third_party/libwebrtc/gen",
-    "/ipc/chromium/src",
-    "/third_party/abseil-cpp/",
-    "/third_party/libwebrtc/",
-    "/tools/profiler/public"
-]
-
-if not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-    DEFINES["NDEBUG"] = True
-    DEFINES["NVALGRIND"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1":
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["ANDROID"] = True
-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_GNU_SOURCE"] = True
-    DEFINES["__STDC_CONSTANT_MACROS"] = True
-    DEFINES["__STDC_FORMAT_MACROS"] = True
-
-    OS_LIBS += [
-        "GLESv2",
-        "log"
-    ]
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-    DEFINES["WEBRTC_MAC"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-    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_NSS_CERTS"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_UDEV"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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
-
-    OS_LIBS += [
-        "rt"
-    ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-    DEFINES["USE_GLIB"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_X11"] = "1"
-    DEFINES["WEBRTC_BSD"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
-
-    OS_LIBS += [
-        "crypt32",
-        "iphlpapi",
-        "secur32",
-        "winmm"
-    ]
-
-if CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-
-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
-    OS_LIBS += [
-        "unwind"
-    ]
-
-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("video_encoder_factory_template_libvpx_vp9_adapter_gn")
diff --git a/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build b/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
deleted file mode 100644
index 846208e9f33b..000000000000
--- a/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
+++ /dev/null
@@ -1,214 +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/.
-
-
-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-  ### DO NOT edit it by hand.                                       ###
-
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = 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_STRICT_FIELD_TRIALS"] = "0"
-
-FINAL_LIBRARY = "xul"
-
-
-LOCAL_INCLUDES += [
-    "!/ipc/ipdl/_ipdlheaders",
-    "!/third_party/libwebrtc/gen",
-    "/ipc/chromium/src",
-    "/third_party/abseil-cpp/",
-    "/third_party/libwebrtc/",
-    "/tools/profiler/public"
-]
-
-if not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-    DEFINES["NDEBUG"] = True
-    DEFINES["NVALGRIND"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1":
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["ANDROID"] = True
-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_GNU_SOURCE"] = True
-    DEFINES["__STDC_CONSTANT_MACROS"] = True
-    DEFINES["__STDC_FORMAT_MACROS"] = True
-
-    OS_LIBS += [
-        "GLESv2",
-        "log"
-    ]
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-    DEFINES["WEBRTC_MAC"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-    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_NSS_CERTS"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_UDEV"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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
-
-    OS_LIBS += [
-        "rt"
-    ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-    DEFINES["USE_GLIB"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_X11"] = "1"
-    DEFINES["WEBRTC_BSD"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
-
-    OS_LIBS += [
-        "crypt32",
-        "iphlpapi",
-        "secur32",
-        "winmm"
-    ]
-
-if CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-
-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
-    OS_LIBS += [
-        "unwind"
-    ]
-
-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("video_encoder_factory_template_open_h264_adapter_gn")
diff --git a/third_party/libwebrtc/media/BUILD.gn b/third_party/libwebrtc/media/BUILD.gn
index ab59fffa31af..837aa9c20b75 100644
--- a/third_party/libwebrtc/media/BUILD.gn
+++ b/third_party/libwebrtc/media/BUILD.gn
@@ -12,10 +12,12 @@ import("../webrtc.gni")
 
 group("media") {
   deps = []
-  deps += [
-    ":rtc_media",
-    ":rtc_media_base",
-  ]
+  if (!build_with_mozilla) {
+    deps += [
+      ":rtc_media",
+      ":rtc_media_base",
+    ]
+  }
 }
 
 config("rtc_media_defines_config") {
@@ -267,9 +269,6 @@ rtc_library("media_engine") {
       "base/media_engine.cc",
       "base/media_engine.h",
     ]
-    deps -= [
-      ":media_channel_impl",
-    ]
   }
 }
 
@@ -394,7 +393,6 @@ rtc_library("codec") {
   ]
 }
 
-# MOZILLA Bug 1931241 - how much of this do we need?
 rtc_library("rtp_utils") {
 if (!build_with_mozilla) {
   sources = [
@@ -440,6 +438,7 @@ rtc_library("media_constants") {
 }
 
 rtc_library("turn_utils") {
+if (!build_with_mozilla) {
   sources = [
     "base/turn_utils.cc",
     "base/turn_utils.h",
@@ -450,14 +449,17 @@ rtc_library("turn_utils") {
     "../rtc_base/system:rtc_export",
   ]
 }
+}
 
 rtc_library("rid_description") {
+if (!build_with_mozilla) {
   sources = [
     "base/rid_description.cc",
     "base/rid_description.h",
   ]
   deps = []
 }
+}
 
 rtc_library("rtc_simulcast_encoder_adapter") {
   visibility = [ "*" ]
@@ -703,12 +705,6 @@ rtc_library("rtc_audio_video") {
     "engine/webrtc_voice_engine.cc",
     "engine/webrtc_voice_engine.h",
   ]
-  if (build_with_mozilla) {
-    sources -= [
-      "engine/webrtc_video_engine.cc",
-      "engine/webrtc_voice_engine.cc",
-    ]
-  }
 
   public_configs = []
   if (!build_with_chromium) {
diff --git a/third_party/libwebrtc/media/audio_source_gn/moz.build b/third_party/libwebrtc/media/audio_source_gn/moz.build
deleted file mode 100644
index 15a7fff97cb4..000000000000
--- a/third_party/libwebrtc/media/audio_source_gn/moz.build
+++ /dev/null
@@ -1,198 +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/.
-
-
-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-  ### DO NOT edit it by hand.                                       ###
-
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = 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_STRICT_FIELD_TRIALS"] = "0"
-
-FINAL_LIBRARY = "xul"
-
-
-LOCAL_INCLUDES += [
-    "!/ipc/ipdl/_ipdlheaders",
-    "!/third_party/libwebrtc/gen",
-    "/ipc/chromium/src",
-    "/third_party/abseil-cpp/",
-    "/third_party/libwebrtc/",
-    "/tools/profiler/public"
-]
-
-if not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-    DEFINES["NDEBUG"] = True
-    DEFINES["NVALGRIND"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1":
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["ANDROID"] = True
-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-    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_NSS_CERTS"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_UDEV"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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["USE_X11"] = "1"
-    DEFINES["WEBRTC_BSD"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
-
-if CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-
-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
-    OS_LIBS += [
-        "unwind"
-    ]
-
-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("audio_source_gn")
diff --git a/third_party/libwebrtc/media/media_engine_gn/moz.build b/third_party/libwebrtc/media/media_engine_gn/moz.build
deleted file mode 100644
index d043267dbae5..000000000000
--- a/third_party/libwebrtc/media/media_engine_gn/moz.build
+++ /dev/null
@@ -1,214 +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/.
-
-
-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-  ### DO NOT edit it by hand.                                       ###
-
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = 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_STRICT_FIELD_TRIALS"] = "0"
-
-FINAL_LIBRARY = "xul"
-
-
-LOCAL_INCLUDES += [
-    "!/ipc/ipdl/_ipdlheaders",
-    "!/third_party/libwebrtc/gen",
-    "/ipc/chromium/src",
-    "/third_party/abseil-cpp/",
-    "/third_party/libwebrtc/",
-    "/tools/profiler/public"
-]
-
-if not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-    DEFINES["NDEBUG"] = True
-    DEFINES["NVALGRIND"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1":
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["ANDROID"] = True
-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_GNU_SOURCE"] = True
-    DEFINES["__STDC_CONSTANT_MACROS"] = True
-    DEFINES["__STDC_FORMAT_MACROS"] = True
-
-    OS_LIBS += [
-        "GLESv2",
-        "log"
-    ]
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-    DEFINES["WEBRTC_MAC"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-    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_NSS_CERTS"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_UDEV"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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
-
-    OS_LIBS += [
-        "rt"
-    ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-    DEFINES["USE_GLIB"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_X11"] = "1"
-    DEFINES["WEBRTC_BSD"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
-
-    OS_LIBS += [
-        "crypt32",
-        "iphlpapi",
-        "secur32",
-        "winmm"
-    ]
-
-if CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-
-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
-    OS_LIBS += [
-        "unwind"
-    ]
-
-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("media_engine_gn")
diff --git a/third_party/libwebrtc/media/rid_description_gn/moz.build b/third_party/libwebrtc/media/rid_description_gn/moz.build
index d564fc86c266..c839981e68a2 100644
--- a/third_party/libwebrtc/media/rid_description_gn/moz.build
+++ b/third_party/libwebrtc/media/rid_description_gn/moz.build
@@ -30,10 +30,6 @@ LOCAL_INCLUDES += [
     "/tools/profiler/public"
 ]
 
-UNIFIED_SOURCES += [
-    "/third_party/libwebrtc/media/base/rid_description.cc"
-]
-
 if not CONFIG["MOZ_DEBUG"]:
 
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
@@ -131,10 +127,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
 
 if CONFIG["TARGET_CPU"] == "arm":
 
-    CXXFLAGS += [
-        "-mfpu=neon"
-    ]
-
     DEFINES["WEBRTC_ARCH_ARM"] = True
     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
     DEFINES["WEBRTC_HAS_NEON"] = True
@@ -187,12 +179,6 @@ if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
         "unwind"
     ]
 
-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
@@ -203,10 +189,6 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
 
 if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 
-    CXXFLAGS += [
-        "-msse2"
-    ]
-
     DEFINES["_GNU_SOURCE"] = True
 
 if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
diff --git a/third_party/libwebrtc/media/rtc_audio_video_gn/moz.build b/third_party/libwebrtc/media/rtc_audio_video_gn/moz.build
deleted file mode 100644
index e13dc1a441ad..000000000000
--- a/third_party/libwebrtc/media/rtc_audio_video_gn/moz.build
+++ /dev/null
@@ -1,268 +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/.
-
-
-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-  ### DO NOT edit it by hand.                                       ###
-
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["HAVE_WEBRTC_VIDEO"] = True
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = 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_STRICT_FIELD_TRIALS"] = "0"
-
-FINAL_LIBRARY = "xul"
-
-
-LOCAL_INCLUDES += [
-    "!/ipc/ipdl/_ipdlheaders",
-    "!/third_party/libwebrtc/gen",
-    "/ipc/chromium/src",
-    "/third_party/abseil-cpp/",
-    "/third_party/libwebrtc/",
-    "/tools/profiler/public"
-]
-
-UNIFIED_SOURCES += [
-    "/third_party/libwebrtc/media/engine/adm_helpers.cc",
-    "/third_party/libwebrtc/media/engine/webrtc_media_engine.cc"
-]
-
-if not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-    DEFINES["NDEBUG"] = True
-    DEFINES["NVALGRIND"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1":
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["ANDROID"] = True
-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_GNU_SOURCE"] = True
-    DEFINES["__STDC_CONSTANT_MACROS"] = True
-    DEFINES["__STDC_FORMAT_MACROS"] = True
-
-    OS_LIBS += [
-        "GLESv2",
-        "log"
-    ]
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-    DEFINES["WEBRTC_MAC"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-    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_NSS_CERTS"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_UDEV"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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
-
-    OS_LIBS += [
-        "rt"
-    ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-    DEFINES["USE_GLIB"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_X11"] = "1"
-    DEFINES["WEBRTC_BSD"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
-
-    OS_LIBS += [
-        "crypt32",
-        "iphlpapi",
-        "ole32",
-        "oleaut32",
-        "secur32",
-        "strmiids",
-        "user32",
-        "winmm"
-    ]
-
-if CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-
-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"] == "mips32":
-
-    DEFINES["MIPS32_LE"] = True
-    DEFINES["MIPS_FPU_LE"] = True
-    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
-    DEFINES["_GNU_SOURCE"] = True
-
-    LOCAL_INCLUDES += [
-        "/third_party/pipewire/"
-    ]
-
-if CONFIG["TARGET_CPU"] == "mips64":
-
-    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
-    DEFINES["_GNU_SOURCE"] = True
-
-    LOCAL_INCLUDES += [
-        "/third_party/pipewire/"
-    ]
-
-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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
-    OS_LIBS += [
-        "unwind"
-    ]
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-    CXXFLAGS += [
-        "-msse2"
-    ]
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
-    DEFINES["_GNU_SOURCE"] = True
-
-    LOCAL_INCLUDES += [
-        "/third_party/pipewire/"
-    ]
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
-
-    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
-    DEFINES["_GNU_SOURCE"] = True
-
-    LOCAL_INCLUDES += [
-        "/third_party/pipewire/"
-    ]
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
-    CXXFLAGS += [
-        "-msse2"
-    ]
-
-    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
-    DEFINES["_GNU_SOURCE"] = True
-
-    LOCAL_INCLUDES += [
-        "/third_party/pipewire/"
-    ]
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-
-    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
-    DEFINES["_GNU_SOURCE"] = True
-
-    LOCAL_INCLUDES += [
-        "/third_party/pipewire/"
-    ]
-
-Library("rtc_audio_video_gn")
diff --git a/third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build b/third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
deleted file mode 100644
index ba17a19c4b04..000000000000
--- a/third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
+++ /dev/null
@@ -1,233 +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/.
-
-
-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-  ### DO NOT edit it by hand.                                       ###
-
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["RTC_USE_LIBAOM_AV1_ENCODER"] = 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_STRICT_FIELD_TRIALS"] = "0"
-
-FINAL_LIBRARY = "xul"
-
-
-LOCAL_INCLUDES += [
-    "!/ipc/ipdl/_ipdlheaders",
-    "!/third_party/libwebrtc/gen",
-    "/ipc/chromium/src",
-    "/third_party/abseil-cpp/",
-    "/third_party/libwebrtc/",
-    "/tools/profiler/public"
-]
-
-UNIFIED_SOURCES += [
-    "/third_party/libwebrtc/media/engine/internal_decoder_factory.cc"
-]
-
-if not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-    DEFINES["NDEBUG"] = True
-    DEFINES["NVALGRIND"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1":
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["ANDROID"] = True
-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_GNU_SOURCE"] = True
-    DEFINES["__STDC_CONSTANT_MACROS"] = True
-    DEFINES["__STDC_FORMAT_MACROS"] = True
-
-    OS_LIBS += [
-        "GLESv2",
-        "log"
-    ]
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-    DEFINES["WEBRTC_MAC"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-    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_NSS_CERTS"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_UDEV"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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
-
-    OS_LIBS += [
-        "rt"
-    ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-    DEFINES["USE_GLIB"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_X11"] = "1"
-    DEFINES["WEBRTC_BSD"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
-
-    OS_LIBS += [
-        "crypt32",
-        "iphlpapi",
-        "secur32",
-        "winmm"
-    ]
-
-if CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-
-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
-    OS_LIBS += [
-        "unwind"
-    ]
-
-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
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-
-    DEFINES["_GNU_SOURCE"] = True
-
-Library("rtc_internal_video_codecs_gn")
diff --git a/third_party/libwebrtc/media/rtc_media_gn/moz.build b/third_party/libwebrtc/media/rtc_media_gn/moz.build
deleted file mode 100644
index 5805e451299b..000000000000
--- a/third_party/libwebrtc/media/rtc_media_gn/moz.build
+++ /dev/null
@@ -1,219 +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/.
-
-
-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-  ### DO NOT edit it by hand.                                       ###
-
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["HAVE_WEBRTC_VIDEO"] = True
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = 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_STRICT_FIELD_TRIALS"] = "0"
-
-FINAL_LIBRARY = "xul"
-
-
-LOCAL_INCLUDES += [
-    "!/ipc/ipdl/_ipdlheaders",
-    "!/third_party/libwebrtc/gen",
-    "/ipc/chromium/src",
-    "/third_party/abseil-cpp/",
-    "/third_party/libwebrtc/",
-    "/tools/profiler/public"
-]
-
-if not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-    DEFINES["NDEBUG"] = True
-    DEFINES["NVALGRIND"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1":
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["ANDROID"] = True
-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_GNU_SOURCE"] = True
-    DEFINES["__STDC_CONSTANT_MACROS"] = True
-    DEFINES["__STDC_FORMAT_MACROS"] = True
-
-    OS_LIBS += [
-        "GLESv2",
-        "log"
-    ]
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-    DEFINES["WEBRTC_MAC"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-    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_NSS_CERTS"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_UDEV"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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
-
-    OS_LIBS += [
-        "rt"
-    ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-    DEFINES["USE_GLIB"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_X11"] = "1"
-    DEFINES["WEBRTC_BSD"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
-
-    OS_LIBS += [
-        "crypt32",
-        "iphlpapi",
-        "ole32",
-        "oleaut32",
-        "secur32",
-        "strmiids",
-        "user32",
-        "winmm"
-    ]
-
-if CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-
-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
-    OS_LIBS += [
-        "unwind"
-    ]
-
-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("rtc_media_gn")
diff --git a/third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build b/third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build
deleted file mode 100644
index a482ce72de83..000000000000
--- a/third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build
+++ /dev/null
@@ -1,198 +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/.
-
-
-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-  ### DO NOT edit it by hand.                                       ###
-
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = 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_STRICT_FIELD_TRIALS"] = "0"
-
-FINAL_LIBRARY = "xul"
-
-
-LOCAL_INCLUDES += [
-    "!/ipc/ipdl/_ipdlheaders",
-    "!/third_party/libwebrtc/gen",
-    "/ipc/chromium/src",
-    "/third_party/abseil-cpp/",
-    "/third_party/libwebrtc/",
-    "/tools/profiler/public"
-]
-
-if not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-    DEFINES["NDEBUG"] = True
-    DEFINES["NVALGRIND"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1":
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["ANDROID"] = True
-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-    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_NSS_CERTS"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_UDEV"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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["USE_X11"] = "1"
-    DEFINES["WEBRTC_BSD"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
-
-if CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-
-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
-    OS_LIBS += [
-        "unwind"
-    ]
-
-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("audio_device_impl_gn")
diff --git a/third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build b/third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build
deleted file mode 100644
index d7062ced7f53..000000000000
--- a/third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build
+++ /dev/null
@@ -1,231 +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/.
-
-
-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-  ### DO NOT edit it by hand.                                       ###
-
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = 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_STRICT_FIELD_TRIALS"] = "0"
-
-FINAL_LIBRARY = "xul"
-
-
-LOCAL_INCLUDES += [
-    "!/ipc/ipdl/_ipdlheaders",
-    "!/third_party/libwebrtc/gen",
-    "/ipc/chromium/src",
-    "/media/libdav1d/",
-    "/media/libyuv/",
-    "/media/libyuv/libyuv/include/",
-    "/third_party/abseil-cpp/",
-    "/third_party/dav1d/include/dav1d/",
-    "/third_party/libwebrtc/",
-    "/tools/profiler/public"
-]
-
-UNIFIED_SOURCES += [
-    "/third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder.cc"
-]
-
-if not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-    DEFINES["NDEBUG"] = True
-    DEFINES["NVALGRIND"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1":
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["ANDROID"] = True
-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-    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_NSS_CERTS"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_UDEV"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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["USE_X11"] = "1"
-    DEFINES["WEBRTC_BSD"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
-
-    OS_LIBS += [
-        "crypt32",
-        "iphlpapi",
-        "secur32",
-        "winmm"
-    ]
-
-if CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-
-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
-    OS_LIBS += [
-        "unwind"
-    ]
-
-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
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-
-    DEFINES["_GNU_SOURCE"] = True
-
-Library("dav1d_decoder_gn")
diff --git a/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder.cc b/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder.cc
index 18362c8a8ea4..262cb9d36b26 100644
--- a/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder.cc
+++ b/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder.cc
@@ -298,9 +298,8 @@ int LibaomAv1Encoder::InitEncode(const VideoCodec* codec_settings,
   } else {
     SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_ENABLE_PALETTE, 0);
   }
-#if !defined(WEBRTC_MOZILLA_BUILD) // Mozilla: Need to update AV1 to enable this
+
   SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_AUTO_TILES, 1);
-#endif
   SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_ROW_MT, 1);
   SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_ENABLE_OBMC, 0);
   SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_NOISE_SENSITIVITY, 0);
@@ -333,10 +332,8 @@ int LibaomAv1Encoder::InitEncode(const VideoCodec* codec_settings,
   SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_MAX_REFERENCE_FRAMES, 3);
 
   if (adaptive_max_consec_drops_) {
-#if !defined(WEBRTC_MOZILLA_BUILD) // Mozilla: Need to update AV1 to enable this
     SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_MAX_CONSEC_FRAME_DROP_MS_CBR,
                                       250);
-#endif
   }
 
   return WEBRTC_VIDEO_CODEC_OK;
diff --git a/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build b/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
deleted file mode 100644
index 13e676095f98..000000000000
--- a/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
+++ /dev/null
@@ -1,231 +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/.
-
-
-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-  ### DO NOT edit it by hand.                                       ###
-
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = 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_STRICT_FIELD_TRIALS"] = "0"
-
-FINAL_LIBRARY = "xul"
-
-
-LOCAL_INCLUDES += [
-    "!/ipc/ipdl/_ipdlheaders",
-    "!/third_party/libwebrtc/gen",
-    "/ipc/chromium/src",
-    "/third_party/abseil-cpp/",
-    "/third_party/libwebrtc/",
-    "/tools/profiler/public"
-]
-
-UNIFIED_SOURCES += [
-    "/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder.cc"
-]
-
-if not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-    DEFINES["NDEBUG"] = True
-    DEFINES["NVALGRIND"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1":
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["ANDROID"] = True
-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-    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_NSS_CERTS"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_UDEV"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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
-
-    OS_LIBS += [
-        "rt"
-    ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-    DEFINES["USE_GLIB"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_X11"] = "1"
-    DEFINES["WEBRTC_BSD"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
-
-    OS_LIBS += [
-        "crypt32",
-        "iphlpapi",
-        "secur32",
-        "winmm"
-    ]
-
-if CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-
-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
-    OS_LIBS += [
-        "unwind"
-    ]
-
-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
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-
-    DEFINES["_GNU_SOURCE"] = True
-
-Library("aom_av1_encoder_gn")
diff --git a/third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build b/third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
deleted file mode 100644
index 2ee1d4db7581..000000000000
--- a/third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
+++ /dev/null
@@ -1,237 +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/.
-
-
-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-  ### DO NOT edit it by hand.                                       ###
-
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = 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_STRICT_FIELD_TRIALS"] = "0"
-
-FINAL_LIBRARY = "xul"
-
-
-LOCAL_INCLUDES += [
-    "!/ipc/ipdl/_ipdlheaders",
-    "!/third_party/libwebrtc/gen",
-    "/ipc/chromium/src",
-    "/media/libyuv/",
-    "/media/libyuv/libyuv/include/",
-    "/third_party/abseil-cpp/",
-    "/third_party/libwebrtc/",
-    "/tools/profiler/public"
-]
-
-UNIFIED_SOURCES += [
-    "/third_party/libwebrtc/modules/video_coding/codecs/h264/h264.cc",
-    "/third_party/libwebrtc/modules/video_coding/codecs/h264/h264_color_space.cc",
-    "/third_party/libwebrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc",
-    "/third_party/libwebrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc"
-]
-
-if not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-    DEFINES["NDEBUG"] = True
-    DEFINES["NVALGRIND"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1":
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["ANDROID"] = True
-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_GNU_SOURCE"] = True
-    DEFINES["__STDC_CONSTANT_MACROS"] = True
-    DEFINES["__STDC_FORMAT_MACROS"] = True
-
-    OS_LIBS += [
-        "GLESv2",
-        "log"
-    ]
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-    DEFINES["WEBRTC_MAC"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-    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_NSS_CERTS"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_UDEV"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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
-
-    OS_LIBS += [
-        "rt"
-    ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-    DEFINES["USE_GLIB"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_X11"] = "1"
-    DEFINES["WEBRTC_BSD"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
-
-    OS_LIBS += [
-        "crypt32",
-        "iphlpapi",
-        "secur32",
-        "winmm"
-    ]
-
-if CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-
-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
-    OS_LIBS += [
-        "unwind"
-    ]
-
-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
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-
-    DEFINES["_GNU_SOURCE"] = True
-
-Library("webrtc_h264_gn")
diff --git a/third_party/libwebrtc/moz.build b/third_party/libwebrtc/moz.build
index 85ff5f480a40..3e92300036e0 100644
--- a/third_party/libwebrtc/moz.build
+++ b/third_party/libwebrtc/moz.build
@@ -117,15 +117,9 @@ DIRS += [
     "/third_party/libwebrtc/api/video/video_rtp_headers_gn",
     "/third_party/libwebrtc/api/video/video_stream_encoder_gn",
     "/third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn",
-    "/third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn",
     "/third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn",
     "/third_party/libwebrtc/api/video_codecs/scalability_mode_gn",
     "/third_party/libwebrtc/api/video_codecs/video_codecs_api_gn",
-    "/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn",
-    "/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn",
-    "/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn",
-    "/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn",
-    "/third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn",
     "/third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn",
     "/third_party/libwebrtc/api/video_track_source_constraints_gn",
     "/third_party/libwebrtc/audio/audio_gn",
@@ -172,18 +166,13 @@ DIRS += [
     "/third_party/libwebrtc/logging/rtc_event_video_gn",
     "/third_party/libwebrtc/logging/rtc_stream_config_gn",
     "/third_party/libwebrtc/media/adapted_video_track_source_gn",
-    "/third_party/libwebrtc/media/audio_source_gn",
     "/third_party/libwebrtc/media/codec_gn",
     "/third_party/libwebrtc/media/media_channel_gn",
     "/third_party/libwebrtc/media/media_channel_impl_gn",
     "/third_party/libwebrtc/media/media_constants_gn",
-    "/third_party/libwebrtc/media/media_engine_gn",
     "/third_party/libwebrtc/media/rid_description_gn",
-    "/third_party/libwebrtc/media/rtc_audio_video_gn",
-    "/third_party/libwebrtc/media/rtc_internal_video_codecs_gn",
     "/third_party/libwebrtc/media/rtc_media_base_gn",
     "/third_party/libwebrtc/media/rtc_media_config_gn",
-    "/third_party/libwebrtc/media/rtc_media_gn",
     "/third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn",
     "/third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn",
     "/third_party/libwebrtc/media/rtp_utils_gn",
@@ -218,7 +207,6 @@ DIRS += [
     "/third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn",
     "/third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn",
     "/third_party/libwebrtc/modules/audio_device/audio_device_gn",
-    "/third_party/libwebrtc/modules/audio_device/audio_device_impl_gn",
     "/third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn",
     "/third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn",
     "/third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn",
@@ -313,8 +301,6 @@ DIRS += [
     "/third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn",
     "/third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn",
     "/third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn",
-    "/third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn",
-    "/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn",
     "/third_party/libwebrtc/modules/video_coding/encoded_frame_gn",
     "/third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn",
     "/third_party/libwebrtc/modules/video_coding/frame_helpers_gn",
@@ -337,7 +323,6 @@ DIRS += [
     "/third_party/libwebrtc/modules/video_coding/video_codec_interface_gn",
     "/third_party/libwebrtc/modules/video_coding/video_coding_gn",
     "/third_party/libwebrtc/modules/video_coding/video_coding_utility_gn",
-    "/third_party/libwebrtc/modules/video_coding/webrtc_h264_gn",
     "/third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn",
     "/third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn",
     "/third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn",
@@ -448,7 +433,6 @@ DIRS += [
     "/third_party/libwebrtc/rtc_base/socket_gn",
     "/third_party/libwebrtc/rtc_base/socket_server_gn",
     "/third_party/libwebrtc/rtc_base/ssl_adapter_gn",
-    "/third_party/libwebrtc/rtc_base/ssl_gn",
     "/third_party/libwebrtc/rtc_base/stringutils_gn",
     "/third_party/libwebrtc/rtc_base/strong_alias_gn",
     "/third_party/libwebrtc/rtc_base/swap_queue_gn",
@@ -484,8 +468,6 @@ DIRS += [
     "/third_party/libwebrtc/third_party/crc32c/crc32c_gn",
     "/third_party/libwebrtc/third_party/crc32c/crc32c_internal_headers_gn",
     "/third_party/libwebrtc/third_party/crc32c/crc32c_sse42_gn",
-    "/third_party/libwebrtc/third_party/dav1d/dav1d_gn",
-    "/third_party/libwebrtc/third_party/libaom/libaom_gn",
     "/third_party/libwebrtc/third_party/libyuv/libyuv_gn",
     "/third_party/libwebrtc/third_party/pffft/pffft_gn",
     "/third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn",
diff --git a/third_party/libwebrtc/rtc_base/BUILD.gn b/third_party/libwebrtc/rtc_base/BUILD.gn
index 7c4dfcf4cb3a..ab656fc85cab 100644
--- a/third_party/libwebrtc/rtc_base/BUILD.gn
+++ b/third_party/libwebrtc/rtc_base/BUILD.gn
@@ -1497,32 +1497,29 @@ rtc_source_set("ssl_header") {
 }
 
 rtc_source_set("digest") {
-if (!build_with_mozilla) {
-   visibility = [ "*" ]
-   sources = [
-     "message_digest.cc",
-     "message_digest.h",
-     "openssl_digest.cc",
-     "openssl_digest.h",
-   ]
-   deps = [
-     ":checks",
-     ":ssl_header",
-     ":stringutils",
-     "//third_party/abseil-cpp/absl/strings:string_view",
-   ]
+  visibility = [ "*" ]
+  sources = [
+    "message_digest.cc",
+    "message_digest.h",
+    "openssl_digest.cc",
+    "openssl_digest.h",
+  ]
+  deps = [
+    ":checks",
+    ":ssl_header",
+    ":stringutils",
+    "//third_party/abseil-cpp/absl/strings:string_view",
+  ]
 
-   # If we are building the SSL library ourselves, we know it's BoringSSL.
-   if (rtc_build_ssl) {
-     deps += [ "//third_party/boringssl" ]
-   } else {
-     configs += [ "..:external_ssl_library" ]
-   }
-}
+  # If we are building the SSL library ourselves, we know it's BoringSSL.
+  if (rtc_build_ssl) {
+    deps += [ "//third_party/boringssl" ]
+  } else {
+    configs += [ "..:external_ssl_library" ]
+  }
 }
 
 rtc_library("crypto_random") {
-if (!build_with_mozilla) {
   visibility = [ "*" ]
   sources = [
     "crypto_random.cc",
@@ -1543,7 +1540,6 @@ if (!build_with_mozilla) {
     configs += [ "..:external_ssl_library" ]
   }
 }
-}
 
 rtc_library("ssl") {
 if (!build_with_mozilla) {
diff --git a/third_party/libwebrtc/rtc_base/ssl_gn/moz.build b/third_party/libwebrtc/rtc_base/ssl_gn/moz.build
deleted file mode 100644
index bfe661ea4787..000000000000
--- a/third_party/libwebrtc/rtc_base/ssl_gn/moz.build
+++ /dev/null
@@ -1,198 +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/.
-
-
-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-  ### DO NOT edit it by hand.                                       ###
-
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = 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_STRICT_FIELD_TRIALS"] = "0"
-
-FINAL_LIBRARY = "xul"
-
-
-LOCAL_INCLUDES += [
-    "!/ipc/ipdl/_ipdlheaders",
-    "!/third_party/libwebrtc/gen",
-    "/ipc/chromium/src",
-    "/third_party/abseil-cpp/",
-    "/third_party/libwebrtc/",
-    "/tools/profiler/public"
-]
-
-if not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-    DEFINES["NDEBUG"] = True
-    DEFINES["NVALGRIND"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1":
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["ANDROID"] = True
-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-    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_NSS_CERTS"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_UDEV"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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["USE_X11"] = "1"
-    DEFINES["WEBRTC_BSD"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
-
-if CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-
-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
-    OS_LIBS += [
-        "unwind"
-    ]
-
-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("ssl_gn")
diff --git a/third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build b/third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build
deleted file mode 100644
index 59c7f92814b7..000000000000
--- a/third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build
+++ /dev/null
@@ -1,200 +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/.
-
-
-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-  ### DO NOT edit it by hand.                                       ###
-
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = 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_STRICT_FIELD_TRIALS"] = "0"
-
-FINAL_LIBRARY = "xul"
-
-
-LOCAL_INCLUDES += [
-    "!/ipc/ipdl/_ipdlheaders",
-    "!/third_party/libwebrtc/gen",
-    "/ipc/chromium/src",
-    "/media/libdav1d/",
-    "/third_party/abseil-cpp/",
-    "/third_party/dav1d/include/dav1d/",
-    "/third_party/libwebrtc/",
-    "/tools/profiler/public"
-]
-
-if not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-    DEFINES["NDEBUG"] = True
-    DEFINES["NVALGRIND"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1":
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["ANDROID"] = True
-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-    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_NSS_CERTS"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_UDEV"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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["USE_X11"] = "1"
-    DEFINES["WEBRTC_BSD"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
-
-if CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-
-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
-    OS_LIBS += [
-        "unwind"
-    ]
-
-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("dav1d_gn")
diff --git a/third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build b/third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build
deleted file mode 100644
index 96e7af57553e..000000000000
--- a/third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build
+++ /dev/null
@@ -1,198 +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/.
-
-
-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-  ### DO NOT edit it by hand.                                       ###
-
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = 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_STRICT_FIELD_TRIALS"] = "0"
-
-FINAL_LIBRARY = "xul"
-
-
-LOCAL_INCLUDES += [
-    "!/ipc/ipdl/_ipdlheaders",
-    "!/third_party/libwebrtc/gen",
-    "/ipc/chromium/src",
-    "/third_party/abseil-cpp/",
-    "/third_party/libwebrtc/",
-    "/tools/profiler/public"
-]
-
-if not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-    DEFINES["NDEBUG"] = True
-    DEFINES["NVALGRIND"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1":
-
-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["ANDROID"] = True
-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-    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_NSS_CERTS"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_UDEV"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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["USE_X11"] = "1"
-    DEFINES["WEBRTC_BSD"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
-
-if CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-
-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
-    OS_LIBS += [
-        "unwind"
-    ]
-
-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("aom_gn")
diff --git a/third_party/libwebrtc/third_party/libaom/source/libaom/aom/aom_codec.h b/third_party/libwebrtc/third_party/libaom/source/libaom/aom/aom_codec.h
deleted file mode 100644
index e88893d18a36..000000000000
--- a/third_party/libwebrtc/third_party/libaom/source/libaom/aom/aom_codec.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=8 sts=2 et sw=2 tw=80:
- *
- * Copyright 2024 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#pragma once
-// This is a trampoline header meant to redirect from where libwebrtc code
-// expects third_party headers to where those headers exist in the Mozilla
-// Firefox repository.
-#include "aom/aom_codec.h"
diff --git a/third_party/libwebrtc/third_party/libaom/source/libaom/aom/aom_encoder.h b/third_party/libwebrtc/third_party/libaom/source/libaom/aom/aom_encoder.h
deleted file mode 100644
index 76cdec65fef5..000000000000
--- a/third_party/libwebrtc/third_party/libaom/source/libaom/aom/aom_encoder.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=8 sts=2 et sw=2 tw=80:
- *
- * Copyright 2024 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#pragma once
-// This is a trampoline header meant to redirect from where libwebrtc code
-// expects third_party headers to where those headers exist in the Mozilla
-// Firefox repository.
-#include "aom/aom_encoder.h"
diff --git a/third_party/libwebrtc/third_party/libaom/source/libaom/aom/aomcx.h b/third_party/libwebrtc/third_party/libaom/source/libaom/aom/aomcx.h
deleted file mode 100644
index a59cd64ccd4f..000000000000
--- a/third_party/libwebrtc/third_party/libaom/source/libaom/aom/aomcx.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=8 sts=2 et sw=2 tw=80:
- *
- * Copyright 2024 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#pragma once
-// This is a trampoline header meant to redirect from where libwebrtc code
-// expects third_party headers to where those headers exist in the Mozilla
-// Firefox repository.
-#include "aom/aomcx.h"
diff --git a/third_party/libwebrtc/webrtc.gni b/third_party/libwebrtc/webrtc.gni
index 2623c212f10a..58b450cbb16e 100644
--- a/third_party/libwebrtc/webrtc.gni
+++ b/third_party/libwebrtc/webrtc.gni
@@ -128,7 +128,7 @@ declare_args() {
 
   # Used to specify an external OpenSSL include path when not compiling the
   # library that comes with WebRTC (i.e. rtc_build_ssl == 0).
-  rtc_ssl_root = ""
+  rtc_ssl_root = "unused"
 
   # Enable when an external authentication mechanism is used for performing
   # packet authentication for RTP packets instead of libsrtp.
@@ -354,7 +354,7 @@ declare_args() {
 }
 
 # Enable liboam only on non-mozilla builds.
-enable_libaom = true
+enable_libaom = !build_with_mozilla
 
 # Make it possible to provide custom locations for some libraries (move these
 # up into declare_args should we need to actually use them for the GN build).
diff --git a/third_party/sipcc/ccsdp.h b/third_party/sipcc/ccsdp.h
index 53551c59868f..39e3c71f6887 100644
--- a/third_party/sipcc/ccsdp.h
+++ b/third_party/sipcc/ccsdp.h
@@ -33,7 +33,6 @@ typedef enum rtp_ptype_
     RTP_H261         = 31,
     RTP_H264_P0      = 97,
     RTP_H264_P1      = 126,
-    RTP_AV1          = 99,
     RTP_TELEPHONE_EVENT = 101,
     RTP_L16          = 102,
     RTP_H263         = 103,
diff --git a/third_party/sipcc/sdp_access.c b/third_party/sipcc/sdp_access.c
index 56f94a3640ab..8a065e2a6a03 100644
--- a/third_party/sipcc/sdp_access.c
+++ b/third_party/sipcc/sdp_access.c
@@ -24,7 +24,6 @@ static const char* logTag = "sdp_access";
 #define SIPSDP_ATTR_ENCNAME_ILBC      "iLBC"
 #define SIPSDP_ATTR_ENCNAME_H263v2    "H263-1998"
 #define SIPSDP_ATTR_ENCNAME_H264      "H264"
-#define SIPSDP_ATTR_ENCNAME_AV1       "AV1"
 #define SIPSDP_ATTR_ENCNAME_VP8       "VP8"
 #define SIPSDP_ATTR_ENCNAME_VP9       "VP9"
 #define SIPSDP_ATTR_ENCNAME_L16_256K  "L16"
@@ -1376,9 +1375,6 @@ rtp_ptype sdp_get_known_payload_type(sdp_t *sdp_p,
             }
           }
         }
-        if (cpr_strcasecmp(encname, SIPSDP_ATTR_ENCNAME_AV1) == 0) {
-          return (RTP_AV1);
-        }
         if (cpr_strcasecmp(encname, SIPSDP_ATTR_ENCNAME_VP8) == 0) {
           return (RTP_VP8);
         }
diff --git a/third_party/sipcc/sdp_attr.c b/third_party/sipcc/sdp_attr.c
index 997089cec0bb..715d0e7a436f 100644
--- a/third_party/sipcc/sdp_attr.c
+++ b/third_party/sipcc/sdp_attr.c
@@ -1320,24 +1320,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
           fmtp_p->rtx_time = (uint32_t)strtoul_result;
 
           codec_info_found = TRUE;
-        } else if (cpr_strncasecmp(tmp, sdp_fmtp_codec_param[53].name,
-                                   sdp_fmtp_codec_param[53].strlen) == 0) {
-            result1 = sdp_get_fmtp_tok_val(sdp_p, &fmtp_ptr, "level-idx", tmp, sizeof(tmp),
-                                           &tok, &strtoul_result, -1, 0, UINT8_MAX);
-            if (result1 != SDP_SUCCESS) { SDP_FREE(temp_ptr); return result1; }
-            fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
-            fmtp_p->av1_has_level_idx = TRUE;
-            fmtp_p->av1_level_idx = (uint8_t)strtoul_result;
-            codec_info_found = TRUE;
-        } else if (cpr_strncasecmp(tmp, sdp_fmtp_codec_param[54].name,
-                                   sdp_fmtp_codec_param[54].strlen) == 0) {
-            result1 = sdp_get_fmtp_tok_val(sdp_p, &fmtp_ptr, "tier", tmp, sizeof(tmp),
-                                           &tok, &strtoul_result, -1, 0, UINT8_MAX);
-            if (result1 != SDP_SUCCESS) { SDP_FREE(temp_ptr); return result1; }
-            fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
-            fmtp_p->av1_has_tier = TRUE;
-            fmtp_p->av1_tier = (uint8_t)strtoul_result;
-            codec_info_found = TRUE;
+
         } else if (strchr(tmp, '/')) {
             // XXX Note that because RFC 5109 so conveniently specified
             // this fmtp with no param names, we hope that nothing else
diff --git a/third_party/sipcc/sdp_main.c b/third_party/sipcc/sdp_main.c
index 2b0f7c1ab9e7..cdc8bf8e0bbb 100644
--- a/third_party/sipcc/sdp_main.c
+++ b/third_party/sipcc/sdp_main.c
@@ -445,9 +445,7 @@ const sdp_namearray_t sdp_fmtp_codec_param[SDP_MAX_FMTP_PARAM] =
     {"max-fr",                          sizeof("max-fr")}, /* 49 */
     {"maxplaybackrate",                 sizeof("maxplaybackrate")}, /* 50 */
     {"apt",                             sizeof("apt")}, /* 51 */
-    {"rtx-time",                         sizeof("rtx-time")}, /* 52 */
-    {"level-idx",                        sizeof("level-idx")}, /* 53 */
-    {"tier",                             sizeof("tier")}, /* 54 */
+    {"rtx-time",                         sizeof("rtx-time")} /* 52 */
 } ;
 
 /* Note: These *must* be in the same order as the enum type. */
diff --git a/third_party/sipcc/sipcc_sdp.h b/third_party/sipcc/sipcc_sdp.h
index c217415e0e73..1b7470ad657c 100644
--- a/third_party/sipcc/sipcc_sdp.h
+++ b/third_party/sipcc/sipcc_sdp.h
@@ -421,8 +421,6 @@ typedef enum {
     SDP_MAX_PLAYBACK_RATE,
     SDP_APT,
     SDP_RTX_TIME,
-    SDP_LEVEL_IDX,
-    SDP_TIER,
     SDP_MAX_FMTP_PARAM,
     SDP_FMTP_PARAM_UNKNOWN
 } sdp_fmtp_codec_param_e;
@@ -738,14 +736,6 @@ typedef struct sdp_fmtp {
     /* RFC 5109 Section 4.2 for specifying redundant encodings */
     uint8_t              redundant_encodings[SDP_FMTP_MAX_REDUNDANT_ENCODINGS];
 
-    /* av1 */
-    uint8_t              av1_profile;
-    tinybool             av1_has_profile;
-    uint8_t              av1_level_idx;
-    tinybool             av1_has_level_idx;
-    uint8_t              av1_tier;
-    tinybool             av1_has_tier;
-
     /* RFC 2833 Section 3.9 (4733) for specifying support DTMF tones:
        The list of values consists of comma-separated elements, which
        can be either a single decimal number or two decimal numbers
diff --git a/toolkit/content/aboutwebrtc/aboutWebrtc.mjs b/toolkit/content/aboutwebrtc/aboutWebrtc.mjs
index 9961001514f4..26a116ffce62 100644
--- a/toolkit/content/aboutwebrtc/aboutWebrtc.mjs
+++ b/toolkit/content/aboutwebrtc/aboutWebrtc.mjs
@@ -1928,8 +1928,6 @@ async function renderMediaCtx(rndr) {
     "media.navigator.video.use_transport_cc",
     "media.navigator.audio.use_fec",
     "media.navigator.video.red_ulpfec_enabled",
-    "media.webrtc.codec.video.av1.enabled",
-    "media.webrtc.codec.video.av1.experimental_preferred",
   ];
 
   const confList = new ConfigurationList(prefs);
@@ -1937,25 +1935,14 @@ async function renderMediaCtx(rndr) {
     `hasH264Hardware: ${ctx.hasH264Hardware}`
   );
   hasH264Hardware.dataset.value = ctx.hasH264Hardware;
-  const hasAv1 = rndr.text_p(`hasAv1: ${ctx.hasAv1}`);
-  hasAv1.dataset.value = ctx.hasAv1;
   const renderFn = async () =>
-    rndr.elems_div({}, [
-      hasH264Hardware,
-      hasAv1,
-      rndr.elem_hr(),
-      confList.view(),
-    ]);
+    rndr.elems_div({}, [hasH264Hardware, rndr.elem_hr(), confList.view()]);
   const updateFn = async () => {
     const newCtx = WGI.getMediaContext();
     if (hasH264Hardware.dataset.value != newCtx.hasH264Hardware) {
       hasH264Hardware.dataset.value = newCtx.hasH264Hardware;
       hasH264Hardware.textContent = `hasH264Hardware: ${newCtx.hasH264Hardware}`;
     }
-    if (hasAv1.dataset.value != newCtx.hasAv1) {
-      hasAv1.dataset.value = newCtx.hasAv1;
-      hasAv1.textContent = `hasAv1: ${newCtx.hasAv1}`;
-    }
     confList.update();
   };