Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: drm codec selection issues #878

Merged
merged 3 commits into from
Jun 25, 2020
Merged

fix: drm codec selection issues #878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2fd8e3
see the failure
brandonocasey Jun 24, 2020
376baa3
fix: wait until sourcebuffer creation for drm setup
brandonocasey Jun 24, 2020
515f5d3
skip on firefox
brandonocasey Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/videojs-http-streaming.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,9 @@ class VhsHandler extends Component {
this.masterPlaylistController_.on('selectedinitialmedia', () => {
// Add the manual rendition mix-in to VhsHandler
renditionSelectionMixin(this);
});

this.masterPlaylistController_.sourceUpdater_.on('ready', () => {
setupEmeOptions(this);
});

Expand Down
47 changes: 45 additions & 2 deletions test/playback.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import videojs from 'video.js';
import window from 'global/window';
import document from 'global/document';
import '../src/videojs-http-streaming';
import 'videojs-contrib-eme';

const playFor = function(player, time, cb) {
if (player.paused()) {
Expand Down Expand Up @@ -63,6 +64,7 @@ QUnit.module('Playback', {
}
});

this.player.eme();
this.player.ready(done, true);
},
afterEach() {
Expand Down Expand Up @@ -286,9 +288,50 @@ QUnit[testFn]('DASH sidx with alt audio should end', function(assert) {
});
});

