Skip to content

GitLab

T
tangled
Commit 7ef6838a authored by jer.noble@apple.com's avatar jer.noble@apple.com
Browse files
Options

2011-04-06 Jer Noble <jer.noble@apple.com> 

        Reviewed by Eric Carlson.

        MediaPlayerPrivateAVFoundation does not change rate due to setRate().
        https://bugs.webkit.org/show_bug.cgi?id=57919

        * media/video-set-rate-from-pause-expected.txt: Added.
        * media/video-set-rate-from-pause.html: Added.
2011-04-06  Jer Noble  <jer.noble@apple.com>

        Reviewed by Eric Carlson.

        MediaPlayerPrivateAVFoundation does not change rate due to setRate().
        https://bugs.webkit.org/show_bug.cgi?id=57919

        Test: media/video-set-rate-from-pause.html

        The base class of MediaPlayerPrivateAVFoundation does not actually change the rate
        of the media; instead a subclass must do that work.  So when setRate() is called,
        inform a subclass through a new pure virtual updateRate() function that there's
        work to be done.

        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
        (WebCore::MediaPlayerPrivateAVFoundation::setRate): Call updateRate()
        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.h:
        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm:
        (WebCore::MediaPlayerPrivateAVFoundationObjC::updateRate): Added.  Set the requested rate.

git-svn-id: svn://svn.chromium.org/blink/trunk@83134 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 3c7c546d
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 0 deletions
third_party/WebKit/LayoutTests/ChangeLog
View file @ 7ef6838a
2011-04-06 Jer Noble <jer.noble@apple.com>
Reviewed by Eric Carlson.
MediaPlayerPrivateAVFoundation does not change rate due to setRate().
https://bugs.webkit.org/show_bug.cgi?id=57919
* media/video-set-rate-from-pause-expected.txt: Added.
* media/video-set-rate-from-pause.html: Added.
2011-04-06 Dan Bernstein <mitz@apple.com>
Correct results for the Geeza Pro metrics change.
third_party/WebKit/LayoutTests/media/video-set-rate-from-pause-expected.txt 0 → 100644
View file @ 7ef6838a
Test that setting a non-zero rate causes an async timeupdate event.
EVENT(canplaythrough)
EVENT(play)
EVENT(timeupdate)
END OF TEST
third_party/WebKit/LayoutTests/media/video-set-rate-from-pause.html 0 → 100644
View file @ 7ef6838a
<!DOCTYPE html>
<html>
<head>
<script src=media-file.js></script>
<script src=video-test.js></script>
<script>
function init() {
findMediaElement();
waitForEvent('canplaythrough', receivedCanPlayThrough);
video.src = findMediaFile("video", "content/test");
}
function receivedCanPlayThrough() {
waitForEvent('play', receivedPlay);
video.playbackRate = 0;
video.play();
}
function receivedPlay() {
waitForEventAndEnd('timeupdate');
video.playbackRate = 1;
}
</script>
</head>
<body onload="init()">
<video controls></video>
<p>Test that setting a non-zero rate causes an async timeupdate event.</p>
</body>
</html>
third_party/WebKit/Source/WebCore/ChangeLog
View file @ 7ef6838a
2011-04-06 Jer Noble <jer.noble@apple.com>
Reviewed by Eric Carlson.
MediaPlayerPrivateAVFoundation does not change rate due to setRate().
https://bugs.webkit.org/show_bug.cgi?id=57919
Test: media/video-set-rate-from-pause.html
The base class of MediaPlayerPrivateAVFoundation does not actually change the rate
of the media; instead a subclass must do that work. So when setRate() is called,
inform a subclass through a new pure virtual updateRate() function that there's
work to be done.
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::setRate): Call updateRate()
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.h:
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::updateRate): Added. Set the requested rate.
2011-04-06 Dai Mikurube <dmikurube@chromium.org>
Reviewed by David Levin.
third_party/WebKit/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
View file @ 7ef6838a
......@@ -285,6 +285,8 @@ void MediaPlayerPrivateAVFoundation::setRate(float rate)
{
LOG(Media, "MediaPlayerPrivateAVFoundation::setRate(%p) - seting to %f", this, rate);
m_requestedRate = rate;
updateRate();
}
bool MediaPlayerPrivateAVFoundation::paused() const
......
third_party/WebKit/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h
View file @ 7ef6838a
......@@ -170,6 +170,7 @@ protected:
virtual AVAssetStatus assetStatus() const = 0;
virtual void checkPlayability() = 0;
virtual void updateRate() = 0;
virtual float rate() const = 0;
virtual void seekToTime(float time) = 0;
virtual unsigned totalBytes() const = 0;
......
third_party/WebKit/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.h
View file @ 7ef6838a
......@@ -93,6 +93,7 @@ private:
virtual MediaPlayerPrivateAVFoundation::AVAssetStatus assetStatus() const;
virtual void checkPlayability();
virtual void updateRate();
virtual float rate() const;
virtual void seekToTime(float time);
virtual unsigned totalBytes() const;
......
third_party/WebKit/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm
View file @ 7ef6838a
......@@ -437,6 +437,13 @@ void MediaPlayerPrivateAVFoundationObjC::setClosedCaptionsVisible(bool closedCap
[m_avPlayer.get() setClosedCaptionDisplayEnabled:closedCaptionsVisible];
}
void MediaPlayerPrivateAVFoundationObjC::updateRate()
{
setDelayCallbacks(true);
[m_avPlayer.get() setRate:requestedRate()];
setDelayCallbacks(false);
}
float MediaPlayerPrivateAVFoundationObjC::rate() const
{
if (!metaDataAvailable())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment