Skip to content

Commit 011c1fd

Browse files
ShikiSeirenShikiSeiren
committed
Added httpTimeout and server certificate options to the UI
1 parent dad1086 commit 011c1fd

File tree

2 files changed

+58
-9
lines changed

2 files changed

+58
-9
lines changed

‎samples/dash-if-reference-player/app/main.js‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,26 +184,34 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
184184
drmKeySystem: 'com.microsoft.playready',
185185
licenseServerUrl: '',
186186
httpRequestHeaders: {},
187+
serverCertificate: '',
188+
httpTimeout: 5000,
187189
priority: 1,
188190
audioRobustness: '',
189-
videoRobustness: ''
191+
videoRobustness: '',
192+
isCustomRobustness: false
190193
}
191194

192195
$scope.drmWidevine = {
193196
isActive: false,
194197
drmKeySystem: 'com.widevine.alpha',
195198
licenseServerUrl: '',
196199
httpRequestHeaders: {},
200+
serverCertificate: '',
201+
httpTimeout: 5000,
197202
priority: 0,
198203
audioRobustness: '',
199-
videoRobustness: ''
204+
videoRobustness: '',
205+
isCustomRobustness: false
200206
}
201207

202208
$scope.drmClearkey = {
203209
isActive: false,
204210
drmKeySystem: 'org.w3.clearkey',
205211
licenseServerUrl: '',
206212
httpRequestHeaders: {},
213+
serverCertificate: '',
214+
httpTimeout: 5000,
207215
kid: '',
208216
key: '',
209217
clearkeys: {},
@@ -1864,7 +1872,8 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
18641872
key !== 'priority' &&
18651873
key !== 'kid' &&
18661874
key !== 'key' &&
1867-
key !== 'inputMode') {
1875+
key !== 'inputMode' &&
1876+
key !== 'isCustomRobustness') {
18681877
queryProtectionData[drmObject[drm].drmKeySystem][key] = drmObject[drm][key];
18691878
}
18701879
}
@@ -1897,7 +1906,8 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
18971906
key !== 'drmKeySystem' &&
18981907
key !== 'licenseServerUrl' &&
18991908
key !== 'httpRequestHeaders' &&
1900-
key !== 'priority') {
1909+
key !== 'priority' &&
1910+
key !== 'isCustomRobustness') {
19011911
queryProtectionData[drmObject[drm].drmKeySystem][key] = drmObject[drm][key];
19021912
}
19031913
}

‎samples/dash-if-reference-player/index.html‎

Lines changed: 44 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -357,26 +357,41 @@
357357
Add Request-Headers
358358
</button>
359359

360+
<label class="options-label">Server Certificate</label>
361+
<input type="text" class="form-control" placeholder="" ng-model="drmPlayready.serverCertificate">
362+
363+
<label class="options-label">HTTP Timeout</label>
364+
<input type="text" class="form-control" placeholder="" ng-model="drmPlayready.httpTimeout">
365+
366+
<label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
367+
title="">
368+
<input type="checkbox" ng-model="drmPlayready.isCustomRobustness">
369+
Use Custom Robustness
370+
</label>
371+
360372
<label class="options-label">Audio Robustness</label>
361-
<select name="playreadyAudioRobustness" id="playreadyAudioRobustness" ng-model="drmPlayready.audioRobustness"
373+
<select name="playreadyAudioRobustness" id="playreadyAudioRobustness" ng-show="!drmPlayready.isCustomRobustness" ng-model="drmPlayready.audioRobustness"
362374
ng-init="drmPlayready.audioRobustness=''">
363375
<option value=""> Default</option>
364376
<option value="3000">SL3000</option>
365377
<option value="2000">SL2000</option>
366378
<option value="150"> SL150</option>
367-
<option value="CUSTOM"></option>
368379
</select>
369380
<!-- If custom, show textbox -->
381+
<input type="text" class="form-control" placeholder="" ng-show="drmPlayready.isCustomRobustness" ng-model="drmPlayready.audioRobustness">
370382

