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: Populate requested scheme into output, not default scheme #69

Merged
merged 2 commits into from
May 14, 2024
Merged

fix: Populate requested scheme into output, not default scheme #69

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e8f29f
fix: Populate requested scheme into output, not default scheme
joeyparrish May 13, 2024
aa26e12
fix compiler
joeyparrish May 14, 2024
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
39 changes: 28 additions & 11 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,15 @@ class EmeEncryptionSchemePolyfill {
const mediaKeySystemAccess =
await EmeEncryptionSchemePolyfill.originalRMKSA_.call(
this, keySystem, filteredSupportedConfigurations);

// Wrap the MKSA object in ours to provide the missing field in the
// returned configuration.
const videoScheme = filteredSupportedConfigurations[0]
.videoCapabilities[0].encryptionScheme;
const audioScheme = filteredSupportedConfigurations[0]
.audioCapabilities[0].encryptionScheme;
return new EmeEncryptionSchemePolyfillMediaKeySystemAccess(
mediaKeySystemAccess, supportedScheme);
mediaKeySystemAccess, videoScheme, audioScheme);
}

/**
Expand Down Expand Up @@ -345,19 +350,20 @@ class McEncryptionSchemePolyfill {
console.assert(this == navigator.mediaCapabilities,
'bad "this" for decodingInfo');

let supportedScheme = null;
let videoScheme = null;
let audioScheme = null;

if (requestedConfiguration.keySystemConfiguration) {
const keySystemConfig = requestedConfiguration.keySystemConfiguration;

const keySystem = keySystemConfig.keySystem;

const audioScheme = keySystemConfig.audio &&
audioScheme = keySystemConfig.audio &&
keySystemConfig.audio.encryptionScheme;
const videoScheme = keySystemConfig.video &&
videoScheme = keySystemConfig.video &&
keySystemConfig.video.encryptionScheme;

supportedScheme = guessSupportedScheme(keySystem);
const supportedScheme = guessSupportedScheme(keySystem);

const notSupportedResult = {
powerEfficient: false,
Expand Down Expand Up @@ -387,7 +393,7 @@ class McEncryptionSchemePolyfill {
// the missing field in the returned configuration.
capabilities.keySystemAccess =
new EmeEncryptionSchemePolyfillMediaKeySystemAccess(
capabilities.keySystemAccess, supportedScheme);
capabilities.keySystemAccess, videoScheme, audioScheme);
} else if (requestedConfiguration.keySystemConfiguration) {
// If the result is supported and the content is encrypted, we should have
// a MediaKeySystemAccess instance as part of the result. If we land
Expand Down Expand Up @@ -439,6 +445,7 @@ class McEncryptionSchemePolyfill {
const capability = {
robustness: mediaCapKeySystemConfig.audio.robustness || '',
contentType: decodingConfig.audio.contentType,
encryptionScheme: mediaCapKeySystemConfig.audio.encryptionScheme,
};
audioCapabilities.push(capability);
}
Expand All @@ -447,6 +454,7 @@ class McEncryptionSchemePolyfill {
const capability = {
robustness: mediaCapKeySystemConfig.video.robustness || '',
contentType: decodingConfig.video.contentType,
encryptionScheme: mediaCapKeySystemConfig.video.encryptionScheme,
};
videoCapabilities.push(capability);
}
Expand Down Expand Up @@ -487,9 +495,12 @@ class EmeEncryptionSchemePolyfillMediaKeySystemAccess {
/**
* @param {!MediaKeySystemAccess} mksa A native MediaKeySystemAccess instance
* to wrap.
* @param {?string} scheme The encryption scheme to add to the configuration.
* @param {?string} videoScheme The encryption scheme to add to the
* configuration for video.
* @param {?string} audioScheme The encryption scheme to add to the
* configuration for audio.
*/
constructor(mksa, scheme) {
constructor(mksa, videoScheme, audioScheme) {
/**
* @const {!MediaKeySystemAccess}
* @private
Expand All @@ -500,7 +511,13 @@ class EmeEncryptionSchemePolyfillMediaKeySystemAccess {
* @const {?string}
* @private
*/
this.scheme_ = scheme;
this.videoScheme_ = videoScheme;

/**
* @const {?string}
* @private
*/
this.audioScheme_ = audioScheme;

/** @const {string} */
this.keySystem = mksa.keySystem;
Expand All @@ -518,13 +535,13 @@ class EmeEncryptionSchemePolyfillMediaKeySystemAccess {

if (configuration.videoCapabilities) {
for (const capability of configuration.videoCapabilities) {
capability['encryptionScheme'] = this.scheme_;
capability['encryptionScheme'] = this.videoScheme_;
}
}

if (configuration.audioCapabilities) {
for (const capability of configuration.audioCapabilities) {
capability['encryptionScheme'] = this.scheme_;
capability['encryptionScheme'] = this.audioScheme_;
}
}

Expand Down
Loading