Changeset 179905 in webkit

Timestamp:

Feb 10, 2015, 5:06:01 PM (12 years ago)

Author:

bshafiei@apple.com

Message:

Merged r179843. rdar://problem/19432919

Location:

branches/safari-600.1.4.15-branch/Source/WebCore

Files:

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

branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-10  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r179843.
+
+    2015-02-09  Jer Noble  <jer.noble@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  <bshafiei@apple.com>
 

branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h

@@ -165 +165 @@
     virtual bool supportsAcceleratedRendering() const { return true; }
     virtual float mediaTimeForTimeValue(float) const;
-    virtual double maximumDurationToCacheMediaTime() const { return 5; }
+    virtual double maximumDurationToCacheMediaTime() const;
 
     virtual void createAVPlayer();

branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

@@ -1600 +1600 @@
 }
 
+double MediaPlayerPrivateAVFoundationObjC::maximumDurationToCacheMediaTime() const
+{
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1010
+    return 0;
+#else
+    return 5;
+#endif
+}
+
 void MediaPlayerPrivateAVFoundationObjC::updateVideoLayerGravity()
 {