Title: [264792] branches/safari-610.1.23.1-branch/Source/WebCore
- Revision
- 264792
- Author
- repst...@apple.com
- Date
- 2020-07-23 14:57:10 -0700 (Thu, 23 Jul 2020)
Log 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
Modified Paths
Diff
Modified: branches/safari-610.1.23.1-branch/Source/WebCore/ChangeLog (264791 => 264792)
--- branches/safari-610.1.23.1-branch/Source/WebCore/ChangeLog 2020-07-23 21:41:11 UTC (rev 264791)
+++ branches/safari-610.1.23.1-branch/Source/WebCore/ChangeLog 2020-07-23 21:57:10 UTC (rev 264792)
@@ -1,5 +1,34 @@
2020-07-23 Alan Coon <alanc...@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.no...@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 <alanc...@apple.com>
+
Cherry-pick r264742. rdar://problem/65995985
[Cocoa|WebM] Decode error when seeking
Modified: branches/safari-610.1.23.1-branch/Source/WebCore/platform/graphics/cocoa/VP9UtilitiesCocoa.mm (264791 => 264792)
--- branches/safari-610.1.23.1-branch/Source/WebCore/platform/graphics/cocoa/VP9UtilitiesCocoa.mm 2020-07-23 21:41:11 UTC (rev 264791)
+++ branches/safari-610.1.23.1-branch/Source/WebCore/platform/graphics/cocoa/VP9UtilitiesCocoa.mm 2020-07-23 21:57:10 UTC (rev 264792)
@@ -98,6 +98,9 @@
void registerSupplementalVP9Decoder()
{
+ if (!VideoToolboxLibrary(true))
+ return;
+
if (canLoad_VideoToolbox_VTRegisterSupplementalVideoDecoderIfAvailable())
softLink_VideoToolbox_VTRegisterSupplementalVideoDecoderIfAvailable(kCMVideoCodecType_VP9);
}
@@ -104,6 +107,8 @@
bool isVP9DecoderAvailable()
{
+ if (!VideoToolboxLibrary(true))
+ return false;
return noErr == VTSelectAndCreateVideoDecoderInstance(kCMVideoCodecType_VP9, kCFAllocatorDefault, nullptr, nullptr);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
