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

Jump to bottom

Add basic support to file type in mediaCapabilities implementation #3570

Merged
merged 4 commits into from
Aug 16, 2021
Merged

Add basic support to file type in mediaCapabilities implementation #3570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fdd3c40
Add basic support to file type in mediaCapabilities implementation
Aug 9, 2021
a1b1ab1
Merge branch 'master' into file-mediacapabilites-support
Aug 11, 2021
c346466
{boolean} should be good enough for the srcEqual parameter.
Aug 11, 2021
23b076e
Add test
Aug 11, 2021
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
13 changes: 12 additions & 1 deletion lib/media/drm_engine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ shaka.media.DrmEngine = class {

/** @const {!shaka.util.Destroyer} */
this.destroyer_ = new shaka.util.Destroyer(() => this.destroyNow_());

/** @private {boolean} */
this.srcEquals_ = false;
}

/** @override */
Expand Down Expand Up @@ -180,6 +183,7 @@ shaka.media.DrmEngine = class {
this.config_ = null;
this.onError_ = () => {};
this.playerInterface_ = null;
this.srcEquals_ = false;
}

/**
Expand All @@ -193,6 +197,13 @@ shaka.media.DrmEngine = class {
this.config_ = config;
}

/**
* @param {!boolean} value
*/
setSrcEquals(value) {
this.srcEquals_ = value;
}

/**
* Initialize the drm engine for storing and deleting stored content.
*
Expand Down Expand Up @@ -351,7 +362,7 @@ shaka.media.DrmEngine = class {
// We should get the decodingInfo results for the variants after we filling
// in the drm infos, and before queryMediaKeys_().
await shaka.util.StreamUtils.getDecodingInfosForVariants(variants,
this.usePersistentLicenses_);
this.usePersistentLicenses_, this.srcEquals_);

const hasDrmInfo = hadDrmInfo || Object.keys(this.config_.servers).length;
// An unencrypted content is initialized.
Expand Down
1 change: 1 addition & 0 deletions lib/player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2115,6 +2115,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
decodingInfos: [],
};

this.drmEngine_.setSrcEquals(/* srcEquals= */ true);
await this.drmEngine_.initForPlayback(
[variant], /* offlineSessionIds= */ []);
await this.drmEngine_.attach(has.mediaElement);
Expand Down
13 changes: 8 additions & 5 deletions lib/util/stream_utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ shaka.util.StreamUtils = class {
'MediaCapabilities should be valid.');

await shaka.util.StreamUtils.getDecodingInfosForVariants(
manifest.variants, usePersistentLicenses);
manifest.variants, usePersistentLicenses, /* srcEquals= */ false);
manifest.variants = manifest.variants.filter((variant) => {
const video = variant.video;
// See: https://github.com/google/shaka-player/issues/3380
Expand Down Expand Up @@ -456,9 +456,11 @@ shaka.util.StreamUtils = class {
*
* @param {!Array.<shaka.extern.Variant>} variants
* @param {boolean} usePersistentLicenses
* @param {boolean} srcEquals
* @exportDoc
*/
static async getDecodingInfosForVariants(variants, usePersistentLicenses) {
static async getDecodingInfosForVariants(variants, usePersistentLicenses,
srcEquals) {
const gotDecodingInfo = variants.some((variant) =>
variant.decodingInfos.length);
if (gotDecodingInfo) {
Expand All @@ -482,7 +484,7 @@ shaka.util.StreamUtils = class {
for (const variant of variants) {
/** @type {!Array.<!MediaDecodingConfiguration>} */
const decodingConfigs = shaka.util.StreamUtils.getDecodingConfigs_(
variant, usePersistentLicenses);
variant, usePersistentLicenses, srcEquals);

for (const config of decodingConfigs) {
operations.push(getVariantDecodingInfos(variant, config));
Expand All @@ -497,17 +499,18 @@ shaka.util.StreamUtils = class {
* results for each variant.
* @param {!shaka.extern.Variant} variant
* @param {boolean} usePersistentLicenses
* @param {boolean} srcEquals
* @return {!Array.<!MediaDecodingConfiguration>}
* @private
*/
static getDecodingConfigs_(variant, usePersistentLicenses) {
static getDecodingConfigs_(variant, usePersistentLicenses, srcEquals) {
const audio = variant.audio;
const video = variant.video;
const ContentType = shaka.util.ManifestParserUtils.ContentType;

/** @type {!MediaDecodingConfiguration} */
const mediaDecodingConfig = {
type: 'media-source',
type: srcEquals ? 'file' : 'media-source',
};

if (video) {
Expand Down
22 changes: 19 additions & 3 deletions test/util/stream_utils_unit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,23 @@ describe('StreamUtils', () => {
});

await StreamUtils.getDecodingInfosForVariants(manifest.variants,
/* usePersistentLicenses= */false);
/* usePersistentLicenses= */false, /* srcEquals= */ false);
expect(manifest.variants.length).toBeTruthy();
expect(manifest.variants[0].decodingInfos.length).toBe(1);
expect(manifest.variants[0].decodingInfos[0].supported).toBeTruthy();
});

it('for srcEquals content', async () => {
manifest = shaka.test.ManifestGenerator.generate((manifest) => {
manifest.addVariant(0, (variant) => {
variant.addVideo(1, (stream) => {
stream.mime('video/mp4', 'avc1.4d400d');
});
});
});

await StreamUtils.getDecodingInfosForVariants(manifest.variants,
/* usePersistentLicenses= */false, /* srcEquals= */ true);
expect(manifest.variants.length).toBeTruthy();
expect(manifest.variants[0].decodingInfos.length).toBe(1);
expect(manifest.variants[0].decodingInfos[0].supported).toBeTruthy();
Expand Down Expand Up @@ -517,7 +533,7 @@ describe('StreamUtils', () => {
});

await StreamUtils.getDecodingInfosForVariants(manifest.variants,
/* usePersistentLicenses= */false);
/* usePersistentLicenses= */false, /* srcEquals= */ false);
expect(manifest.variants.length).toBe(1);
expect(manifest.variants[0].decodingInfos.length).toBe(0);
});
Expand Down Expand Up @@ -820,7 +836,7 @@ describe('StreamUtils', () => {
});

await StreamUtils.getDecodingInfosForVariants(manifest.variants,
/* usePersistentLicenses= */false);
/* usePersistentLicenses= */false, /* srcEquals= */ false);

shaka.util.StreamUtils.chooseCodecsAndFilterManifest(manifest,
/* preferredVideoCodecs= */[],
Expand Down