зеркало из https://github.com/mozilla/gecko-dev.git
Bug 886173 - Preserve playbackRate across pause/play. r=cpearce
This commit is contained in:
Paul Adenot
Родитель
4dcbf9f869
Коммит
6dccab695c
|
|
@ -2097,8 +2097,6 @@ HTMLMediaElement::Play(ErrorResult& aRv)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SetPlaybackRate(mDefaultPlaybackRate);
|
|
||||||
|
|
||||||
mPaused = false;
|
mPaused = false;
|
||||||
mAutoplaying = false;
|
mAutoplaying = false;
|
||||||
// We changed mPaused and mAutoplaying which can affect AddRemoveSelfReference
|
// We changed mPaused and mAutoplaying which can affect AddRemoveSelfReference
|
||||||
|
|
|
||||||
|
|
@ -140,6 +140,7 @@ MOCHITEST_FILES = \
|
||||||
test_VideoPlaybackQuality.html \
|
test_VideoPlaybackQuality.html \
|
||||||
test_VideoPlaybackQuality_disabled.html \
|
test_VideoPlaybackQuality_disabled.html \
|
||||||
test_webvtt_disabled.html \
|
test_webvtt_disabled.html \
|
||||||
|
test_playback_rate_playpause.html \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
# Disabled on Windows for frequent intermittent failures
|
# Disabled on Windows for frequent intermittent failures
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,6 @@ var gProgressTests = [
|
||||||
// Used by test_played.html
|
// Used by test_played.html
|
||||||
var gPlayedTests = [
|
var gPlayedTests = [
|
||||||
{ name:"big.wav", type:"audio/x-wav", duration:9.0 },
|
{ name:"big.wav", type:"audio/x-wav", duration:9.0 },
|
||||||
{ name:"sound.ogg", type:"audio/ogg", duration:4.0 },
|
|
||||||
{ name:"seek.ogv", type:"video/ogg", duration:3.966 },
|
{ name:"seek.ogv", type:"video/ogg", duration:3.966 },
|
||||||
{ name:"seek.webm", type:"video/webm", duration:3.966 },
|
{ name:"seek.webm", type:"video/webm", duration:3.966 },
|
||||||
{ name:"gizmo.mp4", type:"video/mp4", duration:5.56 },
|
{ name:"gizmo.mp4", type:"video/mp4", duration:5.56 },
|
||||||
|
|
|
||||||
|
|
@ -113,40 +113,7 @@ function onended(e) {
|
||||||
ok(!t.muted, "The audio should be muted when playing at high speed, but should not appear as such.");
|
ok(!t.muted, "The audio should be muted when playing at high speed, but should not appear as such.");
|
||||||
is(t.currentTime, t.duration, "Current time should be equal to the duration (not change by playback rate).");
|
is(t.currentTime, t.duration, "Current time should be equal to the duration (not change by playback rate).");
|
||||||
}
|
}
|
||||||
test_defaultPlaybackRate(e);
|
finish_test(t);
|
||||||
}
|
|
||||||
|
|
||||||
function test_defaultPlaybackRate(e) {
|
|
||||||
var t = e.target;
|
|
||||||
t.currentTime = 0.0;
|
|
||||||
t.defaultPlaybackRate = SLOW_RATE;
|
|
||||||
t.addEventListener("timeupdate", ontimeupdate_defaultPlaybackRate);
|
|
||||||
t.startTimestamp = Date.now();
|
|
||||||
t.play();
|
|
||||||
}
|
|
||||||
|
|
||||||
function ontimeupdate_defaultPlaybackRate(e) {
|
|
||||||
var t = e.target;
|
|
||||||
if (t.currentTime > t.duration / 10) {
|
|
||||||
t.oldCurrentTime = t.currentTime;
|
|
||||||
t.timestamp = Date.now();
|
|
||||||
var delta = t.oldCurrentTime,
|
|
||||||
delta_wallclock = (t.timestamp - t.startTimestamp - t.bufferingTime) / 1000;
|
|
||||||
|
|
||||||
t.bufferingTime = 0;
|
|
||||||
|
|
||||||
is(t.playbackRate, SLOW_RATE,
|
|
||||||
"The playback rate shoud be "+SLOW_RATE+"." + t.token + '\n');
|
|
||||||
is(t.defaultPlaybackRate, SLOW_RATE,
|
|
||||||
"The default playback rate shoud be "+SLOW_RATE+"." + t.token);
|
|
||||||
ok(delta_wallclock > delta , "We are effectively slowing down playback. (" + delta_wallclock + ", " + delta + ")");
|
|
||||||
if (t.skippedFastPart) {
|
|
||||||
is(t.ratechangecount, 7, "We should have received 7 \"ratechange\" events.");
|
|
||||||
} else {
|
|
||||||
is(t.ratechangecount, 8, "We should have received 8 \"ratechange\" events.");
|
|
||||||
}
|
|
||||||
finish_test(t);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function onratechange(e) {
|
function onratechange(e) {
|
||||||
|
|
@ -207,7 +174,6 @@ function startTest(test, token) {
|
||||||
element.playbackRate = VERY_SLOW_RATE;
|
element.playbackRate = VERY_SLOW_RATE;
|
||||||
is(element.playbackRate, SLOW_RATE, "PlaybackRate should be clamped to " + SLOW_RATE + ".");
|
is(element.playbackRate, SLOW_RATE, "PlaybackRate should be clamped to " + SLOW_RATE + ".");
|
||||||
element.play();
|
element.play();
|
||||||
is(element.playbackRate, 1.0, "playbackRate should be reset to 1.0 on play() call");
|
|
||||||
element.playbackRate = SLOW_RATE;
|
element.playbackRate = SLOW_RATE;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,73 @@
|
||||||
|
<!DOCTYPE HTML>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>Test that the playbackRate property is not reset when resuming the playback</title>
|
||||||
|
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||||
|
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
||||||
|
<script type="text/javascript" src="manifest.js"></script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<pre id="test">
|
||||||
|
<script class="testbody" type='application/javascript;version=1.8'>
|
||||||
|
|
||||||
|
if (navigator.platform.startsWith("Win")) {
|
||||||
|
SimpleTest.expectAssertions(0, 1);
|
||||||
|
} else if (navigator.platform.startsWith("Mac")) {
|
||||||
|
SimpleTest.expectAssertions(0, 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
let manager = new MediaTestManager;
|
||||||
|
|
||||||
|
function ontimeupdate(e) {
|
||||||
|
var t = e.target;
|
||||||
|
if (t.currentTime != 0.0) {
|
||||||
|
dump(t.token + " t.currentTime != 0.0.\n");
|
||||||
|
t.removeEventListener("timeupdate", ontimeupdate);
|
||||||
|
t.pause();
|
||||||
|
is(t.playbackRate, 0.5, "PlaybackRate should not have changed after pause.");
|
||||||
|
} else {
|
||||||
|
dump(t.token + " t.currentTime == 0.0.\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function onpaused(e) {
|
||||||
|
var t = e.target;
|
||||||
|
dump(t.token + " onpaused.\n");
|
||||||
|
t.play();
|
||||||
|
is(t.playbackRate, 0.5, "PlaybackRate should not have changed after resuming playback.");
|
||||||
|
finish_test(t);
|
||||||
|
}
|
||||||
|
|
||||||
|
function finish_test(element) {
|
||||||
|
dump(element.token + " finish_test.\n");
|
||||||
|
if (element.parentNode)
|
||||||
|
element.parentNode.removeChild(element);
|
||||||
|
element.src="";
|
||||||
|
manager.finished(element.token);
|
||||||
|
}
|
||||||
|
|
||||||
|
function startTest(test, token) {
|
||||||
|
let elemType = /^audio/.test(test.type) ? "audio" : "video";
|
||||||
|
let element = document.createElement(elemType);
|
||||||
|
element.src = test.name;
|
||||||
|
element.token = token;
|
||||||
|
element.controls = true;
|
||||||
|
element.playbackRate = 0.5;
|
||||||
|
element.addEventListener("timeupdate", ontimeupdate);
|
||||||
|
element.addEventListener("pause", onpaused);
|
||||||
|
element.addEventListener("loadedmetadata", function() {
|
||||||
|
dump(element.token + " loadedmetadata\n");
|
||||||
|
element.play();
|
||||||
|
});
|
||||||
|
document.body.appendChild(element);
|
||||||
|
manager.started(token);
|
||||||
|
}
|
||||||
|
|
||||||
|
manager.runTests(gPlayedTests, startTest);
|
||||||
|
|
||||||
|
</script>
|
||||||
|
</pre>
|
||||||
|
<div id="elements">
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
@ -1004,6 +1004,7 @@
|
||||||
if (this.video.paused || this.video.ended) {
|
if (this.video.paused || this.video.ended) {
|
||||||
this._triggeredByControls = true;
|
this._triggeredByControls = true;
|
||||||
this.hideClickToPlay();
|
this.hideClickToPlay();
|
||||||
|
this.video.playbackRate = this.video.defaultPlaybackRate;
|
||||||
this.video.play();
|
this.video.play();
|
||||||
} else {
|
} else {
|
||||||
this.video.pause();
|
this.video.pause();
|
||||||
|
|
|
||||||
Загрузка…
Ссылка в новой задаче