Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #26837 from edx/sarina/LEARNER-8247

Browse Source 
Update edX-hosted video player to use 2x playback speed
This commit is contained in:
Sarina Canelake
2021-03-10 10:20:32 -05:00
committed by GitHub
parent 8aa056e230 ac4c1c37b7
commit 28933de4cb
6 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/lib/xmodule/xmodule/js/spec/helper.js
View File

@@ -123,7 +123,7 @@
}
};
jasmine.stubbedHtml5Speeds = ['0.75', '1.0', '1.25', '1.50'];
jasmine.stubbedHtml5Speeds = ['0.75', '1.0', '1.25', '1.50', '2.0'];
jasmine.stubRequests = function() {
var spy = $.ajax;

12
common/lib/xmodule/xmodule/js/spec/video/html5_video_spec.js
View File

@@ -3,7 +3,7 @@
var STATUS = window.STATUS;
var state,
oldOTBD,
playbackRates = [0.75, 1.0, 1.25, 1.5],
playbackRates = [0.75, 1.0, 1.25, 1.5, 2.0],
describeInfo,
POSTER_URL = '/media/video-images/poster.png';
@@ -280,8 +280,14 @@
});
describe('setPlaybackRate', function() {
it('set a correct value', function() {
playbackRate = 1.5;
it('set a slow value', function() {
playbackRate = 0.75;
state.videoPlayer.player.setPlaybackRate(playbackRate);
expect(state.videoPlayer.player.video.playbackRate).toBe(playbackRate);
});
it('set a fast value', function() {
playbackRate = 2.0;
state.videoPlayer.player.setPlaybackRate(playbackRate);
expect(state.videoPlayer.player.video.playbackRate).toBe(playbackRate);
});

18
common/lib/xmodule/xmodule/js/spec/video/initialize_spec.js
View File

@@ -194,12 +194,12 @@ function(Initialize) {
describe('HTML5', function() {
beforeEach(function() {
state = {
speeds: ['0.75', '1.0', '1.25', '1.50'],
speeds: ['0.75', '1.0', '1.25', '1.50', '2.0'],
storage: jasmine.createSpyObj('storage', ['setItem'])
};
});
describe('when new speed is available', function() {
describe('when 0.75 speed is available', function() {
beforeEach(function() {
Initialize.prototype.setSpeed.call(state, '0.75');
});
@@ -209,6 +209,17 @@ function(Initialize) {
});
});
describe('when 2.0 speed is available', function() {
beforeEach(function() {
Initialize.prototype.setSpeed.call(state, '2.0');
});
it('set new speed', function() {
expect(state.speed).toEqual(2.0);
});
});
describe('when new speed is not available', function() {
beforeEach(function() {
Initialize.prototype.setSpeed.call(state, '1.75');
@@ -222,8 +233,7 @@ function(Initialize) {
it('check mapping', function() {
var map = {
0.25: '0.75',
'0.50': '0.75',
'2.0': '1.50'
'0.50': '0.75'
};
$.each(map, function(key, expected) {

24
common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js
View File

@@ -143,36 +143,36 @@
expect($speedButton).toBeFocused();
});
it('ENTER keydown on speed entry selects speed and closes menu',
it('ENTER keydown on speed entry selects 2.0x speed and closes menu',
function() {
// First open menu.
$speedControl.trigger(keyPressEvent(KEY.UP));
// Focus on 1.50x speed
// Focus on 2.0x speed
speedEntries.eq(0).focus();
speedEntries.eq(0).trigger(keyPressEvent(KEY.ENTER));
// Menu is closed, focus has been returned to speed
// control and video speed is 1.50x.
// control and video speed is 2.0x.
expect($speedButton).toBeFocused();
expect($('.video-speeds li[data-speed="1.50"]'))
expect($('.video-speeds li[data-speed="2.0"]'))
.toHaveClass('is-active');
expect($('.speeds .value')).toHaveHtml('1.50x');
expect($('.speeds .value')).toHaveHtml('2.0x');
});
it('SPACE keydown on speed entry selects speed and closes menu',
it('SPACE keydown on speed entry selects 0.75x speed and closes menu',
function() {
// First open menu.
$speedControl.trigger(keyPressEvent(KEY.UP));
// Focus on 1.50x speed
speedEntries.eq(0).focus();
speedEntries.eq(0).trigger(keyPressEvent(KEY.SPACE));
// Focus on 0.75x speed
speedEntries.eq(4).focus();
speedEntries.eq(4).trigger(keyPressEvent(KEY.SPACE));
// Menu is closed, focus has been returned to speed
// control and video speed is 1.50x.
// control and video speed is 0.75x.
expect($speedButton).toBeFocused();
expect($('.video-speeds li[data-speed="1.50"]'))
expect($('.video-speeds li[data-speed="0.75"]'))
.toHaveClass('is-active');
expect($('.speeds .value')).toHaveHtml('1.50x');
expect($('.speeds .value')).toHaveHtml('0.75x');
});
});
});

6
common/lib/xmodule/xmodule/js/src/video/01_initialize.js
View File

@@ -269,7 +269,7 @@ function(VideoPlayer, i18n, moment, _) {
// The function prepare HTML5 video, parse HTML5
// video sources etc.
function _prepareHTML5Video(state) {
state.speeds = ['0.75', '1.0', '1.25', '1.50'];
state.speeds = ['0.75', '1.0', '1.25', '1.50', '2.0'];
// If none of the supported video formats can be played and there is no
// short-hand video links, than hide the spinner and show error message.
if (!state.config.sources.length) {
@@ -669,7 +669,7 @@ function(VideoPlayer, i18n, moment, _) {
function setSpeed(newSpeed) {
// Possible speeds for each player type.
// HTML5 = [0.75, 1, 1.25, 1.5]
// HTML5 = [0.75, 1, 1.25, 1.5, 2]
// Youtube Flash = [0.75, 1, 1.25, 1.5]
// Youtube HTML5 = [0.25, 0.5, 1, 1.5, 2]
var map = {
@@ -677,7 +677,7 @@ function(VideoPlayer, i18n, moment, _) {
'0.50': '0.75', // Youtube HTML5 -> HTML5 or Youtube Flash
0.75: '0.50', // HTML5 or Youtube Flash -> Youtube HTML5
1.25: '1.50', // HTML5 or Youtube Flash -> Youtube HTML5
'2.0': '1.50' // Youtube HTML5 -> HTML5 or Youtube Flash
2.0: '1.50' // HTML5 or Youtube HTML5 -> Youtube Flash
};
if (_.contains(this.speeds, newSpeed)) {

2
common/lib/xmodule/xmodule/js/src/video/02_html5_video.js
View File

@@ -192,7 +192,7 @@ function(_) {
};
Player.prototype.getAvailablePlaybackRates = function() {
return [0.75, 1.0, 1.25, 1.5];
return [0.75, 1.0, 1.25, 1.5, 2.0];
};
// eslint-disable-next-line no-underscore-dangle