Changeset 219266 in webkit

Timestamp:

Jul 7, 2017 1:24:35 PM (7 years ago)

Author:

jer.noble@apple.com

Message:

AVPlayer can continue to be active after released by MediaPlayerPrivateAVFoundationObjC.
​https://bugs.webkit.org/show_bug.cgi?id=174264

Reviewed by Eric Carlson.

If the AVPlayer is retained (by an autorelease pool, or internally by other objects in
AVFoundation), releasing the AVPlayer is not enough to cancel loading or playback. So before
releasing the AVPlayer, make sure to disassociate the current AVPlayerItem, which should
cancel all activity in the AVPlayer.

• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:

(WebCore::MediaPlayerPrivateAVFoundationObjC::cancelLoad):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-07-07  Jer Noble  <jer.noble@apple.com>
+
+        AVPlayer can continue to be active after released by MediaPlayerPrivateAVFoundationObjC.
+        https://bugs.webkit.org/show_bug.cgi?id=174264
+
+        Reviewed by Eric Carlson.
+
+        If the AVPlayer is retained (by an autorelease pool, or internally by other objects in
+        AVFoundation), releasing the AVPlayer is not enough to cancel loading or playback. So before
+        releasing the AVPlayer, make sure to disassociate the current AVPlayerItem, which should
+        cancel all activity in the AVPlayer.
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::cancelLoad):
+
 2017-07-07  Basuke Suzuki  <Basuke.Suzuki@sony.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

@@ -630 +630 @@
         for (NSString *keyName in playerKVOProperties())
             [m_avPlayer.get() removeObserver:m_objcObserver.get() forKeyPath:keyName];
+
+        [m_avPlayer replaceCurrentItemWithPlayerItem:nil];
         m_avPlayer = nil;
     }