Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 17 insertions, 5 deletions

diff --git a/third_party/libwebrtc/media/base/codec_unittest.cc b/third_party/libwebrtc/media/base/codec_unittest.cc
index 4dc3b18c21..e1e69eb082 100644
--- a/third_party/libwebrtc/media/base/codec_unittest.cc
+++ b/third_party/libwebrtc/media/base/codec_unittest.cc
@@ -228,11 +228,11 @@ TEST(CodecTest, TestAV1CodecMatches) {
   VideoCodec c_no_profile =
       cricket::CreateVideoCodec(95, cricket::kAv1CodecName);
   VideoCodec c_profile0 = cricket::CreateVideoCodec(95, cricket::kAv1CodecName);
-  c_profile0.params[webrtc::kAV1FmtpProfile] = kProfile0;
+  c_profile0.params[cricket::kAv1FmtpProfile] = kProfile0;
   VideoCodec c_profile1 = cricket::CreateVideoCodec(95, cricket::kAv1CodecName);
-  c_profile1.params[webrtc::kAV1FmtpProfile] = kProfile1;
+  c_profile1.params[cricket::kAv1FmtpProfile] = kProfile1;
   VideoCodec c_profile2 = cricket::CreateVideoCodec(95, cricket::kAv1CodecName);
-  c_profile2.params[webrtc::kAV1FmtpProfile] = kProfile2;
+  c_profile2.params[cricket::kAv1FmtpProfile] = kProfile2;
 
   // An AV1 entry with no profile specified should be treated as profile-0.
   EXPECT_TRUE(c_profile0.Matches(c_no_profile));
@@ -248,7 +248,7 @@ TEST(CodecTest, TestAV1CodecMatches) {
     // Two AV1 entries with profile 0 specified are treated as duplicates.
     VideoCodec c_profile0_eq =
         cricket::CreateVideoCodec(95, cricket::kAv1CodecName);
-    c_profile0_eq.params[webrtc::kAV1FmtpProfile] = kProfile0;
+    c_profile0_eq.params[cricket::kAv1FmtpProfile] = kProfile0;
     EXPECT_TRUE(c_profile0.Matches(c_profile0_eq));
   }
 
@@ -256,7 +256,7 @@ TEST(CodecTest, TestAV1CodecMatches) {
     // Two AV1 entries with profile 1 specified are treated as duplicates.
     VideoCodec c_profile1_eq =
         cricket::CreateVideoCodec(95, cricket::kAv1CodecName);
-    c_profile1_eq.params[webrtc::kAV1FmtpProfile] = kProfile1;
+    c_profile1_eq.params[cricket::kAv1FmtpProfile] = kProfile1;
     EXPECT_TRUE(c_profile1.Matches(c_profile1_eq));
   }
 
diff --git a/third_party/libwebrtc/media/base/media_constants.cc b/third_party/libwebrtc/media/base/media_constants.cc
index 2af0295a5a..1a7561aa52 100644
--- a/third_party/libwebrtc/media/base/media_constants.cc
+++ b/third_party/libwebrtc/media/base/media_constants.cc
@@ -124,8 +124,14 @@ const char kH265FmtpProfileCompatibilityIndicator[] =
 const char kH265FmtpInteropConstraints[] = "interop-constraints";
 const char kH265FmtpTxMode[] = "tx-mode";
 
+// draft-ietf-payload-vp9
 const char kVP9ProfileId[] = "profile-id";
 
+// https://aomediacodec.github.io/av1-rtp-spec/
+const char kAv1FmtpProfile[] = "profile";
+const char kAv1FmtpLevelIdx[] = "level-idx";
+const char kAv1FmtpTier[] = "tier";
+
 const int kDefaultVideoMaxFramerate = 60;
 // Max encode quantizer for VP8/9 and AV1 encoders assuming libvpx/libaom API
 // range [0, 63]
diff --git a/third_party/libwebrtc/media/base/media_constants.h b/third_party/libwebrtc/media/base/media_constants.h
index 877cc7a296..d5af17eb2a 100644
--- a/third_party/libwebrtc/media/base/media_constants.h
+++ b/third_party/libwebrtc/media/base/media_constants.h
@@ -147,8 +147,14 @@ RTC_EXPORT extern const char kH265FmtpProfileCompatibilityIndicator[];
 RTC_EXPORT extern const char kH265FmtpInteropConstraints[];
 RTC_EXPORT extern const char kH265FmtpTxMode[];
 
+// draft-ietf-payload-vp9
 extern const char kVP9ProfileId[];
 
+// https://aomediacodec.github.io/av1-rtp-spec/
+extern const char kAv1FmtpProfile[];
+extern const char kAv1FmtpLevelIdx[];
+extern const char kAv1FmtpTier[];
+
 extern const int kDefaultVideoMaxFramerate;
 extern const int kDefaultVideoMaxQpVpx;
 extern const int kDefaultVideoMaxQpH26x;