Changeset 167664 in webkit

Timestamp:

Apr 22, 2014 9:56:24 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r167658.
​https://bugs.webkit.org/show_bug.cgi?id=131993

Caused many crashes on media tests (Requested by ap on
#webkit).

Reverted changeset:

"[Mac] don't ask for AVAssetTrack properties before they are
available"
​https://bugs.webkit.org/show_bug.cgi?id=131902
​http://trac.webkit.org/changeset/167658

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-22  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r167658.
+        https://bugs.webkit.org/show_bug.cgi?id=131993
+
+        Caused many crashes on media tests (Requested by ap on
+        #webkit).
+
+        Reverted changeset:
+
+        "[Mac] don't ask for AVAssetTrack properties before they are
+        available"
+        https://bugs.webkit.org/show_bug.cgi?id=131902
+        http://trac.webkit.org/changeset/167658
+
 2014-04-22  David Hyatt  <hyatt@apple.com>
 

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

@@ -321 +321 @@
     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
@@ -367 +366 @@
     , m_cachedDuration(MediaPlayer::invalidTime())
     , m_cachedRate(0)
-    , m_cachedTotalBytes(0)
     , m_pendingStatusChanges(0)
     , m_cachedItemStatus(MediaPlayerAVPlayerItemStatusDoesNotExist)
@@ -786 +784 @@
 {
     LOG(Media, "MediaPlayerPrivateAVFoundationObjC::beginLoadingMetadata(%p) - requesting metadata loading", this);
-    dispatch_group_t metadataLoadingGroup = dispatch_group_create();
-    dispatch_group_enter(metadataLoadingGroup);
     [m_avAsset.get() loadValuesAsynchronouslyForKeys:[assetMetadataKeyNames() retain] completionHandler:^{
-        if ([m_avAsset.get() statusOfValueForKey:@"tracks" error:nil] == AVKeyValueStatusLoaded) {
-            for (AVAssetTrack *track in [m_avAsset.get() tracks]) {
-                dispatch_group_enter(metadataLoadingGroup);
-                [track loadValuesAsynchronouslyForKeys:[assetTrackMetadataKeyNames() retain] completionHandler:^{
-                    dispatch_group_leave(metadataLoadingGroup);
-                }];
-            }
-        }
-        dispatch_group_leave(metadataLoadingGroup);
+        [m_objcObserver.get() metadataLoaded];
     }];
-    dispatch_group_notify(metadataLoadingGroup, dispatch_get_main_queue(), ^{
-        [m_objcObserver.get() metadataLoaded];
-    });
-    dispatch_release(metadataLoadingGroup);
 }
 
@@ -1147 +1131 @@
         return 0;
 
-    if (m_cachedTotalBytes)
-        return m_cachedTotalBytes;
-
+    long long totalMediaSize = 0;
     for (AVPlayerItemTrack *thisTrack in m_cachedTracks.get())
-        m_cachedTotalBytes += [[thisTrack assetTrack] totalSampleDataLength];
-
-    return m_cachedTotalBytes;
+        totalMediaSize += [[thisTrack assetTrack] totalSampleDataLength];
+
+    return totalMediaSize;
 }
 
@@ -2362 +2344 @@
 {
     m_cachedTracks = tracks;
-    m_cachedTotalBytes = 0;
 
     tracksChanged();
@@ -2441 +2422 @@
                 nil];
     }
-    return keys;
-}
-
-NSArray* assetTrackMetadataKeyNames()
-{
-    static NSArray* keys;
-    if (!keys)
-        keys = @[@"totalSampleDataLength", @"mediaType"];
-
     return keys;
 }