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

Add non-standard DASH PlayReady UUID #2474

Merged

Conversation

avelad
Copy link
Member

@avelad avelad commented Mar 30, 2020

Resolves #2440

@shaka-bot
Copy link
Collaborator

Test Failure:

Chrome 80.0.3987 (Linux 0.0.0)
  DashParser ContentProtection parses key IDs when ignoreDrmInfo flag is set FAILED
    Error: Expected Object({ presentationTimeline: _class({ presentationStartTime_: null, presentationDelay_: 0, duration_: 30, segmentAvailabilityDuration_: Infinity, maxSegmentDuration_: 2, minSegmentStartTime_: 0, maxSegmentEndTime_: null, clockOffset_: 0, static_: true, userSeekStart_: 0, autoCorrectDrift_: true }), periods: [ Object({ startTime: 0, textStreams: [  ], variants: [ Object({ id: 4, language: 'und', primary: false, audio: null, video: Object({ id: 1, originalId: null, createSegmentIndex: Function, segmentIndex: null, mimeType: 'video/mp4', codecs: 'avc1.4d401f', frameRate: undefined, pixelAspectRatio: undefined, bandwidth: 50, width: 576, height: 432, kind: undefined, encrypted: true, keyId: 'deadbeeffeedbaadf00d000008675309', language: 'und', label: null, type: 'video', primary: false, trickModeVideo: null, emsgSchemeIdUris: [  ], roles: [  ], channelsCount: null, audioSamplingRate: null, closedCaptions: Map(  ) }), bandwidth: 50, drmInfos: [ Object({ keySystem: 'com.widevine.alpha',  ... to equal <jasmine.objectContaining(Object({ periods: [ <jasmine.objectContaining(Object({ variants: [ <jasmine.objectContaining(Object({ drmInfos: [ <jasmine.objectContaining(Object({ keySystem: 'com.widevine.alpha', initData: [  ], keyIds: [ 'deadbeeffeedbaadf00d000008675309', 'deadbeeffeedbaadf00d000008675309' ] }))>, <jasmine.objectContaining(Object({ keySystem: 'com.microsoft.playready', initData: [  ], keyIds: [ 'deadbeeffeedbaadf00d000008675309', 'deadbeeffeedbaadf00d000008675309' ] }))>, <jasmine.objectContaining(Object({ keySystem: 'com.adobe.primetime', initData: [  ], keyIds: [ 'deadbeeffeedbaadf00d000008675309', 'deadbeeffeedbaadf00d000008675309' ] }))> ], video: <jasmine.objectContaining(Object({ keyId: 'deadbeeffeedbaadf00d000008675309' }))> }))>, <jasmine.objectContaining(Object({ drmInfos: [ <jasmine.objectContaining(Object({ keySystem: 'com.widevine.alpha', initData: [  ], keyIds: [ 'deadbeeffeedbaadf00d000008675309', 'deadbeeffeedbaadf00d000008675309' ] }))>, <jasmine.objec ....
        at <Jasmine>
        at _callee$ (test/dash/dash_parser_content_protection_unit.js:48:20 <- test/dash/dash_parser_content_protection_unit.js:57:30)
        at tryCatch (node_modules/babel-polyfill/dist/polyfill.js:6900:40)
        at Generator.invoke [as _invoke] (node_modules/babel-polyfill/dist/polyfill.js:7138:22)

Failed 1 tests, passed 1790, skipped 19

@avelad
Copy link
Member Author

avelad commented Mar 30, 2020

I’ll review it, sorry about that

@joeyparrish
Copy link
Member

No worries. Probably just one small test update is needed.

@avelad
Copy link
Member Author

avelad commented Mar 30, 2020

@joeyparrish I fixed the test!

@shaka-bot
Copy link
Collaborator

All tests passed!

@avelad
Copy link
Member Author

avelad commented Apr 1, 2020

@joeyparrish , Is there something else I can do or can you already merge it?

@joeyparrish
Copy link
Member

No, it's okay to merge. I just missed the email from the build bot. Thanks for the reminder.

@joeyparrish joeyparrish merged commit ad33625 into shaka-project:master Apr 1, 2020
@avelad avelad deleted the non-standard-playready-uuid branch April 2, 2020 05:57
joeyparrish pushed a commit that referenced this pull request Apr 10, 2020
Resolves #2440

Backported to v2.5.x

Change-Id: I02e6c55a75ba3cbb3c37c1b83279fe4214c6065a
@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.

Non-standard DASH PlayReady UUID
3 participants