Changeset 171157 in webkit

Timestamp:

Jul 16, 2014 4:11:49 PM (10 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] replace AVPlayerItem on the main thread
​https://bugs.webkit.org/show_bug.cgi?id=134983

Reviewed by Jer Noble.

No new tests, this fixes a problem with a thread configuration not present in the
test environment.

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

(WebCore::MediaPlayerPrivateAVFoundationObjC::setAVPlayerItem): New, when called off of

the main thread, dispatch to the main thread before setting AVPlayerItem.

(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer): Call setAVPlayerItem.
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerItem): Ditto.
(WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldBufferData): Ditto.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-07-16  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] replace AVPlayerItem on the main thread
+        https://bugs.webkit.org/show_bug.cgi?id=134983
+
+        Reviewed by Jer Noble.
+
+        No new tests, this fixes a problem with a thread configuration not present in the
+        test environment.
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::setAVPlayerItem): New, when called off of 
+            the main thread, dispatch to the main thread before setting AVPlayerItem.
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer): Call setAVPlayerItem.
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerItem): Ditto.
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldBufferData): Ditto.
+
 2014-07-16  Jer Noble  <jer.noble@apple.com>
 

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

@@ -206 +206 @@
 #endif
 
+    void setAVPlayerItem(AVPlayerItem *);
+
     void createImageGenerator();
     void destroyImageGenerator();

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

@@ -107 +107 @@
 @end
 
+typedef AVPlayer AVPlayerType;
 typedef AVPlayerItem AVPlayerItemType;
 typedef AVMetadataItem AVMetadataItemType;
@@ -764 +765 @@
 }
 
+void MediaPlayerPrivateAVFoundationObjC::setAVPlayerItem(AVPlayerItemType *item)
+{
+    if (!m_avPlayer)
+        return;
+
+    if (pthread_main_np()) {
+        [m_avPlayer replaceCurrentItemWithPlayerItem:item];
+        return;
+    }
+
+    RetainPtr<AVPlayerType> strongPlayer = m_avPlayer.get();
+    RetainPtr<AVPlayerItemType> strongItem = item;
+    dispatch_async(dispatch_get_main_queue(), [strongPlayer, strongItem] {
+        [strongPlayer replaceCurrentItemWithPlayerItem:strongItem.get()];
+    });
+}
+
 void MediaPlayerPrivateAVFoundationObjC::createAVPlayer()
 {
@@ -792 +810 @@
 
     if (m_avPlayerItem)
-        [m_avPlayer.get() replaceCurrentItemWithPlayerItem:m_avPlayerItem.get()];
+        setAVPlayerItem(m_avPlayerItem.get());
 
     setDelayCallbacks(false);
@@ -816 +834 @@
 
     if (m_avPlayer)
-        [m_avPlayer.get() replaceCurrentItemWithPlayerItem:m_avPlayerItem.get()];
+        setAVPlayerItem(m_avPlayerItem.get());
 
 #if PLATFORM(IOS)
@@ -2399 +2417 @@
         return;
 
-    if (m_shouldBufferData)
-        [m_avPlayer.get() replaceCurrentItemWithPlayerItem:m_avPlayerItem.get()];
-    else
-        [m_avPlayer.get() replaceCurrentItemWithPlayerItem:nil];
+    setAVPlayerItem(shouldBuffer ? m_avPlayerItem.get() : nil);
 }