Changeset 88945 in webkit

Timestamp:

Jun 15, 2011 9:26:45 AM (13 years ago)

Author:

jer.noble@apple.com

Message:

2011-06-14 Jer Noble <​jer.noble@apple.com>

Reviewed by Eric Carlson.

(AVFoundation) Apple event video appears as live stream and is not seekable
​https://bugs.webkit.org/show_bug.cgi?id=62694

No new tests; There are no media-player port specific tests yet.

Work around a bug in apple.com live stream javascript controller library. When an AVAsset returns an indefinite time
for its duration, return 0 if the asset has no tracks, and infinity otherwise. This keeps the apple.com controller
from identifying the stored stream as a live stream.

• platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm: (WebCore::MediaPlayerPrivateAVFoundationObjC::platformDuration):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-14  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Eric Carlson.
+
+        (AVFoundation) Apple event video appears as live stream and is not seekable
+        https://bugs.webkit.org/show_bug.cgi?id=62694
+
+        No new tests; There are no media-player port specific tests yet.
+
+        Work around a bug in apple.com live stream javascript controller library.  When an AVAsset returns an indefinite time
+        for its duration, return 0 if the asset has no tracks, and infinity otherwise.  This keeps the apple.com controller 
+        from identifying the stored stream as a live stream.
+
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::platformDuration):
+
 2011-06-15  Andrey Kosyakov  <caseq@chromium.org>
 

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

@@ -443 +443 @@
         return narrowPrecisionToFloat(CMTimeGetSeconds(cmDuration));
 
-    if (CMTIME_IS_INDEFINITE(cmDuration))
-        return numeric_limits<float>::infinity();
+    if (CMTIME_IS_INDEFINITE(cmDuration)) {
+        if (![[m_avAsset.get() tracks] count])
+            return 0;
+        else
+            return numeric_limits<float>::infinity();
+    }
 
     LOG(Media, "MediaPlayerPrivateAVFoundationObjC::platformDuration(%p) - invalid duration, returning %.0f", this, invalidTime());