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 support for SAMPLE-AES decryption #997

Merged
merged 6 commits into from
Feb 23, 2017
Merged

Conversation

erankor
Copy link
Collaborator

@erankor erankor commented Feb 21, 2017

Description of the Changes

Add support for decryption of SAMPLE-AES for AVC and AAC codecs

CheckLists

  • [V] changes have been done against master branch, and PR does not conflict
  • [V] no commits have been done in dist folder (we will take care of updating it)
  • new unit / functional tests have been added (whenever applicable)
  • [V] Travis tests are passing (or test results are not worse than on master branch :))
  • [V] API or design changes are documented in API.md

@mangui
Copy link
Member

mangui commented Feb 21, 2017

awesome @erankor !
do you have test streams in hands ?

@erankor
Copy link
Collaborator Author

erankor commented Feb 21, 2017

I'm generating streams with our packager (https://github.com/kaltura/nginx-vod-module/) here's a sample URL: http://lbd.kaltura.com:8001/local/ehls/content/bbb.mp4/index.m3u8
(it's on a dev server, so may go down at some point, but for now it's there)

@mangui
Copy link
Member

mangui commented Feb 22, 2017

FYI I mirrored your stream on http://streambox.fr/playlists/sample_aes/index.m3u8
could you add it in streams.json so that AES sample decryption could be automatically checked on every commit ?

@mangui
Copy link
Member

mangui commented Feb 22, 2017

it works great, however the debug logs are a bit too verbose as we got a debug logs for each audio/video samples.
image

IMHO it should be a once-off log.
it would be great to find a way to switch it to a once-off log.

output at most 3 messages per segment (3 in case of a fallback from
WebCrypto to JS following an error)
@erankor
Copy link
Collaborator Author

erankor commented Feb 22, 2017

@mangui

  1. added the stream to streams.json
  2. added a logEnabled boolean on Decrypter to reduce the amount of logging - it will print 1-3 lines per segment, I believe that's how it was before these changes (3 lines are printed in case of fallback from WebCrypto to JS)
  3. resolved conflicts following latest updates to master

Thanks!

@mangui mangui merged commit f2ff8cb into video-dev:master Feb 23, 2017
@mangui
Copy link
Member

mangui commented Feb 23, 2017

perfect, as you can see I just merged and added dailymotion@9ae9b4a that should fix tests failing on Travis/Saucelabs

@mangui
Copy link
Member

mangui commented Feb 23, 2017

@erankor
Copy link
Collaborator Author

erankor commented Feb 23, 2017

Thank you !

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.

None yet

2 participants