Attachment 110017 Details for Bug 69468 – Patch

[patch] Patch

bug-69468-20111006141018.patch (text/plain), 1.88 KB, created by Jer Noble on 2011-10-06 14:10:19 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jer Noble

Created: 2011-10-06 14:10:19 PDT

Size: 1.88 KB

patch

obsolete

>Subversion Revision: 96744
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1e6fb35ae9bc2529924a84ab7e5b4c28cc9f0661..f82e8646876db7b9594b90c3a5a601f4b6cc96df 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2011-10-06  Jer Noble  <jer.noble@apple.com>
>+
>+        media/video-loop.html is failing on Lion because of negative currentTime()
>+        https://bugs.webkit.org/show_bug.cgi?id=69468
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No new tests. Covered by media/video-loop.html test.
>+
>+        AVFoundation will occasionally return small, negative current times during loop operations.
>+        Clean up these negative times before returning the currentTime.
>+
>+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
>+        (WebCore::MediaPlayerPrivateAVFoundationObjC::currentTime):
>+
> 2011-09-21  Jer Noble  <jer.noble@apple.com>
> 
>         Enable WEB_AUDIO by default in the WebKit/mac port.
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>index 2e1f55a6da6983f022247d03646baa5c4943a594..cc0984875fda9e55c143ac6a96f0877a4da0eaa5 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>@@ -430,8 +430,10 @@ float MediaPlayerPrivateAVFoundationObjC::currentTime() const
>         return 0;
> 
>     CMTime itemTime = [m_avPlayerItem.get() currentTime];
>-    if (CMTIME_IS_NUMERIC(itemTime))
>-        return narrowPrecisionToFloat(CMTimeGetSeconds(itemTime));
>+    if (CMTIME_IS_NUMERIC(itemTime)) {
>+        float seconds = narrowPrecisionToFloat(CMTimeGetSeconds(itemTime));
>+        return max(seconds, 0.0f);
>+    }
> 
>     return 0;
> }

Flags:

darin: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 69468: 110017