Title: [179905] branches/safari-600.1.4.15-branch/Source/WebCore
- Revision
- 179905
- Author
- bshaf...@apple.com
- Date
- 2015-02-10 17:06:01 -0800 (Tue, 10 Feb 2015)
Log Message
Merged r179843. rdar://problem/19432919
Modified Paths
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179904 => 179905)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-11 00:54:20 UTC (rev 179904)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-11 01:06:01 UTC (rev 179905)
@@ -1,5 +1,30 @@
2015-02-10 Babak Shafiei <bshaf...@apple.com>
+ Merge r179843.
+
+ 2015-02-09 Jer Noble <jer.no...@apple.com>
+
+ [Mac] Disable the currentTime estimation code in HTMLMediaElement for Yosemite+
+ https://bugs.webkit.org/show_bug.cgi?id=141399
+
+ Reviewed by Eric Carlson.
+
+ Apparenty -[AVPlayer rate] means different things for HLS and progressive content; for progressive,
+ the -rate is the actual rate of playback. For HLS, the -rate is the requested rate, and will return
+ the requested value even if time is not progressing.
+
+ We added the currentTime estimation engine because asking AVFoundation for its -currentTime used to
+ be expensive, but we've been assured that in recent iOS and OS X releases, -currentTime should be
+ very fast. That, in combination with the HLS behavior of -rate and how it breaks the currentTime
+ estimation, means we should probably turn it off for iOS and Yosemite.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::maximumDurationToCacheMediaTime): Move implementation to .mm.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::maximumDurationToCacheMediaTime): Disable on iOS and >=10.10.
+
+2015-02-10 Babak Shafiei <bshaf...@apple.com>
+
Merge r178571.
2015-01-15 Ryosuke Niwa <rn...@webkit.org>
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (179904 => 179905)
--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2015-02-11 00:54:20 UTC (rev 179904)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2015-02-11 01:06:01 UTC (rev 179905)
@@ -164,7 +164,7 @@
virtual bool supportsAcceleratedRendering() const { return true; }
virtual float mediaTimeForTimeValue(float) const;
- virtual double maximumDurationToCacheMediaTime() const { return 5; }
+ virtual double maximumDurationToCacheMediaTime() const;
virtual void createAVPlayer();
virtual void createAVPlayerItem();
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (179904 => 179905)
--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-02-11 00:54:20 UTC (rev 179904)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-02-11 01:06:01 UTC (rev 179905)
@@ -1599,6 +1599,15 @@
return timeValue;
}
+double MediaPlayerPrivateAVFoundationObjC::maximumDurationToCacheMediaTime() const
+{
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1010
+ return 0;
+#else
+ return 5;
+#endif
+}
+
void MediaPlayerPrivateAVFoundationObjC::updateVideoLayerGravity()
{
if (!m_videoLayer)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
