add VDADecoder support for 10.6.3->10.7 platforms (centralle)

getting a little ahead of myself with the stupid block in 10.7, but this has to happen anyways. i dont think VDADecoder will work on a VM, but only on a mac with actual hardware. lmk
i3roly · Dec 12, 2024 · a2a6532 · a2a6532
1 parent a1663d6
commit a2a6532
Show file tree

Hide file tree

Showing 5 changed files with 872 additions and 13 deletions.
diff --git a/dom/media/platforms/apple/AppleDecoderModule.cpp b/dom/media/platforms/apple/AppleDecoderModule.cpp
@@ -10,6 +10,8 @@
 
 #include "AppleATDecoder.h"
 #include "AppleVTDecoder.h"
+#include "AppleVDADecoder.h"
+
 #include "MP4Decoder.h"
 #include "VideoUtils.h"
 #include "VPXDecoder.h"
@@ -42,7 +44,6 @@ void AppleDecoderModule::Init() {
   if (sInitialized) {
     return;
   }
-
   sInitialized = true;
   if (RegisterSupplementalVP9Decoder()) {
     sCanUseVP9Decoder = CanCreateHWDecoder(MediaCodec::VP9);
@@ -63,11 +64,19 @@ already_AddRefed<MediaDataDecoder> AppleDecoderModule::CreateVideoDecoder(
           .isEmpty()) {
     return nullptr;
   }
+
   RefPtr<MediaDataDecoder> decoder;
-  if (IsVideoSupported(aParams.VideoConfig(), aParams.mOptions)) {
-    decoder = new AppleVTDecoder(aParams.VideoConfig(), aParams.mImageContainer,
-                                 aParams.mOptions, aParams.mKnowsCompositor,
-                                 aParams.mTrackingId);
+
+  if(__builtin_available(macOS 10.8, *)) {
+    if (IsVideoSupported(aParams.VideoConfig(), aParams.mOptions)) {
+      decoder = new AppleVTDecoder(aParams.VideoConfig(), aParams.mImageContainer,
+          aParams.mOptions, aParams.mKnowsCompositor,
+          aParams.mTrackingId);
+    }
+  } else {
+      decoder = new AppleVDADecoder(aParams.VideoConfig(), aParams.mImageContainer,
+          aParams.mOptions, aParams.mKnowsCompositor,
+          aParams.mTrackingId);
   }
   return decoder.forget();
 }
@@ -250,24 +259,36 @@ bool AppleDecoderModule::CanCreateHWDecoder(MediaCodec aCodec) {
           vtReportsSupport = false;
           break;
       }
-  } else if (__builtin_available(macOS 10.7, *)) { //VTDecoder is only 10.7 and up.
+  } else if (__builtin_available(macOS 10.6.3, *)) { //HW decoder is 10.6.3 and up
     if (aCodec == media::MediaCodec::H264) {
       // VTIsHardwareDecodeSupported function is only available on 10.13+.
-      // For earlier versions, we must check H264 support by always
+      // For earlier versions (10.6.3+), we must check H264 support by always
       // attempting to create a decoder.
       info.mMimeType = "video/avc";
       vtReportsSupport = true;
     }
   }
     // VT reports HW decode is supported -- verify by creating an actual decoder
   if (vtReportsSupport) {
-    RefPtr<AppleVTDecoder> decoder =
-        new AppleVTDecoder(info, nullptr, {}, nullptr, Nothing());
-    MediaResult rv = decoder->InitializeSession();
+    RefPtr<MediaDataDecoder> decoder;
+    MediaResult rv;
+    char *type;
+    if(__builtin_available(macOS 10.8, *)) {
+      RefPtr<AppleVTDecoder> decoder =
+          new AppleVTDecoder(info, nullptr, {}, nullptr, Nothing());
+      rv = decoder->InitializeSession();
+      type = strdup("VT");
+    } else {
+      RefPtr<AppleVDADecoder> decoder =
+          new AppleVDADecoder(info, nullptr, {}, nullptr, Nothing());
+      rv = decoder->InitializeSession();
+      type = strdup("VDA");
+    }
     if (!NS_SUCCEEDED(rv)) {
       MOZ_LOG(
           sPDMLog, LogLevel::Debug,
-          ("Apple HW decode failure while initializing VT decoder session"));
+          ("Apple HW decode failure while initializing %s decoder session", type));
+      free(type);
       return false;
     }
     nsAutoCString failureReason;
@@ -278,8 +299,9 @@ bool AppleDecoderModule::CanCreateHWDecoder(MediaCodec aCodec) {
                      aCodec == MediaCodec::H264;
     if (!hwSupport) {
       MOZ_LOG(sPDMLog, LogLevel::Debug,
-              ("Apple HW decode failure: '%s'", failureReason.BeginReading()));
+              ("Apple %s HW decode failure: '%s'", type, failureReason.BeginReading()));
     }
+    free(type);
     decoder->Shutdown();
     return hwSupport;
   }

diff --git a/dom/media/platforms/apple/AppleDecoderModule.h b/dom/media/platforms/apple/AppleDecoderModule.h
@@ -43,7 +43,6 @@ class AppleDecoderModule : public PlatformDecoderModule {
 
   static constexpr int kCMVideoCodecType_H264{'avc1'};
   static constexpr int kCMVideoCodecType_VP9{'vp09'};
-
  private:
   AppleDecoderModule() = default;
   virtual ~AppleDecoderModule() = default;