Title: [252059] trunk/Source/WebCore
- Revision
- 252059
- Author
- [email protected]
- Date
- 2019-11-05 10:05:12 -0800 (Tue, 05 Nov 2019)
Log Message
http/tests/media/track-in-band-hls-metadata.html sometimes crashes after r251626
https://bugs.webkit.org/show_bug.cgi?id=203849
<rdar://problem/56889717>
Reviewed by Youenn Fablet.
No new tests, fixes existing test.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(-[WebCoreAVFMovieObserver metadataOutput:didOutputTimedMetadataGroups:fromPlayerItemTrack:]): Return early if
m_player has been cleared.
(-[WebCoreAVFMovieObserver metadataCollector:didCollectDateRangeMetadataGroups:indexesOfNewGroups:indexesOfModifiedGroups:]):
Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (252058 => 252059)
--- trunk/Source/WebCore/ChangeLog 2019-11-05 17:25:57 UTC (rev 252058)
+++ trunk/Source/WebCore/ChangeLog 2019-11-05 18:05:12 UTC (rev 252059)
@@ -1,3 +1,19 @@
+2019-11-05 Eric Carlson <[email protected]>
+
+ http/tests/media/track-in-band-hls-metadata.html sometimes crashes after r251626
+ https://bugs.webkit.org/show_bug.cgi?id=203849
+ <rdar://problem/56889717>
+
+ Reviewed by Youenn Fablet.
+
+ No new tests, fixes existing test.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (-[WebCoreAVFMovieObserver metadataOutput:didOutputTimedMetadataGroups:fromPlayerItemTrack:]): Return early if
+ m_player has been cleared.
+ (-[WebCoreAVFMovieObserver metadataCollector:didCollectDateRangeMetadataGroups:indexesOfNewGroups:indexesOfModifiedGroups:]):
+ Ditto.
+
2019-11-05 Andy Estes <[email protected]>
ApplePaySession should never prevent entering the back/forward cache
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (252058 => 252059)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2019-11-05 17:25:57 UTC (rev 252058)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2019-11-05 18:05:12 UTC (rev 252059)
@@ -3503,6 +3503,9 @@
UNUSED_PARAM(output);
UNUSED_PARAM(track);
+ if (!m_player || !metadataGroups)
+ return;
+
m_taskQueue.enqueueTask([player = m_player, metadataGroups = retainPtr(metadataGroups), currentTime = m_player->currentMediaTime()] {
if (!player)
return;
@@ -3519,6 +3522,9 @@
UNUSED_PARAM(indexesOfNewGroups);
UNUSED_PARAM(indexesOfModifiedGroups);
+ if (!m_player || !metadataGroups)
+ return;
+
m_taskQueue.enqueueTask([player = m_player, metadataGroups = retainPtr(metadataGroups), currentTime = m_player->currentMediaTime()] {
if (!player)
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
