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

Feature/drm UI #3659

Merged
merged 15 commits into from
Jun 9, 2021
Merged

Feature/drm UI #3659

merged 15 commits into from
Jun 9, 2021

Conversation

ShikiSeiren
Copy link
Contributor

@ShikiSeiren ShikiSeiren commented Jun 7, 2021 •
edited
Loading

Updated DRM-UI, added additional functionality:

  • Added Clearkey as a selectable DRM option
    -- Specify with either License Server or KID=KEY scheme
    -- Supports multiple KID=KEY pairs
  • Added support for multiple Request Headers
  • Added ability to select more than one DRM for multi-DRM content
  • UI updates automatically if a stream with preset protection data is selected and loaded from the dropdown menu.
  • Added ability to set the priority of the chose key system(s)

@dsilhavy dsilhavy added this to the 4.0.0 milestone Jun 7, 2021
@dsilhavy dsilhavy self-requested a review June 7, 2021 12:00
ShikiSeiren and others added 9 commits June 7, 2021 14:30
@ShikiSeiren
Rollback of unintentional changes to package.json and package-lock.json
15cb965
@dsilhavy
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
8898634 
…dash.js into feature/drm-ui

� Conflicts:
�	samples/dash-if-reference-player/app/css/main.css
�	samples/dash-if-reference-player/dashjs_config.json
@ShikiSeiren
Removed default server-url
2c18ef7
@ShikiSeiren
Merge branch 'feature/drm-ui' of https://github.com/fraunhoferfokus/d…
7774354 
…ash.js into feature/drm-ui
@ShikiSeiren
Removed commented code, added hr element between each key-value pair …
11359bc 
…in dialogue windows
@ShikiSeiren
Changed time the UI is adjusted from loading the video to selecting t…
e1ba981 
…he URL.
@ShikiSeiren
Fixed old DRM data persisting on selecting a new stream.
17bd00a
@dsilhavy
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
b0b072a 
…dash.js into feature/drm-ui
@dsilhavy
Minor Ui changes for DRM menu
319da84
@dsilhavy dsilhavy merged commit 0512a41 into Dash-Industry-Forum:development Jun 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dsilhavy dsilhavy Awaiting requested review from dsilhavy

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
4.0.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ShikiSeiren @dsilhavy