Changeset 264792 in webkit

Timestamp:

Jul 23, 2020, 2:57:10 PM (6 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r264791. rdar://problem/66014800

[Cocoa] RELEASE_ASSERT when calling registerSupplementalVP9Decoder() when VideoToolbox.framework is not present
​https://bugs.webkit.org/show_bug.cgi?id=214697
<rdar://problem/66010949>

Reviewed by Eric Carlson.

• platform/graphics/cocoa/VP9UtilitiesCocoa.mm: (WebCore::registerSupplementalVP9Decoder): (WebCore::isVP9DecoderAvailable):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@264791 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-610.1.23.1-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cocoa/VP9UtilitiesCocoa.mm (modified) (2 diffs)

branches/safari-610.1.23.1-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-23  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r264791. rdar://problem/66014800
+
+    [Cocoa] RELEASE_ASSERT when calling registerSupplementalVP9Decoder() when VideoToolbox.framework is not present
+    https://bugs.webkit.org/show_bug.cgi?id=214697
+    <rdar://problem/66010949>
+    
+    Reviewed by Eric Carlson.
+    
+    * platform/graphics/cocoa/VP9UtilitiesCocoa.mm:
+    (WebCore::registerSupplementalVP9Decoder):
+    (WebCore::isVP9DecoderAvailable):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@264791 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-07-23  Jer Noble  <jer.noble@apple.com>
+
+            [Cocoa] RELEASE_ASSERT when calling registerSupplementalVP9Decoder() when VideoToolbox.framework is not present
+            https://bugs.webkit.org/show_bug.cgi?id=214697
+            <rdar://problem/66010949>
+
+            Reviewed by Eric Carlson.
+
+            * platform/graphics/cocoa/VP9UtilitiesCocoa.mm:
+            (WebCore::registerSupplementalVP9Decoder):
+            (WebCore::isVP9DecoderAvailable):
+
 2020-07-23  Alan Coon  <alancoon@apple.com>
 

branches/safari-610.1.23.1-branch/Source/WebCore/platform/graphics/cocoa/VP9UtilitiesCocoa.mm

@@ -99 +99 @@
 void registerSupplementalVP9Decoder()
 {
+    if (!VideoToolboxLibrary(true))
+        return;
+
     if (canLoad_VideoToolbox_VTRegisterSupplementalVideoDecoderIfAvailable())
         softLink_VideoToolbox_VTRegisterSupplementalVideoDecoderIfAvailable(kCMVideoCodecType_VP9);
@@ -105 +108 @@
 bool isVP9DecoderAvailable()
 {
+    if (!VideoToolboxLibrary(true))
+        return false;
     return noErr == VTSelectAndCreateVideoDecoderInstance(kCMVideoCodecType_VP9, kCFAllocatorDefault, nullptr, nullptr);
 }