// TODO: why does this make the next test
// throw an "The operation was aborted." on firefox
if (!videojs.browser.IS_FIREFOX) {
QUnit[testFn]('DRM Dash', function(assert) {
const done = assert.async();
const player = this.player;

player.one('ended', () => {
assert.ok(true, 'triggered ended');
assert.equal(player.error(), null, 'no errors');
done();
});

/* eslint-disable max-nested-callbacks */
playFor(player, 1, () => {
// switch audio playlist
player.audioTracks()[1].enabled = true;

playFor(player, 1, () => {
player.currentTime(player.duration() - 5);
});
});
/* eslint-enable max-nested-callbacks */

player.src({
src: 'https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest.mpd',
type: 'application/dash+xml',
keySystems: {
'com.microsoft.playready': {
url: 'https://drm-widevine-licensing.axtest.net/AcquireLicense',
licenseHeaders: {
'X-AxDRM-Message': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA'
}
},
'com.widevine.alpha': {
url: 'https://drm-widevine-licensing.axtest.net/AcquireLicense',
licenseHeaders: {
'X-AxDRM-Message': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA'
}
}
}
});
});

// TODO: why does this make the next test
// throw an "The operation was aborted." on firefox
QUnit[testFn]('loops', function(assert) {
const done = assert.async();
const player = this.player;
Expand Down
40 changes: 28 additions & 12 deletions test/videojs-http-streaming.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@ import testDataManifests from 'create-test-data!manifests';
import {
muxed as muxedSegment,
encryptionKey,
encrypted as encryptedSegment
encrypted as encryptedSegment,
audio as audioSegment,
video as videoSegment,
mp4VideoInit as mp4VideoInitSegment,
mp4Video as mp4VideoSegment,
mp4AudioInit as mp4AudioInitSegment,
mp4Audio as mp4AudioSegment
} from 'create-test-data!segments';
import {
useFakeEnvironment,
Expand Down Expand Up @@ -4254,7 +4260,7 @@ QUnit.test('populates quality levels list when available', function(assert) {
);
});

QUnit.test('configures eme for DASH if present on selectedinitialmedia', function(assert) {
QUnit.test('configures eme for DASH if present on sourceUpdater ready', function(assert) {
this.player.eme = {
options: {
previousSetting: 1
Expand Down Expand Up @@ -4300,7 +4306,7 @@ QUnit.test('configures eme for DASH if present on selectedinitialmedia', functio
}
};

this.player.tech_.vhs.masterPlaylistController_.trigger('selectedinitialmedia');
this.player.tech_.vhs.masterPlaylistController_.sourceUpdater_.trigger('ready');

assert.deepEqual(this.player.eme.options, {
previousSetting: 1
Expand All @@ -4320,7 +4326,7 @@ QUnit.test('configures eme for DASH if present on selectedinitialmedia', functio
}, 'set source eme options');
});

QUnit.test('configures eme for HLS if present on selectedinitialmedia', function(assert) {
QUnit.test('configures eme for HLS if present on sourceUpdater ready', function(assert) {
this.player.eme = {
options: {
previousSetting: 1
Expand Down Expand Up @@ -4351,7 +4357,7 @@ QUnit.test('configures eme for HLS if present on selectedinitialmedia', function
})
};

this.player.tech_.vhs.masterPlaylistController_.trigger('selectedinitialmedia');
this.player.tech_.vhs.masterPlaylistController_.sourceUpdater_.trigger('ready');

assert.deepEqual(this.player.eme.options, {
previousSetting: 1
Expand All @@ -4371,7 +4377,7 @@ QUnit.test('configures eme for HLS if present on selectedinitialmedia', function
}, 'set source eme options');
});

QUnit.test('integration: configures eme for DASH if present on selectedinitialmedia', function(assert) {
QUnit.test('integration: configures eme for DASH if present on sourceUpdater ready', function(assert) {
assert.timeout(3000);
const done = assert.async();

Expand All @@ -4389,9 +4395,9 @@ QUnit.test('integration: configures eme for DASH if present on selectedinitialme
}
}
});
this.clock.tick(1);
openMediaSource(this.player, this.clock);

this.player.tech_.vhs.masterPlaylistController_.on('selectedinitialmedia', () => {
this.player.tech_.vhs.masterPlaylistController_.sourceUpdater_.on('ready', () => {
assert.deepEqual(this.player.eme.options, {
previousSetting: 1
}, 'did not modify plugin options');
Expand All @@ -4414,9 +4420,15 @@ QUnit.test('integration: configures eme for DASH if present on selectedinitialme
this.standardXHRResponse(this.requests[0]);
// this allows the audio playlist loader to load
this.clock.tick(1);

// respond to segement request to get trackinfo
this.standardXHRResponse(this.requests[1], mp4VideoInitSegment());
this.standardXHRResponse(this.requests[2], mp4VideoSegment());
this.standardXHRResponse(this.requests[3], mp4AudioInitSegment());
this.standardXHRResponse(this.requests[4], mp4AudioSegment());
});

QUnit.test('integration: configures eme for HLS if present on selectedinitialmedia', function(assert) {
QUnit.test('integration: configures eme for HLS if present on sourceUpdater ready', function(assert) {
assert.timeout(3000);
const done = assert.async();

Expand All @@ -4434,9 +4446,9 @@ QUnit.test('integration: configures eme for HLS if present on selectedinitialmed
}
}
});
this.clock.tick(1);
openMediaSource(this.player, this.clock);

this.player.tech_.vhs.masterPlaylistController_.on('selectedinitialmedia', () => {
this.player.tech_.vhs.masterPlaylistController_.sourceUpdater_.on('ready', () => {
assert.deepEqual(this.player.eme.options, {
previousSetting: 1
}, 'did not modify plugin options');
Expand Down Expand Up @@ -4467,6 +4479,10 @@ QUnit.test('integration: configures eme for HLS if present on selectedinitialmed

// this allows the audio playlist loader to load
this.clock.tick(1);

// respond to segement request to get trackinfo
this.standardXHRResponse(this.requests.shift(), videoSegment());
this.standardXHRResponse(this.requests.shift(), audioSegment());
});

QUnit.test(
Expand Down Expand Up @@ -4511,7 +4527,7 @@ QUnit.test(
}
}
};
this.player.tech_.vhs.masterPlaylistController_.trigger('selectedinitialmedia');
this.player.tech_.vhs.masterPlaylistController_.sourceUpdater_.trigger('ready');

assert.deepEqual(this.player.currentSource(), {
src: 'manifest/master.mpd',
Expand Down