371383
<label class="options-label">Video Robustness</label>
372-
<select name="playreadyVideoRobustness" id="playreadyVideoRobustness" ng-model="drmPlayready.videoRobustness"
384+
<select name="playreadyVideoRobustness" id="playreadyVideoRobustness" ng-show="!drmPlayready.isCustomRobustness" ng-model="drmPlayready.videoRobustness"
373385
ng-init="drmPlayready.videoRobustness=''">
374386
<option value=""> Default</option>
375387
<option value="3000">SL3000</option>
376388
<option value="2000">SL2000</option>
377389
<option value="150"> SL150</option>
378390
</select>
379391

392+
<!-- If custom, show textbox -->
393+
<input type="text" class="form-control" placeholder="" ng-show="drmPlayready.isCustomRobustness" ng-model="drmPlayready.videoRobustness">
394+
380395
<!-- Header Dialogue Window Content -->
381396
<div id="playreadyRequestHeaderDialogue" class="requestHeaderDialogue">
382397
<div class="requestHeaderDialogueContent">
@@ -441,8 +456,20 @@
441456
Add Request-Headers
442457
</button>
443458

459+
<label class="options-label">Server Certificate</label>
460+
<input type="text" class="form-control" placeholder="" ng-model="drmWidevine.serverCertificate">
461+
462+
<label class="options-label">HTTP Timeout</label>
463+
<input type="text" class="form-control" placeholder="" ng-model="drmWidevine.httpTimeout">
464+
465+
<label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
466+
title="">
467+
<input type="checkbox" ng-model="drmWidevine.isCustomRobustness">
468+
Use Custom Robustness
469+
</label>
470+
444471
<label class="options-label">Audio Robustness</label>
445-
<select name="widevineAudioRobustness" id="widevineAudioRobustness" ng-model="drmWidevine.audioRobustness"
472+
<select name="widevineAudioRobustness" id="widevineAudioRobustness" ng-show="!drmWidevine.isCustomRobustness" ng-model="drmWidevine.audioRobustness"
446473
ng-init="drmWidevine.audioRobustness=''">
447474
<option value=""> Default</option>
448475
<option value="SW_SECURE_CRYPTO">SW Secure Crypto</option>
@@ -452,8 +479,11 @@
452479
<option value="HW_SECURE_ALL" >HW Secure All </option>
453480
</select>
454481

482+
<!-- If custom, show textbox -->
483+
<input type="text" class="form-control" placeholder="" ng-show="drmWidevine.isCustomRobustness" ng-model="drmWidevine.audioRobustness">
484+
455485
<label class="options-label">Video Robustness</label>
456-
<select name="widevineVideoRobustness" id="widevineVideoRobustness" ng-model="drmWidevine.videoRobustness"
486+
<select name="widevineVideoRobustness" id="widevineVideoRobustness" ng-show="!drmWidevine.isCustomRobustness" ng-model="drmWidevine.videoRobustness"
457487
ng-init="drmWidevine.videoRobustness=''">
458488
<option value=""> Default</option>
459489
<option value="SW_SECURE_CRYPTO">SW Secure Crypto</option>
@@ -463,6 +493,9 @@
463493
<option value="HW_SECURE_ALL" >HW Secure All </option>
464494
</select>
465495

496+
<!-- If custom, show textbox -->
497+
<input type="text" class="form-control" placeholder="" ng-show="drmWidevine.isCustomRobustness" ng-model="drmWidevine.videoRobustness">
498+
466499
<!-- Header Dialogue Window Content -->
467500
<div id="widevineRequestHeaderDialogue" class="requestHeaderDialogue">
468501
<div class="requestHeaderDialogueContent">
@@ -536,6 +569,12 @@
536569
Add additional clearkeys
537570
</button>
538571

572+
<label class="options-label">Server Certificate</label>
573+
<input type="text" class="form-control" placeholder="" ng-model="drmClearkey.serverCertificate">
574+
575+
<label class="options-label">HTTP Timeout</label>
576+
<input type="text" class="form-control" placeholder="" ng-model="drmClearkey.httpTimeout">
577+
539578
<!-- KID=KEY Dialogue Window Content -->
540579
<div id="additionalClearkeysDialogue" class="requestHeaderDialogue">
541580
<div class="requestHeaderDialogueContent">

0 commit comments

Comments
 (0)