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

fix: drm keys #23

Merged
merged 7 commits into from
Aug 24, 2017
Merged

fix: drm keys #23

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1a70c65
drm
Aug 23, 2017
1ee1cad
Merge branch 'master' of https://github.com/kaltura/playkit-js-provid…
Aug 23, 2017
77d28b8
fix tests
Aug 23, 2017
291ffdd
retrieve certificate for drm playback
Aug 23, 2017
390dc74
fix jsdoc
Aug 23, 2017
1cd229d
Merge branch 'master' into drm
Aug 23, 2017
43e4b46
fix flow
Aug 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/k-provider/enums.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
//@flow
export class Scheme {
static PLAYREADY_CENC: string = "drm.PLAYREADY_CENC";
static WIDEVINE_CENC: string = "drm.WIDEVINE_CENC";
static FAIRPLAY: string = "fairplay.FAIRPLAY";
static PLAYREADY: string = "playReady.PLAYREADY";
static WIDEVINE: string = "widevine.WIDEVINE";
static ['drm.PLAYREADY_CENC']: string = "com.microsoft.playready";
static ['drm.WIDEVINE_CENC']: string = "com.widevine.alpha";
static ['fairplay.FAIRPLAY']: string = "com.apple.fairplay";
}

export class KalturaRuleActionTypes {
Expand Down
8 changes: 4 additions & 4 deletions src/k-provider/ovp/provider-parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import KalturaFlavorAsset from './response-types/kaltura-flavor-asset'
import KalturaMetadataListResponse from './response-types/kaltura-metadata-list-response'
import PlaySourceUrlBuilder from "./play-source-url-builder"
import XmlParser from '../xml-parser'
import {MediaEntryTypes, EntryTypes, MediaTypes} from '../enums'
import {MediaEntryTypes, EntryTypes, MediaTypes, Scheme} from '../enums'
import Logger from '../../util/logger'
import Configuration from './config'
import {MediaFormats} from '../../entities/media-format'
Expand Down Expand Up @@ -107,7 +107,7 @@ export default class ProviderParser {
static _getParsedSources(kalturaSources: Array<KalturaPlaybackSource>, ks: string, partnerID: number, uiConfId: number, entry: Object, playbackContext: Object): MediaSources {
let sources: MediaSources = new MediaSources();

let addAdaptiveSource = function(source: KalturaPlaybackSource): void{
let addAdaptiveSource = function (source: KalturaPlaybackSource): void {
let parsedSource = ProviderParser._parseAdaptiveSource(source, playbackContext.flavorAssets, ks, partnerID, uiConfId, entry.id);
let sourceFormat = SUPPORTED_FORMATS.get(source.format);
sources.map(parsedSource, sourceFormat);
Expand All @@ -117,7 +117,7 @@ export default class ProviderParser {
kalturaSources.filter((source) => !ProviderParser._isProgressiveSource(source)).forEach(addAdaptiveSource);
};

let parseProgressiveSources = function (): void{
let parseProgressiveSources = function (): void {
let progressiveSource = kalturaSources.find(ProviderParser._isProgressiveSource);
sources.progressive = ProviderParser._parseProgressiveSources(progressiveSource, playbackContext.flavorAssets, ks, partnerID, uiConfId, entry.id);
};
Expand Down Expand Up @@ -187,7 +187,7 @@ export default class ProviderParser {
if (kalturaSource.hasDrmData()) {
let drmParams: Array<Drm> = [];
kalturaSource.drm.forEach((drm) => {
drmParams.push(new Drm(drm.licenseURL, drm.scheme));
drmParams.push(new Drm(drm.licenseURL, Scheme[drm.scheme]));
});
mediaSource.drmData = drmParams;
}
Expand Down
12 changes: 6 additions & 6 deletions test/src/k-provider/ovp/player-config-parsed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@ let NoPluginsWithDrm = {
"drmData": [
{
"licenseUrl": "https://udrm.kaltura.com//cenc/playready/license?custom_data=eyJjYV9zeXN0ZW0iOiJPVlAiLCJ1c2VyX3Rva2VuIjoiTlRBd1pqVmlaV1pqWTJOak5UUmtOR0V5TWpVMU1UZzRPR0UxTm1Vd05EbGpaV0prTXprMU1Yd3hNRFk0TWpreU96RXdOamd5T1RJN01UUTVNREUzTmpFME5qc3dPekUwT1RBd09EazNORFl1TURJeU5qc3dPM1pwWlhjNktpeDNhV1JuWlhRNk1UczciLCJhY2NvdW50X2lkIjoxMDY4MjkyLCJjb250ZW50X2lkIjoiMV9yd2JqM2owYSIsImZpbGVzIjoiMV85MmRmeXJ6NSwxXzlkaGg2bTBpLDFfenVkb3V1YWgsMV9yMHd1Nnk3NywxX296MzQza2xhIn0%3D&signature=jl09zYv64OyEfVUt85rlA0WnK1w%3D",
"scheme": "drm.PLAYREADY_CENC"
"scheme": "com.microsoft.playready"
},
{
"licenseUrl": "https://udrm.kaltura.com//cenc/widevine/license?custom_data=eyJjYV9zeXN0ZW0iOiJPVlAiLCJ1c2VyX3Rva2VuIjoiTlRBd1pqVmlaV1pqWTJOak5UUmtOR0V5TWpVMU1UZzRPR0UxTm1Vd05EbGpaV0prTXprMU1Yd3hNRFk0TWpreU96RXdOamd5T1RJN01UUTVNREUzTmpFME5qc3dPekUwT1RBd09EazNORFl1TURJeU5qc3dPM1pwWlhjNktpeDNhV1JuWlhRNk1UczciLCJhY2NvdW50X2lkIjoxMDY4MjkyLCJjb250ZW50X2lkIjoiMV9yd2JqM2owYSIsImZpbGVzIjoiMV85MmRmeXJ6NSwxXzlkaGg2bTBpLDFfenVkb3V1YWgsMV9yMHd1Nnk3NywxX296MzQza2xhIn0%3D&signature=jl09zYv64OyEfVUt85rlA0WnK1w%3D",
"scheme": "drm.WIDEVINE_CENC"
"scheme": "com.widevine.alpha"
}
]
}
Expand All @@ -157,7 +157,7 @@ let NoPluginsWithDrm = {
"drmData": [
{
"licenseUrl": "https://udrmv3.kaltura.com//fps/license?custom_data=eyJjYV9zeXN0ZW0iOiJPVlAiLCJ1c2VyX3Rva2VuIjoiTlRBd1pqVmlaV1pqWTJOak5UUmtOR0V5TWpVMU1UZzRPR0UxTm1Vd05EbGpaV0prTXprMU1Yd3hNRFk0TWpreU96RXdOamd5T1RJN01UUTVNREUzTmpFME5qc3dPekUwT1RBd09EazNORFl1TURJeU5qc3dPM1pwWlhjNktpeDNhV1JuWlhRNk1UczciLCJhY2NvdW50X2lkIjoxMDY4MjkyLCJjb250ZW50X2lkIjoiMV9yd2JqM2owYSIsImZpbGVzIjoiMV85MmRmeXJ6NSwxXzlkaGg2bTBpLDFfenVkb3V1YWgsMV9yMHd1Nnk3NywxX296MzQza2xhIn0%3D&signature=jl09zYv64OyEfVUt85rlA0WnK1w%3D",
"scheme": "fairplay.FAIRPLAY"
"scheme": "com.apple.fairplay"
}
]
}
Expand Down Expand Up @@ -384,11 +384,11 @@ let WithPluginsWithDrm = {
"drmData": [
{
"licenseUrl": "https://udrm.kaltura.com//cenc/playready/license?custom_data=eyJjYV9zeXN0ZW0iOiJPVlAiLCJ1c2VyX3Rva2VuIjoiWlRGaU56azRNbU01TWpKaVl6a3dPRGxpTXpRelpUUTNZMkk0TXpJd1lUSXpNbVF6TVRNeFlud3hNRFk0TWpreU96RXdOamd5T1RJN01UUTVNREkxTWprNU1qc3dPekUwT1RBeE5qWTFPVEl1T0RVeU1Uc3dPM1pwWlhjNktpeDNhV1JuWlhRNk1UczciLCJhY2NvdW50X2lkIjoxMDY4MjkyLCJjb250ZW50X2lkIjoiMV9yd2JqM2owYSIsImZpbGVzIjoiMV85MmRmeXJ6NSwxXzlkaGg2bTBpLDFfenVkb3V1YWgsMV9yMHd1Nnk3NywxX296MzQza2xhIn0%3D&signature=AZaaKvEx5j8CAh6VMSZbGzmUK1A%3D",
"scheme": "drm.PLAYREADY_CENC"
"scheme": "com.microsoft.playready"
},
{
"licenseUrl": "https://udrm.kaltura.com//cenc/widevine/license?custom_data=eyJjYV9zeXN0ZW0iOiJPVlAiLCJ1c2VyX3Rva2VuIjoiWlRGaU56azRNbU01TWpKaVl6a3dPRGxpTXpRelpUUTNZMkk0TXpJd1lUSXpNbVF6TVRNeFlud3hNRFk0TWpreU96RXdOamd5T1RJN01UUTVNREkxTWprNU1qc3dPekUwT1RBeE5qWTFPVEl1T0RVeU1Uc3dPM1pwWlhjNktpeDNhV1JuWlhRNk1UczciLCJhY2NvdW50X2lkIjoxMDY4MjkyLCJjb250ZW50X2lkIjoiMV9yd2JqM2owYSIsImZpbGVzIjoiMV85MmRmeXJ6NSwxXzlkaGg2bTBpLDFfenVkb3V1YWgsMV9yMHd1Nnk3NywxX296MzQza2xhIn0%3D&signature=AZaaKvEx5j8CAh6VMSZbGzmUK1A%3D",
"scheme": "drm.WIDEVINE_CENC"
"scheme": "com.widevine.alpha"
}
]
}
Expand All @@ -401,7 +401,7 @@ let WithPluginsWithDrm = {
"drmData": [
{
"licenseUrl": "https://udrmv3.kaltura.com//fps/license?custom_data=eyJjYV9zeXN0ZW0iOiJPVlAiLCJ1c2VyX3Rva2VuIjoiWlRGaU56azRNbU01TWpKaVl6a3dPRGxpTXpRelpUUTNZMkk0TXpJd1lUSXpNbVF6TVRNeFlud3hNRFk0TWpreU96RXdOamd5T1RJN01UUTVNREkxTWprNU1qc3dPekUwT1RBeE5qWTFPVEl1T0RVeU1Uc3dPM1pwWlhjNktpeDNhV1JuWlhRNk1UczciLCJhY2NvdW50X2lkIjoxMDY4MjkyLCJjb250ZW50X2lkIjoiMV9yd2JqM2owYSIsImZpbGVzIjoiMV85MmRmeXJ6NSwxXzlkaGg2bTBpLDFfenVkb3V1YWgsMV9yMHd1Nnk3NywxX296MzQza2xhIn0%3D&signature=AZaaKvEx5j8CAh6VMSZbGzmUK1A%3D",
"scheme": "fairplay.FAIRPLAY"
"scheme": "com.apple.fairplay"
}
]
}
Expand Down