Title: [89080] branches/safari-534-branch/Source/WebCore
Diff
Modified: branches/safari-534-branch/Source/WebCore/ChangeLog (89079 => 89080)
--- branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-16 23:15:10 UTC (rev 89079)
+++ branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-16 23:29:48 UTC (rev 89080)
@@ -1,3 +1,23 @@
+2011-06-14 Lucas Forschler <[email protected]>
+
+ Merged 88945.
+
+ 2011-06-14 Jer Noble <[email protected]>
+
+ 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-16 Lucas Forschler <[email protected]>
Merged 88830.
Modified: branches/safari-534-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm (89079 => 89080)
--- branches/safari-534-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm 2011-06-16 23:15:10 UTC (rev 89079)
+++ branches/safari-534-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm 2011-06-16 23:29:48 UTC (rev 89080)
@@ -440,8 +440,12 @@
if (CMTIME_IS_NUMERIC(cmDuration))
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());
return invalidTime();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
