shaka-player 3.3.8 → 3.3.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/workflows/build-and-test.yaml +67 -15
- package/.github/workflows/compute-incremental-coverage.py +251 -0
- package/.github/workflows/report-incremental-coverage.yaml +39 -0
- package/.github/workflows/selenium-lab-tests.yaml +44 -1
- package/AUTHORS +1 -0
- package/CHANGELOG.md +15 -0
- package/CONTRIBUTORS +1 -0
- package/dist/controls.css +1 -1
- package/dist/locales.js +32 -32
- package/dist/shaka-player.compiled.d.ts +1 -1
- package/dist/shaka-player.compiled.debug.d.ts +1 -1
- package/dist/shaka-player.compiled.debug.externs.js +1 -1
- package/dist/shaka-player.compiled.debug.js +85 -79
- package/dist/shaka-player.compiled.debug.map +3 -3
- package/dist/shaka-player.compiled.externs.js +1 -1
- package/dist/shaka-player.compiled.js +317 -313
- package/dist/shaka-player.compiled.map +3 -3
- package/dist/shaka-player.ui.d.ts +1 -1
- package/dist/shaka-player.ui.debug.d.ts +1 -1
- package/dist/shaka-player.ui.debug.externs.js +1 -1
- package/dist/shaka-player.ui.debug.js +100 -94
- package/dist/shaka-player.ui.debug.map +3 -3
- package/dist/shaka-player.ui.externs.js +1 -1
- package/dist/shaka-player.ui.js +492 -489
- package/dist/shaka-player.ui.map +3 -3
- package/karma.conf.js +3 -11
- package/lib/ads/client_side_ad_manager.js +1 -1
- package/lib/media/drm_engine.js +1 -1
- package/lib/media/streaming_engine.js +1 -0
- package/lib/player.js +1 -6
- package/lib/polyfill/media_capabilities.js +2 -0
- package/lib/text/cue.js +0 -5
- package/lib/text/simple_text_displayer.js +21 -9
- package/lib/text/ui_text_displayer.js +83 -19
- package/lib/util/buffer_utils.js +3 -0
- package/lib/util/object_utils.js +1 -0
- package/lib/util/stream_utils.js +23 -3
- package/lib/util/string_utils.js +63 -16
- package/package.json +5 -2
- package/test/text/simple_text_displayer_unit.js +27 -0
- package/test/text/ui_text_displayer_unit.js +65 -0
- package/test/util/string_utils_unit.js +46 -8
- package/ui/text_selection.js +2 -2
|
@@ -147,7 +147,7 @@ if(window.console&&window.console.log.bind){var $jscomp$compprop0={};shaka.log.l
|
|
|
147
147
|
shaka.log.alwaysWarn=shaka.log.logMap_[shaka.log.Level.WARNING];shaka.log.alwaysError=shaka.log.logMap_[shaka.log.Level.ERROR];goog.DEBUG?(goog.exportSymbol("shaka.log",shaka.log),shaka.log.setLevel=function(a){var b=function(c){return c<=a?(goog.asserts.assert(shaka.log.logMap_[c],"Unexpected log level"),shaka.log.logMap_[c]):function(){}};shaka.log.currentLevel=a;shaka.log.error=b(shaka.log.Level.ERROR);shaka.log.warning=b(shaka.log.Level.WARNING);shaka.log.info=b(shaka.log.Level.INFO);shaka.log.debug=
|
|
148
148
|
b(shaka.log.Level.DEBUG);shaka.log.v1=b(shaka.log.Level.V1);shaka.log.v2=b(shaka.log.Level.V2)},shaka.log.setLevel(shaka.log.MAX_LOG_LEVEL)):(shaka.log.MAX_LOG_LEVEL>=shaka.log.Level.ERROR&&(shaka.log.error=shaka.log.logMap_[shaka.log.Level.ERROR]),shaka.log.MAX_LOG_LEVEL>=shaka.log.Level.WARNING&&(shaka.log.warning=shaka.log.logMap_[shaka.log.Level.WARNING]),shaka.log.MAX_LOG_LEVEL>=shaka.log.Level.INFO&&(shaka.log.info=shaka.log.logMap_[shaka.log.Level.INFO]),shaka.log.MAX_LOG_LEVEL>=shaka.log.Level.DEBUG&&
|
|
149
149
|
(shaka.log.debug=shaka.log.logMap_[shaka.log.Level.DEBUG]),shaka.log.MAX_LOG_LEVEL>=shaka.log.Level.V1&&(shaka.log.v1=shaka.log.logMap_[shaka.log.Level.V1]),shaka.log.MAX_LOG_LEVEL>=shaka.log.Level.V2&&(shaka.log.v2=shaka.log.logMap_[shaka.log.Level.V2]))};shaka.util={};shaka.util.ArrayUtils=function(){};shaka.util.ArrayUtils.defaultEquals=function(a,b){return"number"===typeof a&&"number"===typeof b&&isNaN(a)&&isNaN(b)?!0:a===b};shaka.util.ArrayUtils.remove=function(a,b){var c=a.indexOf(b);-1<c&&a.splice(c,1)};shaka.util.ArrayUtils.count=function(a,b){for(var c=0,d=$jscomp.makeIterator(a),e=d.next();!e.done;e=d.next())c+=b(e.value)?1:0;return c};
|
|
150
|
-
shaka.util.ArrayUtils.hasSameElements=function(a,b,c){c||(c=shaka.util.ArrayUtils.defaultEquals);if(a.length!=b.length)return!1;b=b.slice();var d={};a=$jscomp.makeIterator(a);for(var e=a.next();!e.done;d={$jscomp$loop$prop$item$
|
|
150
|
+
shaka.util.ArrayUtils.hasSameElements=function(a,b,c){c||(c=shaka.util.ArrayUtils.defaultEquals);if(a.length!=b.length)return!1;b=b.slice();var d={};a=$jscomp.makeIterator(a);for(var e=a.next();!e.done;d={$jscomp$loop$prop$item$574:d.$jscomp$loop$prop$item$574},e=a.next()){d.$jscomp$loop$prop$item$574=e.value;e=b.findIndex(function(f){return function(g){return c(f.$jscomp$loop$prop$item$574,g)}}(d));if(-1==e)return!1;b[e]=b[b.length-1];b.pop()}return 0==b.length};
|
|
151
151
|
shaka.util.ArrayUtils.equal=function(a,b,c){c||(c=shaka.util.ArrayUtils.defaultEquals);if(a.length!=b.length)return!1;for(var d=0;d<a.length;d++)if(!c(a[d],b[d]))return!1;return!0};shaka.text={};
|
|
152
152
|
shaka.text.Cue=function(a,b,c){var d=shaka.text.Cue;this.startTime=a;this.direction=d.direction.HORIZONTAL_LEFT_TO_RIGHT;this.endTime=b;this.payload=c;this.region=new shaka.text.CueRegion;this.position=null;this.positionAlign=d.positionAlign.AUTO;this.size=0;this.textAlign=d.textAlign.CENTER;this.writingMode=d.writingMode.HORIZONTAL_TOP_TO_BOTTOM;this.lineInterpretation=d.lineInterpretation.LINE_NUMBER;this.line=null;this.lineHeight="";this.lineAlign=d.lineAlign.START;this.displayAlign=d.displayAlign.AFTER;
|
|
153
153
|
this.fontSize=this.textStrokeWidth=this.textStrokeColor=this.border=this.backgroundImage=this.backgroundColor=this.color="";this.fontWeight=d.fontWeight.NORMAL;this.fontStyle=d.fontStyle.NORMAL;this.linePadding=this.letterSpacing=this.fontFamily="";this.opacity=1;this.textDecoration=[];this.wrapLine=!0;this.id="";this.nestedCues=[];this.spacer=this.lineBreak=this.isContainer=!1;this.cellResolution={columns:32,rows:15}};
|
|
@@ -217,15 +217,16 @@ shaka.util.Platform.safariVersion=function(){if(!shaka.util.Platform.isApple())r
|
|
|
217
217
|
shaka.util.Platform.isMobile=function(){return/(?:iPhone|iPad|iPod|Android)/.test(navigator.userAgent)?!0:shaka.util.Platform.isApple()&&1<navigator.maxTouchPoints};shaka.util.Platform.userAgentContains_=function(a){return(navigator.userAgent||"").includes(a)};
|
|
218
218
|
shaka.util.Platform.anyMediaElement=function(){var a=shaka.util.Platform;if(a.cachedMediaElement_)return a.cachedMediaElement_;a.cacheExpirationTimer_||(a.cacheExpirationTimer_=new shaka.util.Timer(function(){a.cachedMediaElement_=null}));a.cachedMediaElement_=document.getElementsByTagName("video")[0]||document.getElementsByTagName("audio")[0];a.cachedMediaElement_||(a.cachedMediaElement_=document.createElement("video"));a.cacheExpirationTimer_.tickAfter(1);return a.cachedMediaElement_};
|
|
219
219
|
shaka.util.Platform.requiresEncryptionInfoInAllInitSegments=function(){var a=shaka.util.Platform;return a.isTizen()||a.isXboxOne()};shaka.util.Platform.cacheExpirationTimer_=null;shaka.util.Platform.cachedMediaElement_=null;shaka.util.StringUtils=function(){};
|
|
220
|
-
shaka.util.StringUtils.fromUTF8=function(a){if(!a)return"";a=shaka.util.BufferUtils.toUint8(a);239==a[0]&&187==a[1]&&191==a[2]&&(a=a.subarray(3));if(window.TextDecoder&&!shaka.util.Platform.isPS4())return a=(new TextDecoder).decode(a),a.includes("\ufffd")&&shaka.log.alwaysError('Decoded string contains an "unknown character" codepoint. That probably means the UTF8 encoding was incorrect!'),a;
|
|
221
|
-
|
|
220
|
+
shaka.util.StringUtils.fromUTF8=function(a){if(!a)return"";a=shaka.util.BufferUtils.toUint8(a);239==a[0]&&187==a[1]&&191==a[2]&&(a=a.subarray(3));if(window.TextDecoder&&!shaka.util.Platform.isPS4())return a=(new TextDecoder).decode(a),a.includes("\ufffd")&&shaka.log.alwaysError('Decoded string contains an "unknown character" codepoint. That probably means the UTF8 encoding was incorrect!'),a;for(var b="",c=0;c<a.length;++c){var d=65533;0==(a[c]&128)?d=a[c]:a.length>=c+2&&192==(a[c]&224)&&128==(a[c+
|
|
221
|
+
1]&192)?(d=(a[c]&31)<<6|a[c+1]&63,c+=1):a.length>=c+3&&224==(a[c]&240)&&128==(a[c+1]&192)&&128==(a[c+2]&192)?(d=(a[c]&15)<<12|(a[c+1]&63)<<6|a[c+2]&63,c+=2):a.length>=c+4&&240==(a[c]&241)&&128==(a[c+1]&192)&&128==(a[c+2]&192)&&128==(a[c+3]&192)&&(d=(a[c]&7)<<18|(a[c+1]&63)<<12|(a[c+2]&63)<<6|a[c+3]&63,c+=3);if(65535>=d)b+=String.fromCharCode(d);else{d-=65536;var e=d&1023;b+=String.fromCharCode(55296+(d>>10));b+=String.fromCharCode(56320+e)}}return b};
|
|
222
|
+
shaka.util.StringUtils.fromUTF16=function(a,b,c){if(!a)return"";if(!c&&0!=a.byteLength%2)throw shaka.log.error("Data has an incorrect length, must be even."),new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.TEXT,shaka.util.Error.Code.BAD_ENCODING);c=Math.floor(a.byteLength/2);var d=new Uint16Array(c);a=shaka.util.BufferUtils.toDataView(a);for(var e=0;e<c;e++)d[e]=a.getUint16(2*e,b);return shaka.util.StringUtils.fromCharCode(d)};
|
|
222
223
|
shaka.util.StringUtils.fromBytesAutoDetect=function(a){var b=shaka.util.StringUtils;if(!a)return"";var c=shaka.util.BufferUtils.toUint8(a);if(239==c[0]&&187==c[1]&&191==c[2])return b.fromUTF8(c);if(254==c[0]&&255==c[1])return b.fromUTF16(c.subarray(2),!1);if(255==c[0]&&254==c[1])return b.fromUTF16(c.subarray(2),!0);var d=function(e){return c.byteLength<=e||32<=c[e]&&126>=c[e]};shaka.log.debug("Unable to find byte-order-mark, making an educated guess.");if(0==c[0]&&0==c[2])return b.fromUTF16(a,!1);
|
|
223
224
|
if(0==c[1]&&0==c[3])return b.fromUTF16(a,!0);if(d(0)&&d(1)&&d(2)&&d(3))return b.fromUTF8(a);throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.TEXT,shaka.util.Error.Code.UNABLE_TO_DETECT_ENCODING);};
|
|
224
225
|
shaka.util.StringUtils.toUTF8=function(a){if(window.TextEncoder&&!shaka.util.Platform.isPS4()){var b=new TextEncoder;return shaka.util.BufferUtils.toArrayBuffer(b.encode(a))}a=encodeURIComponent(a);a=unescape(a);b=new Uint8Array(a.length);for(var c=0;c<a.length;c++)b[c]=a[c].charCodeAt(0);return shaka.util.BufferUtils.toArrayBuffer(b)};shaka.util.StringUtils.toUTF16=function(a,b){for(var c=new ArrayBuffer(2*a.length),d=new DataView(c),e=0;e<a.length;++e){var f=a.charCodeAt(e);d.setUint16(2*e,f,b)}return c};
|
|
225
226
|
shaka.util.StringUtils.fromCharCode=function(a){return shaka.util.StringUtils.fromCharCodeImpl_.value()(a)};shaka.util.StringUtils.resetFromCharCode=function(){shaka.util.StringUtils.fromCharCodeImpl_.reset()};goog.exportSymbol("shaka.util.StringUtils",shaka.util.StringUtils);goog.exportProperty(shaka.util.StringUtils,"resetFromCharCode",shaka.util.StringUtils.resetFromCharCode);goog.exportProperty(shaka.util.StringUtils,"toUTF16",shaka.util.StringUtils.toUTF16);
|
|
226
227
|
goog.exportProperty(shaka.util.StringUtils,"toUTF8",shaka.util.StringUtils.toUTF8);goog.exportProperty(shaka.util.StringUtils,"fromBytesAutoDetect",shaka.util.StringUtils.fromBytesAutoDetect);goog.exportProperty(shaka.util.StringUtils,"fromUTF16",shaka.util.StringUtils.fromUTF16);goog.exportProperty(shaka.util.StringUtils,"fromUTF8",shaka.util.StringUtils.fromUTF8);
|
|
227
|
-
shaka.util.StringUtils.fromCharCodeImpl_=new shaka.util.Lazy(function(){for(var a=function(c){try{var d=new Uint8Array(c),e=String.fromCharCode.apply(null,d);goog.asserts.assert(e,"Should get value");return 0<e.length}catch(f){return!1}},b={$jscomp$loop$prop$size$
|
|
228
|
-
c.$jscomp$loop$prop$size$
|
|
228
|
+
shaka.util.StringUtils.fromCharCodeImpl_=new shaka.util.Lazy(function(){for(var a=function(c){try{var d=new Uint8Array(c),e=String.fromCharCode.apply(null,d);goog.asserts.assert(e,"Should get value");return 0<e.length}catch(f){return!1}},b={$jscomp$loop$prop$size$576:65536};0<b.$jscomp$loop$prop$size$576;b={$jscomp$loop$prop$size$576:b.$jscomp$loop$prop$size$576},b.$jscomp$loop$prop$size$576/=2)if(a(b.$jscomp$loop$prop$size$576))return function(c){return function(d){for(var e="",f=0;f<d.length;f+=
|
|
229
|
+
c.$jscomp$loop$prop$size$576){var g=d.subarray(f,f+c.$jscomp$loop$prop$size$576);e+=String.fromCharCode.apply(null,g)}return e}}(b);goog.asserts.assert(!1,"Unable to create a fromCharCode method");return null});shaka.util.Uint8ArrayUtils=function(){};shaka.util.Uint8ArrayUtils.equal=function(a,b){shaka.Deprecate.deprecateFeature(4,"shaka.util.Uint8ArrayUtils.equal","Please use shaka.util.BufferUtils.equal instead.");return shaka.util.BufferUtils.equal(a,b)};shaka.util.Uint8ArrayUtils.toStandardBase64=function(a){a=shaka.util.StringUtils.fromCharCode(shaka.util.BufferUtils.toUint8(a));return btoa(a)};
|
|
229
230
|
shaka.util.Uint8ArrayUtils.toBase64=function(a,b){b=void 0==b?!0:b;var c=shaka.util.Uint8ArrayUtils.toStandardBase64(a).replace(/\+/g,"-").replace(/\//g,"_");return b?c:c.replace(/[=]*$/,"")};shaka.util.Uint8ArrayUtils.fromBase64=function(a){a=window.atob(a.replace(/-/g,"+").replace(/_/g,"/"));for(var b=new Uint8Array(a.length),c=0;c<a.length;++c)b[c]=a.charCodeAt(c);return b};
|
|
230
231
|
shaka.util.Uint8ArrayUtils.fromHex=function(a){for(var b=a.length/2,c=new Uint8Array(b),d=0;d<b;d++)c[d]=window.parseInt(a.substr(2*d,2),16);return c};shaka.util.Uint8ArrayUtils.toHex=function(a){var b=shaka.util.BufferUtils.toUint8(a);a="";b=$jscomp.makeIterator(b);for(var c=b.next();!c.done;c=b.next())c=c.value,c=c.toString(16),1==c.length&&(c="0"+c),a+=c;return a};
|
|
231
232
|
shaka.util.Uint8ArrayUtils.concat=function(){for(var a=$jscomp.getRestArguments.apply(0,arguments),b=0,c=$jscomp.makeIterator(a),d=c.next();!d.done;d=c.next())b+=d.value.byteLength;b=new Uint8Array(b);c=0;a=$jscomp.makeIterator(a);for(d=a.next();!d.done;d=a.next())d=d.value,b.set(shaka.util.BufferUtils.toUint8(d),c),c+=d.byteLength;return b};goog.exportSymbol("shaka.util.Uint8ArrayUtils",shaka.util.Uint8ArrayUtils);goog.exportProperty(shaka.util.Uint8ArrayUtils,"concat",shaka.util.Uint8ArrayUtils.concat);
|
|
@@ -273,8 +274,8 @@ shaka.util.LanguageUtils.isoMap_=new Map([["aar","aa"],["abk","ab"],["afr","af"]
|
|
|
273
274
|
shaka.util.MultiMap.prototype.remove=function(a,b){a in this.map_&&(this.map_[a]=this.map_[a].filter(function(c){return c!=b}),0==this.map_[a].length&&delete this.map_[a])};shaka.util.MultiMap.prototype.clear=function(){this.map_={}};shaka.util.MultiMap.prototype.forEach=function(a){for(var b in this.map_)a(b,this.map_[b])};shaka.util.MultiMap.prototype.size=function(){return Object.keys(this.map_).length};shaka.util.MultiMap.prototype.keys=function(){return Object.keys(this.map_)};shaka.util.StreamUtils=function(){};shaka.util.StreamUtils.chooseCodecsAndFilterManifest=function(a,b,c,d,e){var f=shaka.util.StreamUtils,g=a.variants;if(b.length||c.length)g=f.choosePreferredCodecs(g,b,c);g=f.filterVariantsByAudioChannelCount(g,d);b=f.getVariantsByCodecs_(g);b=f.filterVariantsByDensity_(b);var h=f.chooseCodecsByDecodingAttributes_(b,e);a.variants=a.variants.filter(function(k){if(f.getVariantCodecs_(k)==h)return!0;shaka.log.debug("Dropping Variant (better codec available)",k);return!1})};
|
|
274
275
|
shaka.util.StreamUtils.getVariantsByCodecs_=function(a){var b=new shaka.util.MultiMap;a=$jscomp.makeIterator(a);for(var c=a.next();!c.done;c=a.next()){c=c.value;var d=shaka.util.StreamUtils.getVariantCodecs_(c);b.push(d,c)}return b};
|
|
275
276
|
shaka.util.StreamUtils.filterVariantsByDensity_=function(a){var b=0,c=new Map,d=a.size();a.forEach(function(e,f){for(var g=$jscomp.makeIterator(f),h=g.next();!h.done;h=g.next()){h=h.value;var k=h.video;if(k&&k.width&&k.height){k=k.width*k.height*(k.frameRate||1);c.has(k)||c.set(k,new shaka.util.MultiMap);var l=c.get(k);l.push(e,h);l.size()===d&&(b=Math.max(b,k))}}});return b?c.get(b):a};
|
|
276
|
-
shaka.util.StreamUtils.choosePreferredCodecs=function(a,b,c){var d={};b=$jscomp.makeIterator(b);for(var e=b.next();!e.done;d={$jscomp$loop$prop$videoCodec$
|
|
277
|
-
b=c.next())if(d.$jscomp$loop$prop$audioCodec$
|
|
277
|
+
shaka.util.StreamUtils.choosePreferredCodecs=function(a,b,c){var d={};b=$jscomp.makeIterator(b);for(var e=b.next();!e.done;d={$jscomp$loop$prop$videoCodec$578:d.$jscomp$loop$prop$videoCodec$578},e=b.next())if(d.$jscomp$loop$prop$videoCodec$578=e.value,e=a.filter(function(f){return function(g){return g.video&&g.video.codecs.startsWith(f.$jscomp$loop$prop$videoCodec$578)}}(d)),e.length){a=e;break}d={};c=$jscomp.makeIterator(c);for(b=c.next();!b.done;d={$jscomp$loop$prop$audioCodec$580:d.$jscomp$loop$prop$audioCodec$580},
|
|
278
|
+
b=c.next())if(d.$jscomp$loop$prop$audioCodec$580=b.value,b=a.filter(function(f){return function(g){return g.audio&&g.audio.codecs.startsWith(f.$jscomp$loop$prop$audioCodec$580)}}(d)),b.length){a=b;break}return a};
|
|
278
279
|
shaka.util.StreamUtils.chooseCodecsByDecodingAttributes_=function(a,b){for(var c=shaka.util.StreamUtils,d=$jscomp.makeIterator(b),e=d.next();!e.done;e=d.next())if(e=e.value,e==c.DecodingAttributes.SMOOTH||e==c.DecodingAttributes.POWER){if(a=c.chooseCodecsByMediaCapabilitiesInfo_(a,e),1==a.size())return a.keys()[0]}else if(e==c.DecodingAttributes.BANDWIDTH)break;return c.findCodecsByLowestBandwidth_(a)};
|
|
279
280
|
shaka.util.StreamUtils.chooseCodecsByMediaCapabilitiesInfo_=function(a,b){var c=0,d=new shaka.util.MultiMap;a.forEach(function(e,f){for(var g=0,h=0,k=$jscomp.makeIterator(f),l=k.next();!l.done;l=k.next())l=l.value,l.decodingInfos.length&&(g+=l.decodingInfos[0][b]?1:0,h++);g/=h;shaka.log.debug("codecs",e,"avg",b,g);g>c?(d.clear(),d.push(e,f),c=g):g==c&&d.push(e,f)});return d};
|
|
280
281
|
shaka.util.StreamUtils.findCodecsByLowestBandwidth_=function(a){var b="",c=Infinity;a.forEach(function(d,e){for(var f=0,g=0,h=$jscomp.makeIterator(e),k=h.next();!k.done;k=h.next())f+=k.value.bandwidth||0,++g;f/=g;shaka.log.debug("codecs",d,"avg bandwidth",f);f<c&&(b=d,c=f)});goog.asserts.assert(""!==b,"Should have chosen codecs!");goog.asserts.assert(!isNaN(c),"Bandwidth should be a number!");return b};
|
|
@@ -288,11 +289,11 @@ if(shaka.util.Platform.isXboxOne()&&e&&(e.width&&1920<e.width||e.height&&1080<e.
|
|
|
288
289
|
shaka.util.StreamUtils.getDecodingInfosForVariants=function(a,b,c){var d,e,f,g,h,k,l,m,n,p,q;return $jscomp.asyncExecutePromiseGeneratorProgram(function(r){if(d=a.some(function(t){return t.decodingInfos.length}))return shaka.log.debug("Already got the variants' decodingInfo."),r["return"]();e=navigator.mediaCapabilities;f=[];g=function(t,u){var v,y;return $jscomp.asyncExecutePromiseGeneratorProgram(function(w){if(1==w.nextAddress)return w.setCatchFinallyBlocks(2),w.yield(e.decodingInfo(u),4);if(2!=
|
|
289
290
|
w.nextAddress)return v=w.yieldResult,t.decodingInfos.push(v),w.leaveTryBlock(0);y=w.enterCatchBlock();shaka.log.info("MediaCapabilities.decodingInfo() failed.",JSON.stringify(u),y);w.jumpToEnd()})};h=$jscomp.makeIterator(a);for(k=h.next();!k.done;k=h.next())for(l=k.value,m=shaka.util.StreamUtils.getDecodingConfigs_(l,b,c),n=$jscomp.makeIterator(m),p=n.next();!p.done;p=n.next())q=p.value,f.push(g(l,q));return r.yield(Promise.all(f),0)})};
|
|
290
291
|
shaka.util.StreamUtils.getDecodingConfigs_=function(a,b,c){var d=a.audio,e=a.video,f=shaka.util.ManifestParserUtils.ContentType;c={type:c?"file":"media-source"};if(e){var g=e.codecs;if(e.codecs.includes(",")){var h=e.codecs.split(",");g=shaka.util.ManifestParserUtils.guessCodecs(f.VIDEO,h);g=shaka.util.StreamUtils.patchVp9(g);h=shaka.util.ManifestParserUtils.guessCodecs(f.AUDIO,h);h=shaka.util.MimeUtils.getFullOrConvertedType(e.mimeType,h,f.AUDIO);c.audio={contentType:h,channels:2,bitrate:a.bandwidth||
|
|
291
|
-
1,samplerate:1,spatialRendering:!1}}g=shaka.util.StreamUtils.patchVp9(g);g=shaka.util.MimeUtils.getFullOrConvertedType(e.mimeType,g,f.VIDEO);c.video={contentType:g,width:e.width||
|
|
292
|
+
1,samplerate:1,spatialRendering:!1}}g=shaka.util.StreamUtils.patchVp9(g);g=shaka.util.MimeUtils.getFullOrConvertedType(e.mimeType,g,f.VIDEO);c.video={contentType:g,width:e.width||64,height:e.height||64,bitrate:e.bandwidth||a.bandwidth||1,framerate:e.frameRate||1};if(e.hdr)switch(e.hdr){case "SDR":c.video.transferFunction="srgb";break;case "PQ":c.video.transferFunction="pq";break;case "HLG":c.video.transferFunction="hlg"}}d&&(g=shaka.util.StreamUtils.getCorrectAudioCodecs_(d.codecs),f=shaka.util.MimeUtils.getFullOrConvertedType(d.mimeType,
|
|
292
293
|
g,f.AUDIO),c.audio={contentType:f,channels:d.channelsCount||2,bitrate:d.bandwidth||a.bandwidth||1,samplerate:d.audioSamplingRate||1,spatialRendering:d.spatialAudio});g=(a.video?a.video.drmInfos:[]).concat(a.audio?a.audio.drmInfos:[]);if(!g.length)return[c];a=[];f=new Map;g=$jscomp.makeIterator(g);for(var k=g.next();!k.done;k=g.next())h=k.value,f.get(h.keySystem)||f.set(h.keySystem,[]),f.get(h.keySystem).push(h);g=b?"required":"optional";b=b?["persistent-license"]:["temporary"];h=$jscomp.makeIterator(f.keys());
|
|
293
294
|
for(var l=h.next();!l.done;l=h.next()){var m=l.value;l=Object.assign({},c);var n=f.get(m);m={keySystem:m,initDataType:"cenc",persistentState:g,distinctiveIdentifier:"optional",sessionTypes:b};n=$jscomp.makeIterator(n);for(k=n.next();!k.done;k=n.next()){k=k.value;if(k.initData&&k.initData.length){for(var p=new Set,q=$jscomp.makeIterator(k.initData),r=q.next();!r.done;r=q.next())p.add(r.value.initDataType);1<p.size&&shaka.log.v2("DrmInfo contains more than one initDataType,","and we use the initDataType of the first initData.",
|
|
294
295
|
k);m.initDataType=k.initData[0].initDataType}k.distinctiveIdentifierRequired&&(m.distinctiveIdentifier="required");k.persistentStateRequired&&(m.persistentState="required");k.sessionType&&(m.sessionTypes=[k.sessionType]);d&&(m.audio?m.audio.robustness=m.audio.robustness||k.audioRobustness:m.audio={robustness:k.audioRobustness});e&&(m.video?m.video.robustness=m.video.robustness||k.videoRobustness:m.video={robustness:k.videoRobustness})}l.keySystemConfiguration=m;a.push(l)}return a};
|
|
295
|
-
shaka.util.StreamUtils.getCorrectAudioCodecs_=function(a){return shaka.util.Platform.isTizen()?"ac-3"==a.toLowerCase()?"ec-3":a:a};shaka.util.StreamUtils.patchVp9=function(a){return"vp9"==a?"vp09.00.
|
|
296
|
+
shaka.util.StreamUtils.getCorrectAudioCodecs_=function(a){return shaka.util.Platform.isTizen()?"ac-3"==a.toLowerCase()?"ec-3":a:a};shaka.util.StreamUtils.patchVp9=function(a){return"vp9"==a?"vp09.00.41.08":a};
|
|
296
297
|
shaka.util.StreamUtils.filterManifestByCurrentVariant=function(a,b){var c=shaka.util.StreamUtils;b.variants=b.variants.filter(function(d){var e=d.audio;d=d.video;return e&&a&&a.audio&&!c.areStreamsCompatible_(e,a.audio)?(shaka.log.debug("Droping variant - not compatible with active audio","active audio",c.getStreamSummaryString_(a.audio),"variant.audio",c.getStreamSummaryString_(e)),!1):d&&a&&a.video&&!c.areStreamsCompatible_(d,a.video)?(shaka.log.debug("Droping variant - not compatible with active video",
|
|
297
298
|
"active video",c.getStreamSummaryString_(a.video),"variant.video",c.getStreamSummaryString_(d)),!1):!0})};shaka.util.StreamUtils.filterTextStreams_=function(a){a.textStreams=a.textStreams.filter(function(b){var c=shaka.util.MimeUtils.getFullType(b.mimeType,b.codecs);(c=shaka.text.TextEngine.isTypeSupported(c))||shaka.log.debug("Dropping text stream. Is not supported by the platform.",b);return c})};
|
|
298
299
|
shaka.util.StreamUtils.filterImageStreams_=function(a){a.imageStreams=a.imageStreams.filter(function(b){var c=["image/svg+xml","image/png","image/jpeg"],d=shaka.util.Platform;(d.isWebOS()||d.isTizen()||d.isChromecast())&&c.push("image/webp");(c=c.includes(b.mimeType))||shaka.log.debug("Dropping image stream. Is not supported by the platform.",b);return c})};shaka.util.StreamUtils.areStreamsCompatible_=function(a,b){return a.mimeType!=b.mimeType||a.codecs.split(".")[0]!=b.codecs.split(".")[0]?!1:!0};
|
|
@@ -359,14 +360,14 @@ shaka.net.NetworkingEngine.prototype.destroy=function(){this.destroyed_=!0;this.
|
|
|
359
360
|
shaka.net.NetworkingEngine.prototype.request=function(a,b){var c=this,d=shaka.util.ObjectUtils,e=new shaka.net.NetworkingEngine.NumBytesRemainingClass;if(this.destroyed_)return d=Promise.reject(new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.PLAYER,shaka.util.Error.Code.OPERATION_ABORTED)),d["catch"](function(){}),new shaka.net.NetworkingEngine.PendingRequest(d,function(){return Promise.resolve()},e);goog.asserts.assert(b.uris&&b.uris.length,"Request without URIs!");
|
|
360
361
|
b.method=b.method||"GET";b.headers=b.headers||{};b.retryParameters=b.retryParameters?d.cloneObject(b.retryParameters):shaka.net.NetworkingEngine.defaultRetryParameters();b.uris=d.cloneObject(b.uris);d=this.filterRequest_(a,b);var f=d.chain(function(){return c.makeRequestWithRetry_(a,b,e)}),g=f.chain(function(n){return c.filterResponse_(a,n)}),h=Date.now(),k=0;d.promise.then(function(){k=Date.now()-h},function(){});var l=0;f.promise.then(function(){l=Date.now()},function(){});var m=g.chain(function(n){var p=
|
|
361
362
|
Date.now()-l,q=n.response;q.timeMs+=k;q.timeMs+=p;if(!n.gotProgress&&c.onProgressUpdated_&&!q.fromCache&&a==shaka.net.NetworkingEngine.RequestType.SEGMENT)c.onProgressUpdated_(q.timeMs,q.data.byteLength);return q},function(n){n&&(goog.asserts.assert(n instanceof shaka.util.Error,"Wrong error type"),n.severity=shaka.util.Error.Severity.CRITICAL);throw n;});d=new shaka.net.NetworkingEngine.PendingRequest(m.promise,function(){return m.abort()},e);this.operationManager_.manage(d);return d};
|
|
362
|
-
shaka.net.NetworkingEngine.prototype.filterRequest_=function(a,b){for(var c=shaka.util.AbortableOperation.completed(void 0),d={},e=$jscomp.makeIterator(this.requestFilters_),f=e.next();!f.done;d={$jscomp$loop$prop$requestFilter$
|
|
363
|
+
shaka.net.NetworkingEngine.prototype.filterRequest_=function(a,b){for(var c=shaka.util.AbortableOperation.completed(void 0),d={},e=$jscomp.makeIterator(this.requestFilters_),f=e.next();!f.done;d={$jscomp$loop$prop$requestFilter$582:d.$jscomp$loop$prop$requestFilter$582},f=e.next())d.$jscomp$loop$prop$requestFilter$582=f.value,c=c.chain(function(g){return function(){b.body&&(b.body=shaka.util.BufferUtils.toArrayBuffer(b.body));return g.$jscomp$loop$prop$requestFilter$582(a,b)}}(d));return c.chain(void 0,
|
|
363
364
|
function(g){if(g instanceof shaka.util.Error&&g.code==shaka.util.Error.Code.OPERATION_ABORTED)throw g;throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.NETWORK,shaka.util.Error.Code.REQUEST_FILTER_ERROR,g);})};shaka.net.NetworkingEngine.prototype.makeRequestWithRetry_=function(a,b,c){var d=new shaka.net.Backoff(b.retryParameters,!1);return this.send_(a,b,d,0,null,c)};
|
|
364
365
|
shaka.net.NetworkingEngine.prototype.send_=function(a,b,c,d,e,f){var g=this;this.forceHTTPS_&&(b.uris[d]=b.uris[d].replace("http://","https://"));var h=new goog.Uri(b.uris[d]),k=h.getScheme(),l=!1;k||(k=shaka.net.NetworkingEngine.getLocationProtocol_(),goog.asserts.assert(":"==k[k.length-1],"location.protocol expected to end with a colon!"),k=k.slice(0,-1),h.setScheme(k),b.uris[d]=h.toString());k=k.toLowerCase();var m=(k=shaka.net.NetworkingEngine.schemes_[k])?k.plugin:null;if(!m)return shaka.util.AbortableOperation.failed(new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,
|
|
365
366
|
shaka.util.Error.Category.NETWORK,shaka.util.Error.Code.UNSUPPORTED_SCHEME,h));var n=k.progressSupport,p=null,q=null,r=!1,t=!1,u;return shaka.util.AbortableOperation.notAbortable(c.attempt()).chain(function(){if(g.destroyed_)return shaka.util.AbortableOperation.aborted();u=Date.now();var v=shaka.net.NetworkingEngine.RequestType.SEGMENT,y=m(b.uris[d],b,a,function(z,A,C){p&&p.stop();q&&q.tickAfter(x/1E3);g.onProgressUpdated_&&a==v&&(g.onProgressUpdated_(z,A),l=!0,f.setBytes(C))},function(z){if(g.onHeadersReceived_)g.onHeadersReceived_(z,
|
|
366
367
|
b,a);t=!0});if(!n)return y;var w=b.retryParameters.connectionTimeout;w&&(p=new shaka.util.Timer(function(){r=!0;y.abort()}),p.tickAfter(w/1E3));var x=b.retryParameters.stallTimeout;x&&(q=new shaka.util.Timer(function(){r=!0;y.abort()}));return y}).chain(function(v){p&&p.stop();q&&q.stop();void 0==v.timeMs&&(v.timeMs=Date.now()-u);var y={response:v,gotProgress:l};if(!t&&g.onHeadersReceived_)g.onHeadersReceived_(v.headers,b,a);return y},function(v){p&&p.stop();q&&q.stop();if(g.onDownloadFailed_){var y=
|
|
367
368
|
null,w=0;v instanceof shaka.util.Error&&(y=v,v.code==shaka.util.Error.Code.BAD_HTTP_STATUS&&(w=v.data[1]));g.onDownloadFailed_(b,y,w,r)}if(g.destroyed_)return shaka.util.AbortableOperation.aborted();r&&(v=new shaka.util.Error(shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.NETWORK,shaka.util.Error.Code.TIMEOUT,b.uris[d],a));if(v instanceof shaka.util.Error){if(v.code==shaka.util.Error.Code.OPERATION_ABORTED)throw v;if(v.code==shaka.util.Error.Code.ATTEMPTS_EXHAUSTED)throw goog.asserts.assert(e,
|
|
368
369
|
"Should have last error"),e;if(v.severity==shaka.util.Error.Severity.RECOVERABLE)return y=(new Map).set("error",v),y=new shaka.util.FakeEvent("retry",y),g.dispatchEvent(y),d=(d+1)%b.uris.length,g.send_(a,b,c,d,v,f)}throw v;})};
|
|
369
|
-
shaka.net.NetworkingEngine.prototype.filterResponse_=function(a,b){for(var c=shaka.util.AbortableOperation.completed(void 0),d={},e=$jscomp.makeIterator(this.responseFilters_),f=e.next();!f.done;d={$jscomp$loop$prop$responseFilter$
|
|
370
|
+
shaka.net.NetworkingEngine.prototype.filterResponse_=function(a,b){for(var c=shaka.util.AbortableOperation.completed(void 0),d={},e=$jscomp.makeIterator(this.responseFilters_),f=e.next();!f.done;d={$jscomp$loop$prop$responseFilter$584:d.$jscomp$loop$prop$responseFilter$584},f=e.next())d.$jscomp$loop$prop$responseFilter$584=f.value,c=c.chain(function(g){return function(){var h=b.response;h.data&&(h.data=shaka.util.BufferUtils.toArrayBuffer(h.data));return g.$jscomp$loop$prop$responseFilter$584(a,h)}}(d));
|
|
370
371
|
return c.chain(function(){return b},function(g){var h=shaka.util.Error.Severity.CRITICAL;if(g instanceof shaka.util.Error){if(g.code==shaka.util.Error.Code.OPERATION_ABORTED)throw g;h=g.severity}throw new shaka.util.Error(h,shaka.util.Error.Category.NETWORK,shaka.util.Error.Code.RESPONSE_FILTER_ERROR,g);})};shaka.net.NetworkingEngine.getLocationProtocol_=function(){return location.protocol};goog.exportSymbol("shaka.net.NetworkingEngine",shaka.net.NetworkingEngine);
|
|
371
372
|
goog.exportProperty(shaka.net.NetworkingEngine.prototype,"request",shaka.net.NetworkingEngine.prototype.request);goog.exportProperty(shaka.net.NetworkingEngine.prototype,"destroy",shaka.net.NetworkingEngine.prototype.destroy);goog.exportProperty(shaka.net.NetworkingEngine,"makeRequest",shaka.net.NetworkingEngine.makeRequest);goog.exportProperty(shaka.net.NetworkingEngine,"defaultRetryParameters",shaka.net.NetworkingEngine.defaultRetryParameters);
|
|
372
373
|
goog.exportProperty(shaka.net.NetworkingEngine.prototype,"clearAllResponseFilters",shaka.net.NetworkingEngine.prototype.clearAllResponseFilters);goog.exportProperty(shaka.net.NetworkingEngine.prototype,"unregisterResponseFilter",shaka.net.NetworkingEngine.prototype.unregisterResponseFilter);goog.exportProperty(shaka.net.NetworkingEngine.prototype,"registerResponseFilter",shaka.net.NetworkingEngine.prototype.registerResponseFilter);
|
|
@@ -416,7 +417,7 @@ c.destroyer_.ensureNotDestroyed();u.setCatchFinallyBlocks(4);c.supportedTypes_.c
|
|
|
416
417
|
shaka.log.info("Created MediaKeys object for key system",c.currentDrmInfo_.keySystem),c.mediaKeys_=r,c.initialized_=!0,u.yield(c.setServerCertificate(),7);case 7:c.destroyer_.ensureNotDestroyed();u.leaveTryBlock(0);break;case 4:t=u.enterCatchBlock();c.destroyer_.ensureNotDestroyed(t);c.currentDrmInfo_=null;c.supportedTypes_.clear();if(t instanceof shaka.util.Error)throw t;throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.DRM,shaka.util.Error.Code.FAILED_TO_CREATE_CDM,
|
|
417
418
|
t.message);}})};
|
|
418
419
|
shaka.media.DrmEngine.prototype.getKeySystemAccessFromVariants_=function(a,b){for(var c=$jscomp.makeIterator(a),d=c.next();!d.done;d=c.next()){var e=this.getVariantDrmInfos_(d.value);e=$jscomp.makeIterator(e);for(d=e.next();!d.done;d=e.next()){var f=d.value;b.has(f.keySystem)||b.set(f.keySystem,[]);b.get(f.keySystem).push(f)}}if(1==b.size&&b.has(""))throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.DRM,shaka.util.Error.Code.NO_RECOGNIZED_KEY_SYSTEMS);c={};e=$jscomp.makeIterator(this.config_.preferredKeySystems);
|
|
419
|
-
for(f=e.next();!f.done;c={$jscomp$loop$prop$preferredKeySystem$
|
|
420
|
+
for(f=e.next();!f.done;c={$jscomp$loop$prop$preferredKeySystem$586:c.$jscomp$loop$prop$preferredKeySystem$586},f=e.next())for(c.$jscomp$loop$prop$preferredKeySystem$586=f.value,f=$jscomp.makeIterator(a),d=f.next();!d.done;d=f.next())if(d=d.value.decodingInfos.find(function(l){return function(m){return m.supported&&null!=m.keySystemAccess&&m.keySystemAccess.keySystem==l.$jscomp$loop$prop$preferredKeySystem$586}}(c)))return d.keySystemAccess;c=$jscomp.makeIterator([!0,!1]);for(e=c.next();!e.done;e=
|
|
420
421
|
c.next())for(e=e.value,f=$jscomp.makeIterator(a),d=f.next();!d.done;d=f.next()){var g=$jscomp.makeIterator(d.value.decodingInfos);for(d=g.next();!d.done;d=g.next()){var h=d.value;if(h.supported&&h.keySystemAccess){d=b.get(h.keySystemAccess.keySystem);var k=$jscomp.makeIterator(d);for(d=k.next();!d.done;d=k.next())if(!!d.value.licenseServerUri==e)return h.keySystemAccess}}}return null};
|
|
421
422
|
shaka.media.DrmEngine.prototype.getKeySystemAccessByConfigs_=function(a){var b=this,c,d,e,f,g,h,k,l,m,n,p,q,r,t,u,v,y;return $jscomp.asyncExecutePromiseGeneratorProgram(function(w){switch(w.nextAddress){case 1:if(1==a.size&&a.has(""))throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.DRM,shaka.util.Error.Code.NO_RECOGNIZED_KEY_SYSTEMS);d=$jscomp.makeIterator(a.values());for(e=d.next();!e.done;e=d.next())f=e.value,0==f.audioCapabilities.length&&delete f.audioCapabilities,
|
|
422
423
|
0==f.videoCapabilities.length&&delete f.videoCapabilities;g=$jscomp.makeIterator(b.config_.preferredKeySystems);h=g.next();case 2:if(h.done){w.jumpTo(4);break}k=h.value;if(!a.has(k)){w.jumpTo(3);break}l=a.get(k);w.setCatchFinallyBlocks(6);return w.yield(navigator.requestMediaKeySystemAccess(k,[l]),8);case 8:return c=w.yieldResult,w["return"](c);case 6:m=w.enterCatchBlock(),shaka.log.v2("Requesting",k,"failed with config",l,m);case 7:b.destroyer_.ensureNotDestroyed();case 3:h=g.next();w.jumpTo(2);
|
|
@@ -439,9 +440,9 @@ b.config_.logLicenseExchange&&(r=shaka.util.Uint8ArrayUtils.toBase64(m.data),sha
|
|
|
439
440
|
w["return"]();case 6:if(b.destroyer_.destroyed())return w["return"]();v=new shaka.util.FakeEvent("drmsessionupdate");b.playerInterface_.onEvent(v);e&&(e.updatePromise&&e.updatePromise.resolve(),y=new shaka.util.Timer(function(){e.loaded=!0;b.areAllSessionsLoaded_()&&b.allSessionsLoaded_.resolve()}),y.tickAfter(shaka.media.DrmEngine.SESSION_LOAD_TIMEOUT_));w.jumpToEnd()}})};
|
|
440
441
|
shaka.media.DrmEngine.prototype.unpackPlayReadyRequest_=function(a){var b=shaka.util.StringUtils.fromUTF16(a.body,!0,!0);if(b.includes("PlayReadyKeyMessage")){shaka.log.debug("Unwrapping PlayReady request.");b=(new DOMParser).parseFromString(b,"application/xml");var c=b.getElementsByTagName("HttpHeader");c=$jscomp.makeIterator(c);for(var d=c.next();!d.done;d=c.next()){var e=d.value;d=e.getElementsByTagName("name")[0];e=e.getElementsByTagName("value")[0];goog.asserts.assert(d&&e,"Malformed PlayReady headers!");
|
|
441
442
|
a.headers[d.textContent]=e.textContent}b=b.getElementsByTagName("Challenge")[0];goog.asserts.assert(b,"Malformed PlayReady challenge!");goog.asserts.assert("base64encoded"==b.getAttribute("encoding"),"Unexpected PlayReady challenge encoding!");a.body=shaka.util.Uint8ArrayUtils.fromBase64(b.textContent)}else shaka.log.debug("PlayReady request is already unwrapped."),a.headers["Content-Type"]="text/xml; charset=utf-8"};
|
|
442
|
-
shaka.media.DrmEngine.prototype.onKeyStatusesChange_=function(a){var b=this;a=a.target;shaka.log.v2("Key status changed for session",a.sessionId);var c=this.activeSessions_.get(a),d=!1;a.keyStatuses.forEach(function(f,g){if("string"==typeof g){var h=g;g=f;f=h}if(shaka.media.DrmEngine.isPlayReadyKeySystem(b.currentDrmInfo_.keySystem)&&16==g.byteLength&&shaka.util.Platform.isEdge()){h=shaka.util.BufferUtils.toDataView(g);var k=h.getUint32(0,!0),l=h.getUint16(4,!0),m=h.getUint16(6
|
|
443
|
-
k,!1);h.setUint16(4,l,!1);h.setUint16(6,m,!1)}"status-pending"!=f&&(c.loaded=!0);c||goog.asserts.assert("usable"!=f,"Usable keys found in closed session");"expired"==f&&(d=!0);h=shaka.util.Uint8ArrayUtils.toHex(g);b.keyStatusByKeyId_.set(h,f)});var e=a.expiration-Date.now();(0>e||d&&1E3>e)&&c&&!c.updatePromise&&(shaka.log.debug("Session has expired",a.sessionId),this.activeSessions_["delete"](a),a.close()["catch"](function(){}));this.areAllSessionsLoaded_()&&(this.allSessionsLoaded_.resolve(),
|
|
444
|
-
shaka.media.DrmEngine.prototype.processKeyStatusChanges_=function(){var a=this.keyStatusByKeyId_,b=this.announcedKeyStatusByKeyId_;b.clear();a.forEach(function(c,d){return b.set(d,c)});a=Array.from(b.values());if(a.length&&a.every(function(c){return"expired"==c}))this.onError_(new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.DRM,shaka.util.Error.Code.EXPIRED));this.playerInterface_.onKeyStatus(shaka.util.MapUtils.asObject(b))};
|
|
443
|
+
shaka.media.DrmEngine.prototype.onKeyStatusesChange_=function(a){var b=this;a=a.target;shaka.log.v2("Key status changed for session",a.sessionId);var c=this.activeSessions_.get(a),d=!1;a.keyStatuses.forEach(function(f,g){if("string"==typeof g){var h=g;g=f;f=h}if(shaka.media.DrmEngine.isPlayReadyKeySystem(b.currentDrmInfo_.keySystem)&&16==g.byteLength&&(shaka.util.Platform.isEdge()||shaka.util.Platform.isPS4())){h=shaka.util.BufferUtils.toDataView(g);var k=h.getUint32(0,!0),l=h.getUint16(4,!0),m=h.getUint16(6,
|
|
444
|
+
!0);h.setUint32(0,k,!1);h.setUint16(4,l,!1);h.setUint16(6,m,!1)}"status-pending"!=f&&(c.loaded=!0);c||goog.asserts.assert("usable"!=f,"Usable keys found in closed session");"expired"==f&&(d=!0);h=shaka.util.Uint8ArrayUtils.toHex(g);b.keyStatusByKeyId_.set(h,f)});var e=a.expiration-Date.now();(0>e||d&&1E3>e)&&c&&!c.updatePromise&&(shaka.log.debug("Session has expired",a.sessionId),this.activeSessions_["delete"](a),a.close()["catch"](function(){}));this.areAllSessionsLoaded_()&&(this.allSessionsLoaded_.resolve(),
|
|
445
|
+
this.keyStatusTimer_.tickAfter(shaka.media.DrmEngine.KEY_STATUS_BATCH_TIME))};shaka.media.DrmEngine.prototype.processKeyStatusChanges_=function(){var a=this.keyStatusByKeyId_,b=this.announcedKeyStatusByKeyId_;b.clear();a.forEach(function(c,d){return b.set(d,c)});a=Array.from(b.values());if(a.length&&a.every(function(c){return"expired"==c}))this.onError_(new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.DRM,shaka.util.Error.Code.EXPIRED));this.playerInterface_.onKeyStatus(shaka.util.MapUtils.asObject(b))};
|
|
445
446
|
shaka.media.DrmEngine.isBrowserSupported=function(){return!!window.MediaKeys&&!!window.navigator&&!!window.navigator.requestMediaKeySystemAccess&&!!window.MediaKeySystemAccess&&!!window.MediaKeySystemAccess.prototype.getConfiguration};
|
|
446
447
|
shaka.media.DrmEngine.probeSupport=function(){var a,b,c,d,e,f,g,h;return $jscomp.asyncExecutePromiseGeneratorProgram(function(k){return 1==k.nextAddress?(goog.asserts.assert(shaka.media.DrmEngine.isBrowserSupported(),"Must have basic EME support"),a="org.w3.clearkey com.widevine.alpha com.microsoft.playready com.microsoft.playready.recommendation com.apple.fps.3_0 com.apple.fps.2_0 com.apple.fps.1_0 com.apple.fps com.adobe.primetime".split(" "),b=[{contentType:'video/mp4; codecs="avc1.42E01E"'},{contentType:'video/webm; codecs="vp8"'}],
|
|
447
448
|
c={initDataTypes:["cenc"],videoCapabilities:b},d={videoCapabilities:b,persistentState:"required",sessionTypes:["persistent-license"]},e=[d,c],f=new Map,g=function(l){var m,n,p;return $jscomp.asyncExecutePromiseGeneratorProgram(function(q){switch(q.nextAddress){case 1:return q.setCatchFinallyBlocks(2),q.yield(navigator.requestMediaKeySystemAccess(l,e),4);case 4:return m=q.yieldResult,p=(n=m.getConfiguration().sessionTypes)?n.includes("persistent-license"):!1,shaka.util.Platform.isTizen3()&&(p=!1),
|
|
@@ -451,9 +452,9 @@ shaka.media.DrmEngine.prototype.closeOpenSessions_=function(){var a=this,b;retur
|
|
|
451
452
|
"persistent-license"===f.type)return shaka.log.v1("Removing session",e.sessionId),h.yield(e.remove(),5);shaka.log.v1("Closing session",e.sessionId,f);return h.yield(a.closeSession_(e),5)}if(2!=h.nextAddress)return h.leaveTryBlock(0);g=h.enterCatchBlock();shaka.log.error("Failed to close or remove the session",g);h.jumpToEnd()})})),0)})};
|
|
452
453
|
shaka.media.DrmEngine.prototype.supportsVariant=function(a){var b=a.audio,c=a.video;if(b&&b.encrypted&&(b=shaka.media.DrmEngine.computeMimeType_(b),!this.willSupport(b))||c&&c.encrypted&&(c=shaka.media.DrmEngine.computeMimeType_(c),!this.willSupport(c)))return!1;var d=shaka.media.DrmEngine.keySystem(this.currentDrmInfo_);a=this.getVariantDrmInfos_(a);return 0==a.length||a.some(function(e){return e.keySystem==d})};
|
|
453
454
|
shaka.media.DrmEngine.areDrmCompatible=function(a,b){return a.length&&b.length?0<shaka.media.DrmEngine.getCommonDrmInfos(a,b).length:!0};
|
|
454
|
-
shaka.media.DrmEngine.getCommonDrmInfos=function(a,b){if(!a.length)return b;if(!b.length)return a;for(var c=[],d=$jscomp.makeIterator(a),e=d.next();!e.done;e=d.next()){e=e.value;for(var f={},g=$jscomp.makeIterator(b),h=g.next();!h.done;f={$jscomp$loop$prop$initData$
|
|
455
|
-
f.$jscomp$loop$prop$initData$
|
|
456
|
-
h.distinctiveIdentifierRequired,persistentStateRequired:e.persistentStateRequired||h.persistentStateRequired,videoRobustness:e.videoRobustness||h.videoRobustness,audioRobustness:e.audioRobustness||h.audioRobustness,serverCertificate:e.serverCertificate||h.serverCertificate,serverCertificateUri:e.serverCertificateUri||h.serverCertificateUri,initData:f.$jscomp$loop$prop$initData$
|
|
455
|
+
shaka.media.DrmEngine.getCommonDrmInfos=function(a,b){if(!a.length)return b;if(!b.length)return a;for(var c=[],d=$jscomp.makeIterator(a),e=d.next();!e.done;e=d.next()){e=e.value;for(var f={},g=$jscomp.makeIterator(b),h=g.next();!h.done;f={$jscomp$loop$prop$initData$588:f.$jscomp$loop$prop$initData$588},h=g.next())if(h=h.value,e.keySystem==h.keySystem){f.$jscomp$loop$prop$initData$588=[];f.$jscomp$loop$prop$initData$588=f.$jscomp$loop$prop$initData$588.concat(e.initData||[]);f.$jscomp$loop$prop$initData$588=
|
|
456
|
+
f.$jscomp$loop$prop$initData$588.concat(h.initData||[]);f.$jscomp$loop$prop$initData$588=f.$jscomp$loop$prop$initData$588.filter(function(k){return function(l,m){return void 0===l.keyId||m===k.$jscomp$loop$prop$initData$588.findIndex(function(n){return n.keyId===l.keyId})}}(f));g=e.keyIds&&h.keyIds?new Set([].concat($jscomp.arrayFromIterable(e.keyIds),$jscomp.arrayFromIterable(h.keyIds))):e.keyIds||h.keyIds;c.push({keySystem:e.keySystem,licenseServerUri:e.licenseServerUri||h.licenseServerUri,distinctiveIdentifierRequired:e.distinctiveIdentifierRequired||
|
|
457
|
+
h.distinctiveIdentifierRequired,persistentStateRequired:e.persistentStateRequired||h.persistentStateRequired,videoRobustness:e.videoRobustness||h.videoRobustness,audioRobustness:e.audioRobustness||h.audioRobustness,serverCertificate:e.serverCertificate||h.serverCertificate,serverCertificateUri:e.serverCertificateUri||h.serverCertificateUri,initData:f.$jscomp$loop$prop$initData$588,keyIds:g});break}}return c};
|
|
457
458
|
shaka.media.DrmEngine.prototype.getVariantDrmInfos_=function(a){return(a.video?a.video.drmInfos:[]).concat(a.audio?a.audio.drmInfos:[])};shaka.media.DrmEngine.prototype.pollExpiration_=function(){var a=this;this.activeSessions_.forEach(function(b,c){var d=b.oldExpiration,e=c.expiration;isNaN(e)&&(e=Infinity);e!=d&&(a.playerInterface_.onExpirationUpdated(c.sessionId,e),b.oldExpiration=e)})};
|
|
458
459
|
shaka.media.DrmEngine.prototype.areAllSessionsLoaded_=function(){var a=this.activeSessions_.values();return shaka.util.Iterables.every(a,function(b){return b.loaded})};
|
|
459
460
|
shaka.media.DrmEngine.replaceDrmInfo_=function(a,b){var c=[];b.forEach(function(f,g){c.push({keySystem:g,licenseServerUri:f,distinctiveIdentifierRequired:!1,persistentStateRequired:!1,audioRobustness:"",videoRobustness:"",serverCertificate:null,serverCertificateUri:"",initData:[],keyIds:new Set})});for(var d=$jscomp.makeIterator(a),e=d.next();!e.done;e=d.next())e=e.value,e.video&&(e.video.drmInfos=c),e.audio&&(e.audio.drmInfos=c)};
|
|
@@ -462,9 +463,9 @@ shaka.media.DrmEngine.prototype.createDrmInfoByInfos_=function(a,b){var c=[],d=[
|
|
|
462
463
|
e.distinctiveIdentifierRequired),e.persistentStateRequired&&(c.persistentStateRequired=e.persistentStateRequired);return c};
|
|
463
464
|
shaka.media.DrmEngine.createDrmInfoByConfigs_=function(a,b){var c=[],d=[],e=[],f=[],g=new Set;shaka.media.DrmEngine.processDrmInfos_(b.drmInfos,c,e,d,f,g);1<e.length&&shaka.log.warning("Multiple unique server certificates found! Only the first will be used.");1<d.length&&shaka.log.warning("Multiple unique server certificate URIs found! Only the first will be used.");1<c.length&&shaka.log.warning("Multiple unique license server URIs found! Only the first will be used.");return{keySystem:a,licenseServerUri:c[0],
|
|
464
465
|
distinctiveIdentifierRequired:"required"==b.distinctiveIdentifier,persistentStateRequired:"required"==b.persistentState,sessionType:b.sessionTypes[0]||"temporary",audioRobustness:(b.audioCapabilities?b.audioCapabilities[0].robustness:"")||"",videoRobustness:(b.videoCapabilities?b.videoCapabilities[0].robustness:"")||"",serverCertificate:e[0],serverCertificateUri:d[0],initData:f,keyIds:g}};
|
|
465
|
-
shaka.media.DrmEngine.processDrmInfos_=function(a,b,c,d,e,f){var g={};a=$jscomp.makeIterator(a);for(var h=a.next();!h.done;g={$jscomp$loop$prop$drmInfo$
|
|
466
|
-
(c.some(function(m){return function(n){return shaka.util.BufferUtils.equal(n,m.$jscomp$loop$prop$drmInfo$
|
|
467
|
-
m.$jscomp$loop$prop$initDataOverride$
|
|
466
|
+
shaka.media.DrmEngine.processDrmInfos_=function(a,b,c,d,e,f){var g={};a=$jscomp.makeIterator(a);for(var h=a.next();!h.done;g={$jscomp$loop$prop$drmInfo$590:g.$jscomp$loop$prop$drmInfo$590},h=a.next()){g.$jscomp$loop$prop$drmInfo$590=h.value;b.includes(g.$jscomp$loop$prop$drmInfo$590.licenseServerUri)||b.push(g.$jscomp$loop$prop$drmInfo$590.licenseServerUri);d.includes(g.$jscomp$loop$prop$drmInfo$590.serverCertificateUri)||d.push(g.$jscomp$loop$prop$drmInfo$590.serverCertificateUri);g.$jscomp$loop$prop$drmInfo$590.serverCertificate&&
|
|
467
|
+
(c.some(function(m){return function(n){return shaka.util.BufferUtils.equal(n,m.$jscomp$loop$prop$drmInfo$590.serverCertificate)}}(g))||c.push(g.$jscomp$loop$prop$drmInfo$590.serverCertificate));if(g.$jscomp$loop$prop$drmInfo$590.initData){h={};for(var k=$jscomp.makeIterator(g.$jscomp$loop$prop$drmInfo$590.initData),l=k.next();!l.done;h={$jscomp$loop$prop$initDataOverride$592:h.$jscomp$loop$prop$initDataOverride$592},l=k.next())h.$jscomp$loop$prop$initDataOverride$592=l.value,e.some(function(m){return function(n){var p=
|
|
468
|
+
m.$jscomp$loop$prop$initDataOverride$592;n=n.keyId&&n.keyId==p.keyId?!0:n.initDataType==p.initDataType&&shaka.util.BufferUtils.equal(n.initData,p.initData);return n}}(h))||e.push(h.$jscomp$loop$prop$initDataOverride$592)}if(g.$jscomp$loop$prop$drmInfo$590.keyIds)for(h=$jscomp.makeIterator(g.$jscomp$loop$prop$drmInfo$590.keyIds),k=h.next();!k.done;k=h.next())f.add(k.value)}};
|
|
468
469
|
shaka.media.DrmEngine.fillInDrmInfoDefaults_=function(a,b,c){if(a.keySystem&&("org.w3.clearkey"!=a.keySystem||!a.licenseServerUri)){b.size&&(b=b.get(a.keySystem)||"",a.licenseServerUri=b);a.keyIds||(a.keyIds=new Set);if(c=c.get(a.keySystem))a.distinctiveIdentifierRequired||(a.distinctiveIdentifierRequired=c.distinctiveIdentifierRequired),a.persistentStateRequired||(a.persistentStateRequired=c.persistentStateRequired),a.videoRobustness||(a.videoRobustness=c.videoRobustness),a.audioRobustness||(a.audioRobustness=
|
|
469
470
|
c.audioRobustness),a.serverCertificate||(a.serverCertificate=c.serverCertificate),c.sessionType&&(a.sessionType=c.sessionType),a.serverCertificateUri||(a.serverCertificateUri=c.serverCertificateUri);window.cast&&window.cast.__platform__&&"com.microsoft.playready"==a.keySystem&&(a.keySystem="com.chromecast.playready")}};shaka.media.DrmEngine.CLOSE_TIMEOUT_=1;shaka.media.DrmEngine.SESSION_LOAD_TIMEOUT_=5;shaka.media.DrmEngine.KEY_STATUS_BATCH_TIME=.5;shaka.media.DrmEngine.DUMMY_KEY_ID=new shaka.util.Lazy(function(){return shaka.util.BufferUtils.toArrayBuffer(new Uint8Array([0]))});shaka.media.ManifestParser=function(){};shaka.media.ManifestParser.registerParserByExtension=function(a,b){shaka.media.ManifestParser.parsersByExtension[a]=b};shaka.media.ManifestParser.registerParserByMime=function(a,b){shaka.media.ManifestParser.parsersByMime[a]=b};shaka.media.ManifestParser.unregisterParserByMime=function(a){delete shaka.media.ManifestParser.parsersByMime[a]};
|
|
470
471
|
shaka.media.ManifestParser.probeSupport=function(){var a=shaka.media.ManifestParser,b={};if(shaka.util.Platform.supportsMediaSource()){for(var c in a.parsersByMime)b[c]=!0;for(var d in a.parsersByExtension)b[d]=!0}c={mpd:"application/dash+xml",m3u8:"application/x-mpegurl",ism:"application/vnd.ms-sstr+xml"};d=$jscomp.makeIterator(["application/dash+xml","application/x-mpegurl","application/vnd.apple.mpegurl","application/vnd.ms-sstr+xml"]);for(var e=d.next();!e.done;e=d.next())e=e.value,shaka.util.Platform.supportsMediaSource()?
|
|
@@ -590,9 +591,9 @@ b.next();!c.done;c=b.next()){c=c.value;shaka.util.Platform.supportsMediaSource()
|
|
|
590
591
|
shaka.media.MediaSourceEngine.prototype.doDestroy_=function(){var a=this,b,c,d,e,f,g,h,k,l,m;return $jscomp.asyncExecutePromiseGeneratorProgram(function(n){if(1==n.nextAddress){b=shaka.util.Functional;c=[];for(d in a.queues_)for(e=a.queues_[d],f=e[0],a.queues_[d]=e.slice(0,1),f&&c.push(f.p["catch"](b.noop)),g=$jscomp.makeIterator(e.slice(1)),h=g.next();!h.done;h=g.next())k=h.value,k.p.reject(shaka.util.Destroyer.destroyedError());a.textEngine_&&c.push(a.textEngine_.destroy());a.textDisplayer_&&c.push(a.textDisplayer_.destroy());
|
|
591
592
|
for(l in a.transmuxers_)c.push(a.transmuxers_[l].destroy());return n.yield(Promise.all(c),2)}a.eventManager_&&(a.eventManager_.release(),a.eventManager_=null);a.video_&&(a.video_.removeAttribute("src"),a.video_.load(),a.video_=null);a.mediaSource_=null;a.textEngine_=null;a.textDisplayer_=null;a.sourceBuffers_={};a.transmuxers_={};a.captionParser_=null;if(goog.DEBUG)for(m in a.queues_)goog.asserts.assert(0==a.queues_[m].length,m+" queue should be empty after destroy!");a.queues_={};n.jumpToEnd()})};
|
|
592
593
|
shaka.media.MediaSourceEngine.prototype.open=function(){return this.mediaSourceOpen_};
|
|
593
|
-
shaka.media.MediaSourceEngine.prototype.init=function(a,b){var c=this,d,e,f,g,h,k,l;return $jscomp.asyncExecutePromiseGeneratorProgram(function(m){if(1==m.nextAddress)return d=shaka.util.ManifestParserUtils.ContentType,m.yield(c.mediaSourceOpen_,2);e={};f=$jscomp.makeIterator(a.keys());for(g=f.next();!g.done;e={$jscomp$loop$prop$contentType$
|
|
594
|
-
"Type negotiation should happen before MediaSourceEngine.init!"),k=shaka.util.MimeUtils.getFullType(h.mimeType,h.codecs),e.$jscomp$loop$prop$contentType$
|
|
595
|
-
"error",function(n){return function(){return c.onError_(n.$jscomp$loop$prop$contentType$
|
|
594
|
+
shaka.media.MediaSourceEngine.prototype.init=function(a,b){var c=this,d,e,f,g,h,k,l;return $jscomp.asyncExecutePromiseGeneratorProgram(function(m){if(1==m.nextAddress)return d=shaka.util.ManifestParserUtils.ContentType,m.yield(c.mediaSourceOpen_,2);e={};f=$jscomp.makeIterator(a.keys());for(g=f.next();!g.done;e={$jscomp$loop$prop$contentType$595:e.$jscomp$loop$prop$contentType$595},g=f.next())e.$jscomp$loop$prop$contentType$595=g.value,h=a.get(e.$jscomp$loop$prop$contentType$595),goog.asserts.assert(shaka.media.MediaSourceEngine.isStreamSupported(h),
|
|
595
|
+
"Type negotiation should happen before MediaSourceEngine.init!"),k=shaka.util.MimeUtils.getFullType(h.mimeType,h.codecs),e.$jscomp$loop$prop$contentType$595==d.TEXT?c.reinitText(k):(!b&&MediaSource.isTypeSupported(k)||!shaka.media.Transmuxer.isSupported(k,e.$jscomp$loop$prop$contentType$595)||(c.transmuxers_[e.$jscomp$loop$prop$contentType$595]=new shaka.media.Transmuxer,k=shaka.media.Transmuxer.convertTsCodecs(e.$jscomp$loop$prop$contentType$595,k)),l=c.mediaSource_.addSourceBuffer(k),c.eventManager_.listen(l,
|
|
596
|
+
"error",function(n){return function(){return c.onError_(n.$jscomp$loop$prop$contentType$595)}}(e)),c.eventManager_.listen(l,"updateend",function(n){return function(){return c.onUpdateEnd_(n.$jscomp$loop$prop$contentType$595)}}(e)),c.sourceBuffers_[e.$jscomp$loop$prop$contentType$595]=l,c.sourceBufferTypes_[e.$jscomp$loop$prop$contentType$595]=k,c.queues_[e.$jscomp$loop$prop$contentType$595]=[],c.expectedEncryption_[e.$jscomp$loop$prop$contentType$595]=!!h.drmInfos.length);m.jumpToEnd()})};
|
|
596
597
|
shaka.media.MediaSourceEngine.prototype.reinitText=function(a){this.textEngine_||(this.textEngine_=new shaka.text.TextEngine(this.textDisplayer_));this.textEngine_.initParser(a)};shaka.media.MediaSourceEngine.prototype.ended=function(){return this.mediaSource_?"ended"==this.mediaSource_.readyState:!0};shaka.media.MediaSourceEngine.prototype.bufferStart=function(a){return a==shaka.util.ManifestParserUtils.ContentType.TEXT?this.textEngine_.bufferStart():shaka.media.TimeRangesUtils.bufferStart(this.getBuffered_(a))};
|
|
597
598
|
shaka.media.MediaSourceEngine.prototype.bufferEnd=function(a){return a==shaka.util.ManifestParserUtils.ContentType.TEXT?this.textEngine_.bufferEnd():shaka.media.TimeRangesUtils.bufferEnd(this.getBuffered_(a))};shaka.media.MediaSourceEngine.prototype.isBuffered=function(a,b,c){if(a==shaka.util.ManifestParserUtils.ContentType.TEXT)return this.textEngine_.isBuffered(b);a=this.getBuffered_(a);return shaka.media.TimeRangesUtils.isBuffered(a,b,c)};
|
|
598
599
|
shaka.media.MediaSourceEngine.prototype.bufferedAheadOf=function(a,b){if(a==shaka.util.ManifestParserUtils.ContentType.TEXT)return this.textEngine_.bufferedAheadOf(b);var c=this.getBuffered_(a);return shaka.media.TimeRangesUtils.bufferedAheadOf(c,b)};
|
|
@@ -613,8 +614,8 @@ shaka.media.MediaSourceEngine.prototype.setAppendWindow_=function(a,b,c){this.so
|
|
|
613
614
|
shaka.media.MediaSourceEngine.prototype.onError_=function(a){var b=this.queues_[a][0];goog.asserts.assert(b,"Spurious error event!");goog.asserts.assert(!this.sourceBuffers_[a].updating,"SourceBuffer should not be updating on error!");b.p.reject(new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MEDIA,shaka.util.Error.Code.MEDIA_SOURCE_OPERATION_FAILED,this.video_.error?this.video_.error.code:0))};
|
|
614
615
|
shaka.media.MediaSourceEngine.prototype.onUpdateEnd_=function(a){var b=this.queues_[a][0];goog.asserts.assert(b,"Spurious updateend event!");b&&(goog.asserts.assert(!this.sourceBuffers_[a].updating,"SourceBuffer should not be updating on updateend!"),b.p.resolve(),this.popFromQueue_(a))};
|
|
615
616
|
shaka.media.MediaSourceEngine.prototype.enqueueOperation_=function(a,b){this.destroyer_.ensureNotDestroyed();var c={start:b,p:new shaka.util.PublicPromise};this.queues_[a].push(c);1==this.queues_[a].length&&this.startOperation_(a);return c.p};
|
|
616
|
-
shaka.media.MediaSourceEngine.prototype.enqueueBlockingOperation_=function(a){var b=this,c,d,e,f,g,h,k,l;return $jscomp.asyncExecutePromiseGeneratorProgram(function(m){switch(m.nextAddress){case 1:b.destroyer_.ensureNotDestroyed();c=[];d={};for(e in b.sourceBuffers_)d.$jscomp$loop$prop$ready$
|
|
617
|
-
1==b.queues_[e].length&&f.start(),d={$jscomp$loop$prop$ready$
|
|
617
|
+
shaka.media.MediaSourceEngine.prototype.enqueueBlockingOperation_=function(a){var b=this,c,d,e,f,g,h,k,l;return $jscomp.asyncExecutePromiseGeneratorProgram(function(m){switch(m.nextAddress){case 1:b.destroyer_.ensureNotDestroyed();c=[];d={};for(e in b.sourceBuffers_)d.$jscomp$loop$prop$ready$597=new shaka.util.PublicPromise,f={start:function(n){return function(){return n.$jscomp$loop$prop$ready$597.resolve()}}(d),p:d.$jscomp$loop$prop$ready$597},b.queues_[e].push(f),c.push(d.$jscomp$loop$prop$ready$597),
|
|
618
|
+
1==b.queues_[e].length&&f.start(),d={$jscomp$loop$prop$ready$597:d.$jscomp$loop$prop$ready$597};m.setCatchFinallyBlocks(2);return m.yield(Promise.all(c),4);case 4:m.leaveTryBlock(3);break;case 2:g=m.enterCatchBlock();goog.asserts.assert(b.destroyer_.destroyed(),"Should be destroyed by now");if(goog.DEBUG)for(h in b.sourceBuffers_)b.queues_[h].length&&(goog.asserts.assert(1==b.queues_[h].length,"Should be at most one item in queue!"),goog.asserts.assert(c.includes(b.queues_[h][0].p),"The item in queue should be one of our waiters!"),
|
|
618
619
|
b.queues_[h].shift());throw g;case 3:if(goog.DEBUG)for(k in b.sourceBuffers_)goog.asserts.assert(0==b.sourceBuffers_[k].updating,"SourceBuffers should not be updating after a blocking op!");try{a()}catch(n){throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MEDIA,shaka.util.Error.Code.MEDIA_SOURCE_OPERATION_THREW,n);}finally{for(l in b.sourceBuffers_)b.popFromQueue_(l)}m.jumpToEnd()}})};
|
|
619
620
|
shaka.media.MediaSourceEngine.prototype.popFromQueue_=function(a){this.queues_[a].shift();this.startOperation_(a)};
|
|
620
621
|
shaka.media.MediaSourceEngine.prototype.startOperation_=function(a){var b=this.queues_[a][0];if(b)try{b.start()}catch(c){"QuotaExceededError"==c.name?b.p.reject(new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MEDIA,shaka.util.Error.Code.QUOTA_EXCEEDED_ERROR,a)):b.p.reject(new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MEDIA,shaka.util.Error.Code.MEDIA_SOURCE_OPERATION_THREW,c)),this.popFromQueue_(a)}};
|
|
@@ -798,34 +799,38 @@ shaka.routing.Walker.prototype.takeNextStep_=function(){var a=this,b,c;return $j
|
|
|
798
799
|
a.currentlyWith_,a.currentRoute_.payload),d.yield(a.currentStep_.promise,4);case 4:a.currentStep_=null;a.currentlyAt_==a.currentRoute_.node&&(a.currentRoute_.listeners.onEnd(),a.currentRoute_=null);d.leaveTryBlock(0);break;case 2:b=d.enterCatchBlock();if(b.code==shaka.util.Error.Code.OPERATION_ABORTED)goog.asserts.assert(a.currentRoute_.interruptible,"Do not put abortable steps in non-interruptible routes!"),a.currentRoute_.listeners.onCancel();else a.currentRoute_.listeners.onError(b);a.currentRoute_=
|
|
799
800
|
null;a.currentStep_=null;c=a;return d.yield(a.implementation_.handleError(a.currentlyWith_,b),5);case 5:c.currentlyAt_=d.yieldResult,d.jumpToEnd()}})};shaka.routing.Walker.prototype.unblockMainLoop_=function(){this.waitForWork_&&(this.waitForWork_.resolve(),this.waitForWork_=null)};shaka.text.SimpleTextDisplayer=function(a){this.textTrack_=null;for(var b=$jscomp.makeIterator(Array.from(a.textTracks)),c=b.next();!c.done;c=b.next())c=c.value,c.mode="disabled",c.label==shaka.Player.TextTrackLabel&&(this.textTrack_=c);this.textTrack_||(this.textTrack_=a.addTextTrack("subtitles",shaka.Player.TextTrackLabel));this.textTrack_.mode="hidden"};
|
|
800
801
|
shaka.text.SimpleTextDisplayer.prototype.remove=function(a,b){if(!this.textTrack_)return!1;shaka.text.SimpleTextDisplayer.removeWhere_(this.textTrack_,function(c){return c.startTime<b&&c.endTime>a});return!0};
|
|
801
|
-
shaka.text.SimpleTextDisplayer.prototype.append=function(a){var b=function(
|
|
802
|
-
"\n"):
|
|
803
|
-
h.endTime==
|
|
804
|
-
shaka.text.SimpleTextDisplayer.prototype.destroy=function(){this.textTrack_&&(shaka.text.SimpleTextDisplayer.removeWhere_(this.textTrack_,function(a){return!0}),this.textTrack_.mode="disabled");this.textTrack_=null;return Promise.resolve()};shaka.text.SimpleTextDisplayer.prototype.isTextVisible=function(){return"showing"==this.textTrack_.mode};
|
|
802
|
+
shaka.text.SimpleTextDisplayer.prototype.append=function(a){var b=function(h){var k=[],l=h.fontWeight>=shaka.text.Cue.fontWeight.BOLD,m=h.fontStyle==shaka.text.Cue.fontStyle.ITALIC,n=h.textDecoration.includes(shaka.text.Cue.textDecoration.UNDERLINE);l&&k.push("b");m&&k.push("i");n&&k.push("u");l=k.reduce(function(p,q){return p+"<"+q+">"},"");k=k.reduceRight(function(p,q){return p+"</"+q+">"},"");return h.lineBreak||h.spacer?(h.spacer&&shaka.Deprecate.deprecateFeature(4,"shaka.extern.Cue","Please use lineBreak instead of spacer."),
|
|
803
|
+
"\n"):h.nestedCues.length?h.nestedCues.map(b).join(""):l+h.payload+k},c=function(h,k){for(var l=$jscomp.makeIterator(h),m=l.next();!m.done;m=l.next())if(m=m.value,m.isContainer)c(m.nestedCues,k);else{var n=m.clone();n.nestedCues=[];n.payload=b(m);k.push(n)}return k},d=c(a,[]),e=[];a=this.textTrack_.cues?Array.from(this.textTrack_.cues):[];var f={};d=$jscomp.makeIterator(d);for(var g=d.next();!g.done;f={$jscomp$loop$prop$inCue$599:f.$jscomp$loop$prop$inCue$599},g=d.next())f.$jscomp$loop$prop$inCue$599=
|
|
804
|
+
g.value,a.some(function(h){return function(k){return k.startTime==h.$jscomp$loop$prop$inCue$599.startTime&&k.endTime==h.$jscomp$loop$prop$inCue$599.endTime&&k.text==h.$jscomp$loop$prop$inCue$599.payload?!0:!1}}(f))||(g=shaka.text.SimpleTextDisplayer.convertToTextTrackCue_(f.$jscomp$loop$prop$inCue$599))&&e.push(g);a=e.slice().sort(function(h,k){return h.startTime!=k.startTime?h.startTime-k.startTime:h.endTime!=k.endTime?h.endTime-k.startTime:"line"in VTTCue.prototype?e.indexOf(k)-e.indexOf(h):e.indexOf(h)-
|
|
805
|
+
e.indexOf(k)});a=$jscomp.makeIterator(a);for(f=a.next();!f.done;f=a.next())this.textTrack_.addCue(f.value)};shaka.text.SimpleTextDisplayer.prototype.destroy=function(){this.textTrack_&&(shaka.text.SimpleTextDisplayer.removeWhere_(this.textTrack_,function(a){return!0}),this.textTrack_.mode="disabled");this.textTrack_=null;return Promise.resolve()};shaka.text.SimpleTextDisplayer.prototype.isTextVisible=function(){return"showing"==this.textTrack_.mode};
|
|
806
|
+
shaka.text.SimpleTextDisplayer.prototype.setTextVisibility=function(a){this.textTrack_.mode=a?"showing":"hidden"};
|
|
805
807
|
shaka.text.SimpleTextDisplayer.convertToTextTrackCue_=function(a){if(a.startTime>=a.endTime)return shaka.log.warning("Invalid cue times: "+a.startTime+" - "+a.endTime),null;var b=shaka.text.Cue,c=new VTTCue(a.startTime,a.endTime,a.payload);c.lineAlign=a.lineAlign;c.positionAlign=a.positionAlign;a.size&&(c.size=a.size);try{c.align=a.textAlign}catch(d){}"center"==a.textAlign&&"center"!=c.align&&(c.align="middle");a.writingMode==b.writingMode.VERTICAL_LEFT_TO_RIGHT?c.vertical="lr":a.writingMode==b.writingMode.VERTICAL_RIGHT_TO_LEFT&&
|
|
806
808
|
(c.vertical="rl");a.lineInterpretation==b.lineInterpretation.PERCENTAGE&&(c.snapToLines=!1);null!=a.line&&(c.line=a.line);null!=a.position&&(c.position=a.position);return c};shaka.text.SimpleTextDisplayer.removeWhere_=function(a,b){var c=a.mode,d="showing"==c?"showing":"hidden";a.mode=d;goog.asserts.assert(a.cues,'Cues should be accessible when mode is set to "'+d+'".');d=$jscomp.makeIterator(Array.from(a.cues));for(var e=d.next();!e.done;e=d.next())(e=e.value)&&b(e)&&a.removeCue(e);a.mode=c};
|
|
807
809
|
goog.exportSymbol("shaka.text.SimpleTextDisplayer",shaka.text.SimpleTextDisplayer);goog.exportProperty(shaka.text.SimpleTextDisplayer.prototype,"setTextVisibility",shaka.text.SimpleTextDisplayer.prototype.setTextVisibility);goog.exportProperty(shaka.text.SimpleTextDisplayer.prototype,"isTextVisible",shaka.text.SimpleTextDisplayer.prototype.isTextVisible);goog.exportProperty(shaka.text.SimpleTextDisplayer.prototype,"destroy",shaka.text.SimpleTextDisplayer.prototype.destroy);
|
|
808
810
|
goog.exportProperty(shaka.text.SimpleTextDisplayer.prototype,"append",shaka.text.SimpleTextDisplayer.prototype.append);goog.exportProperty(shaka.text.SimpleTextDisplayer.prototype,"remove",shaka.text.SimpleTextDisplayer.prototype.remove);shaka.util.Dom=function(){};shaka.util.Dom.createHTMLElement=function(a){return document.createElement(a)};shaka.util.Dom.createButton=function(){return document.createElement("button")};shaka.util.Dom.asHTMLElement=function(a){return a};shaka.util.Dom.asHTMLMediaElement=function(a){return a};shaka.util.Dom.getElementByClassName=function(a,b){var c=b.getElementsByClassName(a);goog.asserts.assert(1==c.length,"Should only be one element with class name "+a);return shaka.util.Dom.asHTMLElement(c[0])};
|
|
809
811
|
shaka.util.Dom.removeAllChildren=function(a){for(;a.firstChild;)a.removeChild(a.firstChild)};goog.exportSymbol("shaka.util.Dom",shaka.util.Dom);goog.exportProperty(shaka.util.Dom,"removeAllChildren",shaka.util.Dom.removeAllChildren);shaka.text.UITextDisplayer=function(a,b){var c=this;goog.asserts.assert(b,"videoContainer should be valid.");this.isTextVisible_=!1;this.cues_=[];this.video_=a;this.videoContainer_=b;this.textContainer_=shaka.util.Dom.createHTMLElement("div");this.textContainer_.classList.add("shaka-text-container");this.textContainer_.style.textAlign="center";this.textContainer_.style.display="flex";this.textContainer_.style.flexDirection="column";this.textContainer_.style.alignItems="center";this.textContainer_.style.justifyContent=
|
|
810
|
-
"flex-end";this.videoContainer_.appendChild(this.textContainer_);this.captionsTimer_=(new shaka.util.Timer(function(){c.updateCaptions_()})).tickEvery(.25);this.currentCuesMap_=new Map;this.eventManager_=new shaka.util.EventManager;this.eventManager_.listen(document,"fullscreenchange",function(){c.updateCaptions_(!0)});this.resizeObserver_=null;"ResizeObserver"in window&&(this.resizeObserver_=new ResizeObserver(function(){c.updateCaptions_(!0)}),this.resizeObserver_.observe(this.textContainer_))
|
|
811
|
-
shaka.text.UITextDisplayer.prototype.append=function(a){var b=[].concat($jscomp.arrayFromIterable(this.cues_)),c={};a=$jscomp.makeIterator(a);for(var d=a.next();!d.done;c={$jscomp$loop$prop$cue$
|
|
812
|
+
"flex-end";this.videoContainer_.appendChild(this.textContainer_);this.captionsTimer_=(new shaka.util.Timer(function(){c.updateCaptions_()})).tickEvery(.25);this.currentCuesMap_=new Map;this.eventManager_=new shaka.util.EventManager;this.eventManager_.listen(document,"fullscreenchange",function(){c.updateCaptions_(!0)});this.resizeObserver_=null;"ResizeObserver"in window&&(this.resizeObserver_=new ResizeObserver(function(){c.updateCaptions_(!0)}),this.resizeObserver_.observe(this.textContainer_));
|
|
813
|
+
this.regionElements_=new Map};shaka.text.UITextDisplayer.prototype.append=function(a){var b=[].concat($jscomp.arrayFromIterable(this.cues_)),c={};a=$jscomp.makeIterator(a);for(var d=a.next();!d.done;c={$jscomp$loop$prop$cue$601:c.$jscomp$loop$prop$cue$601},d=a.next())c.$jscomp$loop$prop$cue$601=d.value,b.some(function(e){return function(f){return shaka.text.Cue.equal(f,e.$jscomp$loop$prop$cue$601)}}(c))||this.cues_.push(c.$jscomp$loop$prop$cue$601);this.updateCaptions_()};
|
|
812
814
|
shaka.text.UITextDisplayer.prototype.destroy=function(){this.videoContainer_.removeChild(this.textContainer_);this.textContainer_=null;this.isTextVisible_=!1;this.cues_=[];this.captionsTimer_&&this.captionsTimer_.stop();this.currentCuesMap_.clear();this.eventManager_&&(this.eventManager_.release(),this.eventManager_=null);this.resizeObserver_&&(this.resizeObserver_.disconnect(),this.resizeObserver_=null)};
|
|
813
815
|
shaka.text.UITextDisplayer.prototype.remove=function(a,b){if(!this.textContainer_)return!1;var c=this.cues_.length;this.cues_=this.cues_.filter(function(d){return d.startTime<a||d.endTime>=b});this.updateCaptions_(c>this.cues_.length);return!0};shaka.text.UITextDisplayer.prototype.isTextVisible=function(){return this.isTextVisible_};shaka.text.UITextDisplayer.prototype.setTextVisibility=function(a){this.isTextVisible_=a};
|
|
814
|
-
shaka.text.UITextDisplayer.prototype.updateCuesRecursive_=function(a,b,c,d){var e=!1,f=[],g=[];a=$jscomp.makeIterator(a);for(var h=a.next();!h.done;h=a.next()){h=h.value;d.push(h);var k=this.currentCuesMap_.get(h),l=h.startTime<=c&&h.endTime>c,m=k?k.wrapper:null;k&&(f.push(k.cueElement),l||(e=!0,this.currentCuesMap_["delete"](h),k=null));l&&(g.push(h),k||(this.createCue_(h,d),k=this.currentCuesMap_.get(h),m=k.wrapper,e=!0));0<h.nestedCues.length&&m&&this.updateCuesRecursive_(h.nestedCues,
|
|
815
|
-
d.pop();goog.asserts.assert(k==h,"Parent cues should be kept in order")}if(e){c=$jscomp.makeIterator(f);for(d=c.next();!d.done;d=c.next())
|
|
816
|
-
|
|
817
|
-
b
|
|
818
|
-
|
|
819
|
-
{
|
|
816
|
+
shaka.text.UITextDisplayer.prototype.updateCuesRecursive_=function(a,b,c,d){var e=!1,f=[],g=[];a=$jscomp.makeIterator(a);for(var h=a.next();!h.done;h=a.next()){h=h.value;d.push(h);var k=this.currentCuesMap_.get(h),l=h.startTime<=c&&h.endTime>c,m=k?k.wrapper:null;k&&(f.push(k.cueElement),k.regionElement&&f.push(k.regionElement),l||(e=!0,this.currentCuesMap_["delete"](h),k=null));l&&(g.push(h),k||(this.createCue_(h,d),k=this.currentCuesMap_.get(h),m=k.wrapper,e=!0));0<h.nestedCues.length&&m&&this.updateCuesRecursive_(h.nestedCues,
|
|
817
|
+
m,c,d);k=d.pop();goog.asserts.assert(k==h,"Parent cues should be kept in order")}if(e){c=$jscomp.makeIterator(f);for(d=c.next();!d.done;d=c.next())d=d.value,d.parentElement&&d.parentElement.removeChild(d);g.sort(function(n,p){return n.startTime!=p.startTime?n.startTime-p.startTime:n.endTime-p.endTime});g=$jscomp.makeIterator(g);for(h=g.next();!h.done;h=g.next())c=this.currentCuesMap_.get(h.value),goog.asserts.assert(c,"cueRegistry should exist."),c.regionElement?(b.appendChild(c.regionElement),c.regionElement.appendChild(c.cueElement)):
|
|
818
|
+
b.appendChild(c.cueElement)}};
|
|
819
|
+
shaka.text.UITextDisplayer.prototype.updateCaptions_=function(a){if(this.textContainer_){var b=this.video_.currentTime;if(!this.isTextVisible_||(void 0===a?0:a)){a=$jscomp.makeIterator(this.regionElements_.values());for(var c=a.next();!c.done;c=a.next())shaka.util.Dom.removeAllChildren(c.value);shaka.util.Dom.removeAllChildren(this.textContainer_);this.currentCuesMap_.clear();this.regionElements_.clear()}if(this.isTextVisible_){a=new Map;c=$jscomp.makeIterator(this.currentCuesMap_.keys());for(var d=
|
|
820
|
+
c.next();!d.done;d=c.next())d=d.value,a.set(d,this.currentCuesMap_.get(d));this.updateCuesRecursive_(this.cues_,this.textContainer_,b,[]);if(goog.DEBUG)for(b=$jscomp.makeIterator(a.keys()),d=b.next();!d.done;d=b.next())c=d.value,this.currentCuesMap_.has(c)||(c=a.get(c).cueElement,goog.asserts.assert(!c.parentNode,"Cue was not properly removed!"))}}};
|
|
821
|
+
shaka.text.UITextDisplayer.prototype.getRegionElement_=function(a){var b=a.region;if(this.regionElements_.has(b.id))return this.regionElements_.get(b.id);var c=shaka.util.Dom.createHTMLElement("span"),d=shaka.text.CueRegion.units.PERCENTAGE,e=b.heightUnits==d?"%":"px",f=b.widthUnits==d?"%":"px";d=b.viewportAnchorUnits==d?"%":"px";c.id="shaka-text-region---"+b.id;c.classList.add("shaka-text-region");c.style.height=b.height+e;c.style.width=b.width+f;c.style.position="absolute";c.style.top=b.viewportAnchorY+
|
|
822
|
+
d;c.style.left=b.viewportAnchorX+d;c.style.display="flex";c.style.flexDirection="column";c.style.alignItems="center";c.style.justifyContent=a.displayAlign==shaka.text.Cue.displayAlign.BEFORE?"flex-start":a.displayAlign==shaka.text.Cue.displayAlign.CENTER?"center":"flex-end";this.regionElements_.set(b.id,c);return c};
|
|
823
|
+
shaka.text.UITextDisplayer.prototype.createCue_=function(a,b){var c=1<b.length,d=c?"span":"div";if(a.lineBreak||a.spacer)a.spacer&&shaka.Deprecate.deprecateFeature(4,"shaka.extern.Cue","Please use lineBreak instead of spacer."),d="br";c=!c&&0<a.nestedCues.length;var e=shaka.util.Dom.createHTMLElement(d);"br"!=d&&this.setCaptionStyles_(e,a,b,c);d=null;a.region&&a.region.id&&(d=this.getRegionElement_(a));var f=e;c&&(f=shaka.util.Dom.createHTMLElement("span"),f.classList.add("shaka-text-wrapper"),f.style.backgroundColor=
|
|
824
|
+
a.backgroundColor,e.appendChild(f));this.currentCuesMap_.set(a,{cueElement:e,wrapper:f,regionElement:d})};
|
|
820
825
|
shaka.text.UITextDisplayer.prototype.setCaptionStyles_=function(a,b,c,d){var e=shaka.text.Cue,f=a.style,g=0==b.nestedCues.length,h=1<c.length;f.whiteSpace="pre-wrap";var k=b.payload.replace(/\s+$/g,function(m){return"\u00a0".repeat(m.length)});f.webkitTextStrokeColor=b.textStrokeColor;f.webkitTextStrokeWidth=b.textStrokeWidth;f.color=b.color;f.direction=b.direction;f.opacity=b.opacity;f.paddingLeft=shaka.text.UITextDisplayer.convertLengthValue_(b.linePadding,b,this.videoContainer_);f.paddingRight=
|
|
821
826
|
shaka.text.UITextDisplayer.convertLengthValue_(b.linePadding,b,this.videoContainer_);if(b.backgroundImage)f.backgroundImage="url('"+b.backgroundImage+"')",f.backgroundRepeat="no-repeat",f.backgroundSize="contain",f.backgroundPosition="center";else{if(b.nestedCues.length)var l=a;else l=shaka.util.Dom.createHTMLElement("span"),a.appendChild(l);b.border&&(l.style.border=b.border);d||((a=shaka.text.UITextDisplayer.inheritProperty_(c,function(m){return m.backgroundColor}))?l.style.backgroundColor=a:k&&
|
|
822
827
|
(l.style.backgroundColor="rgba(0, 0, 0, 0.8)"));k&&(l.textContent=k)}h&&!c[c.length-1].isContainer?f.display="inline":(f.display="flex",f.flexDirection="column",f.alignItems="center",f.justifyContent=b.displayAlign==e.displayAlign.BEFORE?"flex-start":b.displayAlign==e.displayAlign.CENTER?"center":"flex-end");g||(f.margin="0");f.fontFamily=b.fontFamily;f.fontWeight=b.fontWeight.toString();f.fontStyle=b.fontStyle;f.letterSpacing=b.letterSpacing;f.fontSize=shaka.text.UITextDisplayer.convertLengthValue_(b.fontSize,
|
|
823
|
-
b,this.videoContainer_);b.line
|
|
824
|
-
e.lineAlign.START?f.right=b.line+"%":b.lineAlign==e.lineAlign.END&&(f.left=b.line+"%")))
|
|
825
|
-
b.
|
|
826
|
-
shaka.text.UITextDisplayer.
|
|
827
|
-
shaka.text.UITextDisplayer.
|
|
828
|
-
goog.exportProperty(shaka.text.UITextDisplayer.prototype,"
|
|
828
|
+
b,this.videoContainer_);b.line&&b.lineInterpretation==e.lineInterpretation.PERCENTAGE&&(f.position="absolute",f.left="0",f.top="0",b.writingMode==e.writingMode.HORIZONTAL_TOP_TO_BOTTOM?(f.width="100%",b.lineAlign==e.lineAlign.START?f.top=b.line+"%":b.lineAlign==e.lineAlign.END&&(f.bottom=b.line+"%")):b.writingMode==e.writingMode.VERTICAL_LEFT_TO_RIGHT?(f.height="100%",b.lineAlign==e.lineAlign.START?f.left=b.line+"%":b.lineAlign==e.lineAlign.END&&(f.right=b.line+"%")):(f.height="100%",b.lineAlign==
|
|
829
|
+
e.lineAlign.START?f.right=b.line+"%":b.lineAlign==e.lineAlign.END&&(f.left=b.line+"%")));f.lineHeight=b.lineHeight;b.position&&(b.writingMode==e.writingMode.HORIZONTAL_TOP_TO_BOTTOM?f.paddingLeft=b.position:f.paddingTop=b.position);b.positionAlign==e.positionAlign.LEFT?f.cssFloat="left":b.positionAlign==e.positionAlign.RIGHT&&(f.cssFloat="right");f.textAlign=b.textAlign;f.textDecoration=b.textDecoration.join(" ");f.writingMode=b.writingMode;"writingMode"in document.documentElement.style&&f.writingMode==
|
|
830
|
+
b.writingMode||(f.webkitWritingMode=b.writingMode);b.size&&(b.writingMode==e.writingMode.HORIZONTAL_TOP_TO_BOTTOM?f.width=b.size+"%":f.height=b.size+"%")};shaka.text.UITextDisplayer.getLengthValueInfo_=function(a){return(a=(new RegExp(/(\d*\.?\d+)([a-z]+|%+)/)).exec(a))?{value:Number(a[1]),unit:a[2]}:null};
|
|
831
|
+
shaka.text.UITextDisplayer.convertLengthValue_=function(a,b,c){var d=shaka.text.UITextDisplayer.getLengthValueInfo_(a);if(!d)return a;var e=d.value;switch(d.unit){case "%":return shaka.text.UITextDisplayer.getAbsoluteLengthInPixels_(e/100,b,c);case "c":return shaka.text.UITextDisplayer.getAbsoluteLengthInPixels_(e,b,c);default:return a}};shaka.text.UITextDisplayer.getAbsoluteLengthInPixels_=function(a,b,c){return c.clientHeight*a/b.cellResolution.rows+"px"};
|
|
832
|
+
shaka.text.UITextDisplayer.inheritProperty_=function(a,b){for(var c=a.length-1;0<=c;c--){var d=b(a[c]);if(d||0===d)return d}return null};goog.exportSymbol("shaka.text.UITextDisplayer",shaka.text.UITextDisplayer);goog.exportProperty(shaka.text.UITextDisplayer.prototype,"setTextVisibility",shaka.text.UITextDisplayer.prototype.setTextVisibility);goog.exportProperty(shaka.text.UITextDisplayer.prototype,"isTextVisible",shaka.text.UITextDisplayer.prototype.isTextVisible);
|
|
833
|
+
goog.exportProperty(shaka.text.UITextDisplayer.prototype,"remove",shaka.text.UITextDisplayer.prototype.remove);goog.exportProperty(shaka.text.UITextDisplayer.prototype,"destroy",shaka.text.UITextDisplayer.prototype.destroy);goog.exportProperty(shaka.text.UITextDisplayer.prototype,"append",shaka.text.UITextDisplayer.prototype.append);shaka.text.WebVttGenerator=function(){};
|
|
829
834
|
shaka.text.WebVttGenerator.convert=function(a,b){var c=function(h){var k=[],l=h.fontWeight>=shaka.text.Cue.fontWeight.BOLD,m=h.fontStyle==shaka.text.Cue.fontStyle.ITALIC,n=h.textDecoration.includes(shaka.text.Cue.textDecoration.UNDERLINE);l&&k.push("b");m&&k.push("i");n&&k.push("u");l=k.reduce(function(p,q){return p+"<"+q+">"},"");k=k.reduceRight(function(p,q){return p+"</"+q+">"},"");return h.lineBreak||h.spacer?(h.spacer&&shaka.Deprecate.deprecateFeature(4,"shaka.text.Cue","Please use lineBreak instead of spacer."),
|
|
830
835
|
"\n"):h.nestedCues.length?h.nestedCues.map(c).join(""):l+h.payload+k},d=function(h){for(var k=h,l=$jscomp.makeIterator(b),m=l.next();!m.done;m=l.next())m=m.value,m.end&&m.start<h&&(k+=m.end-m.start);h=Math.floor(k/3600);l=Math.floor(k/60%60);m=Math.floor(k%60);k=Math.floor(1E3*k%1E3);return(10>h?"0":"")+h+":"+(10>l?"0":"")+l+":"+(10>m?"0":"")+m+"."+(100>k?10>k?"00":"0":"")+k},e=a.map(function(h){if(h.nestedCues.length){var k=h.clone();k.nestedCues=[];k.payload=c(h);return k}return h}),f="WEBVTT\n\n";
|
|
831
836
|
e=$jscomp.makeIterator(e);for(var g=e.next();!g.done;g=e.next())g=g.value,f+=d(g.startTime)+" --\x3e "+d(g.endTime)+function(h){var k=[],l=shaka.text.Cue;switch(h.textAlign){case l.textAlign.LEFT:k.push("align:left");break;case l.textAlign.RIGHT:k.push("align:right");break;case l.textAlign.CENTER:k.push("align:middle");break;case l.textAlign.START:k.push("align:start");break;case l.textAlign.END:k.push("align:end")}switch(h.writingMode){case l.writingMode.VERTICAL_LEFT_TO_RIGHT:k.push("vertical:lr");
|
|
@@ -885,8 +890,7 @@ shaka.Player.prototype.destroy=function(){var a=this,b;return $jscomp.asyncExecu
|
|
|
885
890
|
function(){d()};b.onCancel=function(){goog.asserts.assert(!1,"Our final detach call should never be cancelled.");d()};b.onError=function(){goog.asserts.assert(!1,"Our final detach call should never see an error");d()};b.onSkip=function(){goog.asserts.assert(!1,"Our final detach call should never be skipped");d()}}),2);case 2:return c.yield(a.walker_.destroy(),3);case 3:a.globalEventManager_&&(a.globalEventManager_.release(),a.globalEventManager_=null);a.attachEventManager_&&(a.attachEventManager_.release(),
|
|
886
891
|
a.attachEventManager_=null);a.loadEventManager_&&(a.loadEventManager_.release(),a.loadEventManager_=null);a.abrManagerFactory_=null;a.abrManager_=null;a.config_=null;a.stats_=null;a.videoContainer_=null;a.cmcdManager_=null;if(!a.networkingEngine_){c.jumpTo(4);break}return c.yield(a.networkingEngine_.destroy(),5);case 5:a.networkingEngine_=null;case 4:shaka.util.FakeEventTarget.prototype.release.call(a),c.jumpToEnd()}})};
|
|
887
892
|
shaka.Player.registerSupportPlugin=function(a,b){shaka.Player.supportPlugins_[a]=b};shaka.Player.setAdManagerFactory=function(a){shaka.Player.adManagerFactory_=a};
|
|
888
|
-
shaka.Player.isBrowserSupported=function(){window.Promise||shaka.log.alwaysWarn("A Promise implementation or polyfill is required");
|
|
889
|
-
!1:shaka.util.Platform.supportsMediaSource()?!0:shaka.util.Platform.supportsMediaType("application/x-mpegurl")};
|
|
893
|
+
shaka.Player.isBrowserSupported=function(){window.Promise||shaka.log.alwaysWarn("A Promise implementation or polyfill is required");if(!(window.Promise&&window.Uint8Array&&Array.prototype.forEach)||shaka.util.Platform.isIE())return!1;var a=shaka.util.Platform.safariVersion();return a&&12>a||!shaka.media.DrmEngine.isBrowserSupported()?!1:shaka.util.Platform.supportsMediaSource()?!0:shaka.util.Platform.supportsMediaType("application/x-mpegurl")};
|
|
890
894
|
shaka.Player.probeSupport=function(a){a=void 0===a?!0:a;var b,c,d,e,f,g;return $jscomp.asyncExecutePromiseGeneratorProgram(function(h){if(1==h.nextAddress)return goog.asserts.assert(shaka.Player.isBrowserSupported(),"Must have basic support"),b={},a?h.yield(shaka.media.DrmEngine.probeSupport(),3):h.jumpTo(2);2!=h.nextAddress&&(b=h.yieldResult);c=shaka.media.ManifestParser.probeSupport();d=shaka.media.MediaSourceEngine.probeSupport();e={manifest:c,media:d,drm:b};f=shaka.Player.supportPlugins_;for(g in f)e[g]=
|
|
891
895
|
f[g]();return h["return"](e)})};
|
|
892
896
|
shaka.Player.prototype.attach=function(a,b){b=void 0===b?!0:b;if(this.loadMode_==shaka.Player.LoadMode.DESTROYED)return Promise.reject(this.createAbortLoadError_());var c=shaka.Player.createEmptyPayload_();c.mediaElement=a;shaka.util.Platform.supportsMediaSource()||(b=!1);var d=b?this.mediaSourceNode_:this.attachNode_,e=this.walker_.startNewRoute(function(f){return{node:d,payload:c,interruptible:!1}});e.onStart=function(){return shaka.log.info("Starting attach...")};return this.wrapWalkerListenersWithPromise_(e)};
|
|
@@ -1087,7 +1091,7 @@ goog.exportProperty(shaka.Player.prototype,"configure",shaka.Player.prototype.co
|
|
|
1087
1091
|
goog.exportProperty(shaka.Player,"probeSupport",shaka.Player.probeSupport);goog.exportProperty(shaka.Player,"isBrowserSupported",shaka.Player.isBrowserSupported);goog.exportProperty(shaka.Player,"setAdManagerFactory",shaka.Player.setAdManagerFactory);goog.exportProperty(shaka.Player,"registerSupportPlugin",shaka.Player.registerSupportPlugin);goog.exportProperty(shaka.Player.prototype,"destroy",shaka.Player.prototype.destroy);
|
|
1088
1092
|
shaka.Player.EventName={AbrStatusChanged:"abrstatuschanged",Adaptation:"adaptation",Buffering:"buffering",DownloadFailed:"downloadfailed",DownloadHeadersReceived:"downloadheadersreceived",DrmSessionUpdate:"drmsessionupdate",Emsg:"emsg",Error:"error",ExpirationUpdated:"expirationupdated",LargeGap:"largegap",Loaded:"loaded",Loading:"loading",ManifestParsed:"manifestparsed",MediaQualityChanged:"mediaqualitychanged",Metadata:"metadata",OnStateChange:"onstatechange",OnStateIdle:"onstateidle",RateChange:"ratechange",
|
|
1089
1093
|
SessionDataEvent:"sessiondata",Streaming:"streaming",TextChanged:"textchanged",TextTrackVisibility:"texttrackvisibility",TimelineRegionAdded:"timelineregionadded",TimelineRegionEnter:"timelineregionenter",TimelineRegionExit:"timelineregionexit",TracksChanged:"trackschanged",Unloading:"unloading",VariantChanged:"variantchanged"};shaka.Player.LoadMode={DESTROYED:0,NOT_LOADED:1,MEDIA_SOURCE:2,SRC_EQUALS:3};goog.exportProperty(shaka.Player,"LoadMode",shaka.Player.LoadMode);
|
|
1090
|
-
shaka.Player.TYPICAL_BUFFERING_THRESHOLD_=.5;shaka.Player.version="v3.3.
|
|
1094
|
+
shaka.Player.TYPICAL_BUFFERING_THRESHOLD_=.5;shaka.Player.version="v3.3.9-debug";goog.exportProperty(shaka.Player,"version",shaka.Player.version);shaka.Deprecate.init(shaka.Player.version);shaka.Player.restrictedStatuses_=["output-restricted","internal-error"];shaka.Player.supportPlugins_={};shaka.Player.adManagerFactory_=null;
|
|
1091
1095
|
shaka.Player.SRC_EQUAL_EXTENSIONS_TO_MIME_TYPES_={mp4:"video/mp4",m4v:"video/mp4",m4a:"audio/mp4",webm:"video/webm",weba:"audio/webm",mkv:"video/webm",ts:"video/mp2t",ogv:"video/ogg",ogg:"audio/ogg",mpg:"video/mpeg",mpeg:"video/mpeg",m3u8:"application/x-mpegurl",mpd:"application/dash+xml",mp3:"audio/mpeg",aac:"audio/aac",flac:"audio/flac",wav:"audio/wav"};
|
|
1092
1096
|
shaka.Player.TEXT_EXTENSIONS_TO_MIME_TYPES_={sbv:"text/x-subviewer",srt:"text/srt",vtt:"text/vtt",webvtt:"text/vtt",ttml:"application/ttml+xml",lrc:"application/x-subtitle-lrc",ssa:"text/x-ssa",ass:"text/x-ssa"};shaka.Player.TextTrackLabel="Shaka Player TextTrack";shaka.ads={};shaka.ads.AdsStats=function(){this.loadTimes_=[];this.skipped_=this.playedCompletely_=this.started_=0};shaka.ads.AdsStats.prototype.addLoadTime=function(a){this.loadTimes_.push(a)};shaka.ads.AdsStats.prototype.incrementStarted=function(){this.started_++};shaka.ads.AdsStats.prototype.incrementPlayedCompletely=function(){this.playedCompletely_++};shaka.ads.AdsStats.prototype.incrementSkipped=function(){this.skipped_++};
|
|
1093
1097
|
shaka.ads.AdsStats.prototype.getBlob=function(){return{loadTimes:this.loadTimes_,started:this.started_,playedCompletely:this.playedCompletely_,skipped:this.skipped_}};shaka.ads.ClientSideAd=function(a,b){var c=this;this.ad_=a;this.manager_=b;this.isPaused_=!1;this.volume_=this.manager_.getVolume();this.eventManager_=new shaka.util.EventManager;this.eventManager_.listen(this.manager_,google.ima.AdEvent.Type.PAUSED,function(){c.isPaused_=!0});this.eventManager_.listen(this.manager_,google.ima.AdEvent.Type.RESUMED,function(){c.isPaused_=!1})};shaka.ads.ClientSideAd.prototype.getDuration=function(){return this.ad_.getDuration()};
|
|
@@ -1116,7 +1120,7 @@ this.eventManager_.listen(this.imaAdsManager_,google.ima.AdEvent.Type.AD_BUFFERI
|
|
|
1116
1120
|
shaka.ads.AdManager.AD_CLOSED)});this.eventManager_.listen(this.imaAdsManager_,google.ima.AdEvent.Type.LOADED,function(c){b(c,shaka.ads.AdManager.AD_LOADED)});this.eventManager_.listen(this.imaAdsManager_,google.ima.AdEvent.Type.ALL_ADS_COMPLETED,function(c){b(c,shaka.ads.AdManager.ALL_ADS_COMPLETED)});this.eventManager_.listen(this.imaAdsManager_,google.ima.AdEvent.Type.LINEAR_CHANGED,function(c){b(c,shaka.ads.AdManager.AD_LINEAR_CHANGED)});this.eventManager_.listen(this.imaAdsManager_,google.ima.AdEvent.Type.AD_METADATA,
|
|
1117
1121
|
function(c){b(c,shaka.ads.AdManager.AD_METADATA)});this.eventManager_.listen(this.imaAdsManager_,google.ima.AdEvent.Type.LOG,function(c){b(c,shaka.ads.AdManager.AD_RECOVERABLE_ERROR)});this.eventManager_.listen(this.imaAdsManager_,google.ima.AdEvent.Type.AD_BREAK_READY,function(c){b(c,shaka.ads.AdManager.AD_BREAK_READY)});this.eventManager_.listen(this.imaAdsManager_,google.ima.AdEvent.Type.INTERACTION,function(c){b(c,shaka.ads.AdManager.AD_INTERACTION)})};
|
|
1118
1122
|
shaka.ads.ClientSideAdManager.prototype.onAdStart_=function(a){goog.asserts.assert(this.imaAdsManager_,"Should have an ads manager at this point!");var b=a.getAd();this.ad_=new shaka.ads.ClientSideAd(b,this.imaAdsManager_);a=(new Map).set("ad",this.ad_).set("sdkAdObject",b).set("originalEvent",a);this.onEvent_(new shaka.util.FakeEvent(shaka.ads.AdManager.AD_STARTED,a));this.ad_.isLinear()&&(this.adContainer_.setAttribute("ad-active","true"),this.video_.pause())};
|
|
1119
|
-
shaka.ads.ClientSideAdManager.prototype.onAdComplete_=function(a){this.onEvent_(new shaka.util.FakeEvent(shaka.ads.AdManager.AD_STOPPED,(new Map).set("originalEvent",a)));this.ad_.isLinear()&&(this.adContainer_.removeAttribute("ad-active"),this.video_.play())};shaka.ads.ServerSideAd=function(a,b){this.ad_=a;this.adProgressData_=null;this.video_=b};shaka.ads.ServerSideAd.prototype.setProgressData=function(a){this.adProgressData_=a};shaka.ads.ServerSideAd.prototype.getDuration=function(){return this.adProgressData_?this.adProgressData_.duration:-1};shaka.ads.ServerSideAd.prototype.getMinSuggestedDuration=function(){return this.getDuration()};
|
|
1123
|
+
shaka.ads.ClientSideAdManager.prototype.onAdComplete_=function(a){this.onEvent_(new shaka.util.FakeEvent(shaka.ads.AdManager.AD_STOPPED,(new Map).set("originalEvent",a)));this.ad_&&this.ad_.isLinear()&&(this.adContainer_.removeAttribute("ad-active"),this.video_.play())};shaka.ads.ServerSideAd=function(a,b){this.ad_=a;this.adProgressData_=null;this.video_=b};shaka.ads.ServerSideAd.prototype.setProgressData=function(a){this.adProgressData_=a};shaka.ads.ServerSideAd.prototype.getDuration=function(){return this.adProgressData_?this.adProgressData_.duration:-1};shaka.ads.ServerSideAd.prototype.getMinSuggestedDuration=function(){return this.getDuration()};
|
|
1120
1124
|
shaka.ads.ServerSideAd.prototype.getRemainingTime=function(){return this.adProgressData_?this.adProgressData_.duration-this.adProgressData_.currentTime:-1};shaka.ads.ServerSideAd.prototype.isPaused=function(){return this.video_.paused};shaka.ads.ServerSideAd.prototype.isSkippable=function(){return this.ad_.isSkippable()};shaka.ads.ServerSideAd.prototype.getTimeUntilSkippable=function(){var a=this.ad_.getSkipTimeOffset();a=this.getRemainingTime()-a;return Math.max(a,0)};
|
|
1121
1125
|
shaka.ads.ServerSideAd.prototype.canSkipNow=function(){return 0==this.getTimeUntilSkippable()};shaka.ads.ServerSideAd.prototype.skip=function(){this.video_.currentTime+=this.getRemainingTime()};shaka.ads.ServerSideAd.prototype.pause=function(){return this.video_.pause()};shaka.ads.ServerSideAd.prototype.play=function(){return this.video_.play()};shaka.ads.ServerSideAd.prototype.getVolume=function(){return this.video_.volume};
|
|
1122
1126
|
shaka.ads.ServerSideAd.prototype.setVolume=function(a){this.video_.volume=a};shaka.ads.ServerSideAd.prototype.isMuted=function(){return this.video_.muted};shaka.ads.ServerSideAd.prototype.isLinear=function(){return!0};shaka.ads.ServerSideAd.prototype.resize=function(a,b){};shaka.ads.ServerSideAd.prototype.setMuted=function(a){this.video_.muted=a};shaka.ads.ServerSideAd.prototype.getSequenceLength=function(){var a=this.ad_.getAdPodInfo();return null==a?1:a.getTotalAds()};
|
|
@@ -1202,8 +1206,8 @@ shaka.cast.CastProxy.prototype.getPlayer=function(){return this.playerProxy_};sh
|
|
|
1202
1206
|
shaka.cast.CastProxy.prototype.cast=function(){var a=this,b;return $jscomp.asyncExecutePromiseGeneratorProgram(function(c){return 1==c.nextAddress?(b=a.getInitState_(),c.yield(a.sender_.cast(b),2)):a.localPlayer_?c.yield(a.localPlayer_.unload(),0):c["return"]()})};shaka.cast.CastProxy.prototype.setAppData=function(a){this.sender_.setAppData(a)};shaka.cast.CastProxy.prototype.suggestDisconnect=function(){this.sender_.showDisconnectDialog()};shaka.cast.CastProxy.prototype.forceDisconnect=function(){this.sender_.forceDisconnect()};
|
|
1203
1207
|
shaka.cast.CastProxy.prototype.changeReceiverId=function(a){var b=this;return $jscomp.asyncExecutePromiseGeneratorProgram(function(c){if(1==c.nextAddress){if(a==b.receiverAppId_)return c["return"]();b.receiverAppId_=a;b.sender_.forceDisconnect();return c.yield(b.sender_.destroy(),2)}b.sender_=null;b.sender_=new shaka.cast.CastSender(a,function(){return b.onCastStatusChanged_()},function(){return b.onFirstCastStateUpdate_()},function(d,e){return b.onRemoteEvent_(d,e)},function(){return b.onResumeLocal_()},
|
|
1204
1208
|
function(){return b.getInitState_()});b.sender_.init();c.jumpToEnd()})};
|
|
1205
|
-
shaka.cast.CastProxy.prototype.init_=function(){var a=this;this.sender_.init();this.eventManager_=new shaka.util.EventManager;for(var b=$jscomp.makeIterator(shaka.cast.CastUtils.VideoEvents),c=b.next();!c.done;c=b.next())this.eventManager_.listen(this.localVideo_,c.value,function(f){return a.videoProxyLocalEvent_(f)});for(var d in shaka.Player.EventName)this.eventManager_.listen(this.localPlayer_,shaka.Player.EventName[d],function(f){return a.playerProxyLocalEvent_(f)});this.videoProxy_={};b={};for(var e in this.localVideo_)b.$jscomp$loop$prop$k$
|
|
1206
|
-
e,Object.defineProperty(this.videoProxy_,b.$jscomp$loop$prop$k$
|
|
1209
|
+
shaka.cast.CastProxy.prototype.init_=function(){var a=this;this.sender_.init();this.eventManager_=new shaka.util.EventManager;for(var b=$jscomp.makeIterator(shaka.cast.CastUtils.VideoEvents),c=b.next();!c.done;c=b.next())this.eventManager_.listen(this.localVideo_,c.value,function(f){return a.videoProxyLocalEvent_(f)});for(var d in shaka.Player.EventName)this.eventManager_.listen(this.localPlayer_,shaka.Player.EventName[d],function(f){return a.playerProxyLocalEvent_(f)});this.videoProxy_={};b={};for(var e in this.localVideo_)b.$jscomp$loop$prop$k$604=
|
|
1210
|
+
e,Object.defineProperty(this.videoProxy_,b.$jscomp$loop$prop$k$604,{configurable:!1,enumerable:!0,get:function(f){return function(){return a.videoProxyGet_(f.$jscomp$loop$prop$k$604)}}(b),set:function(f){return function(g){a.videoProxySet_(f.$jscomp$loop$prop$k$604,g)}}(b)}),b={$jscomp$loop$prop$k$604:b.$jscomp$loop$prop$k$604};this.playerProxy_={};this.iterateOverPlayerMethods_(function(f,g){goog.asserts.assert(a.playerProxy_,"Must have player proxy!");Object.defineProperty(a.playerProxy_,f,{configurable:!1,
|
|
1207
1211
|
enumerable:!0,get:function(){return a.playerProxyGet_(f)}})});COMPILED&&this.mapCompiledToUncompiledPlayerMethodNames_();this.videoEventTarget_=new shaka.util.FakeEventTarget;this.videoEventTarget_.dispatchTarget=this.videoProxy_;this.playerEventTarget_=new shaka.util.FakeEventTarget;this.playerEventTarget_.dispatchTarget=this.playerProxy_};
|
|
1208
1212
|
shaka.cast.CastProxy.prototype.mapCompiledToUncompiledPlayerMethodNames_=function(){var a=this,b=new Map;this.iterateOverPlayerMethods_(function(c,d){if(b.has(d)){var e=b.get(d);c.length<e.length?a.compiledToExternNames_.set(c,e):a.compiledToExternNames_.set(e,c)}else b.set(d,c)})};
|
|
1209
1213
|
shaka.cast.CastProxy.prototype.iterateOverPlayerMethods_=function(a){function b(k){return"constructor"==k||"function"!=typeof c[k]?!1:!d.has(k)}goog.asserts.assert(this.localPlayer_,"Must have player!");var c=this.localPlayer_,d=new Set;for(e in c)b(e)&&(d.add(e),a(e,c[e]));var e=Object.getPrototypeOf(c);for(var f=Object.getPrototypeOf({});e&&e!=f;){for(var g=$jscomp.makeIterator(Object.getOwnPropertyNames(e)),h=g.next();!h.done;h=g.next())h=h.value,b(h)&&(d.add(h),a(h,c[h]));e=Object.getPrototypeOf(e)}};
|
|
@@ -1256,7 +1260,7 @@ shaka.cast.CastReceiver.POLL_INTERVAL=.5;shaka.cast.CastReceiver.IDLE_INTERVAL=5
|
|
|
1256
1260
|
shaka.util.Pssh.prototype.parsePsshBox_=function(a){goog.asserts.assert(null!=a.version,"PSSH boxes are full boxes and must have a valid version");goog.asserts.assert(null!=a.flags,"PSSH boxes are full boxes and must have a valid flag");if(1<a.version)shaka.log.warning("Unrecognized PSSH version found!");else{var b=a.reader.getDataView();goog.asserts.assert(12<=b.byteOffset,"DataView at incorrect position");b=shaka.util.BufferUtils.toUint8(b,-12,a.size);this.data.push(b);this.systemIds.push(shaka.util.Uint8ArrayUtils.toHex(a.reader.readBytes(16)));
|
|
1257
1261
|
if(0<a.version){b=a.reader.readUint32();for(var c=0;c<b;c++){var d=shaka.util.Uint8ArrayUtils.toHex(a.reader.readBytes(16));this.cencKeyIds.push(d)}}}};
|
|
1258
1262
|
shaka.util.Pssh.createPssh=function(a,b){goog.asserts.assert(16==b.byteLength,"Invalid system ID length");var c=a.length,d=12+b.length+4+c,e=new Uint8Array(d),f=shaka.util.BufferUtils.toDataView(e),g=0;f.setUint32(g,d);g+=4;f.setUint32(g,1886614376);g+=4;f.setUint32(g,0);g+=4;e.set(b,g);g+=b.length;f.setUint32(g,c);g+=4;e.set(a,g);goog.asserts.assert(g+c===d,"PSSH invalid length.");return e};
|
|
1259
|
-
shaka.util.Pssh.normaliseInitData=function(a){if(!a)return a;var b=new shaka.util.Pssh(a);if(1>=b.data.length)return a;a=[];var c={};b=$jscomp.makeIterator(b.data);for(var d=b.next();!d.done;c={$jscomp$loop$prop$initData$
|
|
1263
|
+
shaka.util.Pssh.normaliseInitData=function(a){if(!a)return a;var b=new shaka.util.Pssh(a);if(1>=b.data.length)return a;a=[];var c={};b=$jscomp.makeIterator(b.data);for(var d=b.next();!d.done;c={$jscomp$loop$prop$initData$491$606:c.$jscomp$loop$prop$initData$491$606},d=b.next())c.$jscomp$loop$prop$initData$491$606=d.value,a.some(function(e){return function(f){return shaka.util.BufferUtils.equal(f,e.$jscomp$loop$prop$initData$491$606)}}(c))||a.push(c.$jscomp$loop$prop$initData$491$606);return shaka.util.Uint8ArrayUtils.concat.apply(shaka.util.Uint8ArrayUtils,
|
|
1260
1264
|
$jscomp.arrayFromIterable(a))};shaka.util.XmlUtils=function(){};shaka.util.XmlUtils.findChild=function(a,b){var c=shaka.util.XmlUtils.findChildren(a,b);return 1!=c.length?null:c[0]};shaka.util.XmlUtils.findChildNS=function(a,b,c){a=shaka.util.XmlUtils.findChildrenNS(a,b,c);return 1!=a.length?null:a[0]};shaka.util.XmlUtils.findChildren=function(a,b){for(var c=[],d=$jscomp.makeIterator(a.childNodes),e=d.next();!e.done;e=d.next())e=e.value,e instanceof Element&&e.tagName==b&&c.push(e);return c};
|
|
1261
1265
|
shaka.util.XmlUtils.getChildren=function(a){return Array.from(a.childNodes).filter(function(b){return b instanceof Element})};shaka.util.XmlUtils.findChildrenNS=function(a,b,c){var d=[];a=$jscomp.makeIterator(a.childNodes);for(var e=a.next();!e.done;e=a.next())e=e.value,e instanceof Element&&e.localName==c&&e.namespaceURI==b&&d.push(e);return d};shaka.util.XmlUtils.getAttributeNS=function(a,b,c){return a.hasAttributeNS(b,c)?a.getAttributeNS(b,c):null};
|
|
1262
1266
|
shaka.util.XmlUtils.getAttributeNSList=function(a,b,c){b=$jscomp.makeIterator(b);for(var d=b.next();!d.done;d=b.next())if(d=d.value,a.hasAttributeNS(d,c))return a.getAttributeNS(d,c);return null};shaka.util.XmlUtils.getContents=function(a){var b=shaka.util.XmlUtils;return Array.from(a.childNodes).every(b.isText)?a.textContent.trim():null};shaka.util.XmlUtils.isText=function(a){return a.nodeType==Node.TEXT_NODE||a.nodeType==Node.CDATA_SECTION_NODE};
|
|
@@ -1340,8 +1344,8 @@ mediaSegments:d}};
|
|
|
1340
1344
|
shaka.dash.SegmentList.checkSegmentListInfo_=function(a,b){if(!b.segmentDuration&&!b.timeline&&1<b.mediaSegments.length)throw shaka.log.warning("SegmentList does not contain sufficient segment information:","the SegmentList specifies multiple segments,","but does not specify a segment duration or timeline.",a.representation),new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.DASH_NO_SEGMENT_INFO);if(!b.segmentDuration&&!a.periodInfo.duration&&
|
|
1341
1345
|
!b.timeline&&1==b.mediaSegments.length)throw shaka.log.warning("SegmentList does not contain sufficient segment information:","the SegmentList specifies one segment,","but does not specify a segment duration, period duration,","or timeline.",a.representation),new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.DASH_NO_SEGMENT_INFO);if(b.timeline&&0==b.timeline.length)throw shaka.log.warning("SegmentList does not contain sufficient segment information:",
|
|
1342
1346
|
"the SegmentList has an empty timeline.",a.representation),new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.DASH_NO_SEGMENT_INFO);};
|
|
1343
|
-
shaka.dash.SegmentList.createSegmentReferences_=function(a,b,c,d,e,f){c=shaka.util.ManifestParserUtils;var g=e.mediaSegments.length;e.timeline&&e.timeline.length!=e.mediaSegments.length&&(g=Math.min(e.timeline.length,e.mediaSegments.length),shaka.log.warning("The number of items in the segment timeline and the number of ","segment URLs do not match, truncating",e.mediaSegments.length,"to",g));for(var h=a-e.scaledPresentationTimeOffset,k=b?a+b:Infinity,l=[],m=e.startTime,n={},p=0;p<g;n={$jscomp$loop$prop$mediaUri$
|
|
1344
|
-
p++){var q=e.mediaSegments[p];n.$jscomp$loop$prop$mediaUri$
|
|
1347
|
+
shaka.dash.SegmentList.createSegmentReferences_=function(a,b,c,d,e,f){c=shaka.util.ManifestParserUtils;var g=e.mediaSegments.length;e.timeline&&e.timeline.length!=e.mediaSegments.length&&(g=Math.min(e.timeline.length,e.mediaSegments.length),shaka.log.warning("The number of items in the segment timeline and the number of ","segment URLs do not match, truncating",e.mediaSegments.length,"to",g));for(var h=a-e.scaledPresentationTimeOffset,k=b?a+b:Infinity,l=[],m=e.startTime,n={},p=0;p<g;n={$jscomp$loop$prop$mediaUri$608:n.$jscomp$loop$prop$mediaUri$608},
|
|
1348
|
+
p++){var q=e.mediaSegments[p];n.$jscomp$loop$prop$mediaUri$608=c.resolveUris(d,[q.mediaUri]);var r=void 0;null!=e.segmentDuration?r=m+e.segmentDuration:e.timeline?r=e.timeline[p].end:(goog.asserts.assert(1==e.mediaSegments.length&&b,"There should be exactly one segment with a Period duration."),r=m+b);var t=function(u){return function(){return u.$jscomp$loop$prop$mediaUri$608}}(n);l.push(new shaka.media.SegmentReference(a+m,a+r,t,q.start,q.end,f,h,a,k));m=r}return l};
|
|
1345
1349
|
shaka.dash.SegmentList.parseMediaSegments_=function(a){var b=[a.representation.segmentList,a.adaptationSet.segmentList,a.period.segmentList].filter(shaka.util.Functional.isNotNull),c=shaka.util.XmlUtils;return b.map(function(d){return c.findChildren(d,"SegmentURL")}).reduce(function(d,e){return 0<d.length?d:e}).map(function(d){d.getAttribute("indexRange")&&!a.indexRangeWarningGiven&&(a.indexRangeWarningGiven=!0,shaka.log.warning("We do not support the SegmentURL@indexRange attribute on SegmentList. We only use the SegmentList@duration attribute or SegmentTimeline, which must be accurate."));
|
|
1346
1350
|
var e=d.getAttribute("media");d=c.parseAttr(d,"mediaRange",c.parseRange,{start:0,end:null});return{mediaUri:e,start:d.start,end:d.end}})};shaka.dash.SegmentTemplate=function(){};
|
|
1347
1351
|
shaka.dash.SegmentTemplate.createStreamInfo=function(a,b,c,d,e,f){goog.asserts.assert(a.representation.segmentTemplate,"Should only be called with SegmentTemplate");var g=shaka.dash.SegmentTemplate,h=g.createInitSegment_(a),k=g.parseSegmentTemplateInfo_(a);g.checkSegmentTemplateInfo_(a,k);var l=shaka.util.ObjectUtils.shallowCloneObject(a);if(k.indexTemplate)return shaka.dash.SegmentBase.checkSegmentIndexSupport(a,h),{generateSegmentIndex:function(){return g.generateSegmentIndexFromIndexTemplate_(l,b,
|
|
@@ -1357,9 +1361,9 @@ shaka.dash.SegmentTemplate.generateSegmentIndexFromDuration_=function(a,b,c,d,e)
|
|
|
1357
1361
|
u=a.bandwidth||null,v=a.representation.id,y=a.representation.baseUris,w=k-b.scaledPresentationTimeOffset,x=function(){var E=[Math.max(h.getSegmentAvailabilityStart(),k),Math.min(h.getSegmentAvailabilityEnd(),n())];goog.asserts.assert(E.every(isFinite),"Available presentation times must be finite!");goog.asserts.assert(E.every(function(G){return 0<=G}),"Available presentation times must be positive!");goog.asserts.assert(null!=p,"Segment duration must not be null!");E=E.map(function(G){return G-k});
|
|
1358
1362
|
return[Math.ceil(E[0]/p),Math.ceil(E[1]/p)-1].map(function(G){return G+q})},z=x();a=a.dynamic?Math.max(z[0],z[1]-c+1):z[0];z=z[1];c=[];for(var A=function(E){goog.asserts.assert(null!=p,"Segment duration must not be null!");var G=(E-q)*p,J=G+b.scaledPresentationTimeOffset,H=G+k;G=H+p;var I=Math.min(G,n());goog.asserts.assert(H<I,"Generated a segment outside of the period!");H=new shaka.media.SegmentReference(H,I,function(){var K=f.fillUriTemplate(t,v,E,u,J*r);return g.resolveUris(y,[K])},0,null,d,
|
|
1359
1363
|
w,k,n());H.trueEndTime=G;return H},C=a;C<=z;++C){var D=A(C);c.push(D)}var F=new shaka.media.SegmentIndex(c);c=h.getSegmentAvailabilityEnd()<n();C=h.isLive();if(c||C){var B=Math.max(a,z+1);F.updateEvery(p,function(){var E=h.getSegmentAvailabilityStart();F.evict(E);var G=$jscomp.makeIterator(x());G.next();G=G.next().value;for(var J=[];B<=G;){var H=A(B);J.push(H);B++}return E>n()&&!J.length?null:J})}return Promise.resolve(F)};
|
|
1360
|
-
shaka.dash.SegmentTemplate.createFromTimeline_=function(a,b,c){var d=shaka.dash.MpdUtils,e=shaka.util.ManifestParserUtils,f=a.periodInfo.start,g=a.periodInfo.duration,h=f-b.scaledPresentationTimeOffset;g=g?f+g:Infinity;for(var k=[],l={},m=0;m<b.timeline.length;l={$jscomp$loop$prop$mediaTemplate$
|
|
1361
|
-
$jscomp$loop$prop$timeReplacement$
|
|
1362
|
-
a.representation.baseUris;q=function(r){return function(){goog.asserts.assert(r.$jscomp$loop$prop$mediaTemplate$
|
|
1364
|
+
shaka.dash.SegmentTemplate.createFromTimeline_=function(a,b,c){var d=shaka.dash.MpdUtils,e=shaka.util.ManifestParserUtils,f=a.periodInfo.start,g=a.periodInfo.duration,h=f-b.scaledPresentationTimeOffset;g=g?f+g:Infinity;for(var k=[],l={},m=0;m<b.timeline.length;l={$jscomp$loop$prop$mediaTemplate$610:l.$jscomp$loop$prop$mediaTemplate$610,$jscomp$loop$prop$repId$611:l.$jscomp$loop$prop$repId$611,$jscomp$loop$prop$segmentReplacement$612:l.$jscomp$loop$prop$segmentReplacement$612,$jscomp$loop$prop$bandwidth$613:l.$jscomp$loop$prop$bandwidth$613,
|
|
1365
|
+
$jscomp$loop$prop$timeReplacement$614:l.$jscomp$loop$prop$timeReplacement$614,$jscomp$loop$prop$baseUris$615:l.$jscomp$loop$prop$baseUris$615},m++){var n=b.timeline[m],p=n.start,q=n.unscaledStart;n=n.end;l.$jscomp$loop$prop$segmentReplacement$612=m+b.startNumber;l.$jscomp$loop$prop$timeReplacement$614=q+b.unscaledPresentationTimeOffset;l.$jscomp$loop$prop$repId$611=a.representation.id;l.$jscomp$loop$prop$bandwidth$613=a.bandwidth||null;l.$jscomp$loop$prop$mediaTemplate$610=b.mediaTemplate;l.$jscomp$loop$prop$baseUris$615=
|
|
1366
|
+
a.representation.baseUris;q=function(r){return function(){goog.asserts.assert(r.$jscomp$loop$prop$mediaTemplate$610,"There should be a media template with a timeline");var t=d.fillUriTemplate(r.$jscomp$loop$prop$mediaTemplate$610,r.$jscomp$loop$prop$repId$611,r.$jscomp$loop$prop$segmentReplacement$612,r.$jscomp$loop$prop$bandwidth$613||null,r.$jscomp$loop$prop$timeReplacement$614);return e.resolveUris(r.$jscomp$loop$prop$baseUris$615,[t]).map(function(u){return u.toString()})}}(l);k.push(new shaka.media.SegmentReference(f+
|
|
1363
1367
|
p,f+n,q,0,null,c,h,f,g))}return k};
|
|
1364
1368
|
shaka.dash.SegmentTemplate.createInitSegment_=function(a){var b=shaka.dash.MpdUtils,c=shaka.util.ManifestParserUtils,d=b.inheritAttribute(a,shaka.dash.SegmentTemplate.fromInheritance_,"initialization");if(!d)return null;var e=a.representation.id,f=a.bandwidth||null,g=a.representation.baseUris;a=shaka.dash.SegmentBase.createQualityInfo(a);return new shaka.media.InitSegmentReference(function(){goog.asserts.assert(d,"Should have returned earler");var h=b.fillUriTemplate(d,e,null,f,null);return c.resolveUris(g,
|
|
1365
1369
|
[h])},0,null,a)};shaka.util.PeriodCombiner=function(){this.variants_=[];this.audioStreams_=[];this.videoStreams_=[];this.textStreams_=[];this.imageStreams_=[];this.usedPeriodIds_=new Set};
|
|
@@ -1383,9 +1387,9 @@ b.TEXT})});f=a.map(function(J){return J.filter(function(H){return H.type==b.IMAG
|
|
|
1383
1387
|
G.yieldResult,G.yield(shaka.util.PeriodCombiner.combine_([],d,0,shaka.util.PeriodCombiner.cloneStreamDB_,shaka.util.PeriodCombiner.concatenateStreamDBs_),3);case 3:return q=G.yieldResult,G.yield(shaka.util.PeriodCombiner.combine_([],e,0,shaka.util.PeriodCombiner.cloneStreamDB_,shaka.util.PeriodCombiner.concatenateStreamDBs_),4);case 4:return r=G.yieldResult,G.yield(shaka.util.PeriodCombiner.combine_([],f,0,shaka.util.PeriodCombiner.cloneStreamDB_,shaka.util.PeriodCombiner.concatenateStreamDBs_),5);
|
|
1384
1388
|
case 5:t=G.yieldResult;u=0;if(q.length&&p.length)for(z=$jscomp.makeIterator(p),A=z.next();!A.done;A=z.next())for(C=A.value,D=$jscomp.makeIterator(q),F=D.next();!F.done;F=D.next())B=F.value,E=u++,B.variantIds.push(E),C.variantIds.push(E);else for(v=q.concat(p),y=$jscomp.makeIterator(v),w=y.next();!w.done;w=y.next())x=w.value,x.variantIds=[u++];return G["return"](q.concat(p).concat(r).concat(t))}})};
|
|
1385
1389
|
shaka.util.PeriodCombiner.combine_=function(a,b,c,d,e){var f,g,h,k,l,m,n,p,q,r,t,u,v,y,w,x,z,A,C,D,F;return $jscomp.asyncExecutePromiseGeneratorProgram(function(B){switch(B.nextAddress){case 1:f=shaka.util.ManifestParserUtils.ContentType;g=[];for(h=0;h<b.length;h++)h>=c?g.push(new Set(b[h])):g.push(new Set);k=$jscomp.makeIterator(a);l=k.next();case 2:if(l.done){B.jumpTo(4);break}m=l.value;return B.yield(shaka.util.PeriodCombiner.extendExistingOutputStream_(m,b,c,e,g),5);case 5:n=B.yieldResult;if(!n)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,
|
|
1386
|
-
shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.PERIOD_FLATTENING_FAILED);l=k.next();B.jumpTo(2);break;case 4:p=$jscomp.makeIterator(g);for(q=p.next();!q.done;q=p.next())for(r=q.value,t=$jscomp.makeIterator(r),u=t.next();!u.done;u=t.next())v=u.value,(y=shaka.util.PeriodCombiner.createNewOutputStream_(v,b,d,e,g))&&a.push(y);w=$jscomp.makeIterator(g);for(q=w.next();!q.done;q=w.next())for(x=q.value,z={},A=$jscomp.makeIterator(x),u=A.next();!u.done;z={$jscomp$loop$prop$stream$
|
|
1387
|
-
u=A.next())if(z.$jscomp$loop$prop$stream$
|
|
1388
|
-
z.$jscomp$loop$prop$stream$
|
|
1390
|
+
shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.PERIOD_FLATTENING_FAILED);l=k.next();B.jumpTo(2);break;case 4:p=$jscomp.makeIterator(g);for(q=p.next();!q.done;q=p.next())for(r=q.value,t=$jscomp.makeIterator(r),u=t.next();!u.done;u=t.next())v=u.value,(y=shaka.util.PeriodCombiner.createNewOutputStream_(v,b,d,e,g))&&a.push(y);w=$jscomp.makeIterator(g);for(q=w.next();!q.done;q=w.next())for(x=q.value,z={},A=$jscomp.makeIterator(x),u=A.next();!u.done;z={$jscomp$loop$prop$stream$498$617:z.$jscomp$loop$prop$stream$498$617},
|
|
1391
|
+
u=A.next())if(z.$jscomp$loop$prop$stream$498$617=u.value,C=z.$jscomp$loop$prop$stream$498$617.type==f.TEXT&&!z.$jscomp$loop$prop$stream$498$617.language,D=z.$jscomp$loop$prop$stream$498$617.type==f.IMAGE&&!z.$jscomp$loop$prop$stream$498$617.tilesLayout,!C&&!D&&(F=a.some(function(E){return function(G){return G.mimeType==E.$jscomp$loop$prop$stream$498$617.mimeType&&shaka.util.MimeUtils.getNormalizedCodec(G.codecs)==shaka.util.MimeUtils.getNormalizedCodec(E.$jscomp$loop$prop$stream$498$617.codecs)}}(z))))throw shaka.log.error("Unused stream in period-flattening!",
|
|
1392
|
+
z.$jscomp$loop$prop$stream$498$617,a),new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.PERIOD_FLATTENING_FAILED);return B["return"](a)}})};
|
|
1389
1393
|
shaka.util.PeriodCombiner.extendExistingOutputStream_=function(a,b,c,d,e){return $jscomp.asyncExecutePromiseGeneratorProgram(function(f){if(1==f.nextAddress)return shaka.util.PeriodCombiner.findMatchesInAllPeriods_(b,a),goog.asserts.assert(a.createSegmentIndex,"outputStream should be a Stream type!"),a.matchedStreams?a.segmentIndex?f.yield(shaka.util.PeriodCombiner.extendOutputSegmentIndex_(a,c),2):f.jumpTo(2):(shaka.log.error("No matches extending output stream!",a,b),f["return"](!1));shaka.util.PeriodCombiner.extendOutputStream_(a,
|
|
1390
1394
|
c,d,e);return f["return"](!0)})};
|
|
1391
1395
|
shaka.util.PeriodCombiner.extendOutputSegmentIndex_=function(a,b){var c,d,e,f,g,h,k;return $jscomp.asyncExecutePromiseGeneratorProgram(function(l){if(1==l.nextAddress){c=[];d=a.matchedStreams;goog.asserts.assert(d,"matched streams should be valid");e=$jscomp.makeIterator(d);for(f=e.next();!f.done;f=e.next())g=f.value,c.push(g.createSegmentIndex()),g.trickModeVideo&&!g.trickModeVideo.segmentIndex&&c.push(g.trickModeVideo.createSegmentIndex());return l.yield(Promise.all(c),2)}if(a.segmentIndex instanceof
|
|
@@ -1437,8 +1441,8 @@ m);g=this.parsePeriod_(a,b,{start:m,duration:q,node:k,isLastPeriod:null==q||!l})
|
|
|
1437
1441
|
duration:e,durationDerivedFromPeriods:!1}):{periods:f,duration:g,durationDerivedFromPeriods:!0}};
|
|
1438
1442
|
shaka.dash.DashParser.prototype.parsePeriod_=function(a,b,c){var d=this,e=shaka.util.Functional,f=shaka.util.XmlUtils,g=shaka.util.ManifestParserUtils.ContentType;a.period=this.createFrame_(c.node,null,b);a.periodInfo=c;a.period.availabilityTimeOffset=a.availabilityTimeOffset;a.period.id||(shaka.log.info("No Period ID given for Period with start time "+c.start+", Assigning a default"),a.period.id="__shaka_period_"+c.start);var h=f.findChildren(c.node,"EventStream");b=a.presentationTimeline.getSegmentAvailabilityStart();
|
|
1439
1443
|
h=$jscomp.makeIterator(h);for(var k=h.next();!k.done;k=h.next())this.parseEventStream_(c.start,c.duration,k.value,b);e=f.findChildren(c.node,"AdaptationSet").map(function(n){return d.parseAdaptationSet_(a,n)}).filter(e.isNotNull);if(a.dynamic){c=[];f=$jscomp.makeIterator(e);for(b=f.next();!b.done;b=f.next())for(b=$jscomp.makeIterator(b.value.representationIds),h=b.next();!h.done;h=b.next())c.push(h.value);f=new Set(c);if(c.length!=f.size)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,
|
|
1440
|
-
shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.DASH_DUPLICATE_REPRESENTATION_ID);}c=e.filter(function(n){return!n.trickModeFor});e=e.filter(function(n){return n.trickModeFor});e=$jscomp.makeIterator(e);for(f=e.next();!f.done;f=e.next())for(f=f.value,b=f.trickModeFor.split(" "),h=$jscomp.makeIterator(c),k=h.next();!k.done;k=h.next()){var l=k.value;if(b.includes(l.id)){k={};l=$jscomp.makeIterator(l.streams);for(var m=l.next();!m.done;k={$jscomp$loop$prop$stream$
|
|
1441
|
-
m=l.next())k.$jscomp$loop$prop$stream$
|
|
1444
|
+
shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.DASH_DUPLICATE_REPRESENTATION_ID);}c=e.filter(function(n){return!n.trickModeFor});e=e.filter(function(n){return n.trickModeFor});e=$jscomp.makeIterator(e);for(f=e.next();!f.done;f=e.next())for(f=f.value,b=f.trickModeFor.split(" "),h=$jscomp.makeIterator(c),k=h.next();!k.done;k=h.next()){var l=k.value;if(b.includes(l.id)){k={};l=$jscomp.makeIterator(l.streams);for(var m=l.next();!m.done;k={$jscomp$loop$prop$stream$619:k.$jscomp$loop$prop$stream$619},
|
|
1445
|
+
m=l.next())k.$jscomp$loop$prop$stream$619=m.value,k.$jscomp$loop$prop$stream$619.trickModeVideo=f.streams.find(function(n){return function(p){return shaka.util.MimeUtils.getNormalizedCodec(n.$jscomp$loop$prop$stream$619.codecs)==shaka.util.MimeUtils.getNormalizedCodec(p.codecs)}}(k))}}f=this.config_.disableAudio?[]:this.getSetsOfType_(c,g.AUDIO);b=this.config_.disableVideo?[]:this.getSetsOfType_(c,g.VIDEO);e=this.config_.disableText?[]:this.getSetsOfType_(c,g.TEXT);c=this.config_.disableThumbnails?
|
|
1442
1446
|
[]:this.getSetsOfType_(c,g.IMAGE);if(!b.length&&!f.length)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.DASH_EMPTY_PERIOD);g=[];f=$jscomp.makeIterator(f);for(h=f.next();!h.done;h=f.next())g.push.apply(g,$jscomp.arrayFromIterable(h.value.streams));f=[];b=$jscomp.makeIterator(b);for(h=b.next();!h.done;h=b.next())f.push.apply(f,$jscomp.arrayFromIterable(h.value.streams));b=[];e=$jscomp.makeIterator(e);for(h=e.next();!h.done;h=e.next())b.push.apply(b,
|
|
1443
1447
|
$jscomp.arrayFromIterable(h.value.streams));e=[];c=$jscomp.makeIterator(c);for(h=c.next();!h.done;h=c.next())e.push.apply(e,$jscomp.arrayFromIterable(h.value.streams));return{id:a.period.id,audioStreams:g,videoStreams:f,textStreams:b,imageStreams:e}};shaka.dash.DashParser.prototype.getSetsOfType_=function(a,b){return a.filter(function(c){return c.contentType==b})};
|
|
1444
1448
|
shaka.dash.DashParser.prototype.parseAdaptationSet_=function(a,b){var c=this,d=shaka.util.XmlUtils,e=shaka.util.Functional,f=shaka.util.ManifestParserUtils,g=f.ContentType,h=shaka.dash.ContentProtection;a.adaptationSet=this.createFrame_(b,a.period,null);var k=!1,l=d.findChildren(b,"Role"),m=l.map(function(B){return B.getAttribute("value")}).filter(e.isNotNull),n=void 0;if(e=a.adaptationSet.contentType==g.TEXT)n=f.TextStreamKind.SUBTITLE;l=$jscomp.makeIterator(l);for(var p=l.next();!p.done;p=l.next()){p=
|
|
@@ -1555,8 +1559,8 @@ shaka.hls.HlsParser.prototype.createPresentationTimeline_=function(){this.isLive
|
|
|
1555
1559
|
shaka.hls.HlsParser.prototype.getInitSegmentReference_=function(a,b,c){b=shaka.hls.Utils.getFirstTagWithName(b,"EXT-X-MAP");if(!b)return null;var d=b.getRequiredAttrValue("URI");c=this.variableSubstitution_(shaka.hls.Utils.constructAbsoluteUri(a,d),c);a=[c,b.getAttributeValue("BYTERANGE","")].join("-");this.mapTagToInitSegmentRefMap_.has(a)||(b=this.createInitSegmentReference_(c,b),this.mapTagToInitSegmentRefMap_.set(a,b));return this.mapTagToInitSegmentRefMap_.get(a)};
|
|
1556
1560
|
shaka.hls.HlsParser.prototype.createInitSegmentReference_=function(a,b){var c=0,d=null,e=b.getAttributeValue("BYTERANGE");e&&(c=e.split("@"),d=Number(c[0]),c=Number(c[1]),d=c+d-1);return new shaka.media.InitSegmentReference(function(){return[a]},c,d)};
|
|
1557
1561
|
shaka.hls.HlsParser.prototype.createSegmentReference_=function(a,b,c,d,e,f,g,h){var k=c.tags,l=this.variableSubstitution_(c.absoluteUri,f),m=shaka.hls.Utils.getFirstTagWithName(k,"EXTINF"),n=0;f=0;var p=null;if(!m){if(0==c.partialSegments.length)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.HLS_REQUIRED_TAG_MISSING,"EXTINF");if(!this.lowLatencyMode_)return null}var q=[];if(this.lowLatencyMode_){n={};for(var r=0;r<c.partialSegments.length;n=
|
|
1558
|
-
{$jscomp$loop$prop$pAbsoluteUri$
|
|
1559
|
-
shaka.hls.Utils.constructAbsoluteUri(g,t),v=new shaka.media.SegmentReference(v,y,function(z){return function(){return[z.$jscomp$loop$prop$pAbsoluteUri$
|
|
1562
|
+
{$jscomp$loop$prop$pAbsoluteUri$621:n.$jscomp$loop$prop$pAbsoluteUri$621},r++){var t=c.partialSegments[r],u=0==r?b:q[q.length-1],v=0==r?d:u.endTime,y=Number(t.getAttributeValue("DURATION"))||this.partialTargetDuration_;if(y){y=v+y;var w=0,x=null;"EXT-X-PRELOAD-HINT"==t.name?w=(u=t.getAttributeValue("BYTERANGE-START"))?Number(u):0:(w=t.getAttributeValue("BYTERANGE"),u=$jscomp.makeIterator(this.parseByteRange_(u,w)),w=u.next().value,x=u.next().value);if(t=t.getAttributeValue("URI"))n.$jscomp$loop$prop$pAbsoluteUri$621=
|
|
1563
|
+
shaka.hls.Utils.constructAbsoluteUri(g,t),v=new shaka.media.SegmentReference(v,y,function(z){return function(){return[z.$jscomp$loop$prop$pAbsoluteUri$621]}}(n),w,x,a,e,0,Infinity),q.push(v)}}}m?(c=m.value.split(","),n=d+Number(c[0])):n=q[q.length-1].endTime;(c=shaka.hls.Utils.getFirstTagWithName(k,"EXT-X-BYTERANGE"))?(p=$jscomp.makeIterator(this.parseByteRange_(b,c.value)),f=p.next().value,p=p.next().value):q.length&&(f=q[0].startByte,p=q[q.length-1].endByte);b="";c=null;h==shaka.util.ManifestParserUtils.ContentType.IMAGE&&
|
|
1560
1564
|
(b="1x1",h=shaka.hls.Utils.getFirstTagWithName(k,"EXT-X-TILES"))&&(b=h.getRequiredAttrValue("LAYOUT"),(h=h.getAttributeValue("DURATION"))&&(c=Number(h)));return new shaka.media.SegmentReference(d,n,function(){return l.length?[l]:[]},f,p,a,e,0,Infinity,q,b,c)};shaka.hls.HlsParser.prototype.parseByteRange_=function(a,b){var c=0,d=null;b&&(c=b.split("@"),d=Number(c[0]),c[1]?c=Number(c[1]):(goog.asserts.assert(a,"Cannot refer back to previous HLS segment!"),c=a.endByte+1),d=c+d-1);return[c,d]};
|
|
1561
1565
|
shaka.hls.HlsParser.prototype.notifySegments_=function(){if(this.presentationTimeline_){for(var a=$jscomp.makeIterator(this.segmentsToNotifyByStream_),b=a.next();!b.done;b=a.next())this.presentationTimeline_.notifySegments(b.value);this.segmentsToNotifyByStream_=[]}};
|
|
1562
1566
|
shaka.hls.HlsParser.prototype.createSegments_=function(a,b,c,d,e,f,g,h,k){var l=this,m,n,p,q,r,t,u,v,y,w,x,z,A,C,D,F,B,E,G,J,H;return $jscomp.asyncExecutePromiseGeneratorProgram(function(I){switch(I.nextAddress){case 1:m=b.segments;goog.asserts.assert(m.length,"Playlist should have segments!");p=shaka.hls.Utils.getFirstTagWithNameAsNumber(b.tags,"EXT-X-MEDIA-SEQUENCE",0);r=(q=shaka.hls.Utils.getFirstTagWithName(b.tags,"EXT-X-SKIP"))?Number(q.getAttributeValue("SKIPPED-SEGMENTS")):0;t=p+r;if(l.isLive_()&&
|
|
@@ -1628,10 +1632,10 @@ shaka.offline.indexeddb.BaseStorageCell.prototype.getManifests=function(a){var b
|
|
|
1628
1632
|
shaka.offline.indexeddb.BaseStorageCell.prototype.getAllManifests=function(){var a=this,b,c;return $jscomp.asyncExecutePromiseGeneratorProgram(function(d){return 1==d.nextAddress?(b=a.connection_.startReadOnlyOperation(a.manifestStore_),c=new Map,d.yield(b.forEachEntry(function(e,f){var g;return $jscomp.asyncExecutePromiseGeneratorProgram(function(h){if(1==h.nextAddress)return h.yield(a.convertManifest(f),2);g=h.yieldResult;c.set(e,g);h.jumpToEnd()})}),2)):3!=d.nextAddress?d.yield(b.promise(),3):
|
|
1629
1633
|
d["return"](c)})};shaka.offline.indexeddb.BaseStorageCell.prototype.convertSegmentData=function(a){return a};shaka.offline.indexeddb.BaseStorageCell.prototype.convertManifest=function(a){return Promise.resolve(a)};shaka.offline.indexeddb.BaseStorageCell.prototype.rejectAdd=function(a){return Promise.reject(new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.STORAGE,shaka.util.Error.Code.NEW_KEY_OPERATION_NOT_SUPPORTED,"Cannot add new value to "+a))};
|
|
1630
1634
|
shaka.offline.indexeddb.BaseStorageCell.prototype.rejectUpdate=function(a){return Promise.reject(new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.STORAGE,shaka.util.Error.Code.MODIFY_OPERATION_NOT_SUPPORTED,"Cannot modify values in "+a))};
|
|
1631
|
-
shaka.offline.indexeddb.BaseStorageCell.prototype.add=function(a,b){var c=this,d,e,f,g,h,k,l;return $jscomp.asyncExecutePromiseGeneratorProgram(function(m){if(1==m.nextAddress){d=c.connection_.startReadWriteOperation(a);e=d.store();f=[];g={};h=$jscomp.makeIterator(b);for(k=h.next();!k.done;g={$jscomp$loop$prop$request$
|
|
1632
|
-
return m.yield(d.promise(),2)}return m["return"](f)})};shaka.offline.indexeddb.BaseStorageCell.prototype.remove_=function(a,b,c){a=this.connection_.startReadWriteOperation(a);var d=a.store(),e={};b=$jscomp.makeIterator(b);for(var f=b.next();!f.done;e={$jscomp$loop$prop$key$
|
|
1633
|
-
shaka.offline.indexeddb.BaseStorageCell.prototype.get_=function(a,b){var c=this,d,e,f,g,h,k,l;return $jscomp.asyncExecutePromiseGeneratorProgram(function(m){if(1==m.nextAddress){d=c.connection_.startReadOnlyOperation(a);e=d.store();f={};g=[];h={};k=$jscomp.makeIterator(b);for(l=k.next();!l.done;h={$jscomp$loop$prop$request$
|
|
1634
|
-
h.$jscomp$loop$prop$request$
|
|
1635
|
+
shaka.offline.indexeddb.BaseStorageCell.prototype.add=function(a,b){var c=this,d,e,f,g,h,k,l;return $jscomp.asyncExecutePromiseGeneratorProgram(function(m){if(1==m.nextAddress){d=c.connection_.startReadWriteOperation(a);e=d.store();f=[];g={};h=$jscomp.makeIterator(b);for(k=h.next();!k.done;g={$jscomp$loop$prop$request$623:g.$jscomp$loop$prop$request$623},k=h.next())l=k.value,g.$jscomp$loop$prop$request$623=e.add(l),g.$jscomp$loop$prop$request$623.onsuccess=function(n){return function(p){f.push(n.$jscomp$loop$prop$request$623.result)}}(g);
|
|
1636
|
+
return m.yield(d.promise(),2)}return m["return"](f)})};shaka.offline.indexeddb.BaseStorageCell.prototype.remove_=function(a,b,c){a=this.connection_.startReadWriteOperation(a);var d=a.store(),e={};b=$jscomp.makeIterator(b);for(var f=b.next();!f.done;e={$jscomp$loop$prop$key$625:e.$jscomp$loop$prop$key$625},f=b.next())e.$jscomp$loop$prop$key$625=f.value,d["delete"](e.$jscomp$loop$prop$key$625).onsuccess=function(g){return function(){return c(g.$jscomp$loop$prop$key$625)}}(e);return a.promise()};
|
|
1637
|
+
shaka.offline.indexeddb.BaseStorageCell.prototype.get_=function(a,b){var c=this,d,e,f,g,h,k,l;return $jscomp.asyncExecutePromiseGeneratorProgram(function(m){if(1==m.nextAddress){d=c.connection_.startReadOnlyOperation(a);e=d.store();f={};g=[];h={};k=$jscomp.makeIterator(b);for(l=k.next();!l.done;h={$jscomp$loop$prop$request$627:h.$jscomp$loop$prop$request$627,$jscomp$loop$prop$key$628:h.$jscomp$loop$prop$key$628},l=k.next())h.$jscomp$loop$prop$key$628=l.value,h.$jscomp$loop$prop$request$627=e.get(h.$jscomp$loop$prop$key$628),
|
|
1638
|
+
h.$jscomp$loop$prop$request$627.onsuccess=function(n){return function(){void 0==n.$jscomp$loop$prop$request$627.result&&g.push(n.$jscomp$loop$prop$key$628);f[n.$jscomp$loop$prop$key$628]=n.$jscomp$loop$prop$request$627.result}}(h);return m.yield(d.promise(),2)}if(g.length)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.STORAGE,shaka.util.Error.Code.KEY_NOT_FOUND,"Could not find values for "+g);return m["return"](b.map(function(n){return f[n]}))})};shaka.offline.indexeddb.EmeSessionStorageCell=function(a,b){this.connection_=new shaka.offline.indexeddb.DBConnection(a);this.store_=b};shaka.offline.indexeddb.EmeSessionStorageCell.prototype.destroy=function(){return this.connection_.destroy()};
|
|
1635
1639
|
shaka.offline.indexeddb.EmeSessionStorageCell.prototype.getAll=function(){var a=this,b,c;return $jscomp.asyncExecutePromiseGeneratorProgram(function(d){return 1==d.nextAddress?(b=a.connection_.startReadOnlyOperation(a.store_),c=[],d.yield(b.forEachEntry(function(e,f){c.push(f)}),2)):3!=d.nextAddress?d.yield(b.promise(),3):d["return"](c)})};
|
|
1636
1640
|
shaka.offline.indexeddb.EmeSessionStorageCell.prototype.add=function(a){var b=this.connection_.startReadWriteOperation(this.store_),c=b.store();a=$jscomp.makeIterator(a);for(var d=a.next();!d.done;d=a.next())c.add(d.value);return b.promise()};
|
|
1637
1641
|
shaka.offline.indexeddb.EmeSessionStorageCell.prototype.remove=function(a){var b=this,c;return $jscomp.asyncExecutePromiseGeneratorProgram(function(d){return 1==d.nextAddress?(c=b.connection_.startReadWriteOperation(b.store_),d.yield(c.forEachEntry(function(e,f,g){a.includes(f.sessionId)&&g["delete"]()}),2)):d.yield(c.promise(),0)})};shaka.offline.StorageCellHandle={};shaka.offline.StorageCellPath={};shaka.offline.StorageMuxer=function(){this.mechanisms_=new Map};shaka.offline.StorageMuxer.prototype.destroy=function(){for(var a=[],b=$jscomp.makeIterator(this.mechanisms_.values()),c=b.next();!c.done;c=b.next())a.push(c.value.destroy());this.mechanisms_.clear();return Promise.all(a)};
|
|
@@ -1718,9 +1722,9 @@ shaka.offline.Storage.prototype.store_=function(a,b,c,d,e){var f=this,g,h,k,l,m,
|
|
|
1718
1722
|
shaka.util.Error.Category.STORAGE,shaka.util.Error.Code.CANNOT_STORE_LIVE_OFFLINE,a);return x.yield(f.createDrmEngine(p,function(z){n=n||z},d),7);case 7:h=x.yieldResult;f.ensureNotDestroyed_();if(n)throw n;return x.yield(f.filterManifest_(p,h,d),8);case 8:return x.yield(k.init(),9);case 9:return f.ensureNotDestroyed_(),x.yield(k.getActive(),10);case 10:return l=x.yieldResult,f.ensureNotDestroyed_(),goog.asserts.assert(h,"drmEngine should be non-null here."),r=f.makeManifestDB_(h,p,a,b,d,e),t=r.manifestDB,
|
|
1719
1723
|
u=r.toDownload,x.yield(l.cell.addManifests([t]),11);case 11:v=x.yieldResult;f.ensureNotDestroyed_();m=v[0];goog.asserts.assert(h,"drmEngine should be non-null here.");f.ensureNotDestroyed_();if(n)throw n;return x.yield(f.downloadSegments_(u,m,t,e,d,l.cell,p,h),12);case 12:return f.ensureNotDestroyed_(),y=shaka.offline.OfflineUri.manifest(l.path.mechanism,l.path.cell,m),x["return"](shaka.offline.StoredContentUtils.fromManifestDB(y,t));case 3:return x.enterFinallyBlock(),x.yield(k.destroy(),13);case 13:if(!g){x.jumpTo(14);
|
|
1720
1724
|
break}return x.yield(g.stop(),14);case 14:if(!h){x.jumpTo(16);break}return x.yield(h.destroy(),16);case 16:x.leaveFinallyBlock(0);break;case 2:w=x.enterCatchBlock();if(null==m){x.jumpTo(18);break}return x.yield(shaka.offline.Storage.cleanStoredManifest(m),18);case 18:throw n||w;}})};
|
|
1721
|
-
shaka.offline.Storage.prototype.downloadSegments_=function(a,b,c,d,e,f,g,h){var k=this,l,m,n,p,q,r,t,u,v,y;return $jscomp.asyncExecutePromiseGeneratorProgram(function(w){switch(w.nextAddress){case 1:l={};m=0;n=function(x,z){var A,C,D,F,B,E,G;return $jscomp.asyncExecutePromiseGeneratorProgram(function(J){if(1==J.nextAddress){A={};C=$jscomp.makeIterator(x);for(D=C.next();!D.done;A={$jscomp$loop$prop$download$
|
|
1722
|
-
D.value,F=A.$jscomp$loop$prop$download$
|
|
1723
|
-
d.queue(A.$jscomp$loop$prop$download$
|
|
1725
|
+
shaka.offline.Storage.prototype.downloadSegments_=function(a,b,c,d,e,f,g,h){var k=this,l,m,n,p,q,r,t,u,v,y;return $jscomp.asyncExecutePromiseGeneratorProgram(function(w){switch(w.nextAddress){case 1:l={};m=0;n=function(x,z){var A,C,D,F,B,E,G;return $jscomp.asyncExecutePromiseGeneratorProgram(function(J){if(1==J.nextAddress){A={};C=$jscomp.makeIterator(x);for(D=C.next();!D.done;A={$jscomp$loop$prop$download$537$630:A.$jscomp$loop$prop$download$537$630},D=C.next())A.$jscomp$loop$prop$download$537$630=
|
|
1726
|
+
D.value,F=A.$jscomp$loop$prop$download$537$630.makeSegmentRequest(e),B=A.$jscomp$loop$prop$download$537$630.estimateId,E=A.$jscomp$loop$prop$download$537$630.isInitSegment,G=function(H){return function(I){var K,L,N;return $jscomp.asyncExecutePromiseGeneratorProgram(function(M){if(1==M.nextAddress)return M.yield(f.addSegments([{data:I}]),2);K=M.yieldResult;k.ensureNotDestroyed_();L=H.$jscomp$loop$prop$download$537$630.ref;N=shaka.offline.DownloadInfo.idForSegmentRef(L);l[N]=K[0];m+=I.byteLength;M.jumpToEnd()})}}(A),
|
|
1727
|
+
d.queue(A.$jscomp$loop$prop$download$537$630.groupId,F,B,E,G);return J.yield(d.waitToFinish(),2)}if(!z)return J.jumpTo(0);k.ensureNotDestroyed_();k.setManifestDrmFields_(g,c,h,e);return J.yield(f.updateManifest(b,c),0)})};p=!1;w.setCatchFinallyBlocks(2);if(!k.getManifestIsEncrypted_(g)||!p||k.getManifestIncludesInitData_(g)){w.jumpTo(4);break}return w.yield(n(a.filter(function(x){return x.isInitSegment}),!0),5);case 5:return k.ensureNotDestroyed_(),a=a.filter(function(x){return!x.isInitSegment}),
|
|
1724
1728
|
q=l,r=m,l={},m=0,w.yield(shaka.offline.Storage.assignSegmentsToManifest(f,b,c,q,r,function(){return k.ensureNotDestroyed_()}),6);case 6:k.ensureNotDestroyed_();case 4:if(p){w.jumpTo(7);break}return w.yield(n(a,!1),8);case 8:return k.ensureNotDestroyed_(),t=l,u=m,l={},m=0,w.yield(shaka.offline.Storage.assignSegmentsToManifest(f,b,c,t,u,function(){return k.ensureNotDestroyed_()}),9);case 9:k.ensureNotDestroyed_(),goog.asserts.assert(!c.isIncomplete,"The manifest should be complete by now");case 7:w.leaveTryBlock(0);
|
|
1725
1729
|
break;case 2:return v=w.enterCatchBlock(),y=Object.values(l),w.yield(f.removeSegments(y,function(x){}),10);case 10:throw v;}})};
|
|
1726
1730
|
shaka.offline.Storage.cleanStoredManifest=function(a){var b,c,d,e;return $jscomp.asyncExecutePromiseGeneratorProgram(function(f){switch(f.nextAddress){case 1:return b=new shaka.offline.StorageMuxer,f.yield(b.init(),2);case 2:return f.yield(b.getActive(),3);case 3:return c=f.yieldResult,d=shaka.offline.OfflineUri.manifest(c.path.mechanism,c.path.cell,a),f.yield(b.destroy(),4);case 4:return e=new shaka.offline.Storage,f.yield(e.remove(d.toString()),0)}})};
|
|
@@ -1773,7 +1777,8 @@ shaka.polyfill.Fullscreen.install=function(){if(window.Document){var a=Element.p
|
|
|
1773
1777
|
document.webkitFullscreenElement}}),Object.defineProperty(document,"fullscreenEnabled",{get:function(){return document.mozFullScreenEnabled||document.msFullscreenEnabled||document.webkitFullscreenEnabled}}));a=shaka.polyfill.Fullscreen.proxyEvent_;document.addEventListener("webkitfullscreenchange",a);document.addEventListener("webkitfullscreenerror",a);document.addEventListener("mozfullscreenchange",a);document.addEventListener("mozfullscreenerror",a);document.addEventListener("MSFullscreenChange",
|
|
1774
1778
|
a);document.addEventListener("MSFullscreenError",a)}};shaka.polyfill.Fullscreen.proxyEvent_=function(a){var b=a.type.replace(/^(webkit|moz|MS)/,"").toLowerCase(),c=document.createEvent("Event");c.initEvent(b,a.bubbles,a.cancelable);a.target.dispatchEvent(c)};goog.exportProperty(shaka.polyfill,"Fullscreen",shaka.polyfill.Fullscreen);goog.exportProperty(shaka.polyfill.Fullscreen,"install",shaka.polyfill.Fullscreen.install);shaka.polyfill.register(shaka.polyfill.Fullscreen.install);shaka.polyfill.MathRound=function(){};shaka.polyfill.MathRound.install=function(){shaka.log.debug("mathRound.install");var a=shaka.polyfill.MathRound.MAX_ACCURATE_INPUT_+1;if(Math.round(a)!=a){shaka.log.debug("polyfill Math.round");var b=Math.round;Math.round=function(c){var d=c;c<=shaka.polyfill.MathRound.MAX_ACCURATE_INPUT_&&(d=b(c));return d}}};goog.exportProperty(shaka.polyfill,"MathRound",shaka.polyfill.MathRound);goog.exportProperty(shaka.polyfill.MathRound,"install",shaka.polyfill.MathRound.install);
|
|
1775
1779
|
shaka.polyfill.MathRound.MAX_ACCURATE_INPUT_=4503599627370496;shaka.polyfill.register(shaka.polyfill.MathRound.install);shaka.polyfill.MediaCapabilities=function(){};
|
|
1776
|
-
shaka.polyfill.MediaCapabilities.install=function(){shaka.util.Platform.isChromecast()||shaka.util.Platform.isApple()||shaka.util.Platform.isPS4()||shaka.util.Platform.isPS5()||!navigator.mediaCapabilities?(shaka.log.info("MediaCapabilities: install"),navigator.mediaCapabilities||(navigator.mediaCapabilities={}),shaka.polyfill.MediaCapabilities.originalMcap=navigator.mediaCapabilities,navigator.mediaCapabilities.decodingInfo=shaka.polyfill.MediaCapabilities.decodingInfo_):
|
|
1780
|
+
shaka.polyfill.MediaCapabilities.install=function(){shaka.util.Platform.isChromecast()||shaka.util.Platform.isApple()||shaka.util.Platform.isPS4()||shaka.util.Platform.isPS5()||shaka.util.Platform.isWebOS()||shaka.util.Platform.isTizen()||!navigator.mediaCapabilities?(shaka.log.info("MediaCapabilities: install"),navigator.mediaCapabilities||(navigator.mediaCapabilities={}),shaka.polyfill.MediaCapabilities.originalMcap=navigator.mediaCapabilities,navigator.mediaCapabilities.decodingInfo=shaka.polyfill.MediaCapabilities.decodingInfo_):
|
|
1781
|
+
shaka.log.info("MediaCapabilities: Native mediaCapabilities support found.")};
|
|
1777
1782
|
shaka.polyfill.MediaCapabilities.decodingInfo_=function(a){var b,c,d,e,f,g,h,k,l,m,n,p,q,r,t,u;return $jscomp.asyncExecutePromiseGeneratorProgram(function(v){switch(v.nextAddress){case 1:b={supported:!1,powerEfficient:!0,smooth:!0,keySystemAccess:null,configuration:a};if(!a)return v["return"](b);if("media-source"==a.type){if(!shaka.util.Platform.supportsMediaSource()||a.video&&(c=a.video.contentType,d=MediaSource.isTypeSupported(c),!d)||a.audio&&(e=a.audio.contentType,f=MediaSource.isTypeSupported(e),
|
|
1778
1783
|
!f))return v["return"](b)}else if("file"==a.type){if(a.video&&(g=a.video.contentType,h=shaka.util.Platform.supportsMediaType(g),!h)||a.audio&&(k=a.audio.contentType,l=shaka.util.Platform.supportsMediaType(k),!l))return v["return"](b)}else return v["return"](b);if(!a.keySystemConfiguration)return b.supported=!0,v["return"](Promise.resolve(b));m=a.keySystemConfiguration;n=[];p=[];m.audio&&(q={robustness:m.audio.robustness||"",contentType:a.audio.contentType},n.push(q));m.video&&(r={robustness:m.video.robustness||
|
|
1779
1784
|
"",contentType:a.video.contentType},p.push(r));t={initDataTypes:[m.initDataType],distinctiveIdentifier:m.distinctiveIdentifier,persistentState:m.persistentState,sessionTypes:m.sessionTypes};n.length&&(t.audioCapabilities=n);p.length&&(t.videoCapabilities=p);v.setCatchFinallyBlocks(3);return v.yield(navigator.requestMediaKeySystemAccess(m.keySystem,[t]),5);case 5:u=v.yieldResult;v.leaveTryBlock(4);break;case 3:v.enterCatchBlock(),shaka.log.info("navigator.requestMediaKeySystemAccess failed.");case 4:u&&
|
|
@@ -1980,8 +1985,8 @@ goog.exportProperty(shaka.text.SbvTextParser.prototype,"parseMedia",shaka.text.S
|
|
|
1980
1985
|
shaka.text.SrtTextParser.srt2webvtt=function(a){var b=shaka.text.SrtTextParser,c="WEBVTT\n\n";if(""==a)return c;a=a.replace(/\r+/g,"");a=a.trim();a=a.split("\n\n");a=$jscomp.makeIterator(a);for(var d=a.next();!d.done;d=a.next())c+=b.convertSrtCue_(d.value);return c};shaka.text.SrtTextParser.convertSrtCue_=function(a){a=a.split(/\n/);a[0].match(/\d+/)&&a.shift();a[0]=a[0].replace(/,/g,".");return a.join("\n")+"\n\n"};goog.exportSymbol("shaka.text.SrtTextParser",shaka.text.SrtTextParser);
|
|
1981
1986
|
goog.exportProperty(shaka.text.SrtTextParser,"srt2webvtt",shaka.text.SrtTextParser.srt2webvtt);goog.exportProperty(shaka.text.SrtTextParser.prototype,"parseMedia",shaka.text.SrtTextParser.prototype.parseMedia);goog.exportProperty(shaka.text.SrtTextParser.prototype,"parseInit",shaka.text.SrtTextParser.prototype.parseInit);shaka.text.TextEngine.registerParser("text/srt",function(){return new shaka.text.SrtTextParser});shaka.text.SsaTextParser=function(){};shaka.text.SsaTextParser.prototype.parseInit=function(a){goog.asserts.assert(!1,"SSA does not have init segments")};
|
|
1982
1987
|
shaka.text.SsaTextParser.prototype.parseMedia=function(a,b){var c=shaka.text.SsaTextParser,d="",e="",f=shaka.util.StringUtils.fromUTF8(a).split(/\r?\n\s*\r?\n/);f=$jscomp.makeIterator(f);for(var g=f.next();!g.done;g=f.next()){g=g.value;var h=c.ssaContent_.exec(g);if(h){var k=h[1];h=h[2];if("V4 Styles"==k||"V4+ Styles"==k){d=h;continue}if("Events"==k){e=h;continue}}shaka.log.warning("SsaTextParser parser encountered an unknown part.",g)}f=[];g=null;d=d.split(/\r?\n/);d=$jscomp.makeIterator(d);for(h=
|
|
1983
|
-
d.next();!h.done;h=d.next())if(k=h.value,!/^\s*;/.test(k)&&(h=c.lineParts_.exec(k)))if(k=h[1].trim(),h=h[2].trim(),"Format"==k)g=h.split(c.valuesFormat_);else if("Style"==k){k=h.split(c.valuesFormat_);h={};for(var l=0;l<g.length&&l<k.length;l++)h[g[l]]=k[l];f.push(h)}g=[];d=null;k=e.split(/\r?\n/);e={};k=$jscomp.makeIterator(k);for(h=k.next();!h.done;e={$jscomp$loop$prop$styleName$
|
|
1984
|
-
l=l[2].trim(),"Format"==h)d=l.split(c.valuesFormat_);else if("Dialogue"==h){l=l.split(c.valuesFormat_);h={};for(var m=0;m<d.length&&m<l.length;m++)h[d[m]]=l[m];m=c.parseTime_(h.Start);var n=c.parseTime_(h.End);l=l.slice(d.length-1).join(",").replace(/\\N/g,"\n").replace(/\{[^}]+\}/g,"");l=new shaka.text.Cue(m,n,l);e.$jscomp$loop$prop$styleName$
|
|
1988
|
+
d.next();!h.done;h=d.next())if(k=h.value,!/^\s*;/.test(k)&&(h=c.lineParts_.exec(k)))if(k=h[1].trim(),h=h[2].trim(),"Format"==k)g=h.split(c.valuesFormat_);else if("Style"==k){k=h.split(c.valuesFormat_);h={};for(var l=0;l<g.length&&l<k.length;l++)h[g[l]]=k[l];f.push(h)}g=[];d=null;k=e.split(/\r?\n/);e={};k=$jscomp.makeIterator(k);for(h=k.next();!h.done;e={$jscomp$loop$prop$styleName$632:e.$jscomp$loop$prop$styleName$632},h=k.next())if(h=h.value,!/^\s*;/.test(h)&&(l=c.lineParts_.exec(h)))if(h=l[1].trim(),
|
|
1989
|
+
l=l[2].trim(),"Format"==h)d=l.split(c.valuesFormat_);else if("Dialogue"==h){l=l.split(c.valuesFormat_);h={};for(var m=0;m<d.length&&m<l.length;m++)h[d[m]]=l[m];m=c.parseTime_(h.Start);var n=c.parseTime_(h.End);l=l.slice(d.length-1).join(",").replace(/\\N/g,"\n").replace(/\{[^}]+\}/g,"");l=new shaka.text.Cue(m,n,l);e.$jscomp$loop$prop$styleName$632=h.Style;(h=f.find(function(p){return function(q){return q.Name==p.$jscomp$loop$prop$styleName$632}}(e)))&&c.addStyle_(l,h);g.push(l)}return g};
|
|
1985
1990
|
shaka.text.SsaTextParser.addStyle_=function(a,b){var c=shaka.text.Cue,d=shaka.text.SsaTextParser,e=b.Fontname;e&&(a.fontFamily=e);if(e=b.Fontsize)a.fontSize=e+"px";if(e=b.PrimaryColour)if(e=d.parseSsaColor_(e))a.color=e;if(e=b.BackColour)if(d=d.parseSsaColor_(e))a.backgroundColor=d;b.Bold&&(a.fontWeight=c.fontWeight.BOLD);b.Italic&&(a.fontStyle=c.fontStyle.ITALIC);b.Underline&&a.textDecoration.push(c.textDecoration.UNDERLINE);if(d=b.Spacing)a.letterSpacing=d+"px";if(d=b.Alignment)switch(parseInt(d,
|
|
1986
1991
|
10)){case 1:a.displayAlign=c.displayAlign.AFTER;a.textAlign=c.textAlign.START;break;case 2:a.displayAlign=c.displayAlign.AFTER;a.textAlign=c.textAlign.CENTER;break;case 3:a.displayAlign=c.displayAlign.AFTER;a.textAlign=c.textAlign.END;break;case 5:a.displayAlign=c.displayAlign.BEFORE;a.textAlign=c.textAlign.START;break;case 6:a.displayAlign=c.displayAlign.BEFORE;a.textAlign=c.textAlign.CENTER;break;case 7:a.displayAlign=c.displayAlign.BEFORE;a.textAlign=c.textAlign.END;break;case 9:a.displayAlign=
|
|
1987
1992
|
c.displayAlign.CENTER;a.textAlign=c.textAlign.START;break;case 10:a.displayAlign=c.displayAlign.CENTER;a.textAlign=c.textAlign.CENTER;break;case 11:a.displayAlign=c.displayAlign.CENTER,a.textAlign=c.textAlign.END}if(c=b.AlphaLevel)a.opacity=parseFloat(c)};shaka.text.SsaTextParser.parseSsaColor_=function(a){a=parseInt(a.replace("&H",""),16);return 0<=a?"rgba("+(a&255)+","+(a>>8&255)+","+(a>>16&255)+","+(a>>24&255^255)/255+")":null};
|
|
@@ -2000,15 +2005,16 @@ EmeEncryptionSchemePolyfill.polyfillRMKSA_=function(a,b){var c=this,d,e,f,g,h,k,
|
|
|
2000
2005
|
h.videoCapabilities.length&&!k.length||h.audioCapabilities&&h.audioCapabilities.length&&!l.length||(m=Object.assign({},h),m.videoCapabilities=k,m.audioCapabilities=l,e.push(m));if(!e.length)throw n=Error("Unsupported keySystem or supportedConfigurations."),n.name="NotSupportedError",n.code=DOMException.NOT_SUPPORTED_ERR,n;return q.yield(EmeEncryptionSchemePolyfill.originalRMKSA_.call(c,a,e),2)}p=q.yieldResult;return q["return"](new EmeEncryptionSchemePolyfillMediaKeySystemAccess(p,d))})};
|
|
2001
2006
|
EmeEncryptionSchemePolyfill.filterCapabilities_=function(a,b){return a?a.filter(function(c){return!c.encryptionScheme||c.encryptionScheme==b}):a};goog.exportSymbol("EmeEncryptionSchemePolyfill",EmeEncryptionSchemePolyfill);goog.exportProperty(EmeEncryptionSchemePolyfill,"install",EmeEncryptionSchemePolyfill.install);var McEncryptionSchemePolyfill=function(){};
|
|
2002
2007
|
McEncryptionSchemePolyfill.install=function(){McEncryptionSchemePolyfill.originalDecodingInfo_?console.debug("McEncryptionSchemePolyfill: Already installed."):navigator.mediaCapabilities?(McEncryptionSchemePolyfill.originalDecodingInfo_=navigator.mediaCapabilities.decodingInfo,console.debug("McEncryptionSchemePolyfill: Waiting to detect encryptionScheme support."),navigator.mediaCapabilities.decodingInfo=McEncryptionSchemePolyfill.probeDecodingInfo_):console.debug("McEncryptionSchemePolyfill: MediaCapabilities not found")};
|
|
2003
|
-
McEncryptionSchemePolyfill.probeDecodingInfo_=function(a){var b=this,c,d;return $jscomp.asyncExecutePromiseGeneratorProgram(function(
|
|
2004
|
-
navigator.mediaCapabilities.decodingInfo=McEncryptionSchemePolyfill.originalDecodingInfo_,
|
|
2005
|
-
|
|
2006
|
-
|
|
2007
|
-
|
|
2008
|
+
McEncryptionSchemePolyfill.probeDecodingInfo_=function(a){var b=this,c,d,e;return $jscomp.asyncExecutePromiseGeneratorProgram(function(f){switch(f.nextAddress){case 1:return console.assert(b==navigator.mediaCapabilities,'bad "this" for decodingInfo'),f.yield(McEncryptionSchemePolyfill.originalDecodingInfo_.call(b,a),2);case 2:c=f.yieldResult;if(!a.keySystemConfiguration)return f["return"](c);if((d=c.keySystemAccess)&&hasEncryptionScheme(d))return console.debug("McEncryptionSchemePolyfill: Native encryptionScheme support found."),
|
|
2009
|
+
navigator.mediaCapabilities.decodingInfo=McEncryptionSchemePolyfill.originalDecodingInfo_,f["return"](c);console.debug("McEncryptionSchemePolyfill: No native encryptionScheme support found. Patching encryptionScheme support.");navigator.mediaCapabilities.decodingInfo=McEncryptionSchemePolyfill.polyfillDecodingInfo_;if(d){f.jumpTo(3);break}e=c;return f.yield(McEncryptionSchemePolyfill.getMediaKeySystemAccess_(a),4);case 4:return e.keySystemAccess=f.yieldResult,f["return"](c);case 3:return f["return"](McEncryptionSchemePolyfill.polyfillDecodingInfo_.call(b,
|
|
2010
|
+
a))}})};
|
|
2011
|
+
McEncryptionSchemePolyfill.polyfillDecodingInfo_=function(a){var b=this,c,d,e,f,g,h,k,l;return $jscomp.asyncExecutePromiseGeneratorProgram(function(m){switch(m.nextAddress){case 1:return console.assert(b==navigator.mediaCapabilities,'bad "this" for decodingInfo'),c=null,a.keySystemConfiguration&&(d=a.keySystemConfiguration,e=d.keySystem,f=d.audio&&d.audio.encryptionScheme,g=d.video&&d.video.encryptionScheme,c=guessSupportedScheme(e),h={powerEfficient:!1,smooth:!1,supported:!1,keySystemAccess:null,configuration:a},
|
|
2012
|
+
f&&f!=c||g&&g!=c)?m["return"](h):m.yield(McEncryptionSchemePolyfill.originalDecodingInfo_.call(b,a),2);case 2:k=m.yieldResult;if(k.keySystemAccess){k.keySystemAccess=new EmeEncryptionSchemePolyfillMediaKeySystemAccess(k.keySystemAccess,c);m.jumpTo(3);break}if(!a.keySystemConfiguration){m.jumpTo(3);break}l=k;return m.yield(McEncryptionSchemePolyfill.getMediaKeySystemAccess_(a),5);case 5:l.keySystemAccess=m.yieldResult;case 3:return m["return"](k)}})};
|
|
2013
|
+
McEncryptionSchemePolyfill.getMediaKeySystemAccess_=function(a){var b,c;return $jscomp.asyncExecutePromiseGeneratorProgram(function(d){if(1==d.nextAddress)return b=McEncryptionSchemePolyfill.convertToMediaKeySystemConfig_(a),d.yield(navigator.requestMediaKeySystemAccess(a.keySystemConfiguration.keySystem,[b]),2);c=d.yieldResult;return d["return"](c)})};
|
|
2008
2014
|
McEncryptionSchemePolyfill.convertToMediaKeySystemConfig_=function(a){var b=a.keySystemConfiguration,c=[],d=[];b.audio&&c.push({robustness:b.audio.robustness||"",contentType:a.audio.contentType});b.video&&d.push({robustness:b.video.robustness||"",contentType:a.video.contentType});a={initDataTypes:b.initDataType?[b.initDataType]:[],distinctiveIdentifier:b.distinctiveIdentifier,persistentState:b.persistentState,sessionTypes:b.sessionTypes};c.length&&(a.audioCapabilities=c);d.length&&(a.videoCapabilities=
|
|
2009
2015
|
d);return a};goog.exportSymbol("McEncryptionSchemePolyfill",McEncryptionSchemePolyfill);goog.exportProperty(McEncryptionSchemePolyfill,"install",McEncryptionSchemePolyfill.install);var EmeEncryptionSchemePolyfillMediaKeySystemAccess=function(a,b){this.mksa_=a;this.scheme_=b;this.keySystem=a.keySystem};
|
|
2010
2016
|
EmeEncryptionSchemePolyfillMediaKeySystemAccess.prototype.getConfiguration=function(){var a=this.mksa_.getConfiguration();if(a.videoCapabilities)for(var b=$jscomp.makeIterator(a.videoCapabilities),c=b.next();!c.done;c=b.next())c.value.encryptionScheme=this.scheme_;if(a.audioCapabilities)for(b=$jscomp.makeIterator(a.audioCapabilities),c=b.next();!c.done;c=b.next())c.value.encryptionScheme=this.scheme_;return a};EmeEncryptionSchemePolyfillMediaKeySystemAccess.prototype.createMediaKeys=function(){return this.mksa_.createMediaKeys()};
|
|
2011
|
-
function guessSupportedScheme(a){if(a.startsWith("com.widevine")||a.startsWith("com.microsoft")||a.startsWith("com.adobe")||a.startsWith("org.w3"))return"cenc";if(a.startsWith("com.apple"))return"cbcs-1-9";console.warn("EmeEncryptionSchemePolyfill: Unknown key system:",a,"Please contribute!");return null}
|
|
2017
|
+
function guessSupportedScheme(a){if(a.startsWith("com.widevine")||a.startsWith("com.microsoft")||a.startsWith("com.chromecast")||a.startsWith("com.adobe")||a.startsWith("org.w3"))return"cenc";if(a.startsWith("com.apple"))return"cbcs-1-9";console.warn("EmeEncryptionSchemePolyfill: Unknown key system:",a,"Please contribute!");return null}
|
|
2012
2018
|
function hasEncryptionScheme(a){a=a.getConfiguration();var b=a.audioCapabilities&&a.audioCapabilities[0];return(a=a.videoCapabilities&&a.videoCapabilities[0]||b)&&void 0!==a.encryptionScheme?!0:!1}var EncryptionSchemePolyfills=function(){};EncryptionSchemePolyfills.install=function(){EmeEncryptionSchemePolyfill.install();McEncryptionSchemePolyfill.install()};goog.exportSymbol("EncryptionSchemePolyfills",EncryptionSchemePolyfills);goog.exportProperty(EncryptionSchemePolyfills,"install",EncryptionSchemePolyfills.install);
|
|
2013
2019
|
(function(){"undefined"!==typeof module&&module.exports&&(module.exports=EncryptionSchemePolyfills)})();}).call(exportTo,innerGlobal,innerGlobal,undefined);if(typeof exports!="undefined")for(var k in exportTo.shaka)exports[k]=exportTo.shaka[k];else if(typeof define=="function"&&define.amd)define(function(){return exportTo.shaka});else innerGlobal.shaka=exportTo.shaka})();
|
|
2014
2020
|
|