-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Pull request for issue #780 - Support for VDMS Streams in demo app #781
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -51,6 +51,7 @@ shakaAssets.Source = { | |
BITCODIN: 'Bitcodin', | ||
NIMBLE_STREAMER: 'Nimble Streamer', | ||
AZURE_MEDIA_SERVICES: 'Azure Media Services', | ||
UPLYNK: 'Verizon Digital Media Services', | ||
GPAC: 'GPAC' | ||
}; | ||
|
||
|
@@ -223,6 +224,49 @@ shakaAssets.YouTubeResponseFilter = function(type, response) { | |
}; | ||
|
||
|
||
/** | ||
* A response filter for VDMS Uplynk manifest responses, | ||
* this allows us to get the license prefix that is necessary | ||
* to later generate a proper license response. | ||
* @param {shaka.net.NetworkingEngine.RequestType} type | ||
* @param {shakaExtern.Response} response | ||
* The uplynk_prefix attribute is set on the shakaAssets object | ||
* and is later referenced in the UplynkRequestFilter. | ||
*/ | ||
shakaAssets.UplynkResponseFilter = function(type, response) { | ||
if (type == shaka.net.NetworkingEngine.RequestType.MANIFEST) { | ||
// Parse a custom header that contains a value needed to build a proper | ||
// license server URL | ||
shakaAssets.uplynk_prefix = response.headers['x-uplynk-prefix']; | ||
} | ||
}; | ||
|
||
|
||
/** | ||
* A license request filter for VDMS Uplynk license requests. | ||
* @param {shaka.net.NetworkingEngine.RequestType} type | ||
* @param {shakaExtern.Request} request | ||
* The uplynk_prefix variable is retrieved from the shakaAssets | ||
* object, and requires that the uplynk manifest response filter | ||
* also be set. | ||
*/ | ||
shakaAssets.UplynkRequestFilter = function(type, request) { | ||
if (type == shaka.net.NetworkingEngine.RequestType.LICENSE || | ||
type == shaka.net.NetworkingEngine.RequestType.MANIFEST) { | ||
request.allowCrossSiteCredentials = true; | ||
} | ||
|
||
if (type == shaka.net.NetworkingEngine.RequestType.LICENSE) { | ||
// Modify the license request URL based on our cookie | ||
if (request.uris[0].indexOf('wv') !== -1) { | ||
request.uris[0] = shakaAssets.uplynk_prefix.concat('/wv'); | ||
} else if (request.uris[0].indexOf('ck') !== -1) { | ||
request.uris[0] = shakaAssets.uplynk_prefix.concat('/ck'); | ||
} | ||
} | ||
}; | ||
|
||
|
||
/** | ||
* @param {!Node} node | ||
* @return {Array.<shakaExtern.DrmInfo>} | ||
|
@@ -1097,6 +1141,46 @@ shakaAssets.testAssets = [ | |
shakaAssets.Feature.MP4, | ||
shakaAssets.Feature.SEGMENT_TEMPLATE_DURATION | ||
] | ||
}, | ||
{ | ||
name: 'Big Buck Bunny', | ||
manifestUri: 'https://content.uplynk.com/224ac8717e714b68831997ab6cea4015.mpd', // gjslint: disable=110 | ||
|
||
source: shakaAssets.Source.UPLYNK, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please specify which encoder was used in the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done -- Added the "UPLYNK" encoder so I could specify that in these assets. |
||
drm: [ | ||
shakaAssets.KeySystem.WIDEVINE | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
], | ||
features: [ | ||
shakaAssets.Feature.MP4, | ||
shakaAssets.Feature.SEGMENT_LIST_DURATION | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please add There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
], | ||
licenseServers: { | ||
'com.widevine.alpha': 'https://content.uplynk.com/wv', | ||
'org.w3.clearkey': 'https://content.uplynk.com/ck' | ||
}, | ||
requestFilter: shakaAssets.UplynkRequestFilter, | ||
responseFilter: shakaAssets.UplynkResponseFilter | ||
}, | ||
{ | ||
name: 'Sintel - (multiperiod-mix of encrypted and unencrypted)', | ||
//Unencrypted periods interspersed with protected periods | ||
//Requires Chrome 58 | ||
manifestUri: 'https://content.uplynk.com/1eb40d8e64234f5c9879db7045c3d48c.mpd?ad=cleardash', // gjslint: disable=110 | ||
|
||
source: shakaAssets.Source.UPLYNK, | ||
drm: [ | ||
shakaAssets.KeySystem.WIDEVINE | ||
], | ||
features: [ | ||
shakaAssets.Feature.MP4, | ||
shakaAssets.Feature.SEGMENT_LIST_DURATION | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please add There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done -- I also added shakaAssets.Feature.MULTIPLE_LANGUAGES as I was reviewing the features. This asset has a second Portuguese audio track. We could add a new feature for assets like this that have completely clear periods interspersed with encrypted periods too. I believe you haven't had many tests like this up to this point because of Chrome's issues supporting it until 58. |
||
], | ||
licenseServers: { | ||
'com.widevine.alpha': 'https://content.uplynk.com/wv', | ||
'org.w3.clearkey': 'https://content.uplynk.com/ck' | ||
}, | ||
requestFilter: shakaAssets.UplynkRequestFilter, | ||
responseFilter: shakaAssets.UplynkResponseFilter | ||
} | ||
// }}} | ||
]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please enclose these assets in their own group. For example, see line 1038 above, where we start a group for GPAC-sourced assets.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done