Changeset 70814 in webkit

Timestamp:

Oct 28, 2010 2:46:48 PM (13 years ago)

Author:

eric.carlson@apple.com

Message:

2010-10-28 Eric Carlson <​eric.carlson@apple.com>

Reviewed by Adam Roben.

Seeking by very small increment doesn't generate 'seeked' event
​https://bugs.webkit.org/show_bug.cgi?id=48530

Test: media/video-seek-by-small-increment.html

• html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::seek): Ask the media engine for its closest time value so we can avoid asking it to seek to the current time.

• platform/graphics/MediaPlayer.cpp: (WebCore::MediaPlayer::mediaTimeForTimeValue): New.
• platform/graphics/MediaPlayer.h:
• platform/graphics/MediaPlayerPrivate.h: (WebCore::MediaPlayerPrivateInterface::mediaTimeForTimeValue): Ditto.

• platform/graphics/mac/MediaPlayerPrivateQTKit.h:
• platform/graphics/mac/MediaPlayerPrivateQTKit.mm: (WebCore::MediaPlayerPrivate::mediaTimeForTimeValue): Return the closest value in the movie's time scale.

• platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp: (WebCore::MediaPlayerPrivateQuickTimeVisualContext::mediaTimeForTimeValue): Ditto
• platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h:

• platform/graphics/win/QTMovie.cpp: (QTMovie::timeScale): Return the movie's time scale.
• platform/graphics/win/QTMovie.h:

2010-10-28 Eric Carlson <​eric.carlson@apple.com>

Reviewed by Adam Roben.

Seeking by very small increment doesn't generate 'seeked' event
​https://bugs.webkit.org/show_bug.cgi?id=48530

• media/video-seek-by-small-increment-expected.txt: Added.
• media/video-seek-by-small-increment.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-seek-by-small-increment-expected.txt (added)
• LayoutTests/media/video-seek-by-small-increment.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLMediaElement.cpp (modified) (1 diff)
• WebCore/platform/graphics/MediaPlayer.cpp (modified) (1 diff)
• WebCore/platform/graphics/MediaPlayer.h (modified) (1 diff)
• WebCore/platform/graphics/MediaPlayerPrivate.h (modified) (1 diff)
• WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (modified) (1 diff)
• WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (modified) (1 diff)
• WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp (modified) (1 diff)
• WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h (modified) (1 diff)
• WebCore/platform/graphics/win/QTMovie.cpp (modified) (1 diff)
• WebCore/platform/graphics/win/QTMovie.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-28  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Seeking by very small increment doesn't generate 'seeked' event
+        https://bugs.webkit.org/show_bug.cgi?id=48530
+
+        * media/video-seek-by-small-increment-expected.txt: Added.
+        * media/video-seek-by-small-increment.html: Added.
+
 2010-10-28  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-28  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Seeking by very small increment doesn't generate 'seeked' event
+        https://bugs.webkit.org/show_bug.cgi?id=48530
+
+        Test: media/video-seek-by-small-increment.html
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::seek): Ask the media engine for its closest time value so we can
+        avoid asking it to seek to the current time.
+
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::MediaPlayer::mediaTimeForTimeValue): New.
+        * platform/graphics/MediaPlayer.h:
+        * platform/graphics/MediaPlayerPrivate.h:
+        (WebCore::MediaPlayerPrivateInterface::mediaTimeForTimeValue): Ditto.
+
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+        (WebCore::MediaPlayerPrivate::mediaTimeForTimeValue): Return the closest value in the movie's time scale.
+
+        * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::mediaTimeForTimeValue): Ditto
+        * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h:
+
+        * platform/graphics/win/QTMovie.cpp:
+        (QTMovie::timeScale): Return the movie's time scale.
+        * platform/graphics/win/QTMovie.h:
+
 2010-10-28  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/html/HTMLMediaElement.cpp

@@ -1114 +1114 @@
     time = max(time, earliestTime);
 
