Changeset 167776 in webkit

Timestamp:

Apr 24, 2014 2:46:19 PM (10 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] don't ask for AVAssetTrack properties before they are available
​https://bugs.webkit.org/show_bug.cgi?id=131902
<rdar://problem/16505076>

Reviewed by Brent Fulgham.

No new tests, the behavior this changes can not be tested with a layout test.

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

(WebCore::MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC): Initialize

m_cachedTotalBytes.

(WebCore::MediaPlayerPrivateAVFoundationObjC::beginLoadingMetadata): Don't report that

metadata has been loaded until the track properties we need have been loaded too.

(WebCore::MediaPlayerPrivateAVFoundationObjC::totalBytes): Cache totalBytes instead

of recalculating it every time.

(WebCore::MediaPlayerPrivateAVFoundationObjC::tracksDidChange): Invalidate cached

total bytes.

(WebCore::assetTrackMetadataKeyNames): Array of AVAssetTrack properties we use.

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) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-24  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] don't ask for AVAssetTrack properties before they are available
+        https://bugs.webkit.org/show_bug.cgi?id=131902
+        <rdar://problem/16505076>
+
+        Reviewed by Brent Fulgham.
+
+        No new tests, the behavior this changes can not be tested with a layout test.
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC): Initialize
+            m_cachedTotalBytes.
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::beginLoadingMetadata): Don't report that
+            metadata has been loaded until the track properties we need have been loaded too.
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::totalBytes): Cache totalBytes instead
+            of recalculating it every time.
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::tracksDidChange): Invalidate cached
+            total bytes.
+        (WebCore::assetTrackMetadataKeyNames): Array of AVAssetTrack properties we use.
+
 2014-04-24  Myles C. Maxfield  <mmaxfield@apple.com>
 

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

@@ -323 +323 @@
     double m_cachedDuration;
     double m_cachedRate;
+    mutable long long m_cachedTotalBytes;
     unsigned m_pendingStatusChanges;
     int m_cachedItemStatus;

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

@@ -295 +295 @@
 static NSArray *assetMetadataKeyNames();
 static NSArray *itemKVOProperties();
+static NSArray* assetTrackMetadataKeyNames();
 
 #if !LOG_DISABLED
@@ -366 +367 @@
     , m_cachedDuration(MediaPlayer::invalidTime())
     , m_cachedRate(0)
+    , m_cachedTotalBytes(0)
     , m_pendingStatusChanges(0)
     , m_cachedItemStatus(MediaPlayerAVPlayerItemStatusDoesNotExist)
@@ -785 +787 @@
 {
     LOG(Media, "MediaPlayerPrivateAVFoundationObjC::beginLoadingMetadata(%p) - requesting metadata loading", this);
-    [m_avAsset.get() loadValuesAsynchronouslyForKeys:[assetMetadataKeyNames() retain] completionHandler:^{
-        [m_objcObserver.get() metadataLoaded];
+
+    dispatch_group_t metadataLoadingGroup = dispatch_group_create();
+    dispatch_group_enter(metadataLoadingGroup);
+    auto weakThis = createWeakPtr();
+    [m_avAsset.get() loadValuesAsynchronouslyForKeys:assetMetadataKeyNames() completionHandler:^{
+
+        callOnMainThread([weakThis, metadataLoadingGroup] {
+            if (weakThis && [weakThis->m_avAsset.get() statusOfValueForKey:@"tracks" error:nil] == AVKeyValueStatusLoaded) {
+                for (AVAssetTrack *track in [weakThis->m_avAsset.get() tracks]) {
+                    dispatch_group_enter(metadataLoadingGroup);
+                    [track loadValuesAsynchronouslyForKeys:assetTrackMetadataKeyNames() completionHandler:^{
+                        dispatch_group_leave(metadataLoadingGroup);
+                    }];
+                }
+            }
+            dispatch_group_leave(metadataLoadingGroup);
+        });
     }];
+
+    dispatch_group_notify(metadataLoadingGroup, dispatch_get_main_queue(), ^{
+        callOnMainThread([weakThis] {
+            if (weakThis)
+                [weakThis->m_objcObserver.get() metadataLoaded];
+        });
+
+        dispatch_release(metadataLoadingGroup);
+    });
 }
 
@@ -1132 +1158 @@
         return 0;
 
-    long long totalMediaSize = 0;
+    if (m_cachedTotalBytes)
+        return m_cachedTotalBytes;
+
     for (AVPlayerItemTrack *thisTrack in m_cachedTracks.get())
-        totalMediaSize += [[thisTrack assetTrack] totalSampleDataLength];
-
-    return totalMediaSize;
+        m_cachedTotalBytes += [[thisTrack assetTrack] totalSampleDataLength];
+
+    return m_cachedTotalBytes;
 }
 
@@ -2362 +2390 @@
 {
     m_cachedTracks = tracks;
+    m_cachedTotalBytes = 0;
 
     tracksChanged();
@@ -2440 +2469 @@
                 nil];
     }
+    return keys;
+}
+
+NSArray* assetTrackMetadataKeyNames()
+{
+    static NSArray* keys = [[NSArray alloc] initWithObjects:@"totalSampleDataLength", @"mediaType", nil];
+
     return keys;
 }