Title: [236204] trunk/Source/WebCore
- Revision
- 236204
- Author
- jer.no...@apple.com
- Date
- 2018-09-19 06:58:24 -0700 (Wed, 19 Sep 2018)
Log Message
REGRESSION (r236006): New waitingForKey() requirement breaks Modern EME tests.
https://bugs.webkit.org/show_bug.cgi?id=189720
<rdar://problem/44572140>
Reviewed by Xabier Rodriguez-Calvar.
Always call waitingForKey() after calling initializationDataEncountered().
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::shouldWaitForLoadingOfResource):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::initializationDataEncountered):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (236203 => 236204)
--- trunk/Source/WebCore/ChangeLog 2018-09-19 13:50:14 UTC (rev 236203)
+++ trunk/Source/WebCore/ChangeLog 2018-09-19 13:58:24 UTC (rev 236204)
@@ -1,3 +1,18 @@
+2018-09-19 Jer Noble <jer.no...@apple.com>
+
+ REGRESSION (r236006): New waitingForKey() requirement breaks Modern EME tests.
+ https://bugs.webkit.org/show_bug.cgi?id=189720
+ <rdar://problem/44572140>
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ Always call waitingForKey() after calling initializationDataEncountered().
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::shouldWaitForLoadingOfResource):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::initializationDataEncountered):
+
2018-09-19 Philippe Normand <pnorm...@igalia.com>
[GStreamer] Add support for AV1 decoding
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (236203 => 236204)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-09-19 13:50:14 UTC (rev 236203)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-09-19 13:58:24 UTC (rev 236204)
@@ -1784,6 +1784,7 @@
RetainPtr<NSData> keyURIData = [keyURI dataUsingEncoding:NSUTF8StringEncoding allowLossyConversion:YES];
auto keyURIBuffer = SharedBuffer::create(keyURIData.get());
player()->initializationDataEncountered("skd"_s, keyURIBuffer->tryCreateArrayBuffer());
+ player()->waitingForKey();
#endif
return true;
}
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (236203 => 236204)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2018-09-19 13:50:14 UTC (rev 236203)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2018-09-19 13:58:24 UTC (rev 236204)
@@ -969,6 +969,7 @@
void MediaPlayerPrivateMediaSourceAVFObjC::initializationDataEncountered(const String& initDataType, RefPtr<ArrayBuffer>&& initData)
{
m_player->initializationDataEncountered(initDataType, WTFMove(initData));
+ m_player->waitingForKey();
}
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
