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

feat: setup EME key systems for HLS as well as DASH (#629) #657

Merged
merged 6 commits into from
Feb 14, 2020

Conversation

brandonocasey
Copy link
Contributor

Description

#629 but for master!

src/source-updater.js Outdated Show resolved Hide resolved
* @return {Boolean} if this is an audio codec
* @private
*/
export const isAudioCodec = function(codec) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

brought these back from 1.x

Copy link
Member

Choose a reason for hiding this comment

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

not as part of this PR, but may make sense to move this into vhs-utils.

@stale
Copy link

stale bot commented Nov 10, 2019

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the outdated label Nov 10, 2019
@stale stale bot closed this Nov 17, 2019
@gesinger gesinger reopened this Nov 18, 2019
@stale stale bot removed the outdated label Nov 18, 2019
Copy link
Contributor

@gesinger gesinger left a comment

Choose a reason for hiding this comment

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

I may be missing something in the chain here, but:

setupEmeOptions is called on selectedinitialmedia from masterPlaylistController
but
sourceUpdater's createSourceBuffers (which sets the codecs property) isn't called until trackinfo or handleSourceOpen, both of which require startingMedia_ to be set on the mainSegmentLoader, which is set on handleTrackInfo_, which only comes on handling of segment data.

Given that, would sourceUpdater's codecs property be set at this point?

src/videojs-http-streaming.js Outdated Show resolved Hide resolved
@brandonocasey
Copy link
Contributor Author

You're right, selectedintialmedia won't really work. I just wonder if sourceUpdater ready will be too late.

gesinger
gesinger previously approved these changes Feb 11, 2020
@brandonocasey brandonocasey force-pushed the feat/setup-eme-for-hls branch 3 times, most recently from fabb1ef to 65b637c Compare February 12, 2020 18:38
Copy link
Member

@gkatsev gkatsev left a comment

Choose a reason for hiding this comment

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

Tested

@gkatsev gkatsev merged commit af4da1a into master Feb 14, 2020
@gkatsev gkatsev deleted the feat/setup-eme-for-hls branch February 14, 2020 21:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants