Changes in trunk/Source/WebCore/platform/graphics/cocoa/VP9UtilitiesCocoa.mm [264476:265167] in webkit

File:

• trunk/Source/WebCore/platform/graphics/cocoa/VP9UtilitiesCocoa.mm (modified) (3 diffs)

trunk/Source/WebCore/platform/graphics/cocoa/VP9UtilitiesCocoa.mm

@@ -30 +30 @@
 
 #import "FourCC.h"
+#import "LibWebRTCProvider.h"
 #import "MediaCapabilitiesInfo.h"
 #import "PlatformScreen.h"
@@ -97 +98 @@
 }
 
-bool validateVPParameters(VPCodecConfigurationRecord& codecConfiguration, MediaCapabilitiesInfo& info, const VideoConfiguration& videoConfiguration)
-{
-    OSStatus status = VTSelectAndCreateVideoDecoderInstance(kCMVideoCodecType_VP9, kCFAllocatorDefault, nullptr, nullptr);
-    if (status != noErr)
-        return false;
-
-    // VideoConfiguration and VPCodecConfigurationRecord can have conflicting values for HDR properties. If so, reject.
-    if (videoConfiguration.transferFunction) {
-        // Note: Transfer Characteristics are defined by ISO/IEC 23091-2:2019.
-        if (*videoConfiguration.transferFunction == TransferFunction::SRGB && codecConfiguration.transferCharacteristics > 15)
-            return false;
-        if (*videoConfiguration.transferFunction == TransferFunction::PQ && codecConfiguration.transferCharacteristics != 16)
-            return false;
-        if (*videoConfiguration.transferFunction == TransferFunction::HLG && codecConfiguration.transferCharacteristics != 18)
-            return false;
-    }
-
-    if (videoConfiguration.colorGamut) {
-        if (*videoConfiguration.colorGamut == ColorGamut::Rec2020 && codecConfiguration.colorPrimaries != 9)
-            return false;
-    }
-
-    if (canLoad_VideoToolbox_VTIsHardwareDecodeSupported() && VTIsHardwareDecodeSupported(kCMVideoCodecType_VP9) && !hardwareVP9DecoderDisabledForTesting) {
-        info.powerEfficient = true;
-
-        // HW VP9 Decoder supports Profile 0 & 2:
-        if (!codecConfiguration.profile && codecConfiguration.profile != 2)
-            return false;
-
-        // HW VP9 Decoder supports up to Level 6:
-        if (codecConfiguration.level > VPConfigurationLevel::Level_6)
-            return false;
-
-        // HW VP9 Decoder supports 8 or 10 bit color:
-        if (codecConfiguration.bitDepth > 10)
-            return false;
-
-        // HW VP9 Decoder suports only 420 chroma subsampling:
-        if (codecConfiguration.chromaSubsampling > VPConfigurationChromaSubsampling::Subsampling_420_Colocated)
-            return false;
-
-        // HW VP9 Decoder does not support alpha channel:
-        if (videoConfiguration.alphaChannel && *videoConfiguration.alphaChannel)
-            return false;
-
-        // HW VP9 Decoder can support up to 4K @ 120 or 8K @ 30
-        auto resolution = resolutionCategory({ (float)videoConfiguration.width, (float)videoConfiguration.height });
-        if (resolution > ResolutionCategory::R_8K)
-            return false;
-        if (resolution == ResolutionCategory::R_8K && videoConfiguration.framerate > 30)
-            info.smooth = false;
-        else if (resolution <= ResolutionCategory::R_4K && videoConfiguration.framerate > 120)
-            info.smooth = false;
-        else
-            info.smooth = true;
-
-        return true;
-    }
-
-    // SW VP9 Decoder has much more variable capabilities depending on CPU characteristics.
-    // FIXME: Add a lookup table for device-to-capabilities. For now, assume that the SW VP9
-    // decoder can support 4K @ 30.
-    if (videoConfiguration.height <= 1080 && videoConfiguration.framerate > 60)
-        info.smooth = false;
-    if (videoConfiguration.height <= 2160 && videoConfiguration.framerate > 30)
-        info.smooth = false;
-    else
-        info.smooth = true;
+void registerWebKitVP9Decoder()
+{
+    LibWebRTCProvider::registerWebKitVP9Decoder();
+}
+
+void registerSupplementalVP9Decoder()
+{
+    if (!VideoToolboxLibrary(true))
+        return;
+
+    if (canLoad_VideoToolbox_VTRegisterSupplementalVideoDecoderIfAvailable())
+        softLink_VideoToolbox_VTRegisterSupplementalVideoDecoderIfAvailable(kCMVideoCodecType_VP9);
+}
+
+bool isVP9DecoderAvailable()
+{
+    if (!VideoToolboxLibrary(true))
+        return false;
+    return noErr == VTSelectAndCreateVideoDecoderInstance(kCMVideoCodecType_VP9, kCFAllocatorDefault, nullptr, nullptr);
+}
+
+bool isVPCodecConfigurationRecordSupported(VPCodecConfigurationRecord& codecConfiguration)
+{
+    if (!isVP9DecoderAvailable())
+        return false;
+
+    // HW & SW VP9 Decoders support Profile 0 & 2:
+    if (codecConfiguration.profile && codecConfiguration.profile != 2)
+        return false;
+
+    // HW & SW VP9 Decoders support only 420 chroma subsampling:
+    if (codecConfiguration.chromaSubsampling > VPConfigurationChromaSubsampling::Subsampling_420_Colocated)
+        return false;
+
+    // HW & SW VP9 Decoders support 8 or 10 bit color:
+    if (codecConfiguration.bitDepth > 10)
+        return false;
+
+    // HW & SW VP9 Decoders support up to Level 6:
+    if (codecConfiguration.level > VPConfigurationLevel::Level_6)
+        return false;
+
+    // Hardware decoders are always available.
+    if (canLoad_VideoToolbox_VTIsHardwareDecodeSupported() && VTIsHardwareDecodeSupported(kCMVideoCodecType_VP9) && !hardwareVP9DecoderDisabledForTesting)
+        return true;
 
     // For wall-powered devices, always report VP9 as supported, even if not powerEfficient.
-    if (!systemHasBattery()) {
-        info.supported = true;
-        return true;
-    }
+    if (!systemHasBattery())
+        return true;
 
     // For battery-powered devices, always report VP9 as supported when running on AC power,
     // but only on battery when there is an attached screen whose resolution is large enough
     // to support 4K video.
-    if (systemHasAC()) {
-        info.supported = true;
-        return true;
-    }
+    if (systemHasAC())
+        return true;
 
     bool has4kScreen = false;
@@ -194 +168 @@
     }
 
-    if (!has4kScreen) {
-        info.supported = false;
-        return false;
-    }
-
+    return has4kScreen;
+}
+
+bool validateVPParameters(VPCodecConfigurationRecord& codecConfiguration, MediaCapabilitiesInfo& info, const VideoConfiguration& videoConfiguration)
+{
+    if (!isVPCodecConfigurationRecordSupported(codecConfiguration))
+        return false;
+
+    // VideoConfiguration and VPCodecConfigurationRecord can have conflicting values for HDR properties. If so, reject.
+    if (videoConfiguration.transferFunction) {
+        // Note: Transfer Characteristics are defined by ISO/IEC 23091-2:2019.
+        if (*videoConfiguration.transferFunction == TransferFunction::SRGB && codecConfiguration.transferCharacteristics > 15)
+            return false;
+        if (*videoConfiguration.transferFunction == TransferFunction::PQ && codecConfiguration.transferCharacteristics != 16)
+            return false;
+        if (*videoConfiguration.transferFunction == TransferFunction::HLG && codecConfiguration.transferCharacteristics != 18)
+            return false;
+    }
+
+    if (videoConfiguration.colorGamut) {
+        if (*videoConfiguration.colorGamut == ColorGamut::Rec2020 && codecConfiguration.colorPrimaries != 9)
+            return false;
+    }
+
+    if (canLoad_VideoToolbox_VTIsHardwareDecodeSupported() && VTIsHardwareDecodeSupported(kCMVideoCodecType_VP9) && !hardwareVP9DecoderDisabledForTesting) {
+        // HW VP9 Decoder does not support alpha channel:
+        if (videoConfiguration.alphaChannel && *videoConfiguration.alphaChannel)
+            return false;
+
+        // HW VP9 Decoder can support up to 4K @ 120 or 8K @ 30
+        auto resolution = resolutionCategory({ (float)videoConfiguration.width, (float)videoConfiguration.height });
+        if (resolution > ResolutionCategory::R_8K)
+            return false;
+        if (resolution == ResolutionCategory::R_8K && videoConfiguration.framerate > 30)
+            info.smooth = false;
+        else if (resolution <= ResolutionCategory::R_4K && videoConfiguration.framerate > 120)
+            info.smooth = false;
+        else
+            info.smooth = true;
+
+        info.powerEfficient = true;
+        info.supported = true;
+        return true;
+    }
+
+    info.powerEfficient = false;
+
+    // SW VP9 Decoder has much more variable capabilities depending on CPU characteristics.
+    // FIXME: Add a lookup table for device-to-capabilities. For now, assume that the SW VP9
+    // decoder can support 4K @ 30.
+    if (videoConfiguration.height <= 1080 && videoConfiguration.framerate > 60)
+        info.smooth = false;
+    if (videoConfiguration.height <= 2160 && videoConfiguration.framerate > 30)
+        info.smooth = false;
+    else
+        info.smooth = true;
+
+    // For wall-powered devices, always report VP9 as supported, even if not powerEfficient.
+    if (!systemHasBattery()) {
+        info.supported = true;
+        return true;
+    }
+
+    // For battery-powered devices, always report VP9 as supported when running on AC power,
+    // but only on battery when there is an attached screen whose resolution is large enough
+    // to support 4K video.
+    if (systemHasAC()) {
+        info.supported = true;
+        return true;
+    }
+
+    bool has4kScreen = false;
+
+    if (screenSizeAndScaleForTesting) {
+        auto screenSize = FloatSize(screenSizeAndScaleForTesting->width, screenSizeAndScaleForTesting->height).scaled(screenSizeAndScaleForTesting->scale);
+        has4kScreen = resolutionCategory(screenSize) >= ResolutionCategory::R_4K;
+    } else {
+        for (auto& screenData : getScreenProperties().screenDataMap.values()) {
+            if (resolutionCategory(screenData.screenRect.size().scaled(screenData.scaleFactor)) >= ResolutionCategory::R_4K) {
+                has4kScreen = true;
+                break;
+            }
+        }
+    }
+
+    if (!has4kScreen)
+        return false;
+
+    info.supported = true;
     return true;
 }