+    // Ask the media engine for the time value in the movie's time scale before comparing with current time. This
+    // is necessary because if the seek time is not equal to currentTime but the delta is less than the movie's
+    // time scale, we will ask the media engine to "seek" to the current movie time, which may be a noop and
+    // not generate a timechanged callback. This means m_seeking will never be cleared and we will never 
+    // fire a 'seeked' event.
+#if !LOG_DISABLED
+    float mediaTime = m_player->mediaTimeForTimeValue(time);
+    if (time != mediaTime)
+        LOG(Media, "HTMLMediaElement::seek(%f) - media timeline equivalent is %f", time, mediaTime);
+#endif
+    time = m_player->mediaTimeForTimeValue(time);
+
     // 7 - If the (possibly now changed) new playback position is not in one of the ranges given in the 
     // seekable attribute, then let it be the position in one of the ranges given in the seekable attribute 

trunk/WebCore/platform/graphics/MediaPlayer.cpp

@@ -644 +644 @@
 }
 
+float MediaPlayer::mediaTimeForTimeValue(float timeValue) const
+{
+    return m_private->mediaTimeForTimeValue(timeValue);
+}
+
 // Client callbacks.
 void MediaPlayer::networkStateChanged()

trunk/WebCore/platform/graphics/MediaPlayer.h

@@ -275 +275 @@
     bool hasSingleSecurityOrigin() const;
 
+    float mediaTimeForTimeValue(float) const;
+
 private:
     MediaPlayer(MediaPlayerClient*);

trunk/WebCore/platform/graphics/MediaPlayerPrivate.h

@@ -126 +126 @@
     virtual void prepareForRendering() { }
 
+    // Time value in the movie's time scale. It is only necessary to override this if the media
+    // engine uses rational numbers to represent media time.
+    virtual float mediaTimeForTimeValue(float timeValue) const { return timeValue; }
+
 };
 

trunk/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h

@@ -174 +174 @@
     bool isReadyForVideoSetup() const;
     
+    virtual float mediaTimeForTimeValue(float) const;
+
     MediaPlayer* m_player;
     RetainPtr<QTMovie> m_qtMovie;

trunk/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm

@@ -1541 +1541 @@
 }
 
+float MediaPlayerPrivate::mediaTimeForTimeValue(float timeValue) const
+{
+    if (!metaDataAvailable())
+        return timeValue;
+
+    QTTime qttime = createQTTime(timeValue);
+    return static_cast<float>(qttime.timeValue) / qttime.timeScale;
+}
+
 } // namespace WebCore
 

trunk/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp

@@ -1054 +1054 @@
 }
 
+float MediaPlayerPrivateQuickTimeVisualContext::mediaTimeForTimeValue(float timeValue) const
+{
+    long timeScale;
+    if (m_readyState < MediaPlayer::HaveMetadata || !(timeScale = m_movie->timeScale()))
+        return timeValue;
+
+    long mediaTimeValue = static_cast<long>(timeValue * timeScale);
+    return static_cast<float>(mediaTimeValue) / timeScale;
+}
+
 MediaPlayerPrivateQuickTimeVisualContext::MediaRenderingMode MediaPlayerPrivateQuickTimeVisualContext::currentRenderingMode() const
 {

trunk/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h

@@ -174 +174 @@
     void retrieveAndResetMovieTransform();
 
+    virtual float mediaTimeForTimeValue(float) const;
+
     MediaPlayer* m_player;
     RefPtr<QTMovie> m_movie;

trunk/WebCore/platform/graphics/win/QTMovie.cpp

@@ -739 +739 @@
 }
 
+long QTMovie::timeScale() const 
+{
+    if (!m_private->m_movie)
+        return 0;
+
+    return GetMovieTimeScale(m_private->m_movie);
+}
+
 static void initializeSupportedTypes() 
 {

trunk/WebCore/platform/graphics/win/QTMovie.h

@@ -116 +116 @@
     Movie getMovieHandle() const;
 
+    long timeScale() const;
+
 private:
     QTMoviePrivate* m_private;