Changeset 223182 in webkit

Timestamp:

Oct 11, 2017, 9:09:26 AM (9 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r221937. rdar://problem/34893195

Location:

branches/safari-604-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/cf/CoreMediaSoftLink.cpp (modified) (1 diff)
• platform/cf/CoreMediaSoftLink.h (modified) (1 diff)
• platform/graphics/cocoa/WebCoreDecompressionSession.mm (modified) (1 diff)

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

@@ +1 @@
+2017-10-10  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r221937. rdar://problem/34893195
+
+    2017-09-12  Jer Noble  <jer.noble@apple.com>
+
+            [MSE] Don't increase the reported totalFrameDelay for non-displayed frames (or frames coming in while paused).
+            https://bugs.webkit.org/show_bug.cgi?id=175900
+
+            Reviewed by Eric Carlson.
+
+            When seeking to a specific time, the decompression session necessarily needs to be fed samples from before that
+            time (i.e., all samples from the previous I-frame forward). These shouldn't contribute to the "total frame
+            delay" metric. Neither should samples delivered when the video is paused (like, during seeking), as a frame can't
+            be "late" if time is not moving forward.
+
+            * platform/graphics/cocoa/WebCoreDecompressionSession.mm:
+            (WebCore::WebCoreDecompressionSession::handleDecompressionOutput):
+            * platform/cf/CoreMediaSoftLink.cpp:
+            * platform/cf/CoreMediaSoftLink.h:
+
 2017-10-10  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-604-branch/Source/WebCore/platform/cf/CoreMediaSoftLink.cpp

@@ -103 +103 @@
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMTimebaseCreateWithMasterClock, OSStatus, (CFAllocatorRef allocator, CMClockRef masterClock, CMTimebaseRef *timebaseOut), (allocator, masterClock, timebaseOut))
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMTimebaseGetTime, CMTime, (CMTimebaseRef timebase), (timebase))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMTimebaseGetRate, Float64, (CMTimebaseRef timebase), (timebase))
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMTimebaseSetRate, OSStatus, (CMTimebaseRef timebase, Float64 rate), (timebase, rate))
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMTimebaseSetTime, OSStatus, (CMTimebaseRef timebase, CMTime time), (timebase, time))

branches/safari-604-branch/Source/WebCore/platform/cf/CoreMediaSoftLink.h

@@ -164 +164 @@
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreMedia, CMTimebaseGetTime, CMTime, (CMTimebaseRef timebase), (timebase))
 #define CMTimebaseGetTime softLink_CoreMedia_CMTimebaseGetTime
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreMedia, CMTimebaseGetRate, Float64, (CMTimebaseRef timebase), (timebase))
+#define CMTimebaseGetRate softLink_CoreMedia_CMTimebaseGetRate
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreMedia, CMTimebaseSetRate, OSStatus, (CMTimebaseRef timebase, Float64 rate), (timebase, rate))
 #define CMTimebaseSetRate softLink_CoreMedia_CMTimebaseSetRate

branches/safari-604-branch/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.mm

@@ -280 +280 @@
     }
 
-    auto currentTime = CMTimebaseGetTime(m_timebase.get());
-    if (m_timebase && CMTimeCompare(presentationTimeStamp, currentTime) < 0)
-        m_totalFrameDelay += toMediaTime(CMTimeSubtract(currentTime, presentationTimeStamp));
+    if (displaying && m_timebase) {
+        auto currentTime = CMTimebaseGetTime(m_timebase.get());
+        auto currentRate = CMTimebaseGetRate(m_timebase.get());
+        if (currentRate > 0 && CMTimeCompare(presentationTimeStamp, currentTime) < 0)
+            m_totalFrameDelay += toMediaTime(CMTimeSubtract(currentTime, presentationTimeStamp));
+    }
 
     dispatch_async(m_enqueingQueue.get(), [protectedThis = makeRefPtr(this), status, imageSampleBuffer = adoptCF(rawImageSampleBuffer), infoFlags, displaying] {