feat(hls): expose manifest skd uri on drmInfo #6857
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gkatsev
commented
Jun 18, 2024
| @@ -203,6 +203,7 @@ shaka.extern.ServiceDescription; | |||
| * @typedef {{ | |||
| * keySystem: string, | |||
| * encryptionScheme: string, | |||
| * keySystemUris: (Set.<string>|undefined), | |||
There was a problem hiding this comment.
This was made a Set to match keyIds. I originally named it keySystemUris to be more generic, since DrmInfo is used both for hls/fairplay and DASH, but its type is possibly undefined so that the property could be unavailable when the data isn't present.
avelad
added
type: enhancement
|
Incremental code coverage: 78.95% |
joeyparrish
approved these changes
Jun 18, 2024
externs/shaka/manifest.js
Outdated
| @@ -224,6 +225,9 @@ shaka.extern.ServiceDescription; | |||
| * @property {string} encryptionScheme | |||
| * <i>Required.</i> <br> | |||
| * The encryption scheme, e.g., "cenc", "cbcs", "cbcs-1-9". | |||
| * @property {Set.<string>} keySystemUris | |||
There was a problem hiding this comment.
This type (in docs) should match the above type (in compiler)
joeyparrish
previously requested changes
Jun 18, 2024
There was a problem hiding this comment.
Oh, looks like you have a test failure:
TOTAL: 1 FAILED, 2686 SUCCESS
1) for FairPlay
HlsParser constructs DrmInfo with EXT-X-SESSION-KEY
Expected $.variants[0].video.drmInfos[0] not to have properties
keySystemUris: Set( 'skd://f93d4e700d7ddde90529a27735d9e7cb' )
Error: Expected $.variants[0].video.drmInfos[0] not to have properties
keySystemUris: Set( 'skd://f93d4e700d7ddde90529a27735d9e7cb' )
at <Jasmine>
at _callee76$ (test/hls/hls_parser_unit.js:3934:22 <- test/hls/hls_parser_unit.js:2966:30)
at tryCatch (node_modules/@babel/polyfill/dist/polyfill.js:6473:40)
at Generator.invoke [as _invoke] (node_modules/@babel/polyfill/dist/polyfill.js:6702:22)
|
I'll take a look, probably missed something because I was cherry-picking the changes. |
avelad
approved these changes
Jun 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.