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.

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: Fix drm.keySystemsMapping config #4425

Merged
merged 1 commit into from
Aug 18, 2022

Conversation

joeyparrish
Copy link
Member

This fixes the config by adding a missing override in the config parser. This also adds test coverage for the feature.

Closes #4422

This fixes the config by adding a missing override in the config parser.  This also adds test coverage for the feature.

Closes shaka-project#4422
@github-actions
Copy link
Contributor

Incremental code coverage: 100.00%

@joeyparrish joeyparrish merged commit d945084 into shaka-project:main Aug 18, 2022
@joeyparrish joeyparrish deleted the fix-key-systems-mapping branch August 18, 2022 21:30
drmEngine.initForPlayback(variants, manifest.offlineSessionIds))
.toBeRejected();

expect(drmEngine.initialized()).toBe(false);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FMI, this scenario is set to fail DRM initialization because in L690, it was set to fail all key systems?

But even then, it still reaches these lines:

// Make sure all the drm infos are valid and filled in correctly.
for (const variant of variants) {
const drmInfos = this.getVariantDrmInfos_(variant);
for (const info of drmInfos) {
shaka.media.DrmEngine.fillInDrmInfoDefaults_(
info,
shaka.util.MapUtils.asMap(this.config_.servers),
shaka.util.MapUtils.asMap(this.config_.advanced || {}),
this.config_.keySystemsMapping);
}
}
which is why L701-705 show the decodingInfoSpy is called with the mapping information?

avelad pushed a commit that referenced this pull request Aug 31, 2022
This fixes the config by adding a missing override in the config parser.  This also adds test coverage for the feature.

Closes #4422
avelad pushed a commit that referenced this pull request Aug 31, 2022
This fixes the config by adding a missing override in the config parser.  This also adds test coverage for the feature.

Closes #4422
@github-actions github-actions bot added the status: archived Archived and locked; will not be updated label Jul 25, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 25, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
status: archived Archived and locked; will not be updated
Projects
None yet
Development

Successfully merging this pull request may close these issues.

keySystemsMapping unrecognized
3 participants