From 40a355a42d4a9444dc753c04c6608dade2f06a23 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:13:27 +0200
Subject: Adding upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../agnostic/eme/ChromiumCDMVideoDecoder.cpp       | 39 ++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

(limited to 'dom/media/platforms/agnostic/eme/ChromiumCDMVideoDecoder.cpp')

diff --git a/dom/media/platforms/agnostic/eme/ChromiumCDMVideoDecoder.cpp b/dom/media/platforms/agnostic/eme/ChromiumCDMVideoDecoder.cpp
index e71632e6d3..4c74fa8723 100644
--- a/dom/media/platforms/agnostic/eme/ChromiumCDMVideoDecoder.cpp
+++ b/dom/media/platforms/agnostic/eme/ChromiumCDMVideoDecoder.cpp
@@ -11,6 +11,9 @@
 #include "GMPVideoDecoder.h"
 #include "MP4Decoder.h"
 #include "VPXDecoder.h"
+#ifdef MOZ_AV1
+#  include "AOMDecoder.h"
+#endif
 
 namespace mozilla {
 
@@ -45,6 +48,21 @@ static uint32_t ToCDMH264Profile(uint8_t aProfile) {
   return cdm::VideoCodecProfile::kUnknownVideoCodecProfile;
 }
 
+#ifdef MOZ_AV1
+static uint32_t ToCDMAV1Profile(uint8_t aProfile) {
+  switch (aProfile) {
+    case 0:
+      return cdm::VideoCodecProfile::kAv1ProfileMain;
+    case 1:
+      return cdm::VideoCodecProfile::kAv1ProfileHigh;
+    case 2:
+      return cdm::VideoCodecProfile::kAv1ProfilePro;
+    default:
+      return cdm::VideoCodecProfile::kUnknownVideoCodecProfile;
+  }
+}
+#endif
+
 RefPtr<MediaDataDecoder::InitPromise> ChromiumCDMVideoDecoder::Init() {
   if (!mCDMParent) {
     // Must have failed to get the CDMParent from the ChromiumCDMProxy
@@ -60,6 +78,16 @@ RefPtr<MediaDataDecoder::InitPromise> ChromiumCDMVideoDecoder::Init() {
         ToCDMH264Profile(mConfig.mExtraData->SafeElementAt(1, 0));
     config.mExtraData() = mConfig.mExtraData->Clone();
     mConvertToAnnexB = true;
+#ifdef MOZ_AV1
+  } else if (AOMDecoder::IsAV1(mConfig.mMimeType)) {
+    AOMDecoder::AV1SequenceInfo seqInfo;
+    MediaResult seqHdrResult;
+    AOMDecoder::TryReadAV1CBox(mConfig.mExtraData, seqInfo, seqHdrResult);
+    config.mCodec() = cdm::VideoCodec::kCodecAv1;
+    config.mProfile() = NS_SUCCEEDED(seqHdrResult.Code())
+                            ? ToCDMAV1Profile(seqInfo.mProfile)
+                            : cdm::VideoCodecProfile::kUnknownVideoCodecProfile;
+#endif
   } else if (VPXDecoder::IsVP8(mConfig.mMimeType)) {
     config.mCodec() = cdm::VideoCodec::kCodecVp8;
     config.mProfile() = cdm::VideoCodecProfile::kProfileNotNeeded;
@@ -105,9 +133,16 @@ nsCString ChromiumCDMVideoDecoder::GetDescriptionName() const {
 nsCString ChromiumCDMVideoDecoder::GetCodecName() const {
   if (MP4Decoder::IsH264(mConfig.mMimeType)) {
     return "h264"_ns;
-  } else if (VPXDecoder::IsVP8(mConfig.mMimeType)) {
+  }
+#ifdef MOZ_AV1
+  if (AOMDecoder::IsAV1(mConfig.mMimeType)) {
+    return "av1"_ns;
+  }
+#endif
+  if (VPXDecoder::IsVP8(mConfig.mMimeType)) {
     return "vp8"_ns;
-  } else if (VPXDecoder::IsVP9(mConfig.mMimeType)) {
+  }
+  if (VPXDecoder::IsVP9(mConfig.mMimeType)) {
     return "vp9"_ns;
   }
   return "unknown"_ns;
-- 
cgit v1.2.3