shaka-player 4.6.3 → 4.6.5
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/CHANGELOG.md +21 -0
- package/demo/common/asset.js +0 -1
- package/demo/common/assets.js +0 -1
- package/dist/demo.compiled.debug.map +1 -1
- package/dist/demo.compiled.map +1 -1
- package/dist/deps.js +5 -5
- package/dist/locales.js +33 -33
- package/dist/receiver.compiled.debug.map +1 -1
- package/dist/receiver.compiled.map +1 -1
- 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 +5 -2
- package/dist/shaka-player.compiled.debug.js +172 -171
- package/dist/shaka-player.compiled.debug.map +3 -3
- package/dist/shaka-player.compiled.externs.js +5 -2
- package/dist/shaka-player.compiled.js +227 -224
- 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 +5 -2
- package/dist/shaka-player.ui.debug.js +196 -195
- package/dist/shaka-player.ui.debug.map +3 -3
- package/dist/shaka-player.ui.externs.js +5 -2
- package/dist/shaka-player.ui.js +223 -220
- package/dist/shaka-player.ui.map +3 -3
- package/docs/tutorials/ui.md +3 -1
- package/lib/ads/client_side_ad_manager.js +4 -0
- package/lib/ads/media_tailor_ad_manager.js +5 -0
- package/lib/ads/server_side_ad_manager.js +4 -0
- package/lib/hls/hls_parser.js +17 -5
- package/lib/media/drm_engine.js +0 -3
- package/lib/media/media_source_engine.js +1 -1
- package/lib/media/streaming_engine.js +3 -2
- package/lib/media/video_wrapper.js +4 -3
- package/lib/net/networking_utils.js +12 -3
- package/lib/player.js +5 -7
- package/lib/text/simple_text_displayer.js +8 -7
- package/lib/text/text_utils.js +39 -13
- package/lib/text/ui_text_displayer.js +20 -11
- package/lib/text/web_vtt_generator.js +1 -1
- package/lib/util/ts_parser.js +12 -8
- package/package.json +1 -1
- package/test/media/drm_engine_unit.js +27 -0
- package/test/player_unit.js +31 -0
- package/test/test/util/layout_tests.js +2 -1
- package/test/text/simple_text_displayer_unit.js +1 -1
- package/test/text/web_vtt_generator_unit.js +3 -3
- package/test/transmuxer/transmuxer_integration.js +3 -3
- package/ui/volume_bar.js +10 -6
|
@@ -154,7 +154,7 @@ shaka.media.ClosedCaptionParser.registerParser=function(a,b){shaka.media.ClosedC
|
|
|
154
154
|
shaka.media.ClosedCaptionParser.unregisterDecoder=function(){shaka.media.ClosedCaptionParser.decoderFactory_=null};shaka.media.ClosedCaptionParser.findDecoder=function(){return shaka.media.ClosedCaptionParser.decoderFactory_};goog.exportSymbol("shaka.media.ClosedCaptionParser",shaka.media.ClosedCaptionParser);goog.exportProperty(shaka.media.ClosedCaptionParser,"findDecoder",shaka.media.ClosedCaptionParser.findDecoder);goog.exportProperty(shaka.media.ClosedCaptionParser,"unregisterDecoder",shaka.media.ClosedCaptionParser.unregisterDecoder);
|
|
155
155
|
goog.exportProperty(shaka.media.ClosedCaptionParser,"registerDecoder",shaka.media.ClosedCaptionParser.registerDecoder);goog.exportProperty(shaka.media.ClosedCaptionParser,"findParser",shaka.media.ClosedCaptionParser.findParser);goog.exportProperty(shaka.media.ClosedCaptionParser,"unregisterParser",shaka.media.ClosedCaptionParser.unregisterParser);goog.exportProperty(shaka.media.ClosedCaptionParser,"registerParser",shaka.media.ClosedCaptionParser.registerParser);
|
|
156
156
|
shaka.media.ClosedCaptionParser.parserMap_={};shaka.media.ClosedCaptionParser.decoderFactory_=null;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){b=a.indexOf(b);-1<b&&a.splice(b,1)};shaka.util.ArrayUtils.count=function(a,b){var c=0;a=$jscomp.makeIterator(a);for(var d=a.next();!d.done;d=a.next())c+=b(d.value)?1:0;return c};
|
|
157
|
-
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$
|
|
157
|
+
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$770:d.$jscomp$loop$prop$item$770},e=a.next()){d.$jscomp$loop$prop$item$770=e.value;e=b.findIndex(function(f){return function(g){return c(f.$jscomp$loop$prop$item$770,g)}}(d));if(-1==e)return!1;b[e]=b[b.length-1];b.pop()}return 0==b.length};
|
|
158
158
|
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={};
|
|
159
159
|
shaka.text.Cue=function(a,b,c){var d=shaka.text.Cue;this.startTime=a;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.direction=d.direction.HORIZONTAL_LEFT_TO_RIGHT;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;
|
|
160
160
|
this.fontSize=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.textCombineUpright="";this.textDecoration=[];this.textStrokeWidth=this.textStrokeColor=this.textShadow="";this.wrapLine=!0;this.id="";this.nestedCues=[];this.lineBreak=this.isContainer=!1;this.rubyTag=null;this.cellResolution={columns:32,rows:15}};
|
|
@@ -265,13 +265,13 @@ shaka.util.Platform.isWindows=function(){return navigator.userAgentData&&navigat
|
|
|
265
265
|
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_};
|
|
266
266
|
shaka.util.Platform.requiresEncryptionInfoInAllInitSegments=function(){var a=shaka.util.Platform;return a.isTizen()||a.isXboxOne()||a.isOrange()};shaka.util.Platform.supportsSequenceMode=function(){var a=shaka.util.Platform;return a.isTizen3()||a.isTizen2()||a.isWebOS3()||a.isPS4()?!1:!0};shaka.util.Platform.supportsSmoothCodecSwitching=function(){var a=shaka.util.Platform;return a.isTizen2()||a.isTizen3()||a.isTizen4()||a.isWebOS3()||a.isWebOS4()||a.isWebOS5()?!1:!0};
|
|
267
267
|
shaka.util.Platform.isMediaKeysPolyfilled=function(){return window.shakaMediaKeysPolyfill?!0:!1};shaka.util.Platform.cacheExpirationTimer_=null;shaka.util.Platform.cachedMediaElement_=null;shaka.util.StreamUtils=function(){};
|
|
268
|
-
shaka.util.StreamUtils.chooseCodecsAndFilterManifest=function(a,b,c,d){var e=shaka.util.StreamUtils,f=shaka.util.MimeUtils,g=a.variants;if(b.length||c.length)g=e.choosePreferredCodecs(g,b,c);if(d.length){b=new shaka.util.MultiMap;c=$jscomp.makeIterator(g);for(g=c.next();!g.done;g=c.next())g=g.value,b.push(String(g.video.width||0),g);var h=[];b.forEach(function(u,w){u=0;var t=[],v={};w=$jscomp.makeIterator(w);for(var x=w.next();!x.done;v={$jscomp$loop$prop$variant$492$
|
|
269
|
-
w.next())v.$jscomp$loop$prop$variant$492$
|
|
268
|
+
shaka.util.StreamUtils.chooseCodecsAndFilterManifest=function(a,b,c,d){var e=shaka.util.StreamUtils,f=shaka.util.MimeUtils,g=a.variants;if(b.length||c.length)g=e.choosePreferredCodecs(g,b,c);if(d.length){b=new shaka.util.MultiMap;c=$jscomp.makeIterator(g);for(g=c.next();!g.done;g=c.next())g=g.value,b.push(String(g.video.width||0),g);var h=[];b.forEach(function(u,w){u=0;var t=[],v={};w=$jscomp.makeIterator(w);for(var x=w.next();!x.done;v={$jscomp$loop$prop$variant$492$772:v.$jscomp$loop$prop$variant$492$772},x=
|
|
269
|
+
w.next())v.$jscomp$loop$prop$variant$492$772=x.value,x=d.filter(function(y){return function(z){return y.$jscomp$loop$prop$variant$492$772.decodingInfos[0][z]}}(v)).length,x>u?(u=x,t=[v.$jscomp$loop$prop$variant$492$772]):x==u&&t.push(v.$jscomp$loop$prop$variant$492$772);h.push.apply(h,$jscomp.arrayFromIterable(t))});g=h}c=new Set;b=new Set;e=$jscomp.makeIterator(g);for(g=e.next();!g.done;g=e.next())g=g.value,g.audio&&c.add(g.audio),g.video&&b.add(g.video);c=Array.from(c).sort(function(u,w){return u.bandwidth-
|
|
270
270
|
w.bandwidth});var k=[];g=new Map;c=$jscomp.makeIterator(c);for(e=c.next();!e.done;e=c.next()){e=e.value;var l=e.language+(e.channelsCount||0)+(e.audioSamplingRate||0)+e.roles.join(",")+e.label+e.groupId+e.fastSwitching,m=g.get(l)||[];if(m.length){var n=m[m.length-1],p=f.getNormalizedCodec(n.codecs),q=f.getNormalizedCodec(e.codecs);p==q&&e.bandwidth>n.bandwidth&&(m.push(e),k.push(e.id))}else m.push(e),k.push(e.id);g.set(l,m)}c=Array.from(b).sort(function(u,w){return u.bandwidth&&w.bandwidth?u.bandwidth-
|
|
271
271
|
w.bandwidth:u.width-w.width});b=shaka.media.Capabilities.isChangeTypeSupported();var r=[];g=new Map;c=$jscomp.makeIterator(c);for(e=c.next();!e.done;e=c.next()){e=e.value;l=Math.round(e.frameRate||0)+(e.hdr||"")+e.fastSwitching;m=g.get(l)||[];if(m.length){n=m[m.length-1];if(!b&&(p=f.getNormalizedCodec(n.codecs),q=f.getNormalizedCodec(e.codecs),p!==q))continue;e.width>n.width||e.height>n.height?(m.push(e),r.push(e.id)):e.width==n.width&&e.height==n.height&&(p=f.getNormalizedCodec(n.codecs),q=f.getNormalizedCodec(e.codecs),
|
|
272
272
|
p==q&&e.bandwidth<n.bandwidth&&(m.push(e),r.push(e.id)))}else m.push(e),r.push(e.id);g.set(l,m)}a.variants=a.variants.filter(function(u){var w=u.audio,t=u.video;return w&&!k.includes(w.id)||t&&!r.includes(t.id)?(shaka.log.debug("Dropping Variant (better codec available)",u),!1):!0})};
|
|
273
|
-
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$
|
|
274
|
-
b=c.next())if(d.$jscomp$loop$prop$audioCodec$
|
|
273
|
+
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$774:d.$jscomp$loop$prop$videoCodec$774},e=b.next())if(d.$jscomp$loop$prop$videoCodec$774=e.value,e=a.filter(function(f){return function(g){return g.video&&g.video.codecs.startsWith(f.$jscomp$loop$prop$videoCodec$774)}}(d)),e.length){a=e;break}d={};c=$jscomp.makeIterator(c);for(b=c.next();!b.done;d={$jscomp$loop$prop$audioCodec$776:d.$jscomp$loop$prop$audioCodec$776},
|
|
274
|
+
b=c.next())if(d.$jscomp$loop$prop$audioCodec$776=b.value,b=a.filter(function(f){return function(g){return g.audio&&g.audio.codecs.startsWith(f.$jscomp$loop$prop$audioCodec$776)}}(d)),b.length){a=b;break}return a};shaka.util.StreamUtils.filterByRestrictions=function(a,b,c){a.variants=a.variants.filter(function(d){return shaka.util.StreamUtils.meetsRestrictions(d,b,c)})};
|
|
275
275
|
shaka.util.StreamUtils.meetsRestrictions=function(a,b,c){var d=function(f,g,h){return f>=g&&f<=h},e=a.video;return e&&e.width&&e.height&&(!d(e.width,b.minWidth,Math.min(b.maxWidth,c.width))||!d(e.height,b.minHeight,Math.min(b.maxHeight,c.height))||!d(e.width*e.height,b.minPixels,b.maxPixels))||a&&a.video&&a.video.frameRate&&!d(a.video.frameRate,b.minFrameRate,b.maxFrameRate)||!d(a.bandwidth,b.minBandwidth,b.maxBandwidth)?!1:!0};
|
|
276
276
|
shaka.util.StreamUtils.applyRestrictions=function(a,b,c){var d=!1;a=$jscomp.makeIterator(a);for(var e=a.next();!e.done;e=a.next()){e=e.value;var f=e.allowedByApplication;e.allowedByApplication=shaka.util.StreamUtils.meetsRestrictions(e,b,c);f!=e.allowedByApplication&&(d=!0)}return d};
|
|
277
277
|
shaka.util.StreamUtils.filterManifest=function(a,b){return $jscomp.asyncExecutePromiseGeneratorProgram(function(c){if(1==c.nextAddress)return c.yield(shaka.util.StreamUtils.filterManifestByMediaCapabilities(a,b,0<b.offlineSessionIds.length),2);shaka.util.StreamUtils.filterTextStreams_(b);return c.yield(shaka.util.StreamUtils.filterImageStreams_(b),0)})};
|
|
@@ -282,10 +282,10 @@ shaka.log.debug("Dropping variant - not compatible with platform",l.getVariantSu
|
|
|
282
282
|
shaka.util.StreamUtils.alphabeticalKeyOrderStringify_=function(a){var b=[];for(c in a)b.push(c);b.sort();var c=[];b=$jscomp.makeIterator(b);for(var d=b.next();!d.done;d=b.next()){var e=d.value;d=JSON.stringify(e);e=a[e];e instanceof Object?(e=shaka.util.StreamUtils.alphabeticalKeyOrderStringify_(e),c.push(d+":"+e)):(e=JSON.stringify(e),c.push(d+":"+e))}return"{"+c.join(",")+"}"};
|
|
283
283
|
shaka.util.StreamUtils.getDecodingInfosForVariant_=function(a,b){var c,d,e,f;return $jscomp.asyncExecutePromiseGeneratorProgram(function(g){switch(g.nextAddress){case 1:c=shaka.util.StreamUtils.alphabeticalKeyOrderStringify_(b);g.setCatchFinallyBlocks(2);d=shaka.util.StreamUtils.decodingConfigCache_;if(d[c]){shaka.log.v2("Using cached results of mediaCapabilities.decodingInfo","for key",c);a.decodingInfos.push(d[c]);g.jumpTo(4);break}return g.yield(navigator.mediaCapabilities.decodingInfo(b),5);case 5:e=
|
|
284
284
|
g.yieldResult,d[c]=e,a.decodingInfos.push(e);case 4:g.leaveTryBlock(0);break;case 2:f=g.enterCatchBlock(),shaka.log.info("MediaCapabilities.decodingInfo() failed.",JSON.stringify(b),f),g.jumpToEnd()}})};
|
|
285
|
-
shaka.util.StreamUtils.getDecodingInfosForVariants=function(a,b,c,d){var e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,
|
|
286
|
-
case 5:if(m.done){
|
|
287
|
-
break;case 7:if(k)return
|
|
288
|
-
return
|
|
285
|
+
shaka.util.StreamUtils.getDecodingInfosForVariants=function(a,b,c,d){var e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,y;return $jscomp.asyncExecutePromiseGeneratorProgram(function(z){switch(z.nextAddress){case 1:if(e=a.some(function(A){return A.decodingInfos.length}))return shaka.log.debug("Already got the variants' decodingInfo."),z.return();f={};g=$jscomp.makeIterator(d);h=g.next();case 2:if(h.done){z.jumpTo(4);break}f.$jscomp$loop$prop$preferredKeySystem$778=h.value;k=!1;l=$jscomp.makeIterator(a);m=l.next();
|
|
286
|
+
case 5:if(m.done){z.jumpTo(7);break}n=m.value;p=shaka.util.StreamUtils.getDecodingConfigs_(n,b,c).filter(function(A){return function(B){return(B.keySystemConfiguration&&B.keySystemConfiguration.keySystem)===A.$jscomp$loop$prop$preferredKeySystem$778}}(f));q=$jscomp.makeIterator(p);r=q.next();case 8:if(r.done){z.jumpTo(10);break}u=r.value;return z.yield(shaka.util.StreamUtils.getDecodingInfosForVariant_(n,u),9);case 9:r=q.next();z.jumpTo(8);break;case 10:n.decodingInfos.length&&(k=!0);m=l.next();z.jumpTo(5);
|
|
287
|
+
break;case 7:if(k)return z.return();f={$jscomp$loop$prop$preferredKeySystem$778:f.$jscomp$loop$prop$preferredKeySystem$778};h=g.next();z.jumpTo(2);break;case 4:w=$jscomp.makeIterator(a),m=w.next();case 12:if(m.done){z.jumpTo(0);break}t=m.value;v=shaka.util.StreamUtils.getDecodingConfigs_(t,b,c).filter(function(A){A=A.keySystemConfiguration&&A.keySystemConfiguration.keySystem;return!A||!d.includes(A)});x=$jscomp.makeIterator(v);r=x.next();case 15:if(r.done){m=w.next();z.jumpTo(12);break}y=r.value;
|
|
288
|
+
return z.yield(shaka.util.StreamUtils.getDecodingInfosForVariant_(t,y),16);case 16:r=x.next(),z.jumpTo(15)}})};
|
|
289
289
|
shaka.util.StreamUtils.getDecodingConfigs_=function(a,b,c){var d=a.audio,e=a.video,f=shaka.util.ManifestParserUtils.ContentType,g=shaka.util.ManifestParserUtils,h=shaka.util.MimeUtils,k=shaka.util.StreamUtils;c={type:c?"file":"media-source"};if(e){var l=e.codecs;if(e.codecs.includes(",")){var m=e.codecs.split(",");l=g.guessCodecs(f.VIDEO,m);l=k.getCorrectVideoCodecs_(l);g=g.guessCodecs(f.AUDIO,m);g=k.getCorrectAudioCodecs_(g);g=h.getFullOrConvertedType(e.mimeType,g,f.AUDIO);c.audio={contentType:g,
|
|
290
290
|
channels:2,bitrate:a.bandwidth||1,samplerate:1,spatialRendering:!1}}l=k.getCorrectVideoCodecs_(l);l=h.getFullOrConvertedType(e.mimeType,l,f.VIDEO);c.video={contentType:l,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&&(k=k.getCorrectAudioCodecs_(d.codecs),f=h.getFullOrConvertedType(d.mimeType,
|
|
291
291
|
k,f.AUDIO),c.audio={contentType:f,channels:d.channelsCount||2,bitrate:d.bandwidth||a.bandwidth||1,samplerate:d.audioSamplingRate||1,spatialRendering:d.spatialAudio});h=(a.video?a.video.drmInfos:[]).concat(a.audio?a.audio.drmInfos:[]);if(!h.length)return[c];a=[];f=new Map;h=$jscomp.makeIterator(h);for(var n=h.next();!n.done;n=h.next())k=n.value,f.get(k.keySystem)||f.set(k.keySystem,[]),f.get(k.keySystem).push(k);h=b?"required":"optional";b=b?["persistent-license"]:["temporary"];k=$jscomp.makeIterator(f.keys());
|
|
@@ -386,10 +386,10 @@ shaka.net.NetworkingEngine.prototype.filterRequest_=function(a,b,c){var d=shaka.
|
|
|
386
386
|
shaka.util.Error.Category.NETWORK,shaka.util.Error.Code.REQUEST_FILTER_ERROR,h);})};shaka.net.NetworkingEngine.prototype.makeRequestWithRetry_=function(a,b,c,d){var e=new shaka.net.Backoff(b.retryParameters,!1);return this.send_(a,b,c,e,0,null,d)};
|
|
387
387
|
shaka.net.NetworkingEngine.prototype.send_=function(a,b,c,d,e,f,g){var h=this;this.forceHTTPS_&&(b.uris[e]=b.uris[e].replace("http://","https://"));if(0<e&&this.onRetry_)this.onRetry_(a,c,b.uris[e],b.uris[e-1]);var k=new goog.Uri(b.uris[e]),l=k.getScheme(),m=!1;l||(l=shaka.net.NetworkingEngine.getLocationProtocol_(),goog.asserts.assert(":"==l[l.length-1],"location.protocol expected to end with a colon!"),l=l.slice(0,-1),k.setScheme(l),b.uris[e]=k.toString());l=l.toLowerCase();var n=(l=shaka.net.NetworkingEngine.schemes_[l])?
|
|
388
388
|
l.plugin:null;if(!n)return shaka.util.AbortableOperation.failed(new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.NETWORK,shaka.util.Error.Code.UNSUPPORTED_SCHEME,k));var p=l.progressSupport,q=null,r=null,u=!1,w=!1,t;return shaka.util.AbortableOperation.notAbortable(d.attempt()).chain(function(){if(h.destroyed_)return shaka.util.AbortableOperation.aborted();t=Date.now();var v=shaka.net.NetworkingEngine.RequestType.SEGMENT,x=n(b.uris[e],b,a,function(A,B,E){q&&q.stop();
|
|
389
|
-
r&&r.tickAfter(
|
|
390
|
-
Date.now()-t);var x={response:v,gotProgress:m};if(!w&&h.onHeadersReceived_)h.onHeadersReceived_(v.headers,b,a);return x},function(v){q&&q.stop();r&&r.stop();if(h.onDownloadFailed_){var x=null,
|
|
389
|
+
r&&r.tickAfter(z/1E3);if(h.onProgressUpdated_&&a==v){var I=h.allowSwitch_(c);h.onProgressUpdated_(A,B,I);m=!0;g.setBytes(E)}},function(A){if(h.onHeadersReceived_)h.onHeadersReceived_(A,b,a);w=!0});if(!p)return x;var y=b.retryParameters.connectionTimeout;y&&(q=new shaka.util.Timer(function(){u=!0;x.abort()}),q.tickAfter(y/1E3));var z=b.retryParameters.stallTimeout;z&&(r=new shaka.util.Timer(function(){u=!0;x.abort()}));return x}).chain(function(v){q&&q.stop();r&&r.stop();void 0==v.timeMs&&(v.timeMs=
|
|
390
|
+
Date.now()-t);var x={response:v,gotProgress:m};if(!w&&h.onHeadersReceived_)h.onHeadersReceived_(v.headers,b,a);return x},function(v){q&&q.stop();r&&r.stop();if(h.onDownloadFailed_){var x=null,y=0;v instanceof shaka.util.Error&&(x=v,v.code==shaka.util.Error.Code.BAD_HTTP_STATUS&&(y=v.data[1]));h.onDownloadFailed_(b,x,y,u)}if(h.destroyed_)return shaka.util.AbortableOperation.aborted();u&&(v=new shaka.util.Error(shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.NETWORK,shaka.util.Error.Code.TIMEOUT,
|
|
391
391
|
b.uris[e],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(f,"Should have last error"),f;if(v.severity==shaka.util.Error.Severity.RECOVERABLE)return x=(new Map).set("error",v),x=new shaka.util.FakeEvent("retry",x),h.dispatchEvent(x),e=(e+1)%b.uris.length,h.send_(a,b,c,d,e,v,g)}throw v;})};
|
|
392
|
-
shaka.net.NetworkingEngine.prototype.filterResponse_=function(a,b,c){for(var d=shaka.util.AbortableOperation.completed(void 0),e={},f=$jscomp.makeIterator(this.responseFilters_),g=f.next();!g.done;e={$jscomp$loop$prop$responseFilter$
|
|
392
|
+
shaka.net.NetworkingEngine.prototype.filterResponse_=function(a,b,c){for(var d=shaka.util.AbortableOperation.completed(void 0),e={},f=$jscomp.makeIterator(this.responseFilters_),g=f.next();!g.done;e={$jscomp$loop$prop$responseFilter$780:e.$jscomp$loop$prop$responseFilter$780},g=f.next())e.$jscomp$loop$prop$responseFilter$780=g.value,d=d.chain(function(h){return function(){var k=b.response;k.data&&(k.data=shaka.util.BufferUtils.toArrayBuffer(k.data));return h.$jscomp$loop$prop$responseFilter$780(a,
|
|
393
393
|
k,c)}}(e));return d.chain(function(){return b},function(h){var k=shaka.util.Error.Severity.CRITICAL;if(h instanceof shaka.util.Error){if(h.code==shaka.util.Error.Code.OPERATION_ABORTED)throw h;k=h.severity}throw new shaka.util.Error(k,shaka.util.Error.Category.NETWORK,shaka.util.Error.Code.RESPONSE_FILTER_ERROR,h);})};shaka.net.NetworkingEngine.prototype.allowSwitch_=function(a){if(a){var b=a.segment;a=a.stream;if(b&&a&&a.fastSwitching&&b.isPartial()&&!b.isLastPartial())return!1}return!0};
|
|
394
394
|
shaka.net.NetworkingEngine.getLocationProtocol_=function(){return location.protocol};goog.exportSymbol("shaka.net.NetworkingEngine",shaka.net.NetworkingEngine);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);
|
|
395
395
|
goog.exportProperty(shaka.net.NetworkingEngine,"defaultRetryParameters",shaka.net.NetworkingEngine.defaultRetryParameters);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);
|
|
@@ -415,8 +415,8 @@ if(0==c[1]&&0==c[3])return b.fromUTF16(a,!0);if(d(0)&&d(1)&&d(2)&&d(3))return b.
|
|
|
415
415
|
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};
|
|
416
416
|
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);
|
|
417
417
|
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);
|
|
418
|
-
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$
|
|
419
|
-
c.$jscomp$loop$prop$size$
|
|
418
|
+
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$782:65536};0<b.$jscomp$loop$prop$size$782;b={$jscomp$loop$prop$size$782:b.$jscomp$loop$prop$size$782},b.$jscomp$loop$prop$size$782/=2)if(a(b.$jscomp$loop$prop$size$782))return function(c){return function(d){for(var e="",f=0;f<d.length;f+=
|
|
419
|
+
c.$jscomp$loop$prop$size$782){var g=d.subarray(f,f+c.$jscomp$loop$prop$size$782);e+=String.fromCharCode.apply(null,g)}return e}}(b);goog.asserts.assert(!1,"Unable to create a fromCharCode method");return null});shaka.util.DataViewReader=function(a,b){this.dataView_=shaka.util.BufferUtils.toDataView(a);this.littleEndian_=b==shaka.util.DataViewReader.Endianness.LITTLE_ENDIAN;this.position_=0};shaka.util.DataViewReader.prototype.getDataView=function(){return this.dataView_};shaka.util.DataViewReader.prototype.hasMoreData=function(){return this.position_<this.dataView_.byteLength};shaka.util.DataViewReader.prototype.getPosition=function(){return this.position_};
|
|
420
420
|
shaka.util.DataViewReader.prototype.getLength=function(){return this.dataView_.byteLength};shaka.util.DataViewReader.prototype.readUint8=function(){try{var a=this.dataView_.getUint8(this.position_);this.position_+=1;return a}catch(b){throw this.outOfBounds_();}};shaka.util.DataViewReader.prototype.readUint16=function(){try{var a=this.dataView_.getUint16(this.position_,this.littleEndian_);this.position_+=2;return a}catch(b){throw this.outOfBounds_();}};
|
|
421
421
|
shaka.util.DataViewReader.prototype.readUint32=function(){try{var a=this.dataView_.getUint32(this.position_,this.littleEndian_);this.position_+=4;return a}catch(b){throw this.outOfBounds_();}};shaka.util.DataViewReader.prototype.readInt32=function(){try{var a=this.dataView_.getInt32(this.position_,this.littleEndian_);this.position_+=4;return a}catch(b){throw this.outOfBounds_();}};
|
|
422
422
|
shaka.util.DataViewReader.prototype.readUint64=function(){try{if(this.littleEndian_){var a=this.dataView_.getUint32(this.position_,!0);var b=this.dataView_.getUint32(this.position_+4,!0)}else b=this.dataView_.getUint32(this.position_,!1),a=this.dataView_.getUint32(this.position_+4,!1)}catch(c){throw this.outOfBounds_();}if(2097151<b)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MEDIA,shaka.util.Error.Code.JS_INTEGER_OVERFLOW);this.position_+=8;return b*Math.pow(2,
|
|
@@ -445,7 +445,7 @@ shaka.util.Pssh.prototype.parsePsshBox_=function(a){goog.asserts.assert(null!=a.
|
|
|
445
445
|
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)}}}};
|
|
446
446
|
shaka.util.Pssh.createPssh=function(a,b,c,d){goog.asserts.assert(16==b.byteLength,"Invalid system ID length");var e=a.length,f=12+b.length+4+e;0<d&&(f+=4+16*c.size);var g=new Uint8Array(f),h=shaka.util.BufferUtils.toDataView(g),k=0;h.setUint32(k,f);k+=4;h.setUint32(k,1886614376);k+=4;1>d?h.setUint32(k,0):h.setUint32(k,16777216);k+=4;g.set(b,k);k+=b.length;if(0<d)for(h.setUint32(k,c.size),k+=4,b=shaka.util.Uint8ArrayUtils,c=$jscomp.makeIterator(c),d=c.next();!d.done;d=c.next())d=b.fromHex(d.value),
|
|
447
447
|
g.set(d,k),k+=d.length;h.setUint32(k,e);k+=4;g.set(a,k);goog.asserts.assert(k+e===f,"PSSH invalid length.");return g};
|
|
448
|
-
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$514$
|
|
448
|
+
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$514$784:c.$jscomp$loop$prop$initData$514$784},d=b.next())c.$jscomp$loop$prop$initData$514$784=d.value,a.some(function(e){return function(f){return shaka.util.BufferUtils.equal(f,e.$jscomp$loop$prop$initData$514$784)}}(c))||a.push(c.$jscomp$loop$prop$initData$514$784);return shaka.util.Uint8ArrayUtils.concat.apply(shaka.util.Uint8ArrayUtils,
|
|
449
449
|
$jscomp.arrayFromIterable(a))};shaka.util.XmlUtils=function(){};shaka.util.XmlUtils.findChild=function(a,b){a=shaka.util.XmlUtils.findChildren(a,b);return 1!=a.length?null:a[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){var c=[];a=$jscomp.makeIterator(a.childNodes);for(var d=a.next();!d.done;d=a.next())d=d.value,d instanceof Element&&d.tagName==b&&c.push(d);return c};
|
|
450
450
|
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};
|
|
451
451
|
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};
|
|
@@ -464,7 +464,7 @@ shaka.media.DrmEngine.prototype.setSrcEquals=function(a){this.srcEquals_=a};shak
|
|
|
464
464
|
shaka.media.DrmEngine.prototype.initForPlayback=function(a,b){this.storedPersistentSessions_=new Map;b=$jscomp.makeIterator(b);for(var c=b.next();!c.done;c=b.next())this.storedPersistentSessions_.set(c.value,{initData:null,initDataType:null});b=$jscomp.makeIterator(this.config_.persistentSessionsMetadata);for(c=b.next();!c.done;c=b.next())c=c.value,this.storedPersistentSessions_.set(c.sessionId,{initData:c.initData,initDataType:c.initDataType});this.usePersistentLicenses_=0<this.storedPersistentSessions_.size;
|
|
465
465
|
return this.init_(a)};
|
|
466
466
|
shaka.media.DrmEngine.prototype.initForRemoval=function(a,b,c,d,e){var f=new Map;d={audioCapabilities:d,videoCapabilities:e,distinctiveIdentifier:"optional",persistentState:"required",sessionTypes:["persistent-license"],label:a};d.drmInfos=[{keySystem:a,licenseServerUri:b,distinctiveIdentifierRequired:!1,persistentStateRequired:!0,audioRobustness:"",videoRobustness:"",serverCertificate:c,serverCertificateUri:"",initData:null,keyIds:null}];f.set(a,d);return this.queryMediaKeys_(f,[])};
|
|
467
|
-
shaka.media.DrmEngine.prototype.init_=function(a){var b=this,c,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v;return $jscomp.asyncExecutePromiseGeneratorProgram(function(x){if(1==x.nextAddress){goog.asserts.assert(b.config_,"DrmEngine configure() must be called before init()!");if(c=b.configureClearKey_())for(d=$jscomp.makeIterator(a),e=d.next();!e.done;e=d.next())f=e.value,f.video&&(f.video.drmInfos=[c]),f.audio&&(f.audio.drmInfos=[c]);g=a.some(function(
|
|
467
|
+
shaka.media.DrmEngine.prototype.init_=function(a){var b=this,c,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v;return $jscomp.asyncExecutePromiseGeneratorProgram(function(x){if(1==x.nextAddress){goog.asserts.assert(b.config_,"DrmEngine configure() must be called before init()!");if(c=b.configureClearKey_())for(d=$jscomp.makeIterator(a),e=d.next();!e.done;e=d.next())f=e.value,f.video&&(f.video.drmInfos=[c]),f.audio&&(f.audio.drmInfos=[c]);g=a.some(function(y){return y.video&&y.video.drmInfos.length||y.audio&&y.audio.drmInfos.length?
|
|
468
468
|
!0:!1});g||(h=shaka.util.MapUtils.asMap(b.config_.servers),shaka.media.DrmEngine.replaceDrmInfo_(a,h));k=new Set;l=$jscomp.makeIterator(a);for(e=l.next();!e.done;e=l.next())for(m=e.value,n=b.getVariantDrmInfos_(m),p=$jscomp.makeIterator(n),q=p.next();!q.done;q=p.next())r=q.value,k.add(r);u=$jscomp.makeIterator(k);for(q=u.next();!q.done;q=u.next())w=q.value,shaka.media.DrmEngine.fillInDrmInfoDefaults_(w,shaka.util.MapUtils.asMap(b.config_.servers),shaka.util.MapUtils.asMap(b.config_.advanced||{}),
|
|
469
469
|
b.config_.keySystemsMapping);return x.yield(shaka.util.StreamUtils.getDecodingInfosForVariants(a,b.usePersistentLicenses_,b.srcEquals_,b.config_.preferredKeySystems),2)}t=g||Object.keys(b.config_.servers).length;if(!t)return b.initialized_=!0,x.return(Promise.resolve());v=b.queryMediaKeys_(void 0,a);return x.return(g?v:v.catch(function(){}))})};
|
|
470
470
|
shaka.media.DrmEngine.prototype.attachMediaKeys_=function(){var a=this,b;return $jscomp.asyncExecutePromiseGeneratorProgram(function(c){switch(c.nextAddress){case 1:if(a.video_.mediaKeys)return c.return();if(!a.mediaKeysAttached_){c.jumpTo(2);break}return c.yield(a.mediaKeysAttached_,3);case 3:return a.destroyer_.ensureNotDestroyed(),c.return();case 2:return c.setCatchFinallyBlocks(4),a.mediaKeysAttached_=a.video_.setMediaKeys(a.mediaKeys_),c.yield(a.mediaKeysAttached_,6);case 6:c.leaveTryBlock(5);
|
|
@@ -494,11 +494,11 @@ shaka.log.info("Created MediaKeys object for key system",c.currentDrmInfo_.keySy
|
|
|
494
494
|
v.leaveTryBlock(7,4);break;case 8:w=v.enterCatchBlock(4);if(w instanceof shaka.util.Error)throw w;throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.DRM,shaka.util.Error.Code.ERROR_CHECKING_HDCP_VERSION,w.message);case 7:return c.initialized_=!0,v.yield(c.setServerCertificate(),11);case 11:c.destroyer_.ensureNotDestroyed();v.leaveTryBlock(0);break;case 4:t=v.enterCatchBlock();c.destroyer_.ensureNotDestroyed(t);c.currentDrmInfo_=null;c.supportedTypes_.clear();if(t instanceof
|
|
495
495
|
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,t.message);}})};
|
|
496
496
|
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);
|
|
497
|
-
for(f=e.next();!f.done;c={$jscomp$loop$prop$preferredKeySystem$
|
|
497
|
+
for(f=e.next();!f.done;c={$jscomp$loop$prop$preferredKeySystem$786:c.$jscomp$loop$prop$preferredKeySystem$786},f=e.next())for(c.$jscomp$loop$prop$preferredKeySystem$786=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$786}}(c)))return d.keySystemAccess;c=$jscomp.makeIterator([!0,!1]);for(e=c.next();!e.done;e=
|
|
498
498
|
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};
|
|
499
499
|
shaka.media.DrmEngine.prototype.getKeySystemAccessByConfigs_=function(a){var b=this,c,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v;return $jscomp.asyncExecutePromiseGeneratorProgram(function(x){switch(x.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,
|
|
500
500
|
0==f.videoCapabilities.length&&delete f.videoCapabilities;g=$jscomp.makeIterator(b.config_.preferredKeySystems);h=g.next();case 2:if(h.done){x.jumpTo(4);break}k=h.value;if(!a.has(k)){x.jumpTo(3);break}l=a.get(k);x.setCatchFinallyBlocks(6);return x.yield(navigator.requestMediaKeySystemAccess(k,[l]),8);case 8:return c=x.yieldResult,x.return(c);case 6:m=x.enterCatchBlock(),shaka.log.v2("Requesting",k,"failed with config",l,m);case 7:b.destroyer_.ensureNotDestroyed();case 3:h=g.next();x.jumpTo(2);break;
|
|
501
|
-
case 4:n=$jscomp.makeIterator([!0,!1]),p=n.next();case 9:if(p.done){x.jumpTo(11);break}q=p.value;r=$jscomp.makeIterator(a.keys());h=r.next();case 12:if(h.done){p=n.next();x.jumpTo(9);break}u=h.value;w=a.get(u);t=w.drmInfos.some(function(
|
|
501
|
+
case 4:n=$jscomp.makeIterator([!0,!1]),p=n.next();case 9:if(p.done){x.jumpTo(11);break}q=p.value;r=$jscomp.makeIterator(a.keys());h=r.next();case 12:if(h.done){p=n.next();x.jumpTo(9);break}u=h.value;w=a.get(u);t=w.drmInfos.some(function(y){return!!y.licenseServerUri});if(t!=q){x.jumpTo(13);break}x.setCatchFinallyBlocks(15);return x.yield(navigator.requestMediaKeySystemAccess(u,[w]),17);case 17:return c=x.yieldResult,x.return(c);case 15:v=x.enterCatchBlock(),shaka.log.v2("Requesting",u,"failed with config",
|
|
502
502
|
w,v);case 16:b.destroyer_.ensureNotDestroyed();case 13:h=r.next();x.jumpTo(12);break;case 11:return x.return(c)}})};
|
|
503
503
|
shaka.media.DrmEngine.prototype.configureClearKey_=function(){var a=shaka.util.MapUtils.asMap(this.config_.clearKeys);if(0==a.size)return null;var b=shaka.util.StringUtils,c=shaka.util.Uint8ArrayUtils,d=[],e=[];a.forEach(function(g,h){var k=h;22!=k.length&&(k=c.toBase64(c.fromHex(h),!1));h=g;22!=h.length&&(h=c.toBase64(c.fromHex(g),!1));g={kty:"oct",kid:k,k:h};d.push(g);e.push(g.kid)});a=JSON.stringify({keys:d});var f=JSON.stringify({kids:e});b=[{initData:shaka.util.BufferUtils.toUint8(b.toUTF8(f)),
|
|
504
504
|
initDataType:"keyids"}];return{keySystem:"org.w3.clearkey",licenseServerUri:"data:application/json;base64,"+window.btoa(a),distinctiveIdentifierRequired:!1,persistentStateRequired:!1,audioRobustness:"",videoRobustness:"",serverCertificate:null,serverCertificateUri:"",sessionType:"",initData:b,keyIds:new Set(e)}};shaka.media.DrmEngine.prototype.checkSessionsLoaded_=function(){this.areAllSessionsLoaded_()&&this.allSessionsLoaded_.resolve()};
|
|
@@ -541,9 +541,9 @@ shaka.media.DrmEngine.prototype.createDrmInfoByInfos_=function(a,b){var c=[],d=[
|
|
|
541
541
|
c.distinctiveIdentifierRequired),c.persistentStateRequired&&(a.persistentStateRequired=c.persistentStateRequired);return a};
|
|
542
542
|
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],
|
|
543
543
|
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}};
|
|
544
|
-
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$
|
|
545
|
-
(c.some(function(m){return function(n){return shaka.util.BufferUtils.equal(n,m.$jscomp$loop$prop$drmInfo$
|
|
546
|
-
m.$jscomp$loop$prop$initDataOverride$
|
|
544
|
+
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$788:g.$jscomp$loop$prop$drmInfo$788},h=a.next()){g.$jscomp$loop$prop$drmInfo$788=h.value;b.includes(g.$jscomp$loop$prop$drmInfo$788.licenseServerUri)||b.push(g.$jscomp$loop$prop$drmInfo$788.licenseServerUri);d.includes(g.$jscomp$loop$prop$drmInfo$788.serverCertificateUri)||d.push(g.$jscomp$loop$prop$drmInfo$788.serverCertificateUri);g.$jscomp$loop$prop$drmInfo$788.serverCertificate&&
|
|
545
|
+
(c.some(function(m){return function(n){return shaka.util.BufferUtils.equal(n,m.$jscomp$loop$prop$drmInfo$788.serverCertificate)}}(g))||c.push(g.$jscomp$loop$prop$drmInfo$788.serverCertificate));if(g.$jscomp$loop$prop$drmInfo$788.initData){h={};for(var k=$jscomp.makeIterator(g.$jscomp$loop$prop$drmInfo$788.initData),l=k.next();!l.done;h={$jscomp$loop$prop$initDataOverride$790:h.$jscomp$loop$prop$initDataOverride$790},l=k.next())h.$jscomp$loop$prop$initDataOverride$790=l.value,e.some(function(m){return function(n){var p=
|
|
546
|
+
m.$jscomp$loop$prop$initDataOverride$790;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$790)}if(g.$jscomp$loop$prop$drmInfo$788.keyIds)for(h=$jscomp.makeIterator(g.$jscomp$loop$prop$drmInfo$788.keyIds),k=h.next();!k.done;k=h.next())f.add(k.value)}};
|
|
547
547
|
shaka.media.DrmEngine.fillInDrmInfoDefaults_=function(a,b,c,d){var e=a.keySystem;if(e&&("org.w3.clearkey"!=e||!a.licenseServerUri)){b.size&&(b=b.get(e)||"",a.licenseServerUri=b);a.keyIds||(a.keyIds=new Set);if(c=c.get(e))a.distinctiveIdentifierRequired||(a.distinctiveIdentifierRequired=c.distinctiveIdentifierRequired),a.persistentStateRequired||(a.persistentStateRequired=c.persistentStateRequired),a.videoRobustness||(a.videoRobustness=c.videoRobustness),a.audioRobustness||(a.audioRobustness=c.audioRobustness),
|
|
548
548
|
a.serverCertificate||(a.serverCertificate=c.serverCertificate),c.sessionType&&(a.sessionType=c.sessionType),a.serverCertificateUri||(a.serverCertificateUri=c.serverCertificateUri);d[e]&&(a.keySystem=d[e]);window.cast&&window.cast.__platform__&&"com.microsoft.playready"==e&&(a.keySystem="com.chromecast.playready")}};
|
|
549
549
|
shaka.media.DrmEngine.prototype.parseInbandPssh=function(a,b){if(!this.config_.parseInbandPsshEnabled||this.manifestInitData_)return Promise.resolve();var c=shaka.util.ManifestParserUtils.ContentType;if(![c.AUDIO,c.VIDEO].includes(a))return Promise.resolve();b=new shaka.util.Pssh(shaka.util.BufferUtils.toUint8(b));c=0;var d=$jscomp.makeIterator(b.data);for(a=d.next();!a.done;a=d.next())c+=a.value.length;if(0==c)return Promise.resolve();c=new Uint8Array(c);d=0;b=$jscomp.makeIterator(b.data);for(a=
|
|
@@ -639,19 +639,19 @@ b.data=a.subarray(c);return b};shaka.util.TsParser.prototype.parseAvcNalus=funct
|
|
|
639
639
|
shaka.util.TsParser.prototype.parseNalus=function(a,b){var c=shaka.util.TsParser.Timescale;c=a.pts?a.pts/c:null;a=a.data;var d=a.byteLength,e=1;"hvc"==this.videoCodec_&&(e=2);for(var f=0,g=[],h=-1,k=0,l,m=0;m<d;++m){var n=a[m];if(n){if(2<=f&&1==n){b&&!g.length&&-1==h&&(n=m-(3<f?3:f),0!=n&&(n=a.subarray(0,n),b.data=shaka.util.Uint8ArrayUtils.concat(b.data,n),b.fullData=shaka.util.Uint8ArrayUtils.concat(b.fullData,n)));0<=h?(f=m-((3<f?3:f)+1),h={data:a.subarray(h+e,f+1),fullData:a.subarray(h,f+1),type:k,
|
|
640
640
|
time:c},g.push(h)):b&&!g.length&&(h=m-f,0<h&&(h=a.subarray(0,h),b.data=shaka.util.Uint8ArrayUtils.concat(b.data,h),b.fullData=shaka.util.Uint8ArrayUtils.concat(b.fullData,h)));if(m>=d-e)return shaka.log.warning("Malformed TS, incomplete NALU, ignoring."),g;m++;h=m;k="hvc"==this.videoCodec_?a[m]>>1&63:a[m]&31}f=0}else f++;m>=d-1&&0<=h&&0<=f&&(l={data:a.subarray(h+e,d),fullData:a.subarray(h,d),type:k,time:c})}l&&g.push(l);!g.length&&b&&(b.data=shaka.util.Uint8ArrayUtils.concat(b.data,a),b.fullData=
|
|
641
641
|
shaka.util.Uint8ArrayUtils.concat(b.fullData,a));return g};shaka.util.TsParser.prototype.getMetadata=function(){for(var a=shaka.util.TsParser.Timescale,b=[],c=$jscomp.makeIterator(this.id3Data_),d=c.next();!d.done;d=c.next())(d=this.parsePES_(d.value))&&b.push({cueTime:d.pts?d.pts/a:null,data:d.data,frames:shaka.util.Id3Utils.getID3Frames(d.data),dts:d.dts,pts:d.pts});return b};
|
|
642
|
-
shaka.util.TsParser.prototype.getAudioData=function(){if(this.audioData_.length&&!this.audioPes_.length){for(var a=!1,b=$jscomp.makeIterator(this.audioData_),c=b.next();!c.done;c=b.next()){
|
|
643
|
-
(this.audioPes_=this.audioPes_.sort(function(
|
|
644
|
-
shaka.util.TsParser.prototype.getVideoData=function(a){a=void 0===a?!0:a;if(this.videoData_.length&&!this.videoPes_.length){for(var b=!1,c=$jscomp.makeIterator(this.videoData_),d=c.next();!d.done;d=c.next()){
|
|
645
|
-
c=$jscomp.makeIterator(this.videoPes_);for(d=c.next();!d.done;d=c.next())d=d.value,d.nalus=this.parseNalus(d,
|
|
642
|
+
shaka.util.TsParser.prototype.getAudioData=function(){if(this.audioData_.length&&!this.audioPes_.length){for(var a=!1,b=$jscomp.makeIterator(this.audioData_),c=b.next();!c.done;c=b.next()){var d=c.value,e=this.parsePES_(d);c=this.audioPes_.length?this.audioPes_[this.audioPes_.length-1]:null;e&&null!=e.pts&&null!=e.dts&&(!c||c.pts!=e.pts&&c.dts!=e.dts)?(this.audioPes_.length&&e.dts<(c.dts||0)&&(a=!0),this.audioPes_.push(e)):this.audioPes_.length&&(d=e?e.data:d)&&(c=this.audioPes_.pop(),c.data=shaka.util.Uint8ArrayUtils.concat(c.data,
|
|
643
|
+
d),this.audioPes_.push(c))}a&&(this.audioPes_=this.audioPes_.sort(function(f,g){var h=(f.pts||0)-(g.pts||0);return(f.dts||0)-(g.dts||0)||h}))}return this.audioPes_};
|
|
644
|
+
shaka.util.TsParser.prototype.getVideoData=function(a){a=void 0===a?!0:a;if(this.videoData_.length&&!this.videoPes_.length){for(var b=!1,c=$jscomp.makeIterator(this.videoData_),d=c.next();!d.done;d=c.next()){var e=d.value,f=this.parsePES_(e);d=this.videoPes_.length?this.videoPes_[this.videoPes_.length-1]:null;f&&null!=f.pts&&null!=f.dts&&(!d||d.pts!=f.pts&&d.dts!=f.dts)?(this.videoPes_.length&&f.dts<(d.dts||0)&&(b=!0),this.videoPes_.push(f)):this.videoPes_.length&&(e=f?f.data:e)&&(d=this.videoPes_.pop(),
|
|
645
|
+
d.data=shaka.util.Uint8ArrayUtils.concat(d.data,e),this.videoPes_.push(d))}if(a){var g;c=$jscomp.makeIterator(this.videoPes_);for(d=c.next();!d.done;d=c.next())d=d.value,d.nalus=this.parseNalus(d,g),d.nalus.length&&(g=d.nalus[d.nalus.length-1]);this.videoPes_=this.videoPes_.filter(function(h){return h.nalus.length})}b&&(this.videoPes_=this.videoPes_.sort(function(h,k){var l=(h.pts||0)-(k.pts||0);return(h.dts||0)-(k.dts||0)||l}))}return a?this.videoPes_:(a=this.videoPes_,this.videoPes_=[],a)};
|
|
646
646
|
shaka.util.TsParser.prototype.getStartTime=function(a){var b=shaka.util.TsParser.Timescale;if("audio"==a){a=null;var c=this.getAudioData();c.length&&(a=c[0],a=Math.min(a.dts,a.pts)/b);return a}return"video"==a?(a=null,c=this.getVideoData(!1),c.length&&(a=c[0],a=Math.min(a.dts,a.pts)/b),a):null};shaka.util.TsParser.prototype.getCodecs=function(){return{audio:this.audioCodec_,video:this.videoCodec_}};
|
|
647
647
|
shaka.util.TsParser.prototype.getVideoNalus=function(){for(var a=[],b=$jscomp.makeIterator(this.getVideoData()),c=b.next();!c.done;c=b.next())a.push.apply(a,$jscomp.arrayFromIterable(c.value.nalus));return a};shaka.util.TsParser.prototype.getVideoResolution=function(){shaka.Deprecate.deprecateFeature(5,"TsParser","Please use getVideoInfo function instead.");var a=this.getVideoInfo();return{height:a.height,width:a.width}};
|
|
648
648
|
shaka.util.TsParser.prototype.getVideoInfo=function(){return"hvc"==this.videoCodec_?this.getHvcInfo_():this.getAvcInfo_()};
|
|
649
649
|
shaka.util.TsParser.prototype.getAvcInfo_=function(){var a=shaka.util.TsParser,b={height:null,width:null,codec:null},c=this.getVideoNalus();if(!c.length)return b;c=c.find(function(q){return q.type==a.H264_NALU_TYPE_SPS_});if(!c)return b;c=new shaka.util.ExpGolomb(c.data);var d=c.readUnsignedByte(),e=c.readUnsignedByte(),f=c.readUnsignedByte();c.skipExpGolomb();if(a.PROFILES_WITH_OPTIONAL_SPS_DATA_.includes(d)){var g=c.readUnsignedExpGolomb();3===g&&c.skipBits(1);c.skipExpGolomb();c.skipExpGolomb();
|
|
650
650
|
c.skipBits(1);if(c.readBoolean()){g=3!==g?8:12;for(var h=0;h<g;h++)c.readBoolean()&&(6>h?c.skipScalingList(16):c.skipScalingList(64))}}c.skipExpGolomb();g=c.readUnsignedExpGolomb();if(0===g)c.readUnsignedExpGolomb();else if(1===g)for(c.skipBits(1),c.skipExpGolomb(),c.skipExpGolomb(),g=c.readUnsignedExpGolomb(),h=0;h<g;h++)c.skipExpGolomb();c.skipExpGolomb();c.skipBits(1);g=c.readUnsignedExpGolomb();h=c.readUnsignedExpGolomb();var k=c.readBits(1);0===k&&c.skipBits(1);c.skipBits(1);var l=0,m=0,n=0,
|
|
651
651
|
p=0;c.readBoolean()&&(l=c.readUnsignedExpGolomb(),m=c.readUnsignedExpGolomb(),n=c.readUnsignedExpGolomb(),p=c.readUnsignedExpGolomb());b.height=String((2-k)*(h+1)*16-2*n-2*p);b.width=String(16*(g+1)-2*l-2*m);b.codec="avc1."+this.byteToHex_(d)+this.byteToHex_(e)+this.byteToHex_(f);return b};
|
|
652
|
-
shaka.util.TsParser.prototype.getHvcInfo_=function(){var a=shaka.util.TsParser,b={height:null,width:null,codec:null},c=this.getVideoNalus();if(!c.length)return b;c=c.find(function(
|
|
653
|
-
n=d.readUnsignedByte(),p=d.readUnsignedByte(),q=d.readUnsignedByte(),r=d.readUnsignedByte(),u=[],w=[],t=0;t<e;t++)u.push(d.readBoolean()),w.push(d.readBoolean());if(0<e)for(t=e;8>t;t++)d.readBits(2);for(t=0;t<e;t++)u[t]&&d.readBits(88),w[t]&&d.readUnsignedByte();d.readUnsignedExpGolomb();e=d.readUnsignedExpGolomb();3==e&&d.readBits(1);u=d.readUnsignedExpGolomb();w=d.readUnsignedExpGolomb();var v=t=0,x=0,
|
|
654
|
-
|
|
652
|
+
shaka.util.TsParser.prototype.getHvcInfo_=function(){var a=shaka.util.TsParser,b={height:null,width:null,codec:null},c=this.getVideoNalus();if(!c.length)return b;c=c.find(function(z){return z.type==a.H265_NALU_TYPE_SPS_});if(!c)return b;var d=new shaka.util.ExpGolomb(c.fullData,!0);d.readUnsignedByte();d.readUnsignedByte();d.readBits(4);var e=d.readBits(3);d.readBoolean();var f=d.readBits(2),g=d.readBits(1),h=d.readBits(5),k=d.readBits(32);c=d.readUnsignedByte();for(var l=d.readUnsignedByte(),m=d.readUnsignedByte(),
|
|
653
|
+
n=d.readUnsignedByte(),p=d.readUnsignedByte(),q=d.readUnsignedByte(),r=d.readUnsignedByte(),u=[],w=[],t=0;t<e;t++)u.push(d.readBoolean()),w.push(d.readBoolean());if(0<e)for(t=e;8>t;t++)d.readBits(2);for(t=0;t<e;t++)u[t]&&d.readBits(88),w[t]&&d.readUnsignedByte();d.readUnsignedExpGolomb();e=d.readUnsignedExpGolomb();3==e&&d.readBits(1);u=d.readUnsignedExpGolomb();w=d.readUnsignedExpGolomb();var v=t=0,x=0,y=0;d.readBoolean()&&(t+=d.readUnsignedExpGolomb(),v+=d.readUnsignedExpGolomb(),x+=d.readUnsignedExpGolomb(),
|
|
654
|
+
y+=d.readUnsignedExpGolomb());b.width=String(u-(t+v)*(1===e||2===e?2:1));b.height=String(w-(x+y)*(1===e?2:1));d=["","A","B","C"][f];k=function(z){for(var A=0,B=0;32>B;B++)A|=(z>>B&1)<<31-B;return A>>>0}(k);g=1==g?"H":"L";h="hvc1"+("."+d+h)+("."+k.toString(16).toUpperCase());h+="."+g+r;q&&(h+="."+q.toString(16).toUpperCase());p&&(h+="."+p.toString(16).toUpperCase());n&&(h+="."+n.toString(16).toUpperCase());m&&(h+="."+m.toString(16).toUpperCase());l&&(h+="."+l.toString(16).toUpperCase());c&&(h+="."+
|
|
655
655
|
c.toString(16).toUpperCase());b.codec=h;return b};shaka.util.TsParser.prototype.byteToHex_=function(a){return("0"+a.toString(16).toUpperCase()).slice(-2)};shaka.util.TsParser.probe=function(a){a=shaka.util.TsParser.syncOffset(a);if(0>a)return!1;0<a&&shaka.log.warning("MPEG2-TS detected but first sync word found @ offset "+a+", junk ahead ?");return!0};
|
|
656
656
|
shaka.util.TsParser.syncOffset=function(a){for(var b=shaka.util.TsParser.PacketLength_,c=Math.min(1E3,a.length-3*b),d=0;d<c;){if(71==a[d]&&71==a[d+b]&&71==a[d+2*b])return d;d++}return-1};goog.exportSymbol("shaka.util.TsParser",shaka.util.TsParser);goog.exportProperty(shaka.util.TsParser,"syncOffset",shaka.util.TsParser.syncOffset);goog.exportProperty(shaka.util.TsParser,"probe",shaka.util.TsParser.probe);goog.exportProperty(shaka.util.TsParser.prototype,"getVideoInfo",shaka.util.TsParser.prototype.getVideoInfo);
|
|
657
657
|
goog.exportProperty(shaka.util.TsParser.prototype,"getVideoResolution",shaka.util.TsParser.prototype.getVideoResolution);goog.exportProperty(shaka.util.TsParser.prototype,"getVideoNalus",shaka.util.TsParser.prototype.getVideoNalus);goog.exportProperty(shaka.util.TsParser.prototype,"getCodecs",shaka.util.TsParser.prototype.getCodecs);goog.exportProperty(shaka.util.TsParser.prototype,"getStartTime",shaka.util.TsParser.prototype.getStartTime);
|
|
@@ -688,11 +688,11 @@ c&&a.text.push({start:b,end:c})}return a};shaka.media.MediaSourceEngine.prototyp
|
|
|
688
688
|
shaka.media.MediaSourceEngine.prototype.getTimestampAndDispatchMetadata_=function(a,b,c,d,e){var f=null,g=shaka.util.BufferUtils.toUint8(b);if(shaka.util.MimeUtils.RAW_FORMATS.includes(d))e=shaka.util.Id3Utils.getID3Frames(g),e.length&&c&&((a=e.find(function(m){return"com.apple.streaming.transportStreamTimestamp"===m.description}))&&a.data&&(f=Math.round(a.data)/1E3),this.onMetadata_([{cueTime:c.startTime,data:g,frames:e,dts:c.startTime,pts:c.startTime}],0,c.endTime));else if(d.includes("/mp4")&&
|
|
689
689
|
c&&0==c.timestampOffset&&c.initSegmentReference&&c.initSegmentReference.timescale){var h=c.initSegmentReference.timescale;if(!isNaN(h)){c=shaka.util.Mp4Parser;var k=0,l=!1;(new c).box("moof",c.children).box("traf",c.children).fullBox("tfdt",function(m){goog.asserts.assert(0==m.version||1==m.version,"TFDT version can only be 0 or 1");k=shaka.util.Mp4BoxParsers.parseTFDTInaccurate(m.reader,m.version).baseMediaDecodeTime/h;l=!0;m.parser.stop()}).parse(b,!0);l&&(f=k)}}else if(!d.includes("/mp4")&&!d.includes("/webm")&&
|
|
690
690
|
shaka.util.TsParser.probe(g)&&(g=(new shaka.util.TsParser).parse(g),a=g.getStartTime(a),null!=a&&(f=a),g=g.getMetadata(),g.length))this.onMetadata_(g,e,c?c.endTime:null);return f};
|
|
691
|
-
shaka.media.MediaSourceEngine.prototype.appendBuffer=function(a,b,c,d,e,f,g,h,k){f=void 0===f?!1:f;g=void 0===g?!1:g;h=void 0===h?!1:h;k=void 0===k?!1:k;var l=this,m,n,p,q,r,u,w,t,v,x,z,
|
|
691
|
+
shaka.media.MediaSourceEngine.prototype.appendBuffer=function(a,b,c,d,e,f,g,h,k){f=void 0===f?!1:f;g=void 0===g?!1:g;h=void 0===h?!1:h;k=void 0===k?!1:k;var l=this,m,n,p,q,r,u,w,t,v,x,y,z,A,B,E,I;return $jscomp.asyncExecutePromiseGeneratorProgram(function(C){switch(C.nextAddress){case 1:m=shaka.util.ManifestParserUtils.ContentType;if(a!=m.TEXT){C.jumpTo(2);break}if(!l.sequenceMode_){C.jumpTo(3);break}return C.yield(l.textSequenceModeOffset_,4);case 4:n=C.yieldResult,l.textEngine_.setTimestampOffset(n);
|
|
692
692
|
case 3:return C.yield(l.textEngine_.appendBuffer(b,c?c.startTime:null,c?c.endTime:null,c?c.getUris()[0]:null),5);case 5:return C.return();case 2:if(k||!l.needSplitMuxedContent_){C.jumpTo(6);break}return C.yield(l.appendBuffer(m.AUDIO,b,c,d,e,f,g,h,!0),7);case 7:return C.yield(l.appendBuffer(m.VIDEO,b,c,d,e,f,g,h,!0),8);case 8:return C.return();case 6:if(!l.sourceBuffers_[a])return shaka.log.warning("Attempted to restore a non-existent source buffer"),C.return();p=l.sourceBuffers_[a].timestampOffset;
|
|
693
|
-
q=l.sourceBufferTypes_[a];l.transmuxers_[a]&&(q=l.transmuxers_[a].getOriginalMimeType());c&&(r=l.getTimestampAndDispatchMetadata_(a,b,c,q,p),null!=r&&(u=c.startTime-r,w=Math.abs(p-u),(.
|
|
693
|
+
q=l.sourceBufferTypes_[a];l.transmuxers_[a]&&(q=l.transmuxers_[a].getOriginalMimeType());c&&(r=l.getTimestampAndDispatchMetadata_(a,b,c,q,p),null!=r&&(u=c.startTime-r,w=Math.abs(p-u),(.001<=w||f||g)&&(!h||0<u||!p)&&(p=u,l.attemptTimestampOffsetCalculation_&&(l.enqueueOperation_(a,function(){return l.abort_(a)}),l.enqueueOperation_(a,function(){return l.setTimestampOffset_(a,p)}))),t=a==m.VIDEO||!(m.VIDEO in l.sourceBuffers_),l.sequenceMode_&&t&&l.textSequenceModeOffset_.resolve(p)));e&&a==m.VIDEO&&
|
|
694
694
|
(l.textEngine_||l.reinitText(shaka.util.MimeUtils.CEA608_CLOSED_CAPTION_MIMETYPE,l.sequenceMode_,!1),l.captionParser_||(v=q.split(";",1)[0],l.captionParser_=l.getCaptionParser(v)),c?(x=l.captionParser_.parseFrom(b),x.length&&l.textEngine_.storeAndAppendClosedCaptions(x,c.startTime,c.endTime,p)):l.captionParser_.init(b));if(!l.transmuxers_[a]){C.jumpTo(9);break}return C.yield(l.transmuxers_[a].transmux(b,d,c,l.mediaSource_.duration,a),10);case 10:b=C.yieldResult;case 9:return b=l.workAroundBrokenPlatforms_(b,
|
|
695
|
-
c?c.startTime:null,a),c&&l.sequenceMode_&&a!=m.TEXT&&(f||g)&&(
|
|
695
|
+
c?c.startTime:null,a),c&&l.sequenceMode_&&a!=m.TEXT&&(f||g)&&(y=c.startTime,l.enqueueOperation_(a,function(){return l.abort_(a)}),l.enqueueOperation_(a,function(){return l.setTimestampOffset_(a,y)})),z=null,C.yield(l.enqueueOperation_(a,function(){goog.DEBUG&&c&&!c.isPreload()&&!h&&(z=l.getBuffered_(a));l.append_(a,b,p)}),11);case 11:goog.DEBUG&&c&&!c.isPreload()&&!h&&(A=l.getBuffered_(a),B=shaka.media.TimeRangesUtils.computeAddedRange(z,A))&&(E=c.endTime-c.startTime,I=Math.abs(B.end-c.endTime),.1<
|
|
696
696
|
E&&I>E/2&&shaka.log.error("Possible encoding problem detected!","Unexpected buffered range for reference",c,"from URIs",c.getUris(),"should be",{start:c.startTime,end:c.endTime},"but got",B)),C.jumpToEnd()}})};shaka.media.MediaSourceEngine.prototype.setSelectedClosedCaptionId=function(a){var b=this.bufferEnd(shaka.util.ManifestParserUtils.ContentType.VIDEO)||0;this.textEngine_.setSelectedClosedCaptionId(a,b)};
|
|
697
697
|
shaka.media.MediaSourceEngine.prototype.clearSelectedClosedCaptionId=function(){this.textEngine_&&this.textEngine_.setSelectedClosedCaptionId("",0)};
|
|
698
698
|
shaka.media.MediaSourceEngine.prototype.remove=function(a,b,c){var d=this,e;return $jscomp.asyncExecutePromiseGeneratorProgram(function(f){return 1==f.nextAddress?(e=shaka.util.ManifestParserUtils.ContentType,a==e.TEXT?f.yield(d.textEngine_.remove(b,c),0):f.yield(d.enqueueOperation_(a,function(){return d.remove_(a,b,c)}),4)):d.needSplitMuxedContent_?f.yield(d.enqueueOperation_(e.AUDIO,function(){return d.remove_(e.AUDIO,b,c)}),0):f.jumpTo(0)})};
|
|
@@ -710,8 +710,8 @@ shaka.media.MediaSourceEngine.prototype.setTimestampOffset_=function(a,b){0>b&&(
|
|
|
710
710
|
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))};
|
|
711
711
|
shaka.media.MediaSourceEngine.prototype.onUpdateEnd_=function(a){if(!this.reloadingMediaSource_){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))}};
|
|
712
712
|
shaka.media.MediaSourceEngine.prototype.enqueueOperation_=function(a,b){this.destroyer_.ensureNotDestroyed();b={start:b,p:new shaka.util.PublicPromise};this.queues_[a].push(b);1==this.queues_[a].length&&this.startOperation_(a);return b.p};
|
|
713
|
-
shaka.media.MediaSourceEngine.prototype.enqueueBlockingOperation_=function(a){var b=this,c,d,e,f,g,h,k,l,m;return $jscomp.asyncExecutePromiseGeneratorProgram(function(n){switch(n.nextAddress){case 1:b.destroyer_.ensureNotDestroyed();c=[];d={};for(e in b.sourceBuffers_)d.$jscomp$loop$prop$ready$
|
|
714
|
-
1==b.queues_[e].length&&f.start(),d={$jscomp$loop$prop$ready$
|
|
713
|
+
shaka.media.MediaSourceEngine.prototype.enqueueBlockingOperation_=function(a){var b=this,c,d,e,f,g,h,k,l,m;return $jscomp.asyncExecutePromiseGeneratorProgram(function(n){switch(n.nextAddress){case 1:b.destroyer_.ensureNotDestroyed();c=[];d={};for(e in b.sourceBuffers_)d.$jscomp$loop$prop$ready$792=new shaka.util.PublicPromise,f={start:function(p){return function(){return p.$jscomp$loop$prop$ready$792.resolve()}}(d),p:d.$jscomp$loop$prop$ready$792},b.queues_[e].push(f),c.push(d.$jscomp$loop$prop$ready$792),
|
|
714
|
+
1==b.queues_[e].length&&f.start(),d={$jscomp$loop$prop$ready$792:d.$jscomp$loop$prop$ready$792};n.setCatchFinallyBlocks(2);return n.yield(Promise.all(c),4);case 4:n.leaveTryBlock(3);break;case 2:g=n.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!"),
|
|
715
715
|
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!");n.setCatchFinallyBlocks(5,6);return n.yield(a(),6);case 6:n.enterFinallyBlock();for(l in b.sourceBuffers_)b.popFromQueue_(l);n.leaveFinallyBlock(0);break;case 5:throw m=n.enterCatchBlock(),new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MEDIA,shaka.util.Error.Code.MEDIA_SOURCE_OPERATION_THREW,
|
|
716
716
|
m,b.video_.error||"No error in the media element");}})};shaka.media.MediaSourceEngine.prototype.popFromQueue_=function(a){this.queues_[a].shift();this.startOperation_(a)};
|
|
717
717
|
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.video_.error||"No error in the media element")),
|
|
@@ -720,9 +720,9 @@ shaka.media.MediaSourceEngine.prototype.setSegmentRelativeVttTiming=function(a){
|
|
|
720
720
|
shaka.media.MediaSourceEngine.prototype.workAroundBrokenPlatforms_=function(a,b,c){var d=this.expectedEncryption_[c];this.config_.insertFakeEncryptionInInit&&null==b&&d&&shaka.util.Platform.requiresEncryptionInfoInAllInitSegments()&&"mp4"==shaka.util.MimeUtils.getContainerType(this.sourceBufferTypes_[c])&&(shaka.log.debug("Forcing fake encryption information in init segment."),a=shaka.media.ContentWorkarounds.fakeEncryption(a));return a};
|
|
721
721
|
shaka.media.MediaSourceEngine.prototype.change_=function(a,b,c){a===shaka.util.ManifestParserUtils.ContentType.TEXT?shaka.log.debug("Change not supported for "+a):(shaka.log.debug("Change Type: "+this.sourceBufferTypes_[a]+" -> "+b),shaka.media.Capabilities.isChangeTypeSupported()?(this.transmuxers_[a]&&(this.transmuxers_[a].destroy(),delete this.transmuxers_[a]),c&&(this.transmuxers_[a]=c),this.sourceBuffers_[a].changeType(b+this.config_.sourceBufferExtraFeatures),this.sourceBufferTypes_[a]=b):shaka.log.debug("Change Type not supported"),
|
|
722
722
|
this.onUpdateEnd_(a))};shaka.media.MediaSourceEngine.prototype.changeType=function(a,b,c){var d=this;return this.enqueueOperation_(a,function(){return d.change_(a,b,c)})};
|
|
723
|
-
shaka.media.MediaSourceEngine.prototype.reset_=function(a){var b=this,c,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,z,
|
|
723
|
+
shaka.media.MediaSourceEngine.prototype.reset_=function(a){var b=this,c,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,y,z,A,B,E,I;return $jscomp.asyncExecutePromiseGeneratorProgram(function(C){switch(C.nextAddress){case 1:c=shaka.util.Functional;d=shaka.util.ManifestParserUtils.ContentType;b.reloadingMediaSource_=!0;b.needSplitMuxedContent_=!1;e=b.video_.currentTime;f=b.video_.autoplay;g=b.video_.paused;b.playbackHasBegun_&&(b.video_.autoplay=!1);C.setFinallyBlock(2);b.eventManager_.removeAll();h=[];for(k in b.transmuxers_)h.push(b.transmuxers_[k].destroy());
|
|
724
724
|
for(l in b.queues_)for(m=b.queues_[l],n=m[0],b.queues_[l]=m.slice(0,1),n&&h.push(n.p.catch(c.noop)),p=$jscomp.makeIterator(m.slice(1)),q=p.next();!q.done;q=p.next())r=q.value,r.p.reject(shaka.util.Destroyer.destroyedError());for(u in b.sourceBuffers_){w=b.sourceBuffers_[u];try{b.mediaSource_.removeSourceBuffer(w)}catch(G){}}return C.yield(Promise.all(h),4);case 4:return b.transmuxers_={},b.sourceBuffers_={},t=b.mediaSource_.duration,b.mediaSourceOpen_=new shaka.util.PublicPromise,b.mediaSource_=b.createMediaSource(b.mediaSourceOpen_),
|
|
725
|
-
C.yield(b.mediaSourceOpen_,5);case 5:b.mediaSource_.duration=t;v=new shaka.util.PublicPromise;x=b.mediaSource_.sourceBuffers;
|
|
725
|
+
C.yield(b.mediaSourceOpen_,5);case 5:b.mediaSource_.duration=t;v=new shaka.util.PublicPromise;x=b.mediaSource_.sourceBuffers;y=a.size;z=0;b.eventManager_.listen(x,"addsourcebuffer",function(G){z++;z===y&&v.resolve()});A=$jscomp.makeIterator(a.keys());for(B=A.next();!B.done;B=A.next())E=B.value,I=a.get(E),b.initSourceBuffer_(E,I,I.codecs),b.needSplitMuxedContent_?(b.queues_[d.AUDIO]=[],b.queues_[d.VIDEO]=[]):b.queues_[E]=[];b.video_.currentTime=e;return C.yield(v,2);case 2:C.enterFinallyBlock(),b.reloadingMediaSource_=
|
|
726
726
|
!1,b.destroyer_.ensureNotDestroyed(),b.eventManager_.listenOnce(b.video_,"canplay",function(){b.destroyer_.ensureNotDestroyed();b.video_.autoplay=f;g||b.video_.play()}),C.leaveFinallyBlock(0)}})};shaka.media.MediaSourceEngine.prototype.reset=function(a){var b=this;return this.enqueueBlockingOperation_(function(){return b.reset_(a)})};
|
|
727
727
|
shaka.media.MediaSourceEngine.prototype.codecSwitchIfNecessary_=function(a,b,c){var d=this,e,f,g,h,k,l,m,n,p,q,r,u,w;return $jscomp.asyncExecutePromiseGeneratorProgram(function(t){if(1==t.nextAddress){if(a==shaka.util.ManifestParserUtils.ContentType.TEXT)return t.return(!1);e=shaka.util.MimeUtils;f=e.getCodecBase(e.getCodecs(d.sourceBufferTypes_[a]));g=e.getBasicType(d.sourceBufferTypes_[a]);k=shaka.util.MimeUtils.getFullType(b.mimeType,b.codecs);l=d.config_.forceTransmux;if(!shaka.media.Capabilities.isTypeSupported(k)||
|
|
728
728
|
!d.sequenceMode_&&shaka.util.MimeUtils.RAW_FORMATS.includes(k))l=!0;m=shaka.util.MimeUtils.getFullTypeWithAllCodecs(b.mimeType,b.codecs);n=shaka.transmuxer.TransmuxerEngine;l&&(p=n.findTransmuxer(m))&&(h=p(),k=h.convertCodecs(a,m));q=e.getCodecs(k);r=e.getCodecBase(q);u=e.getBasicType(k);if(f===r&&g===u)return t.return(!1);w=!0;if(d.needSplitMuxedContent_||q.split(",").length&&h&&!d.transmuxers_[a])w=!1;if(w&&d.config_.codecSwitchingStrategy===shaka.config.CodecSwitchingStrategy.SMOOTH&&shaka.media.Capabilities.isChangeTypeSupported())return t.yield(d.changeType(a,
|
|
@@ -882,12 +882,12 @@ shaka.media.InitSegmentReference.equal(c,a.lastInitSegmentReference)||a.segmentP
|
|
|
882
882
|
shaka.media.StreamingEngine.prototype.getSegmentReferenceNeeded_=function(a,b,c){var d=shaka.media.StreamingEngine.logPrefix_(a);goog.asserts.assert(a.stream.segmentIndex,"segment index should have been generated already");if(a.segmentIterator)return a.segmentIterator.current();if(a.lastSegmentReference||c)return b=a.lastSegmentReference?a.lastSegmentReference.endTime:c,goog.asserts.assert(null!=b,"Should have a time to search"),shaka.log.v1(d,"looking up segment from new stream endTime:",b),a.needsResync=
|
|
883
883
|
!0,a.segmentIterator=a.stream.segmentIndex.getIteratorForTime(b),a=a.segmentIterator&&a.segmentIterator.next().value,null==a&&shaka.log.warning(d,"cannot find segment","endTime:",b),a;c=this.config_.inaccurateManifestTolerance;var e=Math.max(b-c,0);shaka.log.v1(d,"looking up segment","lookupTime:",e,"presentationTime:",b);var f=null;c&&(a.segmentIterator=a.stream.segmentIndex.getIteratorForTime(e),f=a.segmentIterator&&a.segmentIterator.next().value);f||(a.segmentIterator=a.stream.segmentIndex.getIteratorForTime(b),
|
|
884
884
|
f=a.segmentIterator&&a.segmentIterator.next().value);null==f&&shaka.log.warning(d,"cannot find segment","lookupTime:",e,"presentationTime:",b);return f};
|
|
885
|
-
shaka.media.StreamingEngine.prototype.fetchAndAppend_=function(a,b,c){var d=this,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,z,
|
|
885
|
+
shaka.media.StreamingEngine.prototype.fetchAndAppend_=function(a,b,c){var d=this,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,y,z,A;return $jscomp.asyncExecutePromiseGeneratorProgram(function(B){switch(B.nextAddress){case 1:e=shaka.util.ManifestParserUtils.ContentType;f=shaka.media.StreamingEngine;g=f.logPrefix_(a);shaka.log.v1(g,"fetchAndAppend_:","presentationTime="+b,"reference.startTime="+c.startTime,"reference.endTime="+c.endTime);h=a.stream;k=a.segmentIterator;a.performingUpdate=!0;B.setCatchFinallyBlocks(2);
|
|
886
886
|
if(c.getStatus()==shaka.media.SegmentReference.Status.MISSING)throw new shaka.util.Error(shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.NETWORK,shaka.util.Error.Code.SEGMENT_MISSING);return B.yield(d.initSourceBuffer_(a,c),4);case 4:d.destroyer_.ensureNotDestroyed();if(d.fatalError_)return B.return();shaka.log.v2(g,"fetching segment");l="video/mp4"==h.mimeType||"audio/mp4"==h.mimeType;m=window.ReadableStream;if(d.config_.lowLatencyMode&&m&&l&&(d.manifest_.type!=shaka.media.ManifestParser.HLS||
|
|
887
887
|
c.hasByterangeOptimization()))return q=new Uint8Array(0),u=r=!1,t=function(E){var I,C,G,D;return $jscomp.asyncExecutePromiseGeneratorProgram(function(F){switch(F.nextAddress){case 1:if(r)return F.return();u=!0;d.destroyer_.ensureNotDestroyed();if(d.fatalError_)return F.return();F.setCatchFinallyBlocks(2);q=d.concatArray_(q,E);I=!1;C=0;(new shaka.util.Mp4Parser).box("mdat",function(H){C=H.size+H.start;I=!0}).parse(q,!1,!0);if(!I){F.jumpTo(4);break}G=q.subarray(0,C);q=q.subarray(C);return F.yield(d.append_(a,
|
|
888
888
|
b,h,c,G,!0),5);case 5:a.segmentPrefetch&&a.segmentIterator&&a.segmentPrefetch.prefetchSegments(c,!0);case 4:F.leaveTryBlock(0);break;case 2:w=D=F.enterCatchBlock(),F.jumpToEnd()}})},B.yield(d.fetch_(a,c,t),9);d.config_.lowLatencyMode&&!m&&shaka.log.warning("Low latency streaming mode is enabled, but ReadableStream is not supported by the browser.");n=d.fetch_(a,c);return B.yield(n,7);case 7:p=B.yieldResult;d.destroyer_.ensureNotDestroyed();if(d.fatalError_)return B.return();d.destroyer_.ensureNotDestroyed();
|
|
889
889
|
return a.waitingToClearBuffer?(shaka.log.info(g,"waitingToClearBuffer, skip append"),a.performingUpdate=!1,d.scheduleUpdate_(a,0),B.return()):B.yield(d.append_(a,b,h,c,p),6);case 9:v=B.yieldResult;if(w)throw w;if(u){B.jumpTo(10);break}r=!0;d.destroyer_.ensureNotDestroyed();return d.fatalError_?B.return():a.waitingToClearBuffer?(shaka.log.info(g,"waitingToClearBuffer, skip append"),a.performingUpdate=!1,d.scheduleUpdate_(a,0),B.return()):B.yield(d.append_(a,b,h,c,v),10);case 10:a.segmentPrefetch&&
|
|
890
|
-
a.segmentIterator&&a.segmentPrefetch.prefetchSegments(c,!0);case 6:d.destroyer_.ensureNotDestroyed();if(d.fatalError_)return B.return();a.lastSegmentReference=c;x=k.next().value;shaka.log.v2(g,"advancing to next segment",x);a.performingUpdate=!1;a.recovering=!1;
|
|
890
|
+
a.segmentIterator&&a.segmentPrefetch.prefetchSegments(c,!0);case 6:d.destroyer_.ensureNotDestroyed();if(d.fatalError_)return B.return();a.lastSegmentReference=c;x=k.next().value;shaka.log.v2(g,"advancing to next segment",x);a.performingUpdate=!1;a.recovering=!1;y=d.playerInterface_.mediaSourceEngine.getBufferedInfo();z=y[a.type];shaka.log.v1(g,"finished fetch and append",JSON.stringify(z));if(!a.waitingToClearBuffer)d.playerInterface_.onSegmentAppended(c.startTime,c.endTime,a.type);d.scheduleUpdate_(a,
|
|
891
891
|
0);B.leaveTryBlock(0);break;case 2:A=B.enterCatchBlock();d.destroyer_.ensureNotDestroyed(A);if(d.fatalError_)return B.return();goog.asserts.assert(A instanceof shaka.util.Error,"Should only receive a Shaka error");a.performingUpdate=!1;if(A.code==shaka.util.Error.Code.OPERATION_ABORTED)a.performingUpdate=!1,d.cancelUpdate_(a),d.scheduleUpdate_(a,0),B.jumpTo(0);else if(a.type==e.TEXT&&d.config_.ignoreTextStreamFailures)A.code==shaka.util.Error.Code.BAD_HTTP_STATUS?shaka.log.warning(g,"Text stream failed to download. Proceeding without it."):
|
|
892
892
|
shaka.log.warning(g,"Text stream failed to parse. Proceeding without it."),d.mediaStates_.delete(e.TEXT),B.jumpTo(0);else if(A.code==shaka.util.Error.Code.QUOTA_EXCEEDED_ERROR)d.handleQuotaExceeded_(a,A),B.jumpTo(0);else return shaka.log.error(g,"failed fetch and append: code="+A.code),a.hasError=!0,A.severity=shaka.util.Error.Severity.CRITICAL,B.yield(d.handleStreamingError_(a,A),0)}})};
|
|
893
893
|
shaka.media.StreamingEngine.prototype.aes128Decrypt_=function(a,b,c){var d,e,f,g;return $jscomp.asyncExecutePromiseGeneratorProgram(function(h){if(1==h.nextAddress){d=b;if(d.cryptoKey)return h.jumpTo(2);goog.asserts.assert(d.fetchKey,"If AES-128 cryptoKey was not preloaded, fetchKey function should be provided");return h.yield(d.fetchKey(),3)}2!=h.nextAddress&&goog.asserts.assert(d.cryptoKey,"AES-128 cryptoKey should now be set");e=d.iv;if(!e)for(e=shaka.util.BufferUtils.toUint8(new ArrayBuffer(16)),
|
|
@@ -898,11 +898,11 @@ shaka.media.StreamingEngine.prototype.handleQuotaExceeded_=function(a,b){var c=s
|
|
|
898
898
|
this.fatalError_=a.hasError=!0;this.playerInterface_.onError(b);return}shaka.log.warning(c,"MediaSource threw QuotaExceededError:","reducing buffering goals by "+(100-Math.round(100*this.bufferingGoalScale_))+"%");a.recovering=!0}this.scheduleUpdate_(a,4)};
|
|
899
899
|
shaka.media.StreamingEngine.prototype.initSourceBuffer_=function(a,b){var c=this,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v;return $jscomp.asyncExecutePromiseGeneratorProgram(function(x){if(1==x.nextAddress){d=shaka.util.ManifestParserUtils.ContentType;e=shaka.util.MimeUtils;f=shaka.media.StreamingEngine;g=f.logPrefix_(a);h=[];k=Math.max(0,b.appendWindowStart-f.APPEND_WINDOW_START_FUDGE_);l=b.appendWindowEnd+f.APPEND_WINDOW_END_FUDGE_;goog.asserts.assert(b.startTime<=l,g+" segment should start before append window end");
|
|
900
900
|
m=e.getCodecBase(a.stream.codecs);n=e.getBasicType(a.stream.mimeType);p=b.timestampOffset;if(p==a.lastTimestampOffset&&k==a.lastAppendWindowStart&&l==a.lastAppendWindowEnd&&m==a.lastCodecs&&n==a.lastMimeType)return x.jumpTo(2);shaka.log.v1(g,"setting timestamp offset to "+p);shaka.log.v1(g,"setting append window start to "+k);shaka.log.v1(g,"setting append window end to "+l);if(q=a.lastCodecs&&a.lastMimeType&&c.playerInterface_.mediaSourceEngine.isResetMediaSourceNecessary(a.type,a.stream))r=null,
|
|
901
|
-
a.type===d.VIDEO?r=c.mediaStates_.get(d.AUDIO):a.type===d.AUDIO&&(r=c.mediaStates_.get(d.VIDEO)),r&&(r.lastInitSegmentReference=null,c.forceClearBuffer_(r),c.abortOperations_(r).catch(function(){}));u=function(){var z,
|
|
902
|
-
k,a.lastAppendWindowEnd=l,a.lastCodecs=m,a.lastMimeType=n,a.lastTimestampOffset=p,
|
|
903
|
-
a.lastAppendWindowStart=null;a.lastAppendWindowEnd=null;a.lastCodecs=null;a.lastTimestampOffset=null;throw B;})};return x.yield(u(),2)}shaka.media.InitSegmentReference.equal(b.initSegmentReference,a.lastInitSegmentReference)||(a.lastInitSegmentReference=b.initSegmentReference,b.isIndependent()&&b.initSegmentReference&&(shaka.log.v1(g,"fetching init segment"),w=c.fetch_(a,b.initSegmentReference),t=function(){var z,
|
|
904
|
-
G.yield(w,4);case 4:return
|
|
905
|
-
|
|
901
|
+
a.type===d.VIDEO?r=c.mediaStates_.get(d.AUDIO):a.type===d.AUDIO&&(r=c.mediaStates_.get(d.VIDEO)),r&&(r.lastInitSegmentReference=null,c.forceClearBuffer_(r),c.abortOperations_(r).catch(function(){}));u=function(){var y,z,A,B;return $jscomp.asyncExecutePromiseGeneratorProgram(function(E){if(1==E.nextAddress)return y=new Map,c.currentVariant_.audio&&y.set(d.AUDIO,c.currentVariant_.audio),c.currentVariant_.video&&y.set(d.VIDEO,c.currentVariant_.video),E.setCatchFinallyBlocks(2),a.lastAppendWindowStart=
|
|
902
|
+
k,a.lastAppendWindowEnd=l,a.lastCodecs=m,a.lastMimeType=n,a.lastTimestampOffset=p,z=c.manifest_.sequenceMode||c.manifest_.type==shaka.media.ManifestParser.HLS,E.yield(c.playerInterface_.mediaSourceEngine.setStreamProperties(a.type,p,k,l,z,a.stream,y),4);if(2!=E.nextAddress)return q&&(A=null,a.type===d.VIDEO?A=c.mediaStates_.get(d.AUDIO):a.type===d.AUDIO&&(A=c.mediaStates_.get(d.VIDEO)),A&&(A.waitingToClearBuffer=!1,A.performingUpdate=!1,c.forceClearBuffer_(A))),E.leaveTryBlock(0);B=E.enterCatchBlock();
|
|
903
|
+
a.lastAppendWindowStart=null;a.lastAppendWindowEnd=null;a.lastCodecs=null;a.lastTimestampOffset=null;throw B;})};return x.yield(u(),2)}shaka.media.InitSegmentReference.equal(b.initSegmentReference,a.lastInitSegmentReference)||(a.lastInitSegmentReference=b.initSegmentReference,b.isIndependent()&&b.initSegmentReference&&(shaka.log.v1(g,"fetching init segment"),w=c.fetch_(a,b.initSegmentReference),t=function(){var y,z,A,B,E,I,C;return $jscomp.asyncExecutePromiseGeneratorProgram(function(G){switch(G.nextAddress){case 1:return G.setCatchFinallyBlocks(2),
|
|
904
|
+
G.yield(w,4);case 4:return y=G.yieldResult,c.destroyer_.ensureNotDestroyed(),z=null,A=new Map,B=new shaka.util.Mp4Parser,E=shaka.util.Mp4Parser,B.box("moov",E.children).box("trak",E.children).box("mdia",E.children).fullBox("mdhd",function(D){goog.asserts.assert(null!=D.version,"MDHD is a full box and should have a valid version.");z=shaka.util.Mp4BoxParsers.parseMDHD(D.reader,D.version).timescale}).box("hdlr",function(D){switch(shaka.util.Mp4BoxParsers.parseHDLR(D.reader).handlerType){case "soun":A.set(d.AUDIO,
|
|
905
|
+
z);break;case "vide":A.set(d.VIDEO,z)}z=null}).parse(y),A.has(a.type)?b.initSegmentReference.timescale=A.get(a.type):null!=z&&(b.initSegmentReference.timescale=z),shaka.log.v1(g,"appending init segment"),I=a.stream.closedCaptions&&0<a.stream.closedCaptions.size,G.yield(c.playerInterface_.beforeAppendSegment(a.type,y),5);case 5:return G.yield(c.playerInterface_.mediaSourceEngine.appendBuffer(a.type,y,null,a.stream,I),6);case 6:G.leaveTryBlock(0);break;case 2:throw C=G.enterCatchBlock(),a.lastInitSegmentReference=
|
|
906
906
|
null,C;}})},c.playerInterface_.onInitSegmentAppended(b.startTime,b.initSegmentReference),h.push(t())));c.manifest_.sequenceMode&&(v=a.lastSegmentReference?a.lastSegmentReference.discontinuitySequence:null,b.discontinuitySequence!=v||a.needsResync)&&(a.needsResync=!1,h.push(c.playerInterface_.mediaSourceEngine.resync(a.type,b.startTime)));return x.yield(Promise.all(h),0)})};
|
|
907
907
|
shaka.media.StreamingEngine.prototype.append_=function(a,b,c,d,e,f){f=void 0===f?!1:f;var g=this,h,k,l,m,n,p,q;return $jscomp.asyncExecutePromiseGeneratorProgram(function(r){switch(r.nextAddress){case 1:h=shaka.media.StreamingEngine.logPrefix_(a);k=c.closedCaptions&&0<c.closedCaptions.size;m=null!=c.emsgSchemeIdUris&&0<c.emsgSchemeIdUris.length||g.config_.dispatchAllEmsgBoxes;n=g.config_.parsePrftBox&&!g.parsedPrftEventRaised_;if(m||n)l=new shaka.util.Mp4Parser;m&&l.fullBox("emsg",function(u){return g.parseEMSG_(d,
|
|
908
908
|
c.emsgSchemeIdUris,u)});n&&l.fullBox("prft",function(u){return g.parsePrft_(d,u)});(m||n)&&l.parse(e);return r.yield(g.evict_(a,b),2);case 2:return g.destroyer_.ensureNotDestroyed(),p=a.seeked,a.seeked=!1,q=a.adaptation,a.adaptation=!1,r.yield(g.playerInterface_.beforeAppendSegment(a.type,e),3);case 3:return r.yield(g.playerInterface_.mediaSourceEngine.appendBuffer(a.type,e,d,c,k,p,q,f),4);case 4:g.destroyer_.ensureNotDestroyed(),shaka.log.v2(h,"appended media segment"),r.jumpToEnd()}})};
|
|
@@ -926,17 +926,18 @@ g.yield(c.onUpdate_(a),4);if(2!=g.nextAddress)return g.leaveTryBlock(0);f=g.ente
|
|
|
926
926
|
shaka.media.StreamingEngine.prototype.abortOperations_=function(a){return $jscomp.asyncExecutePromiseGeneratorProgram(function(b){return a.operation?b.yield(a.operation.abort(),0):b.jumpTo(0)})};
|
|
927
927
|
shaka.media.StreamingEngine.prototype.handleStreamingError_=function(a,b){var c=this,d;return $jscomp.asyncExecutePromiseGeneratorProgram(function(e){if(1==e.nextAddress)return e.yield(c.failureCallbackBackoff_.attempt(),2);c.destroyer_.ensureNotDestroyed();d=c.getDisabledTime_(b);b.category===shaka.util.Error.Category.NETWORK&&0<d&&(b.handled=c.playerInterface_.disableStream(a.stream,d),b.handled&&(b.severity=shaka.util.Error.Severity.RECOVERABLE));c.playerInterface_.onError(b);b.handled||c.config_.failureCallback(b);
|
|
928
928
|
e.jumpToEnd()})};shaka.media.StreamingEngine.prototype.getDisabledTime_=function(a){return 0===this.config_.maxDisabledTime&&a.code==shaka.util.Error.Code.SEGMENT_MISSING?1:this.config_.maxDisabledTime};shaka.media.StreamingEngine.logPrefix_=function(a){return"("+a.type+":"+a.stream.id+")"};shaka.media.StreamingEngine.APPEND_WINDOW_START_FUDGE_=.1;shaka.media.StreamingEngine.APPEND_WINDOW_END_FUDGE_=.01;shaka.media.StreamingEngine.MAX_RUN_AHEAD_SEGMENTS_=1;shaka.net.NetworkingUtils=function(){};
|
|
929
|
-
shaka.net.NetworkingUtils.getMimeType=function(a,b,c){var d,e,f,g,h;return $jscomp.asyncExecutePromiseGeneratorProgram(function(
|
|
930
|
-
"")})};shaka.net.NetworkingUtils.getExtension_=function(a){a=(new goog.Uri(a)).getPath().split("/").pop().split(".");return 1==a.length?"":a.pop().toLowerCase()};
|
|
929
|
+
shaka.net.NetworkingUtils.getMimeType=function(a,b,c){var d,e,f,g,h,k,l;return $jscomp.asyncExecutePromiseGeneratorProgram(function(m){switch(m.nextAddress){case 1:d=shaka.net.NetworkingUtils.getExtension_(a);if(e=shaka.net.NetworkingUtils.EXTENSIONS_TO_MIME_TYPES_[d])return m.return(e);f=shaka.net.NetworkingEngine.RequestType.MANIFEST;g=shaka.net.NetworkingEngine.makeRequest([a],c);m.setCatchFinallyBlocks(2);g.method="HEAD";return m.yield(b.request(f,g).promise,4);case 4:h=m.yieldResult;e=h.headers["content-type"];
|
|
930
|
+
m.leaveTryBlock(3);break;case 2:k=m.enterCatchBlock();if(!k||k.code!=shaka.util.Error.Code.HTTP_ERROR){m.jumpTo(3);break}g.method="GET";return m.yield(b.request(f,g).promise,6);case 6:l=m.yieldResult,e=l.headers["content-type"];case 3:return m.return(e?e.toLowerCase().split(";").shift():"")}})};shaka.net.NetworkingUtils.getExtension_=function(a){a=(new goog.Uri(a)).getPath().split("/").pop().split(".");return 1==a.length?"":a.pop().toLowerCase()};
|
|
931
931
|
shaka.net.NetworkingUtils.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",ism:"application/vnd.ms-sstr+xml",mp3:"audio/mpeg",aac:"audio/aac",flac:"audio/flac",wav:"audio/wav",sbv:"text/x-subviewer",srt:"text/srt",vtt:"text/vtt",webvtt:"text/vtt",ttml:"application/ttml+xml",lrc:"application/x-subtitle-lrc",
|
|
932
932
|
ssa:"text/x-ssa",ass:"text/x-ssa"};shaka.text.Utils=function(){};
|
|
933
|
-
shaka.text.Utils.flattenPayload_=function(a){if(a.lineBreak)return"\n";if(a.nestedCues.length)return a.nestedCues.map(shaka.text.Utils.flattenPayload_).join("");var
|
|
934
|
-
".bg_"+
|
|
935
|
-
shaka.text.Utils.getColorName_=function(a){
|
|
936
|
-
|
|
933
|
+
shaka.text.Utils.flattenPayload_=function(a,b){if(a.lineBreak)return"\n";if(a.nestedCues.length)return a.nestedCues.map(function(g){return shaka.text.Utils.flattenPayload_(g,a)}).join("");var c=[],d=a.fontWeight>=shaka.text.Cue.fontWeight.BOLD,e=a.fontStyle==shaka.text.Cue.fontStyle.ITALIC,f=a.textDecoration.includes(shaka.text.Cue.textDecoration.UNDERLINE);d&&c.push(["b"]);e&&c.push(["i"]);f&&c.push(["u"]);e=a.color;""==e&&b&&(e=b.color);d="";(e=shaka.text.Utils.getColorName_(e))&&(d+="."+e);e=a.backgroundColor;
|
|
934
|
+
""==e&&b&&(e=b.backgroundColor);(b=shaka.text.Utils.getColorName_(e))&&(d+=".bg_"+b);d&&c.push(["c",d]);return c.reduceRight(function(g,h){var k=$jscomp.makeIterator(h);h=k.next().value;k=k.next().value;return"<"+h+(void 0===k?"":k)+">"+g+"</"+h+">"},a.payload)};
|
|
935
|
+
shaka.text.Utils.getColorName_=function(a){a=a.toLowerCase();var b=a.replace(/\s/g,"").match(/^rgba?\((\d+),(\d+),(\d+),?([^,\s)]+)?/i);b?a="#"+(parseInt(b[1],10)|256).toString(16).slice(1)+(parseInt(b[2],10)|256).toString(16).slice(1)+(parseInt(b[3],10)|256).toString(16).slice(1):a.startsWith("#")&&7<a.length&&(a=a.slice(0,7));switch(a){case "white":case "#fff":case "#ffffff":return"white";case "lime":case "#0f0":case "#00ff00":return"lime";case "cyan":case "#0ff":case "#00ffff":return"cyan";case "red":case "#f00":case "#ff0000":return"red";
|
|
936
|
+
case "yellow":case "#ff0":case "#ffff00":return"yellow";case "magenta":case "#f0f":case "#ff00ff":return"magenta";case "blue":case "#00f":case "#0000ff":return"blue";case "black":case "#000":case "#000000":return"black"}return null};
|
|
937
|
+
shaka.text.Utils.getCuesToFlatten=function(a,b){var c=[];a=$jscomp.makeIterator(a);for(var d=a.next();!d.done;d=a.next())if(d=d.value,d.isContainer)c.push.apply(c,$jscomp.arrayFromIterable(shaka.text.Utils.getCuesToFlatten(d.nestedCues,d)));else{var e=d.clone();e.nestedCues=[];e.payload=shaka.text.Utils.flattenPayload_(d,b);c.push(e)}return c};shaka.text.SimpleTextDisplayer=function(a,b){this.textTrack_=null;for(var c=$jscomp.makeIterator(Array.from(a.textTracks)),d=c.next();!d.done;d=c.next())d=d.value,d.mode="disabled",d.label==b&&(this.textTrack_=d);this.textTrack_||(this.textTrack_=a.addTextTrack("subtitles",b));this.textTrack_.mode="hidden"};
|
|
937
938
|
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};
|
|
938
|
-
shaka.text.SimpleTextDisplayer.prototype.append=function(a){var b=shaka.text.Utils.getCuesToFlatten(a
|
|
939
|
-
!0:!1}}(d))||(e=shaka.text.SimpleTextDisplayer.convertToTextTrackCue_(d.$jscomp$loop$prop$inCue$
|
|
939
|
+
shaka.text.SimpleTextDisplayer.prototype.append=function(a){var b=shaka.text.Utils.getCuesToFlatten(a),c=[];a=this.textTrack_.cues?Array.from(this.textTrack_.cues):[];var d={};b=$jscomp.makeIterator(b);for(var e=b.next();!e.done;d={$jscomp$loop$prop$inCue$794:d.$jscomp$loop$prop$inCue$794},e=b.next())d.$jscomp$loop$prop$inCue$794=e.value,a.some(function(f){return function(g){return g.startTime==f.$jscomp$loop$prop$inCue$794.startTime&&g.endTime==f.$jscomp$loop$prop$inCue$794.endTime&&g.text==f.$jscomp$loop$prop$inCue$794.payload?
|
|
940
|
+
!0:!1}}(d))||(e=shaka.text.SimpleTextDisplayer.convertToTextTrackCue_(d.$jscomp$loop$prop$inCue$794))&&c.push(e);a=c.slice().sort(function(f,g){return f.startTime!=g.startTime?f.startTime-g.startTime:f.endTime!=g.endTime?f.endTime-g.startTime:"line"in VTTCue.prototype?c.indexOf(g)-c.indexOf(f):c.indexOf(f)-c.indexOf(g)});a=$jscomp.makeIterator(a);for(d=a.next();!d.done;d=a.next())this.textTrack_.addCue(d.value)};
|
|
940
941
|
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};shaka.text.SimpleTextDisplayer.prototype.setTextVisibility=function(a){this.textTrack_.mode=a?"showing":"hidden"};
|
|
941
942
|
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&&
|
|
942
943
|
(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};
|
|
@@ -953,7 +954,7 @@ goog.exportProperty(shaka.text.StubTextDisplayer.prototype,"remove",shaka.text.S
|
|
|
953
954
|
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.aspectRatio_=null;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";
|
|
954
955
|
this.textContainer_.style.justifyContent="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.eventManager_.listen(this.video_,"resize",function(){var d=c.video_,e=d.videoWidth;d=d.videoHeight;c.aspectRatio_=e&&d?e/d:null});this.resizeObserver_=
|
|
955
956
|
null;"ResizeObserver"in window&&(this.resizeObserver_=new ResizeObserver(function(){c.updateCaptions_(!0)}),this.resizeObserver_.observe(this.textContainer_));this.regionElements_=new Map};
|
|
956
|
-
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$
|
|
957
|
+
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$796:c.$jscomp$loop$prop$cue$796},d=a.next())c.$jscomp$loop$prop$cue$796=d.value,b.some(function(e){return function(f){return shaka.text.Cue.equal(f,e.$jscomp$loop$prop$cue$796)}}(c))||this.cues_.push(c.$jscomp$loop$prop$cue$796);this.updateCaptions_()};
|
|
957
958
|
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)};
|
|
958
959
|
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};
|
|
959
960
|
shaka.text.UITextDisplayer.prototype.isElementUnderTextContainer_=function(a){for(;null!=a;){if(a==this.textContainer_)return!0;a=a.parentElement}return!1};
|
|
@@ -973,13 +974,13 @@ b.positionAlign.CENTER};
|
|
|
973
974
|
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=
|
|
974
975
|
shaka.text.UITextDisplayer.convertLengthValue_(b.linePadding,b,this.videoContainer_);f.textCombineUpright=b.textCombineUpright;f.textShadow=b.textShadow;if(b.backgroundImage)f.backgroundImage="url('"+b.backgroundImage+"')",f.backgroundRepeat="no-repeat",f.backgroundSize="contain",f.backgroundPosition="center",f.width="100%",f.height="100%";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,
|
|
975
976
|
function(m){return m.backgroundColor}))?l.style.backgroundColor=a:k&&(l.style.backgroundColor="rgba(0, 0, 0, 0.8)"),a=shaka.text.UITextDisplayer.inheritProperty_(c,function(m){return m.fontFamily}))&&(l.style.fontFamily=a);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");
|
|
976
|
-
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,b,this.videoContainer_);
|
|
977
|
-
"%":b.lineAlign==e.lineAlign.END&&(f.bottom=100-
|
|
978
|
-
c=this.computeCuePositionAlignment_(b);c==e.positionAlign.LEFT?f.cssFloat="left":c==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==b.writingMode||(f.webkitWritingMode=b.writingMode);b.size&&(b.writingMode==e.writingMode.HORIZONTAL_TOP_TO_BOTTOM?f.width=b.size+"%":f.height=b.size+"%")};
|
|
977
|
+
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,b,this.videoContainer_);c=b.line;null!=c&&(g=b.lineInterpretation,g==e.lineInterpretation.LINE_NUMBER&&(g=e.lineInterpretation.PERCENTAGE,h=16,this.aspectRatio_&&1>this.aspectRatio_&&(h=32),c=0>c?100+c/h*100:c/h*100),g==e.lineInterpretation.PERCENTAGE&&(f.position="absolute",b.writingMode==e.writingMode.HORIZONTAL_TOP_TO_BOTTOM?
|
|
978
|
+
(f.width="100%",b.lineAlign==e.lineAlign.START?f.top=c+"%":b.lineAlign==e.lineAlign.END&&(f.bottom=100-c+"%")):b.writingMode==e.writingMode.VERTICAL_LEFT_TO_RIGHT?(f.height="100%",b.lineAlign==e.lineAlign.START?f.left=c+"%":b.lineAlign==e.lineAlign.END&&(f.right=100-c+"%")):(f.height="100%",b.lineAlign==e.lineAlign.START?f.right=c+"%":b.lineAlign==e.lineAlign.END&&(f.left=100-c+"%"))));f.lineHeight=b.lineHeight;null!=b.position&&(b.writingMode==e.writingMode.HORIZONTAL_TOP_TO_BOTTOM?f.paddingLeft=
|
|
979
|
+
b.position:f.paddingTop=b.position);c=this.computeCuePositionAlignment_(b);c==e.positionAlign.LEFT?f.cssFloat="left":c==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==b.writingMode||(f.webkitWritingMode=b.writingMode);b.size&&(b.writingMode==e.writingMode.HORIZONTAL_TOP_TO_BOTTOM?f.width=b.size+"%":f.height=b.size+"%")};
|
|
979
980
|
shaka.text.UITextDisplayer.getLengthValueInfo_=function(a){return(a=(new RegExp(/(\d*\.?\d+)([a-z]+|%+)/)).exec(a))?{value:Number(a[1]),unit:a[2]}:null};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}};
|
|
980
981
|
shaka.text.UITextDisplayer.getAbsoluteLengthInPixels_=function(a,b,c){return c.clientHeight*a/b.cellResolution.rows+"px"};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);
|
|
981
982
|
goog.exportProperty(shaka.text.UITextDisplayer.prototype,"isTextVisible",shaka.text.UITextDisplayer.prototype.isTextVisible);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(){};
|
|
982
|
-
shaka.text.WebVttGenerator.convert=function(a,b){var c=function(f){for(var g=f,h=$jscomp.makeIterator(b),k=h.next();!k.done;k=h.next())k=k.value,k.end&&k.start<f&&(g+=k.end-k.start);f=Math.floor(g/3600);h=Math.floor(g/60%60);k=Math.floor(g%60);g=Math.floor(1E3*g%1E3);return(10>f?"0":"")+f+":"+(10>h?"0":"")+h+":"+(10>k?"0":"")+k+"."+(100>g?10>g?"00":"0":"")+g},d=shaka.text.Utils.getCuesToFlatten(a
|
|
983
|
+
shaka.text.WebVttGenerator.convert=function(a,b){var c=function(f){for(var g=f,h=$jscomp.makeIterator(b),k=h.next();!k.done;k=h.next())k=k.value,k.end&&k.start<f&&(g+=k.end-k.start);f=Math.floor(g/3600);h=Math.floor(g/60%60);k=Math.floor(g%60);g=Math.floor(1E3*g%1E3);return(10>f?"0":"")+f+":"+(10>h?"0":"")+h+":"+(10>k?"0":"")+k+"."+(100>g?10>g?"00":"0":"")+g},d=shaka.text.Utils.getCuesToFlatten(a);a="WEBVTT\n\n";d=$jscomp.makeIterator(d);for(var e=d.next();!e.done;e=d.next())e=e.value,a+=c(e.startTime)+
|
|
983
984
|
" --\x3e "+c(e.endTime)+function(f){var g=[],h=shaka.text.Cue;switch(f.textAlign){case h.textAlign.LEFT:g.push("align:left");break;case h.textAlign.RIGHT:g.push("align:right");break;case h.textAlign.CENTER:g.push("align:middle");break;case h.textAlign.START:g.push("align:start");break;case h.textAlign.END:g.push("align:end")}switch(f.writingMode){case h.writingMode.VERTICAL_LEFT_TO_RIGHT:g.push("vertical:lr");break;case h.writingMode.VERTICAL_RIGHT_TO_LEFT:g.push("vertical:rl")}return g.length?" "+
|
|
984
985
|
g.join(" "):""}(e)+"\n",a+=e.payload+"\n\n";return a};goog.exportSymbol("shaka.text.WebVttGenerator",shaka.text.WebVttGenerator);shaka.util.CmcdManager=function(a,b){this.playerInterface_=a;this.config_=b;this.sid_="";this.sf_=void 0;this.playbackStarted_=!1;this.buffering_=!0;this.starved_=!1};shaka.util.CmcdManager.prototype.configure=function(a){this.config_=a};shaka.util.CmcdManager.prototype.setBuffering=function(a){a||this.playbackStarted_||(this.playbackStarted_=!0);this.playbackStarted_&&a&&(this.starved_=!0);this.buffering_=a};
|
|
985
986
|
shaka.util.CmcdManager.prototype.applyData=function(a,b,c){c=void 0===c?{}:c;if(this.config_.enabled)if("HEAD"===b.method)this.apply_(b);else{var d=shaka.net.NetworkingEngine.RequestType,e=shaka.util.CmcdManager.ObjectType;switch(a){case d.MANIFEST:this.applyManifestData(b,c);break;case d.SEGMENT:this.applySegmentData(b,c);break;case d.LICENSE:case d.SERVER_CERTIFICATE:case d.KEY:this.apply_(b,{ot:e.KEY});break;case d.TIMING:this.apply_(b,{ot:e.OTHER})}}};
|
|
@@ -1086,7 +1087,7 @@ e),2);g.manifest_=m.yieldResult;h=b.makeEvent_(shaka.util.FakeEvent.EventName.Ma
|
|
|
1086
1087
|
shaka.Player.prototype.initializeDrmInner_=function(){var a=this,b,c;return $jscomp.asyncExecutePromiseGeneratorProgram(function(d){return 1==d.nextAddress?(goog.asserts.assert(a.networkingEngine_,"|onInitializeDrm_| should never be called after |destroy|"),goog.asserts.assert(a.config_,"|onInitializeDrm_| should never be called after |destroy|"),goog.asserts.assert(a.manifest_,"|this.manifest_| should have been set in an earlier step."),goog.asserts.assert(a.video_,"We should have a media element when initializing the DRM Engine."),
|
|
1087
1088
|
a.makeStateChangeEvent_("drm-engine"),b=Date.now()/1E3,c=!0,a.drmEngine_=a.createDrmEngine({netEngine:a.networkingEngine_,onError:function(e){a.onError_(e)},onKeyStatus:function(e){a.onKeyStatus_(e)},onExpirationUpdated:function(e,f){a.onExpirationUpdated_(e,f)},onEvent:function(e){a.dispatchEvent(e);e.type==shaka.util.FakeEvent.EventName.DrmSessionUpdate&&c&&(c=!1,e=Date.now()/1E3-b,a.stats_.setDrmTime(e),a.lcevcDec_&&a.lcevcDec_.hideCanvas())}}),a.drmEngine_.configure(a.config_.drm),d.yield(a.drmEngine_.initForPlayback(a.manifest_.variants,
|
|
1088
1089
|
a.manifest_.offlineSessionIds),2)):3!=d.nextAddress?d.yield(a.drmEngine_.attach(a.video_),3):d.yield(a.filterManifest_(a.manifest_),0)})};
|
|
1089
|
-
shaka.Player.prototype.loadInner_=function(a){var b=this,c,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,z
|
|
1090
|
+
shaka.Player.prototype.loadInner_=function(a){var b=this,c,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,y,z;return $jscomp.asyncExecutePromiseGeneratorProgram(function(A){switch(A.nextAddress){case 1:goog.asserts.assert(b.video_,"We should have a media element by now.");goog.asserts.assert(b.manifest_,"The manifest should already be parsed.");goog.asserts.assert(b.assetUri_,"We should have an asset uri by now.");b.makeStateChangeEvent_("load");c=b.video_;b.playRateController_=new shaka.media.PlayRateController({getRate:function(){return c.playbackRate},
|
|
1090
1091
|
getDefaultRate:function(){return c.defaultPlaybackRate},setRate:function(B){c.playbackRate=B},movePlayhead:function(B){c.currentTime+=B}});d=function(){return b.updateStateHistory_()};e=function(){return b.onRateChange_()};b.loadEventManager_.listen(c,"playing",d);b.loadEventManager_.listen(c,"pause",d);b.loadEventManager_.listen(c,"ended",d);b.loadEventManager_.listen(c,"ratechange",e);b.setupLcevc_(b.config_);f=b.config_.abrFactory;b.abrManager_&&b.abrManagerFactory_==f||(b.abrManagerFactory_=f,
|
|
1091
1092
|
b.abrManager_=f(),"function"!=typeof b.abrManager_.setMediaElement&&(shaka.Deprecate.deprecateFeature(5,"AbrManager","Please use an AbrManager with setMediaElement function."),b.abrManager_.setMediaElement=function(){}),b.abrManager_.configure(b.config_.abr));b.currentAdaptationSetCriteria_=new shaka.media.PreferenceBasedCriteria(b.config_.preferredAudioLanguage,b.config_.preferredVariantRole,b.config_.preferredAudioChannelCount,b.config_.preferredVideoHdrLevel,b.config_.preferredVideoLayout,b.config_.preferredAudioLabel,
|
|
1092
1093
|
b.config_.mediaSource.codecSwitchingStrategy,b.config_.manifest.dash.enableAudioGroups);b.currentTextLanguage_=b.config_.preferredTextLanguage;b.currentTextRole_=b.config_.preferredTextRole;b.currentTextForced_=b.config_.preferForcedSubs;shaka.Player.applyPlayRange_(b.manifest_.presentationTimeline,b.config_.playRangeStart,b.config_.playRangeEnd);b.abrManager_.init(function(B,E,I){return b.switch_(B,E,I)});b.abrManager_.setMediaElement(c);shaka.util.StreamUtils.chooseCodecsAndFilterManifest(b.manifest_,
|
|
@@ -1094,7 +1095,7 @@ b.config_.preferredVideoCodecs,b.config_.preferredAudioCodecs,b.config_.preferre
|
|
|
1094
1095
|
g=null;h=b.streamingEngine_.getCurrentVariant();h||(g=b.chooseVariant_(!0),goog.asserts.assert(g,"Must choose an initial variant!"));k=[];l=h||g;m=$jscomp.makeIterator([l.video,l.audio]);for(n=m.next();!n.done;n=m.next())(p=n.value)&&!p.segmentIndex&&k.push(p.createSegmentIndex());if(!(0<k.length)){A.jumpTo(2);break}return A.yield(Promise.all(k),2);case 2:if(b.parser_&&b.parser_.onInitialVariantChosen)b.parser_.onInitialVariantChosen(l);shaka.Player.applyPlayRange_(b.manifest_.presentationTimeline,
|
|
1095
1096
|
b.config_.playRangeStart,b.config_.playRangeEnd);b.playhead_=b.createPlayhead(b.startTime_);b.playheadObservers_=b.createPlayheadObserversForMSE_(a);q=Math.max(b.manifest_.minBufferTime,b.config_.streaming.rebufferingGoal);b.startBufferManagement_(c,q);if(h){A.jumpTo(4);break}goog.asserts.assert(g,"Must have choosen an initial variant!");b.switchVariant_(g,!0,!1,0);if(!b.config_.streaming.startAtSegmentBoundary){A.jumpTo(4);break}r=b.playhead_;u=r.setStartTime;return A.yield(b.adjustStartTime_(g,
|
|
1096
1097
|
b.playhead_.getTime()),6);case 6:u.call(r,A.yieldResult);case 4:return b.playhead_.ready(),w=b.getTextTracks().find(function(B){return B.active}),w||((t=b.chooseTextStream_())&&b.addTextStreamToSwitchHistory_(t,!0),g&&b.setInitialTextState_(g,t),t&&b.shouldStreamText_()&&b.streamingEngine_.switchTextStream(t)),A.yield(b.streamingEngine_.start(),7);case 7:b.config_.abr.enabled&&(b.abrManager_.enable(),b.onAbrStatusChanged_());b.onTracksChanged_();b.updateAbrManagerVariants_();v=b.manifest_.variants.some(function(B){return B.primary});
|
|
1097
|
-
b.config_.preferredAudioLanguage||v||shaka.log.warning("No preferred audio language set. We have chosen an arbitrary language initially");(x=b.isLive())&&(b.config_.streaming.liveSync||b.manifest_.serviceDescription)?(
|
|
1098
|
+
b.config_.preferredAudioLanguage||v||shaka.log.warning("No preferred audio language set. We have chosen an arbitrary language initially");(x=b.isLive())&&(b.config_.streaming.liveSync||b.manifest_.serviceDescription)?(y=function(){return b.onTimeUpdate_()},b.loadEventManager_.listen(c,"timeupdate",y)):x||(z=function(){return b.onVideoProgress_()},b.loadEventManager_.listen(c,"timeupdate",z),b.onVideoProgress_());if(b.adManager_)b.adManager_.onManifestUpdated(x);b.fullyLoaded_=!0;b.loadEventManager_.listenOnce(c,
|
|
1098
1099
|
"loadedmetadata",function(){var B=Date.now()/1E3-a;b.stats_.setLoadLatency(B)});A.jumpToEnd()}})};
|
|
1099
1100
|
shaka.Player.prototype.initializeSrcEqualsDrmInner_=function(a){var b=this,c,d,e,f;return $jscomp.asyncExecutePromiseGeneratorProgram(function(g){return 1==g.nextAddress?(c=shaka.util.ManifestParserUtils.ContentType,goog.asserts.assert(b.networkingEngine_,"|onInitializeSrcEqualsDrm_| should never be called after |destroy|"),goog.asserts.assert(b.config_,"|onInitializeSrcEqualsDrm_| should never be called after |destroy|"),d=Date.now()/1E3,e=!0,b.drmEngine_=b.createDrmEngine({netEngine:b.networkingEngine_,
|
|
1100
1101
|
onError:function(h){b.onError_(h)},onKeyStatus:function(h){b.onKeyStatus_(h)},onExpirationUpdated:function(h,k){b.onExpirationUpdated_(h,k)},onEvent:function(h){b.dispatchEvent(h);h.type==shaka.util.FakeEvent.EventName.DrmSessionUpdate&&e&&(e=!1,h=Date.now()/1E3-d,b.stats_.setDrmTime(h))}}),b.drmEngine_.configure(b.config_.drm),f={id:0,language:"und",disabledUntilTime:0,primary:!1,audio:null,video:{id:0,originalId:null,groupId:null,createSegmentIndex:function(){return Promise.resolve()},segmentIndex:null,
|
|
@@ -1150,8 +1151,8 @@ shaka.Player.prototype.getImageTracks=function(){var a=shaka.util.StreamUtils,b=
|
|
|
1150
1151
|
shaka.Player.prototype.getAllThumbnails=function(a){var b=this,c,d,e,f;return $jscomp.asyncExecutePromiseGeneratorProgram(function(g){if(1==g.nextAddress){if(b.loadMode_!=shaka.Player.LoadMode.MEDIA_SOURCE&&b.loadMode_!=shaka.Player.LoadMode.SRC_EQUALS)return g.return(null);c=b.externalSrcEqualsThumbnailsStreams_;b.manifest_&&(c=b.manifest_.imageStreams);return(d=c.find(function(h){return h.id==a}))?d.segmentIndex?g.jumpTo(2):g.yield(d.createSegmentIndex(),2):g.return(null)}if(4!=g.nextAddress)return e=
|
|
1151
1152
|
[],d.segmentIndex.forEachTopLevelReference(function(h){var k=b.parseTilesLayout_(h.getTilesLayout()||d.tilesLayout);if(k){k=k.rows*k.columns;for(var l=h.trueEndTime-h.startTime,m=0;m<k;m++)e.push(b.getThumbnails(a,h.startTime+l*m/k))}}),g.yield(Promise.all(e),4);f=g.yieldResult;return g.return(f.filter(function(h){return h}))})};
|
|
1152
1153
|
shaka.Player.prototype.parseTilesLayout_=function(a){if(!a)return null;var b=/(\d+)x(\d+)/.exec(a);if(!b)return shaka.log.warning("Tiles layout does not contain a valid format (columns x rows)"),null;a=parseInt(b[1],10);b=parseInt(b[2],10);return{columns:a,rows:b}};
|
|
1153
|
-
shaka.Player.prototype.getThumbnails=function(a,b){var c=this,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,
|
|
1154
|
-
e.segmentIndex.find(b);if(null==f)return
|
|
1154
|
+
shaka.Player.prototype.getThumbnails=function(a,b){var c=this,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,y;return $jscomp.asyncExecutePromiseGeneratorProgram(function(z){if(1==z.nextAddress){if(c.loadMode_!=shaka.Player.LoadMode.MEDIA_SOURCE&&c.loadMode_!=shaka.Player.LoadMode.SRC_EQUALS)return z.return(null);d=c.externalSrcEqualsThumbnailsStreams_;c.manifest_&&(d=c.manifest_.imageStreams);return(e=d.find(function(A){return A.id==a}))?e.segmentIndex?z.jumpTo(2):z.yield(e.createSegmentIndex(),2):z.return(null)}f=
|
|
1155
|
+
e.segmentIndex.find(b);if(null==f)return z.return(null);g=e.segmentIndex.get(f);h=c.parseTilesLayout_(g.getTilesLayout()||e.tilesLayout);if(!h)return z.return(null);k=e.width||0;l=e.height||0;m=k/h.columns;n=l/h.rows;p=h.columns*h.rows;q=g.trueEndTime-g.startTime;r=g.getTileDuration()||q/p;u=g.startTime;t=w=0;1<p&&(v=Math.floor((b-g.startTime)/r),u=g.startTime+v*r,w=v%h.columns*m,t=Math.floor(v/h.columns)*n);x=!1;if(y=g.getThumbnailSprite())x=!0,n=y.height,w=y.positionX,t=y.positionY,m=y.width;return z.return({segment:g,
|
|
1155
1156
|
imageHeight:l,imageWidth:k,height:n,positionX:w,positionY:t,startTime:u,duration:r,uris:g.getUris(),width:m,sprite:x})})};
|
|
1156
1157
|
shaka.Player.prototype.selectTextTrack=function(a){if(this.manifest_&&this.streamingEngine_){var b=this.manifest_.textStreams.find(function(d){return d.id==a.id});b?b==this.streamingEngine_.getCurrentTextStream()?shaka.log.debug("Text track already selected."):(this.addTextStreamToSwitchHistory_(b,!1),this.streamingEngine_.switchTextStream(b),this.onTextChanged_(),this.currentTextLanguage_=b.language):shaka.log.error("No stream with id",a.id)}else if(this.video_&&this.video_.src&&this.video_.textTracks){b=
|
|
1157
1158
|
this.getFilteredTextTracks_();b=$jscomp.makeIterator(b);for(var c=b.next();!c.done;c=b.next())c=c.value,shaka.util.StreamUtils.html5TrackId(c)==a.id?c.mode=this.isTextVisible_?"showing":"hidden":c.mode="disabled";this.onTextChanged_()}};
|
|
@@ -1177,18 +1178,18 @@ shaka.Player.prototype.getPresentationStartTimeAsDate=function(){if(!this.isLive
|
|
|
1177
1178
|
null):a;shaka.log.warning("No way to get presentation start time as Date!");return null};shaka.Player.prototype.getBufferedInfo=function(){if(this.loadMode_==shaka.Player.LoadMode.MEDIA_SOURCE)return this.mediaSourceEngine_.getBufferedInfo();var a={total:[],audio:[],video:[],text:[]};this.loadMode_==shaka.Player.LoadMode.SRC_EQUALS&&(a.total=shaka.media.TimeRangesUtils.getBufferedInfo(this.video_.buffered));return a};
|
|
1178
1179
|
shaka.Player.prototype.getStats=function(){if(this.loadMode_!=shaka.Player.LoadMode.MEDIA_SOURCE&&this.loadMode_!=shaka.Player.LoadMode.SRC_EQUALS)return shaka.util.Stats.getEmptyBlob();this.updateStateHistory_();goog.asserts.assert(this.video_,"If we have stats, we should have video_");var a=this.video_,b=a.currentTime/a.duration;isNaN(b)||this.stats_.setCompletionPercent(Math.round(100*b));this.playhead_&&(this.stats_.setGapsJumped(this.playhead_.getGapsJumped()),this.stats_.setStallsDetected(this.playhead_.getStallsDetected()));
|
|
1179
1180
|
a.getVideoPlaybackQuality&&(b=a.getVideoPlaybackQuality(),this.stats_.setDroppedFrames(Number(b.droppedVideoFrames),Number(b.totalVideoFrames)),this.stats_.setCorruptedFrames(Number(b.corruptedVideoFrames)));b=this.drmEngine_?this.drmEngine_.getLicenseTime():NaN;this.stats_.setLicenseTime(b);if(this.loadMode_==shaka.Player.LoadMode.MEDIA_SOURCE){if(b=this.streamingEngine_.getCurrentVariant()){var c=(this.playRateController_?this.playRateController_.getRealRate():1)*b.bandwidth;this.stats_.setCurrentStreamBandwidth(c)}b&&
|
|
1180
|
-
b.video&&this.stats_.setResolution(b.video.width||NaN,b.video.height||NaN);this.isLive()&&(b=this.getPresentationStartTimeAsDate().valueOf()+1E3*
|
|
1181
|
+
b.video&&this.stats_.setResolution(b.video.width||NaN,b.video.height||NaN);this.isLive()&&(b=this.getPresentationStartTimeAsDate().valueOf()+1E3*a.currentTime,b=(Date.now()-b)/1E3,this.stats_.setLiveLatency(b));this.manifest_&&this.manifest_.presentationTimeline&&(b=this.manifest_.presentationTimeline.getMaxSegmentDuration(),this.stats_.setMaxSegmentDuration(b));b=this.abrManager_.getBandwidthEstimate();this.stats_.setBandwidthEstimate(b)}this.loadMode_==shaka.Player.LoadMode.SRC_EQUALS&&this.stats_.setResolution(a.videoWidth||
|
|
1181
1182
|
NaN,a.videoHeight||NaN);return this.stats_.getBlob()};
|
|
1182
|
-
shaka.Player.prototype.addTextTrackAsync=function(a,b,c,d,e,f,g){g=void 0===g?!1:g;var h=this,k,l,m,n,p,q,r,u,w,t,v,x,
|
|
1183
|
-
if(d){
|
|
1184
|
-
throw new shaka.util.Error(shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.TEXT,shaka.util.Error.Code.CANNOT_ADD_EXTERNAL_TEXT_TO_SRC_EQUALS);case 4:q=shaka.util.ManifestParserUtils.ContentType;r=h.video_.duration;h.manifest_&&(r=h.manifest_.presentationTimeline.getDuration());if(Infinity==r)throw new shaka.util.Error(shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.CANNOT_ADD_EXTERNAL_TEXT_TO_LIVE_STREAM);if(!k.length){
|
|
1185
|
-
"Need networking engine.");return
|
|
1186
|
-
drmInfos:[],keyIds:new Set,language:b,originalLanguage:b,label:f||null,type:q.TEXT,primary:!1,trickModeVideo:null,emsgSchemeIdUris:null,roles:[],forced:!!g,channelsCount:null,audioSamplingRate:null,spatialAudio:!1,closedCaptions:null,accessibilityPurpose:null,external:!0,fastSwitching:!1};x=shaka.util.MimeUtils.getFullType(v.mimeType,v.codecs);
|
|
1187
|
-
d);h.manifest_.textStreams.push(v);h.onTracksChanged_();return
|
|
1183
|
+
shaka.Player.prototype.addTextTrackAsync=function(a,b,c,d,e,f,g){g=void 0===g?!1:g;var h=this,k,l,m,n,p,q,r,u,w,t,v,x,y;return $jscomp.asyncExecutePromiseGeneratorProgram(function(z){switch(z.nextAddress){case 1:if(h.loadMode_!=shaka.Player.LoadMode.MEDIA_SOURCE&&h.loadMode_!=shaka.Player.LoadMode.SRC_EQUALS)throw shaka.log.error("Must call load() and wait for it to resolve before adding text tracks."),new shaka.util.Error(shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.PLAYER,shaka.util.Error.Code.CONTENT_NOT_LOADED);
|
|
1184
|
+
if(d){z.jumpTo(2);break}return z.yield(h.getTextMimetype_(a),3);case 3:d=z.yieldResult;case 2:k=[];h.adManager_&&(k=h.adManager_.getCuePoints());if(h.loadMode_!=shaka.Player.LoadMode.SRC_EQUALS){z.jumpTo(4);break}g&&(c="forced");return z.yield(h.addSrcTrackElement_(a,b,c,d,f||"",k),5);case 5:l=shaka.util.LanguageUtils;m=l.normalize(b);n=h.getTextTracks();if(p=n.find(function(A){return l.normalize(A.language)==m&&A.label==(f||"")&&A.kind==c}))return h.onTracksChanged_(),z.return(p);shaka.log.error("Cannot add this text when loaded with src=");
|
|
1185
|
+
throw new shaka.util.Error(shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.TEXT,shaka.util.Error.Code.CANNOT_ADD_EXTERNAL_TEXT_TO_SRC_EQUALS);case 4:q=shaka.util.ManifestParserUtils.ContentType;r=h.video_.duration;h.manifest_&&(r=h.manifest_.presentationTimeline.getDuration());if(Infinity==r)throw new shaka.util.Error(shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.CANNOT_ADD_EXTERNAL_TEXT_TO_LIVE_STREAM);if(!k.length){z.jumpTo(6);break}goog.asserts.assert(h.networkingEngine_,
|
|
1186
|
+
"Need networking engine.");return z.yield(h.getTextData_(a,h.networkingEngine_,h.config_.streaming.retryParameters),7);case 7:u=z.yieldResult,w=h.convertToWebVTT_(u,d,k),t=new Blob([w],{type:"text/vtt"}),a=shaka.media.MediaSourceEngine.createObjectURL(t),d="text/vtt";case 6:v={id:h.nextExternalStreamId_++,originalId:null,groupId:null,createSegmentIndex:function(){return Promise.resolve()},segmentIndex:shaka.media.SegmentIndex.forSingleSegment(0,r,[a]),mimeType:d||"",codecs:e||"",kind:c,encrypted:!1,
|
|
1187
|
+
drmInfos:[],keyIds:new Set,language:b,originalLanguage:b,label:f||null,type:q.TEXT,primary:!1,trickModeVideo:null,emsgSchemeIdUris:null,roles:[],forced:!!g,channelsCount:null,audioSamplingRate:null,spatialAudio:!1,closedCaptions:null,accessibilityPurpose:null,external:!0,fastSwitching:!1};x=shaka.util.MimeUtils.getFullType(v.mimeType,v.codecs);y=shaka.text.TextEngine.isTypeSupported(x);if(!y)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.TEXT,shaka.util.Error.Code.MISSING_TEXT_PLUGIN,
|
|
1188
|
+
d);h.manifest_.textStreams.push(v);h.onTracksChanged_();return z.return(shaka.util.StreamUtils.textStreamToTrack(v))}})};
|
|
1188
1189
|
shaka.Player.prototype.addThumbnailsTrack=function(a,b){var c=this,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v;return $jscomp.asyncExecutePromiseGeneratorProgram(function(x){switch(x.nextAddress){case 1:if(c.loadMode_!=shaka.Player.LoadMode.MEDIA_SOURCE&&c.loadMode_!=shaka.Player.LoadMode.SRC_EQUALS)throw shaka.log.error("Must call load() and wait for it to resolve before adding image tracks."),new shaka.util.Error(shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.PLAYER,shaka.util.Error.Code.CONTENT_NOT_LOADED);
|
|
1189
1190
|
if(b){x.jumpTo(2);break}return x.yield(c.getTextMimetype_(a),3);case 3:b=x.yieldResult;case 2:if("text/vtt"!=b)throw new shaka.util.Error(shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.TEXT,shaka.util.Error.Code.UNSUPPORTED_EXTERNAL_THUMBNAILS_URI,a);d=shaka.util.ManifestParserUtils.ContentType;e=c.video_.duration;c.manifest_&&(e=c.manifest_.presentationTimeline.getDuration());if(Infinity==e)throw new shaka.util.Error(shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.MANIFEST,
|
|
1190
1191
|
shaka.util.Error.Code.CANNOT_ADD_EXTERNAL_THUMBNAILS_TO_LIVE_STREAM);goog.asserts.assert(c.networkingEngine_,"Need networking engine.");return x.yield(c.getTextData_(a,c.networkingEngine_,c.config_.streaming.retryParameters),4);case 4:f=x.yieldResult;g=shaka.text.TextEngine.findParser(b);if(!g)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.TEXT,shaka.util.Error.Code.MISSING_TEXT_PLUGIN,b);h=g();k={periodStart:0,segmentStart:0,segmentEnd:e,vttOffset:0};l=shaka.util.BufferUtils.toUint8(f);
|
|
1191
|
-
m=h.parseMedia(l,k,a);n=[];p={};q=$jscomp.makeIterator(m);for(r=q.next();!r.done;p={$jscomp$loop$prop$imageUri$
|
|
1192
|
+
m=h.parseMedia(l,k,a);n=[];p={};q=$jscomp.makeIterator(m);for(r=q.next();!r.done;p={$jscomp$loop$prop$imageUri$798:p.$jscomp$loop$prop$imageUri$798},r=q.next())u=r.value,p.$jscomp$loop$prop$imageUri$798=shaka.util.ManifestParserUtils.resolveUris([a],[u.payload])[0],w=new shaka.media.SegmentReference(u.startTime,u.endTime,function(y){return function(){return[y.$jscomp$loop$prop$imageUri$798]}}(p),0,null,null,0,0,Infinity),p.$jscomp$loop$prop$imageUri$798.includes("#xywh")&&(t=p.$jscomp$loop$prop$imageUri$798.split("#xywh=")[1].split(","),
|
|
1192
1193
|
4===t.length&&w.setThumbnailSprite({height:parseInt(t[3],10),positionX:parseInt(t[0],10),positionY:parseInt(t[1],10),width:parseInt(t[2],10)})),n.push(w);v={id:c.nextExternalStreamId_++,originalId:null,groupId:null,createSegmentIndex:function(){return Promise.resolve()},segmentIndex:new shaka.media.SegmentIndex(n),mimeType:b||"",codecs:"",kind:"",encrypted:!1,drmInfos:[],keyIds:new Set,language:"und",originalLanguage:null,label:null,type:d.IMAGE,primary:!1,trickModeVideo:null,emsgSchemeIdUris:null,
|
|
1193
1194
|
roles:[],forced:!1,channelsCount:null,audioSamplingRate:null,spatialAudio:!1,closedCaptions:null,tilesLayout:"1x1",accessibilityPurpose:null,external:!0,fastSwitching:!1};c.loadMode_==shaka.Player.LoadMode.SRC_EQUALS?c.externalSrcEqualsThumbnailsStreams_.push(v):c.manifest_.imageStreams.push(v);c.onTracksChanged_();return x.return(shaka.util.StreamUtils.imageStreamToTrack(v))}})};
|
|
1194
1195
|
shaka.Player.prototype.addChaptersTrack=function(a,b,c){var d=this,e,f,g,h;return $jscomp.asyncExecutePromiseGeneratorProgram(function(k){switch(k.nextAddress){case 1:if(d.loadMode_!=shaka.Player.LoadMode.MEDIA_SOURCE&&d.loadMode_!=shaka.Player.LoadMode.SRC_EQUALS)throw shaka.log.error("Must call load() and wait for it to resolve before adding chapters tracks."),new shaka.util.Error(shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.PLAYER,shaka.util.Error.Code.CONTENT_NOT_LOADED);if(c){k.jumpTo(2);
|
|
@@ -1203,8 +1204,8 @@ shaka.Player.prototype.convertToWebVTT_=function(a,b,c){var d=shaka.text.TextEng
|
|
|
1203
1204
|
shaka.Player.prototype.setMaxHardwareResolution=function(a,b){this.maxHwRes_.width=a;this.maxHwRes_.height=b};shaka.Player.prototype.retryStreaming=function(a){return this.loadMode_==shaka.Player.LoadMode.MEDIA_SOURCE?this.streamingEngine_.retry(void 0===a?.1:a):!1};
|
|
1204
1205
|
shaka.Player.prototype.getManifest=function(){shaka.log.alwaysWarn("Shaka Player's internal Manifest structure is NOT covered by semantic versioning compatibility guarantees. It may change at any time! Please consider filing a feature request for whatever you use getManifest() for.");return this.manifest_};shaka.Player.prototype.getManifestParserFactory=function(){return this.parserFactory_};
|
|
1205
1206
|
shaka.Player.prototype.addVariantToSwitchHistory_=function(a,b){this.stats_.getSwitchHistory().updateCurrentVariant(a,b)};shaka.Player.prototype.addTextStreamToSwitchHistory_=function(a,b){this.stats_.getSwitchHistory().updateCurrentText(a,b)};
|
|
1206
|
-
shaka.Player.prototype.defaultConfig_=function(){var a=this,b=shaka.util.PlayerConfiguration.createDefault();b.streaming.failureCallback=function(c){a.defaultStreamingFailureCallback_(c)};b.textDisplayFactory=function(){if(a.videoContainer_)return new shaka.text.UITextDisplayer(a.video_,a.videoContainer_);if(HTMLMediaElement.prototype.addTextTrack)return new shaka.text.SimpleTextDisplayer(a.video_);shaka.log.warning("Text tracks are not supported by the browser, disabling.");
|
|
1207
|
-
return b};shaka.Player.prototype.setVideoContainer=function(a){this.videoContainer_=a};shaka.Player.prototype.defaultStreamingFailureCallback_=function(a){if(this.isLive()){var b=null;a.code==shaka.util.Error.Code.BAD_HTTP_STATUS||a.code==shaka.util.Error.Code.HTTP_ERROR?b=1:a.code==shaka.util.Error.Code.TIMEOUT&&(b=.1);null!=b&&(a.severity=shaka.util.Error.Severity.RECOVERABLE,shaka.log.warning("Live streaming error. Retrying automatically..."),this.retryStreaming(b))}};
|
|
1207
|
+
shaka.Player.prototype.defaultConfig_=function(){var a=this,b=shaka.util.PlayerConfiguration.createDefault();b.streaming.failureCallback=function(c){a.defaultStreamingFailureCallback_(c)};b.textDisplayFactory=function(){if(a.videoContainer_)return new shaka.text.UITextDisplayer(a.video_,a.videoContainer_);if(HTMLMediaElement.prototype.addTextTrack)return new shaka.text.SimpleTextDisplayer(a.video_,shaka.Player.TextTrackLabel);shaka.log.warning("Text tracks are not supported by the browser, disabling.");
|
|
1208
|
+
return new shaka.text.StubTextDisplayer};return b};shaka.Player.prototype.setVideoContainer=function(a){this.videoContainer_=a};shaka.Player.prototype.defaultStreamingFailureCallback_=function(a){if(this.isLive()){var b=null;a.code==shaka.util.Error.Code.BAD_HTTP_STATUS||a.code==shaka.util.Error.Code.HTTP_ERROR?b=1:a.code==shaka.util.Error.Code.TIMEOUT&&(b=.1);null!=b&&(a.severity=shaka.util.Error.Severity.RECOVERABLE,shaka.log.warning("Live streaming error. Retrying automatically..."),this.retryStreaming(b))}};
|
|
1208
1209
|
shaka.Player.prototype.makeTextStreamsForClosedCaptions_=function(a){for(var b=shaka.util.ManifestParserUtils.ContentType,c=shaka.util.ManifestParserUtils.TextStreamKind,d=shaka.util.MimeUtils.CEA608_CLOSED_CAPTION_MIMETYPE,e=shaka.util.MimeUtils.CEA708_CLOSED_CAPTION_MIMETYPE,f=new Set,g=$jscomp.makeIterator(a.textStreams),h=g.next();!h.done;h=g.next())h=h.value,h.mimeType!=d&&h.mimeType!=e||f.add(h.originalId);g=$jscomp.makeIterator(a.variants);for(h=g.next();!h.done;h=g.next())if((h=h.value.video)&&
|
|
1209
1210
|
h.closedCaptions)for(var k=$jscomp.makeIterator(h.closedCaptions.keys()),l=k.next();!l.done;l=k.next())if(l=l.value,!f.has(l)){var m=l.startsWith("CC")?d:e,n=new shaka.media.MetaSegmentIndex,p=h.closedCaptions.get(l);m={id:this.nextExternalStreamId_++,originalId:l,groupId:null,createSegmentIndex:function(){return Promise.resolve()},segmentIndex:n,mimeType:m,codecs:"",kind:c.CLOSED_CAPTION,encrypted:!1,drmInfos:[],keyIds:new Set,language:p,originalLanguage:p,label:null,type:b.TEXT,primary:!1,trickModeVideo:null,
|
|
1210
1211
|
emsgSchemeIdUris:null,roles:h.roles,forced:!1,channelsCount:null,audioSamplingRate:null,spatialAudio:!1,closedCaptions:null,accessibilityPurpose:null,external:!1,fastSwitching:!1};a.textStreams.push(m);f.add(l)}};shaka.Player.prototype.filterManifest_=function(a){var b=this;return $jscomp.asyncExecutePromiseGeneratorProgram(function(c){if(1==c.nextAddress)return c.yield(b.filterManifestWithStreamUtils_(a),2);b.filterManifestWithRestrictions_(a);c.jumpToEnd()})};
|
|
@@ -1243,9 +1244,9 @@ shaka.Player.prototype.onRegionEvent_=function(a,b){b={schemeIdUri:b.schemeIdUri
|
|
|
1243
1244
|
shaka.Player.prototype.onMediaQualityChange_=function(a,b){a={bandwidth:a.bandwidth,audioSamplingRate:a.audioSamplingRate,codecs:a.codecs,contentType:a.contentType,frameRate:a.frameRate,height:a.height,mimeType:a.mimeType,channelsCount:a.channelsCount,pixelAspectRatio:a.pixelAspectRatio,width:a.width};b=(new Map).set("mediaQuality",a).set("position",b);this.dispatchEvent(this.makeEvent_(shaka.util.FakeEvent.EventName.MediaQualityChanged,b))};
|
|
1244
1245
|
shaka.Player.prototype.videoErrorToShakaError_=function(){goog.asserts.assert(this.video_.error,"Video error expected, but missing!");if(!this.video_.error)return null;var a=this.video_.error.code;if(1==a)return null;var b=this.video_.error.msExtendedCode;b&&(0>b&&(b+=Math.pow(2,32)),b=b.toString(16));return new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MEDIA,shaka.util.Error.Code.VIDEO_ERROR,a,b,this.video_.error.message)};
|
|
1245
1246
|
shaka.Player.prototype.onVideoError_=function(a){if(a=this.videoErrorToShakaError_())this.onError_(a)};
|
|
1246
|
-
shaka.Player.prototype.onKeyStatus_=function(a){if(this.streamingEngine_){var b=this.makeEvent_(shaka.util.FakeEvent.EventName.KeyStatusChanged);this.dispatchEvent(b);var c=Object.keys(a);0==c.length&&shaka.log.warning("Got a key status event without any key statuses, so we don't know the real key statuses. If we don't have all the keys, you'll need to set restrictions so we don't select those tracks.");
|
|
1247
|
-
var
|
|
1248
|
-
f.allowedByKeySystem&&(
|
|
1247
|
+
shaka.Player.prototype.onKeyStatus_=function(a){if(this.streamingEngine_){var b=this.makeEvent_(shaka.util.FakeEvent.EventName.KeyStatusChanged);this.dispatchEvent(b);var c=Object.keys(a);0==c.length&&shaka.log.warning("Got a key status event without any key statuses, so we don't know the real key statuses. If we don't have all the keys, you'll need to set restrictions so we don't select those tracks.");(b=1==c.length&&"00"==c[0])&&shaka.log.warning("Got a synthetic key status event, so we don't know the real key statuses. If we don't have all the keys, you'll need to set restrictions so we don't select those tracks.");
|
|
1248
|
+
var d=shaka.Player.restrictedStatuses_,e=!1;if(c.length){c=$jscomp.makeIterator(this.manifest_.variants);for(var f=c.next();!f.done;f=c.next()){f=f.value;var g=shaka.util.StreamUtils.getVariantStreams(f);g=$jscomp.makeIterator(g);for(var h=g.next();!h.done;h=g.next()){var k=h.value;h=f.allowedByKeySystem;if(k.keyIds.size){f.allowedByKeySystem=!0;k=$jscomp.makeIterator(k.keyIds);for(var l=k.next();!l.done;l=k.next())l=l.value,l=a[b?"00":l],f.allowedByKeySystem=f.allowedByKeySystem&&!!l&&!d.includes(l)}h!=
|
|
1249
|
+
f.allowedByKeySystem&&(e=!0)}}}if(e&&(this.onTracksChanged_(),!this.updateAbrManagerVariants_()))return;(a=this.streamingEngine_.getCurrentVariant())&&!a.allowedByKeySystem&&(shaka.log.debug("Choosing new streams after key status changed"),this.chooseVariantAndSwitch_())}};shaka.Player.prototype.onExpirationUpdated_=function(a,b){if(this.parser_&&this.parser_.onExpirationUpdated)this.parser_.onExpirationUpdated(a,b);a=this.makeEvent_(shaka.util.FakeEvent.EventName.ExpirationUpdated);this.dispatchEvent(a)};
|
|
1249
1250
|
shaka.Player.prototype.shouldStreamText_=function(){return this.config_.streaming.alwaysStreamText||this.isTextTrackVisible()};shaka.Player.applyPlayRange_=function(a,b,c){0<b&&(a.isLive()?shaka.log.warning("|playRangeStart| has been configured for live content. Ignoring the setting."):a.setUserSeekStart(b));b=a.getDuration();c<b&&(a.isLive()?shaka.log.warning("|playRangeEnd| has been configured for live content. Ignoring the setting."):a.setDuration(c))};
|
|
1250
1251
|
shaka.Player.prototype.checkRestrictedVariants_=function(a){var b=shaka.Player.restrictedStatuses_,c=this.drmEngine_?this.drmEngine_.getKeyStatuses():{},d=Object.keys(c);d=d.length&&"00"==d[0];var e=!1,f=!1,g=new Set,h=new Set;a=$jscomp.makeIterator(a.variants);for(var k=a.next();!k.done;k=a.next()){k=k.value;var l=[];k.audio&&l.push(k.audio);k.video&&l.push(k.video);l=$jscomp.makeIterator(l);for(var m=l.next();!m.done;m=l.next())if(m=m.value,m.keyIds.size){m=$jscomp.makeIterator(m.keyIds);for(var n=
|
|
1251
1252
|
m.next();!n.done;n=m.next()){n=n.value;var p=c[d?"00":n];p?b.includes(p)&&h.add(p):g.add(n)}}k.allowedByApplication?k.allowedByKeySystem&&(e=!0):f=!0}if(!e)throw b={hasAppRestrictions:f,missingKeys:Array.from(g),restrictedKeyStatuses:Array.from(h)},new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.RESTRICTIONS_CANNOT_BE_MET,b);};
|
|
@@ -1268,7 +1269,7 @@ goog.exportProperty(shaka.Player.prototype,"isInProgress",shaka.Player.prototype
|
|
|
1268
1269
|
goog.exportProperty(shaka.Player.prototype,"getMediaElement",shaka.Player.prototype.getMediaElement);goog.exportProperty(shaka.Player.prototype,"getManifestType",shaka.Player.prototype.getManifestType);goog.exportProperty(shaka.Player.prototype,"getLoadMode",shaka.Player.prototype.getLoadMode);goog.exportProperty(shaka.Player.prototype,"resetConfiguration",shaka.Player.prototype.resetConfiguration);goog.exportProperty(shaka.Player.prototype,"getBufferFullness",shaka.Player.prototype.getBufferFullness);
|
|
1269
1270
|
goog.exportProperty(shaka.Player.prototype,"getConfiguration",shaka.Player.prototype.getConfiguration);goog.exportProperty(shaka.Player.prototype,"configure",shaka.Player.prototype.configure);goog.exportProperty(shaka.Player.prototype,"releaseAllMutexes",shaka.Player.prototype.releaseAllMutexes);goog.exportProperty(shaka.Player.prototype,"load",shaka.Player.prototype.load);goog.exportProperty(shaka.Player.prototype,"updateStartTime",shaka.Player.prototype.updateStartTime);
|
|
1270
1271
|
goog.exportProperty(shaka.Player.prototype,"unload",shaka.Player.prototype.unload);goog.exportProperty(shaka.Player.prototype,"detach",shaka.Player.prototype.detach);goog.exportProperty(shaka.Player.prototype,"attachCanvas",shaka.Player.prototype.attachCanvas);goog.exportProperty(shaka.Player.prototype,"attach",shaka.Player.prototype.attach);goog.exportProperty(shaka.Player,"probeSupport",shaka.Player.probeSupport);goog.exportProperty(shaka.Player,"isBrowserSupported",shaka.Player.isBrowserSupported);
|
|
1271
|
-
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);shaka.Player.LoadMode={DESTROYED:0,NOT_LOADED:1,MEDIA_SOURCE:2,SRC_EQUALS:3};goog.exportProperty(shaka.Player,"LoadMode",shaka.Player.LoadMode);shaka.Player.TYPICAL_BUFFERING_THRESHOLD_=.5;shaka.Player.version="v4.6.
|
|
1272
|
+
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);shaka.Player.LoadMode={DESTROYED:0,NOT_LOADED:1,MEDIA_SOURCE:2,SRC_EQUALS:3};goog.exportProperty(shaka.Player,"LoadMode",shaka.Player.LoadMode);shaka.Player.TYPICAL_BUFFERING_THRESHOLD_=.5;shaka.Player.version="v4.6.5-debug";
|
|
1272
1273
|
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;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_++};
|
|
1273
1274
|
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,c){var d=this;this.ad_=a;this.manager_=b;this.video_=c;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(){d.isPaused_=!0});this.eventManager_.listen(this.manager_,google.ima.AdEvent.Type.RESUMED,function(){d.isPaused_=!1})};shaka.ads.ClientSideAd.prototype.getDuration=function(){return this.ad_.getDuration()};
|
|
1274
1275
|
shaka.ads.ClientSideAd.prototype.getMinSuggestedDuration=function(){return this.ad_.getMinSuggestedDuration()};shaka.ads.ClientSideAd.prototype.getRemainingTime=function(){return this.manager_.getRemainingTime()};shaka.ads.ClientSideAd.prototype.isPaused=function(){return this.isPaused_};shaka.ads.ClientSideAd.prototype.isSkippable=function(){return 0<=this.ad_.getSkipTimeOffset()};
|
|
@@ -1450,7 +1451,7 @@ shaka.cast.CastProxy.prototype.cast=function(){var a=this,b;return $jscomp.async
|
|
|
1450
1451
|
shaka.cast.CastProxy.prototype.changeReceiverId=function(a,b){b=void 0===b?!1:b;var c=this;return $jscomp.asyncExecutePromiseGeneratorProgram(function(d){if(1==d.nextAddress){if(a==c.receiverAppId_&&b==c.androidReceiverCompatible_)return d.return();c.receiverAppId_=a;c.androidReceiverCompatible_=b;c.sender_.forceDisconnect();return d.yield(c.sender_.destroy(),2)}c.sender_=null;c.sender_=new shaka.cast.CastSender(a,function(){return c.onCastStatusChanged_()},function(){return c.onFirstCastStateUpdate_()},
|
|
1451
1452
|
function(e,f){return c.onRemoteEvent_(e,f)},function(){return c.onResumeLocal_()},function(){return c.getInitState_()},b);c.sender_.init();d.jumpToEnd()})};
|
|
1452
1453
|
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.util.FakeEvent.EventName)this.eventManager_.listen(this.localPlayer_,shaka.util.FakeEvent.EventName[d],function(f){return a.playerProxyLocalEvent_(f)});this.videoProxy_=
|
|
1453
|
-
{};b={};for(var e in this.localVideo_)b.$jscomp$loop$prop$k$
|
|
1454
|
+
{};b={};for(var e in this.localVideo_)b.$jscomp$loop$prop$k$801=e,Object.defineProperty(this.videoProxy_,b.$jscomp$loop$prop$k$801,{configurable:!1,enumerable:!0,get:function(f){return function(){return a.videoProxyGet_(f.$jscomp$loop$prop$k$801)}}(b),set:function(f){return function(g){a.videoProxySet_(f.$jscomp$loop$prop$k$801,g)}}(b)}),b={$jscomp$loop$prop$k$801:b.$jscomp$loop$prop$k$801};this.playerProxy_={};this.iterateOverPlayerMethods_(function(f,g){goog.asserts.assert(a.playerProxy_,"Must have player proxy!");
|
|
1454
1455
|
Object.defineProperty(a.playerProxy_,f,{configurable:!1,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_};
|
|
1455
1456
|
shaka.cast.CastProxy.prototype.mapCompiledToUncompiledPlayerMethodNames_=function(){var a=this,b=new Map;this.iterateOverPlayerMethods_(function(c,d){b.has(d)?(d=b.get(d),c.length<d.length?a.compiledToExternNames_.set(c,d):a.compiledToExternNames_.set(d,c)):b.set(d,c)})};
|
|
1456
1457
|
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)}};
|
|
@@ -1501,7 +1502,7 @@ shaka.cast.CastReceiver.prototype.sendMediaStatus_=function(a,b){a=void 0===a?0:
|
|
|
1501
1502
|
goog.exportProperty(shaka.cast.CastReceiver.prototype,"destroy",shaka.cast.CastReceiver.prototype.destroy);goog.exportProperty(shaka.cast.CastReceiver.prototype,"setContentArtist",shaka.cast.CastReceiver.prototype.setContentArtist);goog.exportProperty(shaka.cast.CastReceiver.prototype,"setContentImage",shaka.cast.CastReceiver.prototype.setContentImage);goog.exportProperty(shaka.cast.CastReceiver.prototype,"setContentTitle",shaka.cast.CastReceiver.prototype.setContentTitle);
|
|
1502
1503
|
goog.exportProperty(shaka.cast.CastReceiver.prototype,"clearContentMetadata",shaka.cast.CastReceiver.prototype.clearContentMetadata);goog.exportProperty(shaka.cast.CastReceiver.prototype,"setContentMetadata",shaka.cast.CastReceiver.prototype.setContentMetadata);goog.exportProperty(shaka.cast.CastReceiver.prototype,"isIdle",shaka.cast.CastReceiver.prototype.isIdle);goog.exportProperty(shaka.cast.CastReceiver.prototype,"isConnected",shaka.cast.CastReceiver.prototype.isConnected);
|
|
1503
1504
|
shaka.cast.CastReceiver.POLL_INTERVAL=.5;shaka.cast.CastReceiver.IDLE_INTERVAL=5;shaka.cast.CastReceiver.PLAY_STATE={IDLE:"IDLE",PLAYING:"PLAYING",BUFFERING:"BUFFERING",PAUSED:"PAUSED"};shaka.cea.CeaUtils=function(){};
|
|
1504
|
-
shaka.cea.CeaUtils.getParsedCaption=function(a,b,c,d,e){if(d>=e)return null;for(var f=-1,g=-1,h=0;h<c.length;h++)if(c[h].some(function(
|
|
1505
|
+
shaka.cea.CeaUtils.getParsedCaption=function(a,b,c,d,e){if(d>=e)return null;for(var f=-1,g=-1,h=0;h<c.length;h++)if(c[h].some(function(y){return null!=y&&""!=y.getChar().trim()})){f=h;break}for(h=c.length-1;0<=h;h--)if(c[h].some(function(y){return null!=y&&""!=y.getChar().trim()})){g=h;break}if(-1===f||-1===g)return null;for(var k=h=!1,l=shaka.cea.CeaUtils.DEFAULT_TXT_COLOR,m=shaka.cea.CeaUtils.DEFAULT_BG_COLOR,n=shaka.cea.CeaUtils.createStyledCue(d,e,h,k,l,m);f<=g;f++){for(var p=c[f],q=-1,r=-1,u=
|
|
1505
1506
|
0;u<p.length;u++)if(null!=p[u]&&""!==p[u].getChar().trim()){q=u;break}for(u=p.length-1;0<=u;u--)if(null!=p[u]&&""!==p[u].getChar().trim()){r=u;break}if(-1===q||-1===r)p=shaka.cea.CeaUtils.createLineBreakCue(d,e),a.nestedCues.push(p);else{for(;q<=r;q++)if(u=p[q]){var w=u.isUnderlined(),t=u.isItalicized(),v=u.getTextColor(),x=u.getBackgroundColor();if(w!=h||t!=k||v!=l||x!=m)n.payload&&a.nestedCues.push(n),n=shaka.cea.CeaUtils.createStyledCue(d,e,w,t,v,x),h=w,k=t,l=v,m=x;n.payload+=u.getChar()}else n.payload+=
|
|
1506
1507
|
" ";n.payload&&a.nestedCues.push(n);f!==g&&(n=shaka.cea.CeaUtils.createLineBreakCue(d,e),a.nestedCues.push(n));n=shaka.cea.CeaUtils.createStyledCue(d,e,h,k,l,m)}}return a.nestedCues.length?{cue:a,stream:b}:null};shaka.cea.CeaUtils.createStyledCue=function(a,b,c,d,e,f){a=new shaka.text.Cue(a,b,"");c&&a.textDecoration.push(shaka.text.Cue.textDecoration.UNDERLINE);d&&(a.fontStyle=shaka.text.Cue.fontStyle.ITALIC);a.color=e;a.backgroundColor=f;return a};
|
|
1507
1508
|
shaka.cea.CeaUtils.createLineBreakCue=function(a,b){a=new shaka.text.Cue(a,b,"");a.lineBreak=!0;return a};shaka.cea.CeaUtils.StyledChar=function(a,b,c,d,e){this.character_=a;this.underline_=b;this.italics_=c;this.backgroundColor_=d;this.textColor_=e};shaka.cea.CeaUtils.StyledChar.prototype.getChar=function(){return this.character_};shaka.cea.CeaUtils.StyledChar.prototype.isUnderlined=function(){return this.underline_};shaka.cea.CeaUtils.StyledChar.prototype.isItalicized=function(){return this.italics_};
|
|
@@ -1652,8 +1653,8 @@ shaka.media.WebmSegmentIndexParser.INFO_ID=357149030;shaka.media.WebmSegmentInde
|
|
|
1652
1653
|
shaka.dash.SegmentBase.createInitSegment=function(a,b,c){var d=shaka.util.XmlUtils,e=shaka.util.ManifestParserUtils;b=shaka.dash.MpdUtils.inheritChild(a,b,"Initialization");if(!b)return null;var f=a.representation.getBaseUris(),g=b.getAttribute("sourceURL");g&&(f=e.resolveUris(f,[g]));e=0;g=null;if(d=d.parseAttr(b,"range",d.parseRange))e=d.start,g=d.end;a=shaka.dash.SegmentBase.createQualityInfo(a);return new shaka.media.InitSegmentReference(function(){return f},e,g,a,null,null,c)};
|
|
1653
1654
|
shaka.dash.SegmentBase.createStreamInfo=function(a,b,c){goog.asserts.assert(a.representation.segmentBase,"Should only be called with SegmentBase");var d=shaka.dash.MpdUtils,e=shaka.dash.SegmentBase,f=shaka.util.XmlUtils,g=Number(d.inheritAttribute(a,e.fromInheritance_,"presentationTimeOffset"))||0;d=d.inheritAttribute(a,e.fromInheritance_,"timescale");var h=1;d&&(h=f.parsePositiveInt(d)||1);var k=g/h||0,l=e.createInitSegment(a,e.fromInheritance_,c);e.checkSegmentIndexRangeSupport_(a,l);var m=shaka.util.ObjectUtils.shallowCloneObject(a);
|
|
1654
1655
|
return{generateSegmentIndex:function(){return e.generateSegmentIndex_(m,b,l,k)}}};
|
|
1655
|
-
shaka.dash.SegmentBase.generateSegmentIndexFromUris=function(a,b,c,d,e,f,g){var h,k,l,m,n,p,q,r,u,w,t,v,x,z
|
|
1656
|
-
v=null;x=l-g;
|
|
1656
|
+
shaka.dash.SegmentBase.generateSegmentIndexFromUris=function(a,b,c,d,e,f,g){var h,k,l,m,n,p,q,r,u,w,t,v,x,y,z;return $jscomp.asyncExecutePromiseGeneratorProgram(function(A){if(1==A.nextAddress)return h=a.presentationTimeline,k=!a.dynamic||!a.periodInfo.isLastPeriod,l=a.periodInfo.start,m=a.periodInfo.duration,n=a.representation.mimeType.split("/")[1],p=b,q=null,r=[p(d,e,f,!1),"webm"==n?p(c.getUris(),c.startByte,c.endByte,!0):null],p=null,A.yield(Promise.all(r),2);u=A.yieldResult;w=u[0];t=u[1]||null;
|
|
1657
|
+
v=null;x=l-g;y=l;z=m?l+m:Infinity;"mp4"==n?v=shaka.media.Mp4SegmentIndexParser.parse(w,e,d,c,x,y,z):(goog.asserts.assert(t,"WebM requires init data"),v=shaka.media.WebmSegmentIndexParser.parse(w,t,d,c,x,y,z));h.notifySegments(v);goog.asserts.assert(!q,"Should not call generateSegmentIndex twice");q=new shaka.media.SegmentIndex(v);k&&q.fit(y,z,!0);return A.return(q)})};shaka.dash.SegmentBase.fromInheritance_=function(a){return a.segmentBase};
|
|
1657
1658
|
shaka.dash.SegmentBase.computeIndexRange_=function(a){var b=shaka.dash.MpdUtils,c=shaka.dash.SegmentBase,d=shaka.util.XmlUtils,e=b.inheritChild(a,c.fromInheritance_,"RepresentationIndex");a=b.inheritAttribute(a,c.fromInheritance_,"indexRange");a=d.parseRange(a||"");e&&(a=d.parseAttr(e,"range",d.parseRange,a));return a};
|
|
1658
1659
|
shaka.dash.SegmentBase.computeIndexUris_=function(a){var b=shaka.util.ManifestParserUtils,c=shaka.dash.MpdUtils.inheritChild(a,shaka.dash.SegmentBase.fromInheritance_,"RepresentationIndex");a=a.representation.getBaseUris();c&&(c=c.getAttribute("sourceURL"))&&(a=b.resolveUris(a,[c]));return a};
|
|
1659
1660
|
shaka.dash.SegmentBase.checkSegmentIndexRangeSupport_=function(a,b){var c=shaka.dash.SegmentBase;c.checkSegmentIndexSupport(a,b);if(!c.computeIndexRange_(a))throw shaka.log.error("SegmentBase does not contain sufficient segment information:","the SegmentBase does not contain @indexRange","or a RepresentationIndex element.",a.representation),new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.DASH_NO_SEGMENT_INFO);};
|
|
@@ -1668,9 +1669,9 @@ mediaSegments:d}};
|
|
|
1668
1669
|
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&&
|
|
1669
1670
|
!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:",
|
|
1670
1671
|
"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);};
|
|
1671
|
-
shaka.dash.SegmentList.createSegmentReferences_=function(a,b,c,d,e,f,g){var h=shaka.util.ManifestParserUtils;c=e.mediaSegments.length;e.timeline&&e.timeline.length!=e.mediaSegments.length&&(c=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",c));for(var k=a-e.scaledPresentationTimeOffset,l=b?a+b:Infinity,m=[],n=e.startTime,p={},q=0;q<c;p={$jscomp$loop$prop$uris$
|
|
1672
|
-
$jscomp$loop$prop$segment$
|
|
1673
|
-
return w.$jscomp$loop$prop$uris$
|
|
1672
|
+
shaka.dash.SegmentList.createSegmentReferences_=function(a,b,c,d,e,f,g){var h=shaka.util.ManifestParserUtils;c=e.mediaSegments.length;e.timeline&&e.timeline.length!=e.mediaSegments.length&&(c=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",c));for(var k=a-e.scaledPresentationTimeOffset,l=b?a+b:Infinity,m=[],n=e.startTime,p={},q=0;q<c;p={$jscomp$loop$prop$uris$803:p.$jscomp$loop$prop$uris$803,
|
|
1673
|
+
$jscomp$loop$prop$segment$804:p.$jscomp$loop$prop$segment$804},q++){p.$jscomp$loop$prop$segment$804=e.mediaSegments[q];var r=void 0;null!=e.segmentDuration?r=n+e.segmentDuration:e.timeline?r=e.timeline[q].end:(goog.asserts.assert(1==e.mediaSegments.length&&b,"There should be exactly one segment with a Period duration."),r=n+b);p.$jscomp$loop$prop$uris$803=null;var u=function(w){return function(){null==w.$jscomp$loop$prop$uris$803&&(w.$jscomp$loop$prop$uris$803=h.resolveUris(d(),[w.$jscomp$loop$prop$segment$804.mediaUri]));
|
|
1674
|
+
return w.$jscomp$loop$prop$uris$803}}(p);m.push(new shaka.media.SegmentReference(a+n,a+r,u,p.$jscomp$loop$prop$segment$804.start,p.$jscomp$loop$prop$segment$804.end,f,k,a,l,[],"",null,null,shaka.media.SegmentReference.Status.AVAILABLE,g));n=r}return m};
|
|
1674
1675
|
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."));
|
|
1675
1676
|
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(){};
|
|
1676
1677
|
shaka.dash.SegmentTemplate.createStreamInfo=function(a,b,c,d,e,f,g){goog.asserts.assert(a.representation.segmentTemplate,"Should only be called with SegmentTemplate");var h=shaka.dash.SegmentTemplate,k=shaka.dash.TimelineSegmentIndex,l=h.createInitSegment_(a,g),m=h.parseSegmentTemplateInfo_(a);h.checkSegmentTemplateInfo_(a,m);var n=shaka.util.ObjectUtils.shallowCloneObject(a);if(m.indexTemplate)return shaka.dash.SegmentBase.checkSegmentIndexSupport(a,l),{generateSegmentIndex:function(){return h.generateSegmentIndexFromIndexTemplate_(n,b,
|
|
@@ -1684,9 +1685,9 @@ shaka.dash.SegmentTemplate.checkSegmentTemplateInfo_=function(a,b){var c=b.index
|
|
|
1684
1685
|
a.representation),new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.DASH_NO_SEGMENT_INFO);};
|
|
1685
1686
|
shaka.dash.SegmentTemplate.generateSegmentIndexFromIndexTemplate_=function(a,b,c,d){var e=shaka.dash.MpdUtils,f=shaka.util.ManifestParserUtils;goog.asserts.assert(d.indexTemplate,"must be using index template");e=e.fillUriTemplate(d.indexTemplate,a.representation.id,null,null,a.bandwidth||null,null);f=f.resolveUris(a.representation.getBaseUris(),[e]);return shaka.dash.SegmentBase.generateSegmentIndexFromUris(a,b,c,f,0,null,d.scaledPresentationTimeOffset)};
|
|
1686
1687
|
shaka.dash.SegmentTemplate.generateSegmentIndexFromDuration_=function(a,b,c,d,e,f){goog.asserts.assert(b.mediaTemplate,"There should be a media template with duration");var g=shaka.dash.MpdUtils,h=shaka.util.ManifestParserUtils,k=a.presentationTimeline,l=a.periodInfo.start,m=a.period.id,n=a.periodInfo.duration,p=function(){var D=null!=m&&e[m]||n;return D?l+D:Infinity},q=b.segmentDuration;goog.asserts.assert(null!=q,"Segment duration must not be null!");var r=b.startNumber,u=b.timescale,w=b.mediaTemplate,
|
|
1687
|
-
t=a.bandwidth||null,v=a.representation.id,x=a.representation.getBaseUris,
|
|
1688
|
-
l});return[Math.ceil(D[0]/q),Math.ceil(D[1]/q)-1].map(function(F){return F+r})},A=
|
|
1689
|
-
M=g.fillUriTemplate(w,v,D,null,t,M);return h.resolveUris(x(),[M])},0,null,d,
|
|
1688
|
+
t=a.bandwidth||null,v=a.representation.id,x=a.representation.getBaseUris,y=l-b.scaledPresentationTimeOffset,z=function(){var D=[Math.max(k.getSegmentAvailabilityStart(),l),Math.min(k.getSegmentAvailabilityEnd(),p())];goog.asserts.assert(D.every(isFinite),"Available presentation times must be finite!");goog.asserts.assert(D.every(function(F){return 0<=F}),"Available presentation times must be positive!");goog.asserts.assert(null!=q,"Segment duration must not be null!");D=D.map(function(F){return F-
|
|
1689
|
+
l});return[Math.ceil(D[0]/q),Math.ceil(D[1]/q)-1].map(function(F){return F+r})},A=z();a=a.dynamic?Math.max(A[0],A[1]-c+1):A[0];A=A[1];c=[];var B=function(D){goog.asserts.assert(null!=q,"Segment duration must not be null!");var F=(D-r)*q,H=F+b.scaledPresentationTimeOffset,J=F+l;F=J+q;var K=Math.min(F,p());goog.asserts.assert(J<K,"Generated a segment outside of the period!");J=new shaka.media.SegmentReference(J,K,function(){var M=H*u;"BigInt"in window&&M>Number.MAX_SAFE_INTEGER&&(M=BigInt(H)*BigInt(u));
|
|
1690
|
+
M=g.fillUriTemplate(w,v,D,null,t,M);return h.resolveUris(x(),[M])},0,null,d,y,l,p(),[],"",null,null,shaka.media.SegmentReference.Status.AVAILABLE,f);J.trueEndTime=F;return J},E=a;for(;E<=A;++E){var I=B(E);c.push(I)}var C=new shaka.media.SegmentIndex(c);c=k.getSegmentAvailabilityEnd()<p();E=k.isLive();if(c||E){var G=Math.max(a,A+1);C.updateEvery(q,function(){var D=k.getSegmentAvailabilityStart();C.evict(D);var F=$jscomp.makeIterator(z());F.next();F=F.next().value;for(var H=[];G<=F;){var J=B(G);H.push(J);
|
|
1690
1691
|
G++}return D>p()&&!H.length?null:H})}return Promise.resolve(C)};
|
|
1691
1692
|
shaka.dash.SegmentTemplate.createInitSegment_=function(a,b){var c=shaka.dash.MpdUtils,d=shaka.util.ManifestParserUtils,e=c.inheritAttribute(a,shaka.dash.SegmentTemplate.fromInheritance_,"initialization");if(!e)return null;var f=a.representation.id,g=a.bandwidth||null,h=a.representation.getBaseUris;a=shaka.dash.SegmentBase.createQualityInfo(a);return new shaka.media.InitSegmentReference(function(){goog.asserts.assert(e,"Should have returned earler");var k=c.fillUriTemplate(e,f,null,null,g,null);return d.resolveUris(h(),
|
|
1692
1693
|
[k])},0,null,a,null,null,b)};shaka.dash.TimelineSegmentIndex=function(a,b,c,d,e,f,g,h,k,l){shaka.media.SegmentIndex.call(this,[]);this.templateInfo_=a;this.representationId_=b;this.bandwidth_=c;this.getBaseUris_=d;this.periodStart_=e;this.periodEnd_=f;this.initSegmentReference_=g;this.aes128Key_=k;this.segmentSequenceCadence_=l;h&&this.fitTimeline()};$jscomp.inherits(shaka.dash.TimelineSegmentIndex,shaka.media.SegmentIndex);
|
|
@@ -1696,8 +1697,8 @@ shaka.dash.TimelineSegmentIndex.prototype.appendTemplateInfo=function(a,b,c,d,e)
|
|
|
1696
1697
|
a,this.periodStart_=b,this.periodEnd_=c;d&&this.fitTimeline()};shaka.dash.TimelineSegmentIndex.prototype.isBeforeFirstEntry=function(a){return this.templateInfo_&&this.templateInfo_.timeline&&this.templateInfo_.timeline.length?a<this.templateInfo_.timeline[0].start+this.periodStart_:!1};
|
|
1697
1698
|
shaka.dash.TimelineSegmentIndex.prototype.fitTimeline=function(){if(!this.getIsImmutable()){for(var a=this.templateInfo_.timeline;a.length;)if(a[a.length-1].start>=this.periodEnd_)a.pop();else break;this.evict(this.periodStart_);0!==a.length&&Infinity!==this.periodEnd_&&(a[a.length-1].end=this.periodEnd_-this.periodStart_)}};
|
|
1698
1699
|
shaka.dash.TimelineSegmentIndex.prototype.find=function(a){shaka.log.debug("Find "+a);if(this.isBeforeFirstEntry(a))return this.numEvicted_;if(!this.templateInfo_)return null;var b=this.templateInfo_.timeline;if(a<this.periodStart_||a>this.periodEnd_)return null;for(var c=b.length-1,d=0;d<b.length;d++){var e=b[d],f=e.start+this.periodStart_;e=e.end+this.periodStart_;d<c&&(e=b[d+1].start+this.periodStart_);if(a>=f&&a<e)return d+this.numEvicted_}return null};
|
|
1699
|
-
shaka.dash.TimelineSegmentIndex.prototype.get=function(a){var b=this;a-=this.numEvicted_;if(0>a||a>=this.getNumReferences()||!this.templateInfo_)return null;var c=this.references[a];if(!c){var d=this.templateInfo_.mediaTemplate,e=this.templateInfo_.timeline[a],f=e.segmentPosition,g=this.templateInfo_.unscaledPresentationTimeOffset+e.unscaledStart;c=this.periodStart_-this.templateInfo_.scaledPresentationTimeOffset;for(var h=[],k=(e.end-e.start)/e.partialSegments,l={},m=0;m<e.partialSegments;l={$jscomp$loop$prop$uris$
|
|
1700
|
-
$jscomp$loop$prop$subNumber$
|
|
1700
|
+
shaka.dash.TimelineSegmentIndex.prototype.get=function(a){var b=this;a-=this.numEvicted_;if(0>a||a>=this.getNumReferences()||!this.templateInfo_)return null;var c=this.references[a];if(!c){var d=this.templateInfo_.mediaTemplate,e=this.templateInfo_.timeline[a],f=e.segmentPosition,g=this.templateInfo_.unscaledPresentationTimeOffset+e.unscaledStart;c=this.periodStart_-this.templateInfo_.scaledPresentationTimeOffset;for(var h=[],k=(e.end-e.start)/e.partialSegments,l={},m=0;m<e.partialSegments;l={$jscomp$loop$prop$uris$806:l.$jscomp$loop$prop$uris$806,
|
|
1701
|
+
$jscomp$loop$prop$subNumber$807:l.$jscomp$loop$prop$subNumber$807},m++){var n=e.start+k*m,p=n+k;l.$jscomp$loop$prop$subNumber$807=m+1;l.$jscomp$loop$prop$uris$806=null;var q=function(r){return function(){if(!b.templateInfo_)return[];null==r.$jscomp$loop$prop$uris$806&&(r.$jscomp$loop$prop$uris$806=shaka.dash.TimelineSegmentIndex.createUris_(b.templateInfo_.mediaTemplate,b.representationId_,f,b.bandwidth_,g,r.$jscomp$loop$prop$subNumber$807,b.getBaseUris_));return r.$jscomp$loop$prop$uris$806}}(l);
|
|
1701
1702
|
n=new shaka.media.SegmentReference(this.periodStart_+n,this.periodStart_+p,q,0,null,this.initSegmentReference_,c,this.periodStart_,this.periodEnd_,[],"",null,null,shaka.media.SegmentReference.Status.AVAILABLE,this.aes128Key_);0==this.segmentSequenceCadence_?0<m&&n.markAsNonIndependent():0!=m%this.segmentSequenceCadence_&&n.markAsNonIndependent();h.push(n)}c=new shaka.media.SegmentReference(this.periodStart_+e.start,this.periodStart_+e.end,function(){return 0<e.partialSegments?[]:shaka.dash.TimelineSegmentIndex.createUris_(d,
|
|
1702
1703
|
b.representationId_,f,b.bandwidth_,g,null,b.getBaseUris_)},0,null,this.initSegmentReference_,c,this.periodStart_,this.periodEnd_,h,"",null,null,shaka.media.SegmentReference.Status.AVAILABLE,this.aes128Key_,0<e.partialSegments);this.references[a]=c}return c};shaka.dash.TimelineSegmentIndex.createUris_=function(a,b,c,d,e,f,g){a=shaka.dash.MpdUtils.fillUriTemplate(a,b,c,f,d||null,e);return shaka.util.ManifestParserUtils.resolveUris(g(),[a]).map(function(h){return h.toString()})};shaka.util.ContentSteeringManager=function(a){this.config_=null;this.playerInterface_=a;this.operationManager_=new shaka.util.OperationManager;this.baseUris_=[];this.defaultPathwayId_=null;this.pathwayPriority_=[];this.lastPathwayUsed_=null;this.pathwayClones_=[];this.lastTTL_=300;this.locations_=new Map;this.bannedLocations_=new Map;this.updateTimer_=null;this.manifestType_=shaka.media.ManifestParser.UNKNOWN};shaka.util.ContentSteeringManager.prototype.configure=function(a){this.config_=a};
|
|
1703
1704
|
shaka.util.ContentSteeringManager.prototype.destroy=function(){this.playerInterface_=this.config_=null;this.baseUris_=[];this.defaultPathwayId_=null;this.pathwayPriority_=[];this.pathwayClones_=[];this.locations_.clear();null!=this.updateTimer_&&(this.updateTimer_.stop(),this.updateTimer_=null);return this.operationManager_.destroy()};shaka.util.ContentSteeringManager.prototype.setManifestType=function(a){this.manifestType_=a};
|
|
@@ -1707,30 +1708,30 @@ m.yield(f.promise,4);if(2!=m.nextAddress)return g=m.yieldResult,h=shaka.util.Str
|
|
|
1707
1708
|
shaka.util.ContentSteeringManager.prototype.addQueryParams_=function(a){if(!this.pathwayPriority_.length)return a;a=new goog.Uri(a);var b=this.lastPathwayUsed_||this.pathwayPriority_[0],c=Math.round(this.playerInterface_.getBandwidthEstimate()),d=a.getQueryData();this.manifestType_==shaka.media.ManifestParser.DASH?(d.add("_DASH_pathway",b),d.add("_DASH_throughput",String(c))):this.manifestType_==shaka.media.ManifestParser.HLS&&(d.add("_HLS_pathway",b),d.add("_HLS_throughput",String(c)));d.getCount()&&
|
|
1708
1709
|
a.setQueryData(d);return a.toString()};shaka.util.ContentSteeringManager.prototype.processManifest_=function(a,b){var c=this;null!=this.updateTimer_&&(this.updateTimer_.stop(),this.updateTimer_=null);var d=a["RELOAD-URI"]||b;this.updateTimer_=new shaka.util.Timer(function(){c.requestInfo(d)});if(b=a.TTL)this.lastTTL_=b;this.updateTimer_.tickAfter(this.lastTTL_);this.pathwayPriority_=a["PATHWAY-PRIORITY"]||[];this.pathwayClones_=a["PATHWAY-CLONES"]||[]};
|
|
1709
1710
|
shaka.util.ContentSteeringManager.prototype.clearPreviousLocations=function(){this.locations_.clear()};shaka.util.ContentSteeringManager.prototype.addLocation=function(a,b,c){var d=this.locations_.get(a);d||(d=new Map);d.set(b,c);this.locations_.set(a,d)};shaka.util.ContentSteeringManager.prototype.banLocation=function(a){var b=Date.now()+6E4;this.bannedLocations_.set(a,b)};
|
|
1710
|
-
shaka.util.ContentSteeringManager.prototype.getLocations=function(a){var b=this;a=this.locations_.get(a)||new Map;for(var c=[],d={},e=$jscomp.makeIterator(this.pathwayPriority_),f=e.next();!f.done;d={$jscomp$loop$prop$pathwayId$
|
|
1711
|
-
h.$jscomp$loop$prop$pathwayId$
|
|
1711
|
+
shaka.util.ContentSteeringManager.prototype.getLocations=function(a){var b=this;a=this.locations_.get(a)||new Map;for(var c=[],d={},e=$jscomp.makeIterator(this.pathwayPriority_),f=e.next();!f.done;d={$jscomp$loop$prop$pathwayId$809:d.$jscomp$loop$prop$pathwayId$809},f=e.next())if(d.$jscomp$loop$prop$pathwayId$809=f.value,f=a.get(d.$jscomp$loop$prop$pathwayId$809))c.push({pathwayId:d.$jscomp$loop$prop$pathwayId$809,location:f});else if(f=this.pathwayClones_.find(function(h){return function(k){return k.ID==
|
|
1712
|
+
h.$jscomp$loop$prop$pathwayId$809}}(d))){var g=a.get(f["BASE-ID"]);g&&(f["URI-REPLACEMENT"].HOST?(g=new goog.Uri(g),g.setDomain(f["URI-REPLACEMENT"].HOST),c.push({pathwayId:d.$jscomp$loop$prop$pathwayId$809,location:g.toString()})):c.push({pathwayId:d.$jscomp$loop$prop$pathwayId$809,location:g}))}d=Date.now();e=$jscomp.makeIterator(this.bannedLocations_.keys());for(f=e.next();!f.done;f=e.next())f=f.value,g=this.bannedLocations_.get(f),d>g&&this.bannedLocations_.delete(f);c=c.filter(function(h){for(var k=
|
|
1712
1713
|
$jscomp.makeIterator(b.bannedLocations_.keys()),l=k.next();!l.done;l=k.next())if(l.value.includes((new goog.Uri(h.location)).getDomain()))return!1;return!0});c.length&&(this.lastPathwayUsed_=c[0].pathwayId);c=c.map(function(h){return h.location});if(!c.length&&this.defaultPathwayId_)for(d=$jscomp.makeIterator(this.defaultPathwayId_.split(",")),f=d.next();!f.done;f=d.next())if(e=a.get(f.value))this.lastPathwayUsed_=this.defaultPathwayId_,c.push(e);if(!c.length)for(a=$jscomp.makeIterator(a.values()),
|
|
1713
1714
|
d=a.next();!d.done;d=a.next())c.push(d.value);return shaka.util.ManifestParserUtils.resolveUris(this.baseUris_,c)};shaka.util.PeriodCombiner=function(){this.variants_=[];this.audioStreams_=[];this.videoStreams_=[];this.textStreams_=[];this.imageStreams_=[];this.usedPeriodIds_=new Set};
|
|
1714
1715
|
shaka.util.PeriodCombiner.prototype.release=function(){var a=this.audioStreams_.concat(this.videoStreams_,this.textStreams_,this.imageStreams_);a=$jscomp.makeIterator(a);for(var b=a.next();!b.done;b=a.next())b=b.value,b.segmentIndex&&b.segmentIndex.release();this.audioStreams_=[];this.videoStreams_=[];this.textStreams_=[];this.imageStreams_=[];this.variants_=[]};shaka.util.PeriodCombiner.prototype.getVariants=function(){return this.variants_};shaka.util.PeriodCombiner.prototype.getTextStreams=function(){return this.textStreams_.slice()};
|
|
1715
1716
|
shaka.util.PeriodCombiner.prototype.getImageStreams=function(){return this.imageStreams_};shaka.util.PeriodCombiner.prototype.getStreamsPerPeriod_=function(a){var b=[],c=[],d=[],e=[];a=$jscomp.makeIterator(a);for(var f=a.next();!f.done;f=a.next())f=f.value,b.push(f.audioStreams),c.push(f.videoStreams),d.push(f.textStreams),e.push(f.imageStreams);return{audioStreamsPerPeriod:b,videoStreamsPerPeriod:c,textStreamsPerPeriod:d,imageStreamsPerPeriod:e}};
|
|
1716
|
-
shaka.util.PeriodCombiner.prototype.combinePeriods=function(a,b){var c=this,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,z,
|
|
1717
|
+
shaka.util.PeriodCombiner.prototype.combinePeriods=function(a,b){var c=this,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,y,z,A,B,E,I,C,G,D,F,H,J,K,M;return $jscomp.asyncExecutePromiseGeneratorProgram(function(L){if(1==L.nextAddress){d=shaka.util.ManifestParserUtils.ContentType;shaka.util.PeriodCombiner.filterOutDuplicates_(a);if(!b&&1==a.length)return e=a[0],c.audioStreams_=e.audioStreams,c.videoStreams_=e.videoStreams,c.textStreams_=e.textStreams,c.imageStreams_=e.imageStreams,L.jumpTo(2);f=-1;for(g=0;g<a.length;g++)h=
|
|
1717
1718
|
a[g],c.usedPeriodIds_.has(h.id)||(c.usedPeriodIds_.add(h.id),-1==f&&(f=g));if(-1==f)return L.return();k=c.getStreamsPerPeriod_(a);l=k.audioStreamsPerPeriod;m=k.videoStreamsPerPeriod;n=k.textStreamsPerPeriod;p=k.imageStreamsPerPeriod;q=$jscomp.makeIterator(n);for(r=q.next();!r.done;r=q.next())u=r.value,u.push(shaka.util.PeriodCombiner.dummyStream_(d.TEXT));w=$jscomp.makeIterator(p);for(t=w.next();!t.done;t=w.next())v=t.value,v.push(shaka.util.PeriodCombiner.dummyStream_(d.IMAGE));return L.yield(Promise.all([shaka.util.PeriodCombiner.combine_(c.audioStreams_,
|
|
1718
1719
|
l,f,shaka.util.PeriodCombiner.cloneStream_,shaka.util.PeriodCombiner.concatenateStreams_),shaka.util.PeriodCombiner.combine_(c.videoStreams_,m,f,shaka.util.PeriodCombiner.cloneStream_,shaka.util.PeriodCombiner.concatenateStreams_),shaka.util.PeriodCombiner.combine_(c.textStreams_,n,f,shaka.util.PeriodCombiner.cloneStream_,shaka.util.PeriodCombiner.concatenateStreams_),shaka.util.PeriodCombiner.combine_(c.imageStreams_,p,f,shaka.util.PeriodCombiner.cloneStream_,shaka.util.PeriodCombiner.concatenateStreams_)]),
|
|
1719
|
-
2)}x=0;
|
|
1720
|
-
audio:D,video:J,bandwidth:(D.bandwidth||0)+(J.bandwidth||0),drmInfos:K,allowedByApplication:!0,allowedByKeySystem:!0,decodingInfos:[]}));else for(
|
|
1721
|
-
c.variants_=
|
|
1720
|
+
2)}x=0;y=[];if(c.videoStreams_.length&&c.audioStreams_.length)for(C=$jscomp.makeIterator(c.audioStreams_),G=C.next();!G.done;G=C.next())for(D=G.value,F=$jscomp.makeIterator(c.videoStreams_),H=F.next();!H.done;H=F.next())J=H.value,K=shaka.media.DrmEngine.getCommonDrmInfos(D.drmInfos,J.drmInfos),D.drmInfos.length&&J.drmInfos.length&&!K.length?shaka.log.warning("Incompatible DRM in audio & video, skipping variant creation.",D,J):(M=x++,y.push({id:M,language:D.language,disabledUntilTime:0,primary:D.primary,
|
|
1721
|
+
audio:D,video:J,bandwidth:(D.bandwidth||0)+(J.bandwidth||0),drmInfos:K,allowedByApplication:!0,allowedByKeySystem:!0,decodingInfos:[]}));else for(z=c.videoStreams_.length?c.videoStreams_:c.audioStreams_,A=$jscomp.makeIterator(z),B=A.next();!B.done;B=A.next())E=B.value,I=x++,y.push({id:I,language:E.language,disabledUntilTime:0,primary:E.primary,audio:E.type==d.AUDIO?E:null,video:E.type==d.VIDEO?E:null,bandwidth:E.bandwidth||0,drmInfos:E.drmInfos,allowedByApplication:!0,allowedByKeySystem:!0,decodingInfos:[]});
|
|
1722
|
+
c.variants_=y;L.jumpToEnd()})};
|
|
1722
1723
|
shaka.util.PeriodCombiner.filterOutDuplicates_=function(a){var b=shaka.util.PeriodCombiner,c=shaka.util.ArrayUtils,d=shaka.util.MapUtils;a=$jscomp.makeIterator(a);for(var e=a.next();!e.done;e=a.next())e=e.value,e.videoStreams=b.filterOutStreamDuplicates_(e.videoStreams,function(f,g){return f.id!==g.id&&f.fastSwitching==g.fastSwitching&&f.width===g.width&&f.frameRate===g.frameRate&&f.codecs===g.codecs&&f.mimeType===g.mimeType&&f.label===g.label&&c.hasSameElements(f.roles,g.roles)&&d.hasSameElements(f.closedCaptions,
|
|
1723
1724
|
g.closedCaptions)&&f.bandwidth===g.bandwidth}),e.audioStreams=b.filterOutStreamDuplicates_(e.audioStreams,function(f,g){return f.id!==g.id&&f.fastSwitching==g.fastSwitching&&f.channelsCount===g.channelsCount&&f.language===g.language&&f.bandwidth===g.bandwidth&&f.label===g.label&&f.codecs===g.codecs&&f.mimeType===g.mimeType&&c.hasSameElements(f.roles,g.roles)&&f.audioSamplingRate===g.audioSamplingRate&&f.primary===g.primary}),e.textStreams=b.filterOutStreamDuplicates_(e.textStreams,function(f,g){return f.id!==
|
|
1724
1725
|
g.id&&f.language===g.language&&f.label===g.label&&f.codecs===g.codecs&&f.mimeType===g.mimeType&&f.bandwidth===g.bandwidth&&c.hasSameElements(f.roles,g.roles)}),e.imageStreams=b.filterOutStreamDuplicates_(e.imageStreams,function(f,g){return f.id!==g.id&&f.width===g.width&&f.codecs===g.codecs&&f.mimeType===g.mimeType})};
|
|
1725
|
-
shaka.util.PeriodCombiner.filterOutStreamDuplicates_=function(a,b){var c=[],d={};a=$jscomp.makeIterator(a);for(var e=a.next();!e.done;d={$jscomp$loop$prop$s1$
|
|
1726
|
-
shaka.util.PeriodCombiner.combineDbStreams=function(a){var b,c,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,z,
|
|
1726
|
+
shaka.util.PeriodCombiner.filterOutStreamDuplicates_=function(a,b){var c=[],d={};a=$jscomp.makeIterator(a);for(var e=a.next();!e.done;d={$jscomp$loop$prop$s1$811:d.$jscomp$loop$prop$s1$811},e=a.next())d.$jscomp$loop$prop$s1$811=e.value,c.some(function(f){return function(g){return b(f.$jscomp$loop$prop$s1$811,g)}}(d))||c.push(d.$jscomp$loop$prop$s1$811);return c};
|
|
1727
|
+
shaka.util.PeriodCombiner.combineDbStreams=function(a){var b,c,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,y,z,A,B,E,I,C,G;return $jscomp.asyncExecutePromiseGeneratorProgram(function(D){switch(D.nextAddress){case 1:b=shaka.util.ManifestParserUtils.ContentType;if(1==a.length)return D.return(a[0]);c=a.map(function(F){return F.filter(function(H){return H.type==b.AUDIO})});d=a.map(function(F){return F.filter(function(H){return H.type==b.VIDEO})});e=a.map(function(F){return F.filter(function(H){return H.type==b.TEXT})});
|
|
1727
1728
|
f=a.map(function(F){return F.filter(function(H){return H.type==b.IMAGE})});g=$jscomp.makeIterator(e);for(h=g.next();!h.done;h=g.next())k=h.value,k.push(shaka.util.PeriodCombiner.dummyStreamDB_(b.TEXT));l=$jscomp.makeIterator(f);for(m=l.next();!m.done;m=l.next())n=m.value,n.push(shaka.util.PeriodCombiner.dummyStreamDB_(b.IMAGE));return D.yield(shaka.util.PeriodCombiner.combine_([],c,0,shaka.util.PeriodCombiner.cloneStreamDB_,shaka.util.PeriodCombiner.concatenateStreamDBs_),2);case 2:return p=D.yieldResult,
|
|
1728
1729
|
D.yield(shaka.util.PeriodCombiner.combine_([],d,0,shaka.util.PeriodCombiner.cloneStreamDB_,shaka.util.PeriodCombiner.concatenateStreamDBs_),3);case 3:return q=D.yieldResult,D.yield(shaka.util.PeriodCombiner.combine_([],e,0,shaka.util.PeriodCombiner.cloneStreamDB_,shaka.util.PeriodCombiner.concatenateStreamDBs_),4);case 4:return r=D.yieldResult,D.yield(shaka.util.PeriodCombiner.combine_([],f,0,shaka.util.PeriodCombiner.cloneStreamDB_,shaka.util.PeriodCombiner.concatenateStreamDBs_),5);case 5:u=D.yieldResult;
|
|
1729
|
-
w=0;if(q.length&&p.length)for(
|
|
1730
|
-
shaka.util.PeriodCombiner.combine_=function(a,b,c,d,e){var f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,z,
|
|
1731
|
-
shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.PERIOD_FLATTENING_FAILED);l=k.next();C.jumpTo(2);break;case 4:p=$jscomp.makeIterator(g);for(q=p.next();!q.done;q=p.next())for(r=q.value,u=$jscomp.makeIterator(r),w=u.next();!w.done;w=u.next())t=w.value,(v=shaka.util.PeriodCombiner.createNewOutputStream_(t,b,d,e,g))&&a.push(v);x=$jscomp.makeIterator(g);for(q=x.next();!q.done;q=x.next())for(
|
|
1732
|
-
w=A.next())if(
|
|
1733
|
-
|
|
1730
|
+
w=0;if(q.length&&p.length)for(z=$jscomp.makeIterator(p),A=z.next();!A.done;A=z.next())for(B=A.value,E=$jscomp.makeIterator(q),I=E.next();!I.done;I=E.next())C=I.value,G=w++,C.variantIds.push(G),B.variantIds.push(G);else for(t=q.concat(p),v=$jscomp.makeIterator(t),x=v.next();!x.done;x=v.next())y=x.value,y.variantIds=[w++];return D.return(q.concat(p).concat(r).concat(u))}})};
|
|
1731
|
+
shaka.util.PeriodCombiner.combine_=function(a,b,c,d,e){var f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,y,z,A,B,E,I;return $jscomp.asyncExecutePromiseGeneratorProgram(function(C){switch(C.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){C.jumpTo(4);break}m=l.value;return C.yield(shaka.util.PeriodCombiner.extendExistingOutputStream_(m,b,c,e,g),5);case 5:n=C.yieldResult;if(!n)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,
|
|
1732
|
+
shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.PERIOD_FLATTENING_FAILED);l=k.next();C.jumpTo(2);break;case 4:p=$jscomp.makeIterator(g);for(q=p.next();!q.done;q=p.next())for(r=q.value,u=$jscomp.makeIterator(r),w=u.next();!w.done;w=u.next())t=w.value,(v=shaka.util.PeriodCombiner.createNewOutputStream_(t,b,d,e,g))&&a.push(v);x=$jscomp.makeIterator(g);for(q=x.next();!q.done;q=x.next())for(y=q.value,z={},A=$jscomp.makeIterator(y),w=A.next();!w.done;z={$jscomp$loop$prop$stream$650$813:z.$jscomp$loop$prop$stream$650$813},
|
|
1733
|
+
w=A.next())if(z.$jscomp$loop$prop$stream$650$813=w.value,B=z.$jscomp$loop$prop$stream$650$813.type==f.TEXT&&!z.$jscomp$loop$prop$stream$650$813.language,E=z.$jscomp$loop$prop$stream$650$813.type==f.IMAGE&&!z.$jscomp$loop$prop$stream$650$813.tilesLayout,!B&&!E&&(I=a.some(function(G){return function(D){return D.mimeType==G.$jscomp$loop$prop$stream$650$813.mimeType&&shaka.util.MimeUtils.getNormalizedCodec(D.codecs)==shaka.util.MimeUtils.getNormalizedCodec(G.$jscomp$loop$prop$stream$650$813.codecs)}}(z))))throw shaka.log.error("Unused stream in period-flattening!",
|
|
1734
|
+
z.$jscomp$loop$prop$stream$650$813,a),new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.PERIOD_FLATTENING_FAILED);return C.return(a)}})};
|
|
1734
1735
|
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,
|
|
1735
1736
|
c,d,e);return f.return(!0)})};
|
|
1736
1737
|
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
|
|
@@ -1772,9 +1773,9 @@ shaka.dash.DashParser.prototype.requestManifest_=function(){var a=this,b,c,d,e,f
|
|
|
1772
1773
|
f.uri&&f.uri!=f.originalUri&&!a.manifestUris_.includes(f.uri)&&a.manifestUris_.unshift(f.uri);return k.yield(a.parseManifest_(f.data,f.uri),3)}g=Date.now();h=(g-e)/1E3;a.averageUpdateDuration_.sample(1,h);return k.return(h)})};
|
|
1773
1774
|
shaka.dash.DashParser.prototype.parseManifest_=function(a,b){var c=this,d,e,f,g,h,k,l;return $jscomp.asyncExecutePromiseGeneratorProgram(function(m){if(1==m.nextAddress){d=shaka.util.Error;e=shaka.dash.MpdUtils;f=shaka.util.XmlUtils.parseXml(a,"MPD");if(!f)throw new d(d.Severity.CRITICAL,d.Category.MANIFEST,d.Code.DASH_INVALID_XML,b);if(g=c.config_.dash.disableXlinkProcessing)return m.return(c.processManifest_(f,b));h=c.config_.dash.xlinkFailGracefully;k=e.processXlinks(f,c.config_.retryParameters,
|
|
1774
1775
|
h,b,c.playerInterface_.networkingEngine);c.operationManager_.manage(k);return m.yield(k.promise,2)}l=m.yieldResult;return m.return(c.processManifest_(l,b))})};
|
|
1775
|
-
shaka.dash.DashParser.prototype.processManifest_=function(a,b){var c=this,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,z,
|
|
1776
|
+
shaka.dash.DashParser.prototype.processManifest_=function(a,b){var c=this,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,y,z,A,B,E,I,C,G,D,F,H,J,K,M,L,O,P,Q,S,N,R,X,V,U,Y,Z,da,W,aa,ba,ca;return $jscomp.asyncExecutePromiseGeneratorProgram(function(T){switch(T.nextAddress){case 1:d=shaka.util.Functional;e=shaka.util.XmlUtils;(f=c.config_.dash.manifestPreprocessor)&&f(a);g=[b];h=e.findChildren(a,"Location").map(e.getContents).filter(d.isNotNull);0<h.length&&(k=shaka.util.ManifestParserUtils.resolveUris(g,h),g=c.manifestUris_=
|
|
1776
1777
|
k);l=Promise.resolve();if((m=e.findChild(a,"ContentSteering"))&&c.playerInterface_)if(n=m.getAttribute("defaultServiceLocation"),c.contentSteeringManager_)c.contentSteeringManager_.setBaseUris(g),c.contentSteeringManager_.setDefaultPathwayId(n);else if(c.contentSteeringManager_=new shaka.util.ContentSteeringManager(c.playerInterface_),c.contentSteeringManager_.configure(c.config_),c.contentSteeringManager_.setManifestType(shaka.media.ManifestParser.DASH),c.contentSteeringManager_.setBaseUris(g),c.contentSteeringManager_.setDefaultPathwayId(n),
|
|
1777
|
-
p=e.getContents(m))(q=e.parseAttr(m,"queryBeforeStart",e.parseBoolean,!1))?l=c.contentSteeringManager_.requestInfo(p):c.contentSteeringManager_.requestInfo(p);r=e.findChildren(a,"BaseURL");w=!1;if(c.contentSteeringManager_)for(c.contentSteeringManager_.clearPreviousLocations(),t=$jscomp.makeIterator(r),v=t.next();!v.done;v=t.next())x=v.value,
|
|
1778
|
+
p=e.getContents(m))(q=e.parseAttr(m,"queryBeforeStart",e.parseBoolean,!1))?l=c.contentSteeringManager_.requestInfo(p):c.contentSteeringManager_.requestInfo(p);r=e.findChildren(a,"BaseURL");w=!1;if(c.contentSteeringManager_)for(c.contentSteeringManager_.clearPreviousLocations(),t=$jscomp.makeIterator(r),v=t.next();!v.done;v=t.next())x=v.value,y=x.getAttribute("serviceLocation"),z=e.getContents(x),y&&z&&(c.contentSteeringManager_.addLocation("BaseURL",y,z),w=!0);w&&c.contentSteeringManager_||(A=r.map(e.getContents),
|
|
1778
1779
|
u=shaka.util.ManifestParserUtils.resolveUris(g,A));B=function(){return c.contentSteeringManager_&&w?c.contentSteeringManager_.getLocations("BaseURL"):u?u:[]};E=0;r&&r.length&&(E=e.parseAttr(r[0],"availabilityTimeOffset",e.parseFloat)||0);I=c.config_.dash.ignoreMinBufferTime;C=0;I||(C=e.parseAttr(a,"minBufferTime",e.parseDuration)||0);c.updatePeriod_=e.parseAttr(a,"minimumUpdatePeriod",e.parseDuration,-1);G=e.parseAttr(a,"availabilityStartTime",e.parseDate);D=e.parseAttr(a,"timeShiftBufferDepth",e.parseDuration);
|
|
1779
1780
|
F=c.config_.dash.ignoreSuggestedPresentationDelay;H=null;F||(H=e.parseAttr(a,"suggestedPresentationDelay",e.parseDuration));J=c.config_.dash.ignoreMaxSegmentDuration;K=null;J||(K=e.parseAttr(a,"maxSegmentDuration",e.parseDuration));M=a.getAttribute("type")||"static";if(c.manifest_)for(L=c.manifest_.presentationTimeline,O=$jscomp.makeIterator(Object.values(c.streamMap_)),P=O.next();!P.done;P=O.next())Q=P.value,Q.segmentIndex&&Q.segmentIndex.evict(L.getSegmentAvailabilityStart());else S=c.config_.defaultPresentationDelay||
|
|
1780
1781
|
1.5*C,N=null!=H?H:S,L=new shaka.media.PresentationTimeline(G,N,c.config_.dash.autoCorrectDrift);L.setStatic("static"==M);(R=L.isLive())&&!isNaN(c.config_.availabilityWindowOverride)&&(D=c.config_.availabilityWindowOverride);null==D&&(D=Infinity);L.setSegmentAvailabilityDuration(D);X=a.getAttribute("profiles")||"";V={dynamic:"static"!=M,presentationTimeline:L,period:null,periodInfo:null,adaptationSet:null,representation:null,bandwidth:0,indexRangeWarningGiven:!1,availabilityTimeOffset:E,profiles:X.split(",")};
|
|
@@ -1790,34 +1791,34 @@ m);g=this.parsePeriod_(a,b,{start:m,duration:q,node:k,isLastPeriod:null==q||!l})
|
|
|
1790
1791
|
duration:e,durationDerivedFromPeriods:!1}):{periods:f,duration:g,durationDerivedFromPeriods:!0}};
|
|
1791
1792
|
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();
|
|
1792
1793
|
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,
|
|
1793
|
-
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$
|
|
1794
|
-
m=l.next())k.$jscomp$loop$prop$stream$
|
|
1794
|
+
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$815:k.$jscomp$loop$prop$stream$815},
|
|
1795
|
+
m=l.next())k.$jscomp$loop$prop$stream$815=m.value,k.$jscomp$loop$prop$stream$815.trickModeVideo=f.streams.find(function(n){return function(p){return shaka.util.MimeUtils.getNormalizedCodec(n.$jscomp$loop$prop$stream$815.codecs)==shaka.util.MimeUtils.getNormalizedCodec(p.codecs)}}(k))}}e=this.getStreamsFromSets_(this.config_.disableAudio,c,g.AUDIO);f=this.getStreamsFromSets_(this.config_.disableVideo,c,g.VIDEO);b=this.getStreamsFromSets_(this.config_.disableText,c,g.TEXT);g=this.getStreamsFromSets_(this.config_.disableThumbnails,
|
|
1795
1796
|
c,g.IMAGE);if(0===f.length&&0===e.length)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.DASH_EMPTY_PERIOD);return{id:a.period.id,audioStreams:e,videoStreams:f,textStreams:b,imageStreams:g}};shaka.dash.DashParser.prototype.getStreamsFromSets_=function(a,b,c){return a||!b.length?[]:b.reduce(function(d,e){if(e.contentType!=c)return d;d.push.apply(d,$jscomp.arrayFromIterable(e.streams));return d},[])};
|
|
1796
1797
|
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(D){return D.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=
|
|
1797
1798
|
p.value;var q=p.getAttribute("schemeIdUri");if(null==q||"urn:mpeg:dash:role:2011"==q)switch(p=p.getAttribute("value"),p){case "main":k=!0;break;case "caption":case "subtitle":n=p}}var r;q=function(D){switch(D){case 1:case 6:case 13:case 14:case 15:return"SDR";case 16:return"PQ";case 18:return"HLG"}};var u=d.findChildren(b,"EssentialProperty");l=null;var w=!1;p=!1;u=$jscomp.makeIterator(u);for(var t=u.next();!t.done;t=u.next()){t=t.value;var v=t.getAttribute("schemeIdUri");"http://dashif.org/guidelines/trickmode"==
|
|
1798
1799
|
v?l=t.getAttribute("value"):"urn:mpeg:mpegB:cicp:TransferCharacteristics"==v?r=q(parseInt(t.getAttribute("value"),10)):"urn:mpeg:mpegB:cicp:ColourPrimaries"!=v&&"urn:mpeg:mpegB:cicp:MatrixCoefficients"!=v&&("urn:mpeg:dash:ssr:2023"==v?w=!0:p=!0)}u=d.findChildren(b,"SupplementalProperty");u=$jscomp.makeIterator(u);for(t=u.next();!t.done;t=u.next())t=t.value,"urn:mpeg:mpegB:cicp:TransferCharacteristics"==t.getAttribute("schemeIdUri")&&(r=q(parseInt(t.getAttribute("value"),10)));u=d.findChildren(b,"Accessibility");
|
|
1799
|
-
q=shaka.util.LanguageUtils;var x=new Map;u=$jscomp.makeIterator(u);for(t=u.next();!t.done;t=u.next())if(v=t.value,t=v.getAttribute("schemeIdUri"),v=v.getAttribute("value"),"urn:scte:dash:cc:cea-608:2015"==t)if(t=1,null!=v){v=v.split(";");for(var
|
|
1800
|
-
t)if(t=1,null!=v)for(v=$jscomp.makeIterator(v.split(";")),
|
|
1800
|
+
q=shaka.util.LanguageUtils;var x=new Map;u=$jscomp.makeIterator(u);for(t=u.next();!t.done;t=u.next())if(v=t.value,t=v.getAttribute("schemeIdUri"),v=v.getAttribute("value"),"urn:scte:dash:cc:cea-608:2015"==t)if(t=1,null!=v){v=v.split(";");for(var y=$jscomp.makeIterator(v),z=y.next();!z.done;z=y.next()){var A=z.value,B=z=void 0;A.includes("=")?(A=A.split("="),z=A[0].startsWith("CC")?A[0]:"CC"+A[0],B=A[1]||"und"):(z="CC"+t,2==v.length?t+=2:t++,B=A);x.set(z,q.normalize(B))}}else x.set("CC1","und");else if("urn:scte:dash:cc:cea-708:2015"==
|
|
1801
|
+
t)if(t=1,null!=v)for(v=$jscomp.makeIterator(v.split(";")),z=v.next();!z.done;z=v.next())z=z.value,A=y=void 0,z.includes("=")?(z=z.split("="),y="svc"+z[0],A=z[1].split(",")[0].split(":").pop()):(y="svc"+t,t++,A=z),x.set(y,q.normalize(A));else x.set("svc1","und");else if("urn:mpeg:dash:role:2011"==t)null!=v&&(m.push(v),"captions"==v&&(n=f.TextStreamKind.CLOSED_CAPTION));else if("urn:tva:metadata:cs:AudioPurposeCS:2007"==t)if("1"==v)var E=shaka.media.ManifestParser.AccessibilityPurpose.VISUALLY_IMPAIRED;
|
|
1801
1802
|
else"2"==v&&(E=shaka.media.ManifestParser.AccessibilityPurpose.HARD_OF_HEARING);if(p)return null;f=d.findChildren(b,"ContentProtection");var I=h.parseFromAdaptationSet(f,this.config_.dash.ignoreDrmInfo,this.config_.dash.keySystemsByURI),C=shaka.util.LanguageUtils.normalize(a.adaptationSet.language||"und"),G=b.getAttribute("label");(h=d.findChildren(b,"Label"))&&h.length&&(h=h[0],h.textContent&&(G=h.textContent));d=d.findChildren(b,"Representation");b=d.map(function(D){if(D=c.parseRepresentation_(a,
|
|
1802
1803
|
I,n,C,G,k,m,x,D,E))D.hdr=D.hdr||r,D.fastSwitching=w;return D}).filter(function(D){return!!D});if(0==b.length){l=a.adaptationSet.contentType==g.IMAGE;if(this.config_.dash.ignoreEmptyAdaptationSet||e||l)return null;throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.DASH_EMPTY_ADAPTATION_SET);}if(!a.adaptationSet.contentType||a.adaptationSet.contentType==g.APPLICATION)for(a.adaptationSet.contentType=shaka.dash.DashParser.guessContentType_(b[0].mimeType,
|
|
1803
1804
|
b[0].codecs),g=$jscomp.makeIterator(b),h=g.next();!h.done;h=g.next())h.value.type=a.adaptationSet.contentType;g=a.adaptationSet.id||"__fake__"+this.globalId_++;e=$jscomp.makeIterator(b);for(h=e.next();!h.done;h=e.next()){h=h.value;f=$jscomp.makeIterator(I.drmInfos);for(p=f.next();!p.done;p=f.next())p=p.value,p.keyIds=p.keyIds&&h.keyIds?new Set([].concat($jscomp.arrayFromIterable(p.keyIds),$jscomp.arrayFromIterable(h.keyIds))):p.keyIds||h.keyIds;this.config_.dash.enableAudioGroups&&(h.groupId=g)}e=
|
|
1804
1805
|
d.map(function(D){return D.getAttribute("id")}).filter(shaka.util.Functional.isNotNull);return{id:g,contentType:a.adaptationSet.contentType,language:C,main:k,streams:b,drmInfos:I.drmInfos,trickModeFor:l,representationIds:e}};
|
|
1805
1806
|
shaka.dash.DashParser.prototype.parseRepresentation_=function(a,b,c,d,e,f,g,h,k,l){var m=this,n=shaka.util.XmlUtils,p=shaka.util.ManifestParserUtils.ContentType;a.representation=this.createFrame_(k,a.adaptationSet,null);this.minTotalAvailabilityTimeOffset_=Math.min(this.minTotalAvailabilityTimeOffset_,a.representation.availabilityTimeOffset);if(!this.verifyRepresentation_(a.representation))return shaka.log.warning("Skipping Representation",a.representation),null;var q=a.periodInfo.start;a.bandwidth=
|
|
1806
|
-
n.parseAttr(k,"bandwidth",n.parsePositiveInt)||0;var r=a.representation.contentType,u=r==p.TEXT||r==p.APPLICATION;p=r==p.IMAGE;try{var w=void 0;if(b.aes128Info){var t=a.representation.getBaseUris,v=shaka.util.ManifestParserUtils.resolveUris(t(),[b.aes128Info.keyUri]),x=shaka.net.NetworkingEngine.RequestType.KEY,
|
|
1807
|
-
H.nextAddress)return H.yield(m.makeNetworkRequest_(
|
|
1808
|
-
shaka.dash.SegmentBase.createStreamInfo(a,t,w);else if(a.representation.segmentList)
|
|
1807
|
+
n.parseAttr(k,"bandwidth",n.parsePositiveInt)||0;var r=a.representation.contentType,u=r==p.TEXT||r==p.APPLICATION;p=r==p.IMAGE;try{var w=void 0;if(b.aes128Info){var t=a.representation.getBaseUris,v=shaka.util.ManifestParserUtils.resolveUris(t(),[b.aes128Info.keyUri]),x=shaka.net.NetworkingEngine.RequestType.KEY,y=shaka.net.NetworkingEngine.makeRequest(v,this.config_.retryParameters);w={method:"AES-128",iv:b.aes128Info.iv,firstMediaSequenceNumber:0,fetchKey:function(){var G,D,F;return $jscomp.asyncExecutePromiseGeneratorProgram(function(H){if(1==
|
|
1808
|
+
H.nextAddress)return H.yield(m.makeNetworkRequest_(y,x),2);if(3!=H.nextAddress){G=H.yieldResult;if(!G.data||16!=G.data.byteLength)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.AES_128_INVALID_KEY_LENGTH);D={name:"AES-CBC"};F=w;return H.yield(window.crypto.subtle.importKey("raw",G.data,D,!0,["decrypt"]),3)}F.cryptoKey=H.yieldResult;w.fetchKey=void 0;H.jumpToEnd()})}}}t=function(G,D,F,H){return m.requestSegment_(G,D,F,H)};if(a.representation.segmentBase)var z=
|
|
1809
|
+
shaka.dash.SegmentBase.createStreamInfo(a,t,w);else if(a.representation.segmentList)z=shaka.dash.SegmentList.createStreamInfo(a,this.streamMap_,w);else if(a.representation.segmentTemplate)z=shaka.dash.SegmentTemplate.createStreamInfo(a,t,this.streamMap_,!!this.manifest_,this.config_.dash.initialSegmentLimit,this.periodDurations_,w);else{goog.asserts.assert(u,"Must have Segment* with non-text streams.");var A=a.periodInfo.duration||0,B=a.representation.getBaseUris;z={generateSegmentIndex:function(){return Promise.resolve(shaka.media.SegmentIndex.forSingleSegment(q,
|
|
1809
1810
|
A,B()))}}}}catch(G){if((u||p)&&G.code==shaka.util.Error.Code.DASH_NO_SEGMENT_INFO)return null;throw G;}t=n.findChildren(k,"ContentProtection");t=shaka.dash.ContentProtection.parseFromRepresentation(t,b,this.config_.dash.ignoreDrmInfo,this.config_.dash.keySystemsByURI);t=new Set(t?[t]:[]);v=!1;n.findChildren(k,"SupplementalProperty").some(function(G){return"tag:dolby.com,2018:dash:EC3_ExtensionType:2018"==G.getAttribute("schemeIdUri")&&"JOC"==G.getAttribute("value")})&&(v=!0);r=!1;u&&(r=g.includes("forced_subtitle")||
|
|
1810
1811
|
g.includes("forced-subtitle"));var E;if(p&&((k=n.findChildren(k,"EssentialProperty").find(function(G){return["http://dashif.org/thumbnail_tile","http://dashif.org/guidelines/thumbnail_tile"].includes(G.getAttribute("schemeIdUri"))}))&&(E=k.getAttribute("value")),!E))return null;var I;k=a.representation.codecs;a.profiles.includes("http://dashif.org/guidelines/dash-if-uhd#hevc-hdr-pq10")&&(k.includes("hvc1.2.4.L153.B0")||k.includes("hev1.2.4.L153.B0"))&&(I="PQ");k=a.representation.id?a.period.id+","+
|
|
1811
1812
|
a.representation.id:"";var C=k&&this.streamMap_[k]?this.streamMap_[k]:{id:this.globalId_++,originalId:a.representation.id,groupId:null,createSegmentIndex:function(){return Promise.resolve()},closeSegmentIndex:function(){C.segmentIndex&&(C.segmentIndex.release(),C.segmentIndex=null)},segmentIndex:null,mimeType:a.representation.mimeType,codecs:a.representation.codecs,frameRate:a.representation.frameRate,pixelAspectRatio:a.representation.pixelAspectRatio,bandwidth:a.bandwidth,width:a.representation.width,
|
|
1812
1813
|
height:a.representation.height,kind:c,encrypted:0<b.drmInfos.length,drmInfos:b.drmInfos,keyIds:t,language:d,originalLanguage:a.adaptationSet.language,label:e,type:a.adaptationSet.contentType,primary:f,trickModeVideo:null,emsgSchemeIdUris:a.representation.emsgSchemeIdUris,roles:g,forced:r,channelsCount:a.representation.numChannels,audioSamplingRate:a.representation.audioSamplingRate,spatialAudio:v,closedCaptions:h,hdr:I,videoLayout:void 0,tilesLayout:E,matchedStreams:[],accessibilityPurpose:l,external:!1,
|
|
1813
|
-
fastSwitching:!1};C.createSegmentIndex=function(){var G;return $jscomp.asyncExecutePromiseGeneratorProgram(function(D){if(1==D.nextAddress){if(C.segmentIndex)return D.jumpTo(0);G=C;return D.yield(
|
|
1814
|
+
fastSwitching:!1};C.createSegmentIndex=function(){var G;return $jscomp.asyncExecutePromiseGeneratorProgram(function(D){if(1==D.nextAddress){if(C.segmentIndex)return D.jumpTo(0);G=C;return D.yield(z.generateSegmentIndex(),3)}G.segmentIndex=D.yieldResult;D.jumpToEnd()})};k&&a.dynamic&&!this.streamMap_[k]&&(this.streamMap_[k]=C);return C};
|
|
1814
1815
|
shaka.dash.DashParser.prototype.onUpdate_=function(){var a=this,b,c;return $jscomp.asyncExecutePromiseGeneratorProgram(function(d){switch(d.nextAddress){case 1:return goog.asserts.assert(0<=a.updatePeriod_,"There should be an update period"),shaka.log.info("Updating manifest..."),b=0,d.setCatchFinallyBlocks(2),d.yield(a.requestManifest_(),4);case 4:b=d.yieldResult;d.leaveTryBlock(3);break;case 2:if(c=d.enterCatchBlock(),goog.asserts.assert(c instanceof shaka.util.Error,"Should only receive a Shaka error"),
|
|
1815
1816
|
a.playerInterface_){if(a.config_.raiseFatalErrorOnManifestUpdateRequestFailure)return a.playerInterface_.onError(c),d.return();c.severity=shaka.util.Error.Severity.RECOVERABLE;a.playerInterface_.onError(c)}case 3:if(!a.playerInterface_)return d.return();a.playerInterface_.onManifestUpdated();a.setUpdateTimer_(b);d.jumpToEnd()}})};shaka.dash.DashParser.prototype.setUpdateTimer_=function(a){0>=this.updatePeriod_||(a=Math.max(this.updatePeriod_-a,this.averageUpdateDuration_.getEstimate()),this.updateTimer_.tickAfter(a))};
|
|
1816
1817
|
shaka.dash.DashParser.prototype.createFrame_=function(a,b,c){var d=this;goog.asserts.assert(b||c,"Must provide either parent or getBaseUris");var e=shaka.util.ManifestParserUtils,f=shaka.util.XmlUtils;b=b||{contentType:"",mimeType:"",codecs:"",emsgSchemeIdUris:[],frameRate:void 0,pixelAspectRatio:void 0,numChannels:null,audioSamplingRate:null,availabilityTimeOffset:0,segmentSequenceCadence:0};c=c||b.getBaseUris;var g=f.parseNonNegativeInt,h=f.evalDivision,k=a.getAttribute("id"),l=f.findChildren(a,
|
|
1817
1818
|
"BaseURL"),m,n=!1;if(this.contentSteeringManager_)for(var p=$jscomp.makeIterator(l),q=p.next();!q.done;q=p.next()){var r=q.value;q=r.getAttribute("serviceLocation");r=f.getContents(r);q&&r&&(this.contentSteeringManager_.addLocation(k,q,r),n=!0)}n&&this.contentSteeringManager_||(m=l.map(f.getContents));p=a.getAttribute("contentType")||b.contentType;q=a.getAttribute("mimeType")||b.mimeType;r=a.getAttribute("codecs")||b.codecs;h=f.parseAttr(a,"frameRate",h)||b.frameRate;var u=a.getAttribute("sar")||
|
|
1818
|
-
b.pixelAspectRatio,w=this.emsgSchemeIdUris_(f.findChildren(a,"InbandEventStream"),b.emsgSchemeIdUris),t=f.findChildren(a,"AudioChannelConfiguration");t=this.parseAudioChannels_(t)||b.numChannels;var v=f.parseAttr(a,"audioSamplingRate",g)||b.audioSamplingRate;p||(p=shaka.dash.DashParser.guessContentType_(q,r));var x=f.findChild(a,"SegmentBase"),
|
|
1819
|
-
0:0,B=l&&l.length?f.parseAttr(l[0],"availabilityTimeOffset",f.parseFloat)||0:0;
|
|
1820
|
-
width:f.parseAttr(a,"width",g)||b.width,height:f.parseAttr(a,"height",g)||b.height,contentType:p,mimeType:q,codecs:r,frameRate:h,pixelAspectRatio:u,emsgSchemeIdUris:w,id:k,language:a.getAttribute("lang"),numChannels:t,audioSamplingRate:v,availabilityTimeOffset:
|
|
1819
|
+
b.pixelAspectRatio,w=this.emsgSchemeIdUris_(f.findChildren(a,"InbandEventStream"),b.emsgSchemeIdUris),t=f.findChildren(a,"AudioChannelConfiguration");t=this.parseAudioChannels_(t)||b.numChannels;var v=f.parseAttr(a,"audioSamplingRate",g)||b.audioSamplingRate;p||(p=shaka.dash.DashParser.guessContentType_(q,r));var x=f.findChild(a,"SegmentBase"),y=f.findChild(a,"SegmentTemplate"),z=x?f.parseAttr(x,"availabilityTimeOffset",f.parseFloat)||0:0,A=y?f.parseAttr(y,"availabilityTimeOffset",f.parseFloat)||
|
|
1820
|
+
0:0,B=l&&l.length?f.parseAttr(l[0],"availabilityTimeOffset",f.parseFloat)||0:0;z=b.availabilityTimeOffset+B+z+A;A=null;(B=f.findChild(a,"SegmentSequenceProperties"))&&(B=f.findChild(B,"SAP"))&&(A=f.parseAttr(B,"cadence",f.parseInt));return{getBaseUris:function(){return e.resolveUris(c(),l.length?d.contentSteeringManager_&&n?d.contentSteeringManager_.getLocations(k):m?m:[]:[])},segmentBase:x||b.segmentBase,segmentList:f.findChild(a,"SegmentList")||b.segmentList,segmentTemplate:y||b.segmentTemplate,
|
|
1821
|
+
width:f.parseAttr(a,"width",g)||b.width,height:f.parseAttr(a,"height",g)||b.height,contentType:p,mimeType:q,codecs:r,frameRate:h,pixelAspectRatio:u,emsgSchemeIdUris:w,id:k,language:a.getAttribute("lang"),numChannels:t,audioSamplingRate:v,availabilityTimeOffset:z,segmentSequenceCadence:A||b.segmentSequenceCadence}};
|
|
1821
1822
|
shaka.dash.DashParser.prototype.emsgSchemeIdUris_=function(a,b){b=b.slice();a=$jscomp.makeIterator(a);for(var c=a.next();!c.done;c=a.next())c=c.value.getAttribute("schemeIdUri"),b.includes(c)||b.push(c);return b};
|
|
1822
1823
|
shaka.dash.DashParser.prototype.parseAudioChannels_=function(a){a=$jscomp.makeIterator(a);for(var b=a.next();!b.done;b=a.next()){var c=b.value;if(b=c.getAttribute("schemeIdUri"))if(c=c.getAttribute("value"))switch(b){case "urn:mpeg:dash:outputChannelPositionList:2012":return c.trim().split(/ +/).length;case "urn:mpeg:dash:23003:3:audio_channel_configuration:2011":case "urn:dts:dash:audio_channel_configuration:2012":var d=parseInt(c,10);if(!d){shaka.log.warning("Channel parsing failure! Ignoring scheme and value",
|
|
1823
1824
|
b,c);continue}return d;case "tag:dolby.com,2014:dash:audio_channel_configuration:2011":case "urn:dolby:dash:audio_channel_configuration:2011":d=parseInt(c,16);if(!d){shaka.log.warning("Channel parsing failure! Ignoring scheme and value",b,c);continue}for(a=0;d;)d&1&&++a,d>>=1;return a;case "urn:mpeg:mpegB:cicp:ChannelConfiguration":d=[0,1,2,3,4,5,6,8,2,3,4,7,8,24,8,12,10,12,14,12,14];var e=parseInt(c,10);if(!e){shaka.log.warning("Channel parsing failure! Ignoring scheme and value",b,c);continue}if(0<
|
|
@@ -1869,10 +1870,10 @@ shaka.hls.HlsParser.prototype.stop=function(){this.updatePlaylistTimer_&&(this.u
|
|
|
1869
1870
|
return Promise.all(a)};
|
|
1870
1871
|
shaka.hls.HlsParser.prototype.update=function(){var a=this,b,c,d,e,f,g,h,k,l;return $jscomp.asyncExecutePromiseGeneratorProgram(function(m){if(1==m.nextAddress){if(!a.isLive_())return m.return();b=[];c=Array.from(a.uriToStreamInfosMap_.values());a.lastTargetDuration_=Infinity;d=c.filter(function(n){return n.stream.segmentIndex});e=$jscomp.makeIterator(d);for(f=e.next();!f.done;f=e.next())g=f.value,b.push(a.updateStream_(g));return m.yield(Promise.all(b),2)}a.notifySegmentsForStreams_(d.map(function(n){return n.stream}));h=
|
|
1871
1872
|
d.some(function(n){return 0==n.hasEndList});d.length&&!h&&(k=shaka.hls.HlsParser.PresentationType_,a.setPresentationType_(k.VOD),l=d.map(function(n){return n.maxTimestamp}),a.presentationTimeline_.setDuration(Math.min.apply(Math,$jscomp.arrayFromIterable(l))),a.playerInterface_.updateDuration());h&&a.determineDuration_();m.jumpToEnd()})};shaka.hls.HlsParser.prototype.getMediaSequenceToStartTimeFor_=function(a){return this.isLive_()?this.mediaSequenceToStartTimeByType_.get(a.type):a.mediaSequenceToStartTime};
|
|
1872
|
-
shaka.hls.HlsParser.prototype.updateStream_=function(a){var b=this,c,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,z,
|
|
1873
|
+
shaka.hls.HlsParser.prototype.updateStream_=function(a){var b=this,c,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,y,z,A,B,E,I,C,G,D,F,H,J;return $jscomp.asyncExecutePromiseGeneratorProgram(function(K){if(1==K.nextAddress){c=[];d=$jscomp.makeIterator(a.getUris());for(e=d.next();!e.done;e=d.next())f=e.value,g=new goog.Uri(f),h=g.getQueryData(),a.canBlockReload&&(0<=a.nextMediaSequence&&h.add("_HLS_msn",String(a.nextMediaSequence)),0<=a.nextPart&&h.add("_HLS_part",String(a.nextPart))),a.canSkipSegments&&h.add("_HLS_skip",
|
|
1873
1874
|
"YES"),h.getCount()&&g.setQueryData(h),c.push(g.toString());return K.yield(b.requestManifest_(c,!0),2)}k=K.yieldResult;if(!a.stream.segmentIndex)return K.return();l=b.manifestTextParser_.parsePlaylist(k.data);if(l.type!=shaka.hls.PlaylistType.MEDIA)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.HLS_INVALID_PLAYLIST_HIERARCHY);m=k.uri;m==k.originalUri||a.getUris().includes(m)||a.redirectUris.push(m);n=shaka.hls.Utils.filterTagsByName(l.tags,
|
|
1874
|
-
"EXT-X-DEFINE");p=b.parseMediaVariables_(n,m);q=a.stream;r=b.getMediaSequenceToStartTimeFor_(a);u=b.parseDrmInfo_(l,q.mimeType);w=u.keyIds;t=u.drmInfos;v=function(M,L){return M.size===L.size&&[].concat($jscomp.arrayFromIterable(M)).every(function(O){return L.has(O)})};v(q.keyIds,w)||(q.keyIds=w,q.drmInfos=t,b.playerInterface_.newDrmInfo(q));x=b.createSegments_(l,q,r,p,a.getUris);
|
|
1875
|
-
|
|
1875
|
+
"EXT-X-DEFINE");p=b.parseMediaVariables_(n,m);q=a.stream;r=b.getMediaSequenceToStartTimeFor_(a);u=b.parseDrmInfo_(l,q.mimeType);w=u.keyIds;t=u.drmInfos;v=function(M,L){return M.size===L.size&&[].concat($jscomp.arrayFromIterable(M)).every(function(O){return L.has(O)})};v(q.keyIds,w)||(q.keyIds=w,q.drmInfos=t,b.playerInterface_.newDrmInfo(q));x=b.createSegments_(l,q,r,p,a.getUris);y=x.segments;z=x.bandwidth;q.bandwidth=z;q.segmentIndex.mergeAndEvict(y,b.presentationTimeline_.getSegmentAvailabilityStart());
|
|
1876
|
+
y.length&&(A=shaka.hls.Utils.getFirstTagWithNameAsNumber(l.tags,"EXT-X-MEDIA-SEQUENCE",0),E=(B=shaka.hls.Utils.getFirstTagWithName(l.tags,"EXT-X-SKIP"))?Number(B.getAttributeValue("SKIPPED-SEGMENTS")):0,I=b.getNextMediaSequenceAndPart_(A,y),C=I.nextMediaSequence,G=I.nextPart,a.nextMediaSequence=C+E,a.nextPart=G,D=r.get(A),q.segmentIndex.evict(D));F=y[0];goog.asserts.assert(F,"Should have segments!");a.minTimestamp=F.startTime;H=y[y.length-1];goog.asserts.assert(H,"Should have segments!");a.maxTimestamp=
|
|
1876
1877
|
H.endTime;if(J=shaka.hls.Utils.getFirstTagWithName(l.tags,"EXT-X-ENDLIST"))a.hasEndList=!0;b.determineLastTargetDuration_(l);K.jumpToEnd()})};shaka.hls.HlsParser.prototype.onExpirationUpdated=function(a,b){};shaka.hls.HlsParser.prototype.onInitialVariantChosen=function(a){};shaka.hls.HlsParser.prototype.banLocation=function(a){this.contentSteeringManager_&&this.contentSteeringManager_.banLocation(a)};
|
|
1877
1878
|
shaka.hls.HlsParser.prototype.syncStreamsWithSequenceNumber_=function(a){for(var b=-1==this.minSequenceNumber_,c=$jscomp.makeIterator(a),d=c.next();!d.done;d=c.next()){d=d.value;var e=d.stream.segmentIndex;goog.asserts.assert(e,"Only loaded streams should be synced");var f=this.getMediaSequenceToStartTimeFor_(d);if(e=e.earliestReference()){if(goog.DEBUG){var g=f.values().next().value;goog.asserts.assert(g==e.startTime,"Sequence number map is not ordered as expected!")}f=$jscomp.makeIterator(f);for(g=
|
|
1878
1879
|
f.next();!g.done;g=f.next()){g=$jscomp.makeIterator(g.value);var h=g.next().value;if(g.next().value==e.startTime){b&&(this.minSequenceNumber_=Math.max(this.minSequenceNumber_,h));d.firstSequenceNumber=h;break}}}}if(!(0>this.minSequenceNumber_))for(shaka.log.debug("Syncing HLS streams against base sequence number:",this.minSequenceNumber_),a=$jscomp.makeIterator(a),d=a.next();!d.done;d=a.next())if(b=d.value,c=b.stream.segmentIndex)if(c.dropFirstReferences(this.minSequenceNumber_-b.firstSequenceNumber),
|
|
@@ -1880,17 +1881,17 @@ c=c.earliestReference())c=-c.startTime,b.stream.segmentIndex.offset(c),this.offs
|
|
|
1880
1881
|
shaka.hls.HlsParser.prototype.syncStreamsWithProgramDateTime_=function(a){if(Infinity==this.lowestSyncTime_){a=$jscomp.makeIterator(a);for(var b=a.next();!b.done;b=a.next()){var c=b.value.stream.segmentIndex;goog.asserts.assert(c,"Only loaded streams should be synced");c=c.earliestReference();null!=c&&null!=c.syncTime&&(this.lowestSyncTime_=Math.min(this.lowestSyncTime_,c.syncTime))}}a=this.lowestSyncTime_;if(Infinity!=a)for(shaka.log.debug("Syncing HLS streams against base time:",a),c=$jscomp.makeIterator(this.uriToStreamInfosMap_.values()),
|
|
1881
1882
|
b=c.next();!b.done;b=c.next()){b=b.value;var d=b.stream.segmentIndex;if(null!=d){var e=d.earliestReference();if(null==e.syncTime)shaka.log.alwaysError("Missing EXT-X-PROGRAM-DATE-TIME for stream",b.getUris(),"Expect AV sync issues!");else for(this.offsetStreamInfo_(b,e.syncTime-a-e.startTime),b=$jscomp.makeIterator(d),d=b.next();!d.done;d=b.next())d.value.syncAgainst(a)}}};
|
|
1882
1883
|
shaka.hls.HlsParser.prototype.offsetStreamInfo_=function(a,b){a.minTimestamp+=b;a.maxTimestamp+=b;goog.asserts.assert(0<=a.maxTimestamp,"Negative maxTimestamp after adjustment!");for(var c=this.getMediaSequenceToStartTimeFor_(a),d=$jscomp.makeIterator(c),e=d.next();!e.done;e=d.next()){var f=$jscomp.makeIterator(e.value);e=f.next().value;f=f.next().value;c.set(e,f+b)}shaka.log.debug("Offset",b,"applied to",a.getUris())};
|
|
1883
|
-
shaka.hls.HlsParser.prototype.parseManifest_=function(a,b){var c=this,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,z,
|
|
1884
|
+
shaka.hls.HlsParser.prototype.parseManifest_=function(a,b){var c=this,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,y,z,A,B,E,I,C,G,D,F,H,J,K,M;return $jscomp.asyncExecutePromiseGeneratorProgram(function(L){switch(L.nextAddress){case 1:d=shaka.hls.Utils;goog.asserts.assert(c.masterPlaylistUri_,"Master playlist URI must be set before calling parseManifest_!");e=c.manifestTextParser_.parsePlaylist(a);f=d.filterTagsByName(e.tags,"EXT-X-DEFINE");g=[];h=[];k=[];if(e.type==shaka.hls.PlaylistType.MEDIA)return w=function(){return[b]},
|
|
1884
1885
|
L.yield(c.getMediaPlaylistBasicInfo_(e,w),6);c.parseMasterVariables_(f);l=d.filterTagsByName(e.tags,"EXT-X-MEDIA");m=d.filterTagsByName(e.tags,"EXT-X-STREAM-INF");n=d.filterTagsByName(e.tags,"EXT-X-IMAGE-STREAM-INF");p=d.filterTagsByName(e.tags,"EXT-X-I-FRAME-STREAM-INF");q=d.filterTagsByName(e.tags,"EXT-X-SESSION-KEY");r=d.filterTagsByName(e.tags,"EXT-X-SESSION-DATA");u=d.filterTagsByName(e.tags,"EXT-X-CONTENT-STEERING");c.processSessionData_(r);return L.yield(c.processContentSteering_(u),4);case 4:return c.parseCodecs_(m),
|
|
1885
|
-
c.parseClosedCaptions_(l),g=c.createVariantsForTags_(m,q,l),h=c.parseTexts_(l),L.yield(c.parseImages_(n,p),5);case 5:k=L.yieldResult;L.jumpTo(3);break;case 6:return t=L.yieldResult,v=t.type,x=t.mimeType,
|
|
1886
|
-
B,A,null,null,null),g.push({id:0,language:c.getLanguage_(
|
|
1886
|
+
c.parseClosedCaptions_(l),g=c.createVariantsForTags_(m,q,l),h=c.parseTexts_(l),L.yield(c.parseImages_(n,p),5);case 5:k=L.yieldResult;L.jumpTo(3);break;case 6:return t=L.yieldResult,v=t.type,x=t.mimeType,y=t.codecs,z=t.language,A=t.height,B=t.width,E=t.channelCount,I=t.sampleRate,C=t.closedCaptions,L.yield(c.convertParsedPlaylistIntoStreamInfo_(c.globalId_++,e,w,b,y,v,z,!0,"Media Playlist",E,C,null,!1,I,!1,x),7);case 7:G=L.yieldResult,c.uriToStreamInfosMap_.set(b,G),"video"==v&&c.addVideoAttributes_(G.stream,
|
|
1887
|
+
B,A,null,null,null),g.push({id:0,language:c.getLanguage_(z),disabledUntilTime:0,primary:!0,audio:"audio"==v?G.stream:null,video:"video"==v?G.stream:null,bandwidth:G.stream.bandwidth||0,allowedByApplication:!0,allowedByKeySystem:!0,decodingInfos:[]});case 3:if(!c.playerInterface_)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.PLAYER,shaka.util.Error.Code.OPERATION_ABORTED);goog.asserts.assert(null==c.presentationTimeline_,"Presentation timeline created early!");
|
|
1887
1888
|
c.presentationTimeline_=new shaka.media.PresentationTimeline(null,0);c.presentationTimeline_.setStatic(!0);e.type==shaka.hls.PlaylistType.MEDIA&&(c.isLive_()&&(c.changePresentationTimelineToLive_(e),D=c.getUpdatePlaylistDelay_(),c.updatePlaylistTimer_.tickAfter(D)),F=Array.from(c.uriToStreamInfosMap_.values()),c.finalizeStreams_(F),c.determineDuration_());c.manifest_={presentationTimeline:c.presentationTimeline_,variants:g,textStreams:h,imageStreams:k,offlineSessionIds:[],minBufferTime:0,sequenceMode:c.config_.hls.sequenceMode,
|
|
1888
1889
|
ignoreManifestTimestampsInSegmentsMode:c.config_.hls.ignoreManifestTimestampsInSegmentsMode,type:shaka.media.ManifestParser.HLS,serviceDescription:null};if(c.codecInfoInManifest_||!c.config_.hls.disableCodecGuessing){L.jumpTo(8);break}H=[];J=$jscomp.makeIterator(c.manifest_.variants);for(K=J.next();!K.done;K=J.next())M=K.value,M.audio&&""===M.audio.codecs&&H.push(M.audio.createSegmentIndex()),M.video&&""===M.video.codecs&&H.push(M.video.createSegmentIndex());return L.yield(Promise.all(H),8);case 8:c.playerInterface_.makeTextStreamsForClosedCaptions(c.manifest_),
|
|
1889
1890
|
L.jumpToEnd()}})};
|
|
1890
|
-
shaka.hls.HlsParser.prototype.getMediaPlaylistBasicInfo_=function(a,b){var c=this,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,z,
|
|
1891
|
+
shaka.hls.HlsParser.prototype.getMediaPlaylistBasicInfo_=function(a,b){var c=this,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,y,z,A,B;return $jscomp.asyncExecutePromiseGeneratorProgram(function(E){switch(E.nextAddress){case 1:d=shaka.hls.HlsParser;e=shaka.media.SegmentUtils.getBasicInfoFromMimeType(c.config_.hls.mediaPlaylistFullMimeType);if(!a.segments.length)return E.return(e);f=Math.trunc((a.segments.length-1)/2);g=a.segments[f];h=shaka.hls.Utils.constructSegmentUris(b(),a.segments[0].verbatimSegmentUri);k=
|
|
1891
1892
|
h[0];l=new goog.Uri(k);m=l.getPath().split(".").pop();if(n=d.RAW_FORMATS_TO_MIME_TYPES_[m])return E.return(shaka.media.SegmentUtils.getBasicInfoFromMimeType(n));p=shaka.net.NetworkingEngine.RequestType.SEGMENT;q=null;r=c.getInitSegmentReference_(a,g.tags,b);if(!r){E.jumpTo(2);break}u=shaka.net.NetworkingEngine.makeRequest(r.getUris(),c.config_.retryParameters);w=shaka.net.NetworkingEngine.AdvancedRequestType.INIT_SEGMENT;return E.yield(c.makeNetworkRequest_(u,p,{type:w}),3);case 3:t=E.yieldResult,
|
|
1892
|
-
q=t.data;case 2:return v=shaka.net.NetworkingEngine.makeRequest(h,c.config_.retryParameters),x=shaka.net.NetworkingEngine.AdvancedRequestType.MEDIA_SEGMENT,E.yield(c.makeNetworkRequest_(v,p,{type:x}),4);case 4:
|
|
1893
|
-
|
|
1893
|
+
q=t.data;case 2:return v=shaka.net.NetworkingEngine.makeRequest(h,c.config_.retryParameters),x=shaka.net.NetworkingEngine.AdvancedRequestType.MEDIA_SEGMENT,E.yield(c.makeNetworkRequest_(v,p,{type:x}),4);case 4:y=E.yieldResult;(z=y.headers["content-type"])&&(z=z.split(";")[0].toLowerCase());if("ts"==m||"video/mp2t"==z){if(A=shaka.media.SegmentUtils.getBasicInfoFromTs(y.data))return E.return(A)}else if("mp4"==m||"cmfv"==m||"m4s"==m||"video/mp4"==z||"audio/mp4"==z||"video/iso.segment"==z)if(B=shaka.media.SegmentUtils.getBasicInfoFromMp4(q,
|
|
1894
|
+
y.data))return E.return(B);return E.return(e)}})};
|
|
1894
1895
|
shaka.hls.HlsParser.prototype.determineDuration_=function(){goog.asserts.assert(this.presentationTimeline_,"Presentation timeline not created!");if(this.isLive_()){if(this.presentationType_==shaka.hls.HlsParser.PresentationType_.LIVE){var a=this.getLiveDuration_();this.config_.hls.useSafariBehaviorForLive&&(a=this.presentationTimeline_.getDelay());isNaN(this.config_.availabilityWindowOverride)||(a=this.config_.availabilityWindowOverride);this.presentationTimeline_.setSegmentAvailabilityDuration(a)}}else this.presentationTimeline_.setDuration(this.getMinDuration_());this.presentationTimeline_.lockStartTime();
|
|
1895
1896
|
goog.asserts.assert(!this.presentationTimeline_.usingPresentationStartTime(),"We should not be using the presentation start time in HLS!")};
|
|
1896
1897
|
shaka.hls.HlsParser.prototype.parseMasterVariables_=function(a){var b=(new goog.Uri(this.masterPlaylistUri_)).getQueryData();a=$jscomp.makeIterator(a);for(var c=a.next();!c.done;c=a.next()){var d=c.value;c=d.getAttributeValue("NAME");var e=d.getAttributeValue("VALUE");d=d.getAttributeValue("QUERYPARAM");c&&e&&(this.globalVariables_.has(c)||this.globalVariables_.set(c,e));d&&(c=b.get(d)[0])&&!this.globalVariables_.has(c)&&this.globalVariables_.set(d,c)}};
|
|
@@ -1935,19 +1936,19 @@ shaka.hls.HlsParser.prototype.createStreamInfoFromIframeTag_=function(a){goog.as
|
|
|
1935
1936
|
shaka.hls.HlsParser.prototype.createStreamInfoFromVariantTags_=function(a,b,c,d,e,f,g,h,k){k=this.globalId_++;for(var l=[],m=$jscomp.makeIterator(a),n=m.next();!n.done;n=m.next()){var p=n.value;goog.asserts.assert("EXT-X-STREAM-INF"==p.name,"Should only be called on variant tags!");n=p.getRequiredAttrValue("URI");p=p.getAttributeValue("PATHWAY-ID");this.contentSteeringManager_&&p&&this.contentSteeringManager_.addLocation(k,p,n);l.push(n)}m=l.sort().join(",");if(this.uriToStreamInfosMap_.has(m))return this.uriToStreamInfosMap_.get(m);
|
|
1936
1937
|
a=this.getClosedCaptions_(a[0],c);b=shaka.util.ManifestParserUtils.guessCodecs(c,b);c=this.createStreamInfo_(k,l,b,c,d,!1,e,f,a,g,!1,h,!1);this.uriToStreamInfosMap_.set(m,c);return c};
|
|
1937
1938
|
shaka.hls.HlsParser.prototype.createStreamInfo_=function(a,b,c,d,e,f,g,h,k,l,m,n,p){var q=this,r=this.makeStreamObject_(a,c,d,e,f,g,h,k,l,m,n,p),u=[],w=function(){return q.contentSteeringManager_&&1<b.length?q.contentSteeringManager_.getLocations(a):u.concat(shaka.hls.Utils.constructUris([q.masterPlaylistUri_],b,q.globalVariables_))},t={stream:r,type:d,redirectUris:u,getUris:w,minTimestamp:0,maxTimestamp:0,mediaSequenceToStartTime:new Map,canSkipSegments:!1,canBlockReload:!1,hasEndList:!1,firstSequenceNumber:-1,
|
|
1938
|
-
nextMediaSequence:-1,nextPart:-1,loadedOnce:!1},v=function(
|
|
1939
|
-
w),4);case 4:G=N.yieldResult,goog.asserts.assert(d===G.type,"Media types should match!"),C=G.mimeType,c=G.codecs;case 3:return D=q.isLive_(),N.yield(q.convertParsedPlaylistIntoStreamInfo_(a,I,w,E,c,d,e,f,g,h,k,l,m,n,p,C),5);case 5:F=N.yieldResult;if(
|
|
1939
|
+
nextMediaSequence:-1,nextPart:-1,loadedOnce:!1},v=function(z){var A,B,E,I,C,G,D,F,H,J,K,M,L,O,P,Q,S;return $jscomp.asyncExecutePromiseGeneratorProgram(function(N){switch(N.nextAddress){case 1:return A=t.getUris(),N.yield(q.requestManifest_(t.getUris(),!0),2);case 2:B=N.yieldResult;if(z.aborted)return N.return();E=B.uri;E==B.originalUri||A.includes(E)||u.push(E);I=q.manifestTextParser_.parsePlaylist(B.data);C=void 0;if(q.codecInfoInManifest_||!q.config_.hls.disableCodecGuessing){N.jumpTo(3);break}return N.yield(q.getMediaPlaylistBasicInfo_(I,
|
|
1940
|
+
w),4);case 4:G=N.yieldResult,goog.asserts.assert(d===G.type,"Media types should match!"),C=G.mimeType,c=G.codecs;case 3:return D=q.isLive_(),N.yield(q.convertParsedPlaylistIntoStreamInfo_(a,I,w,E,c,d,e,f,g,h,k,l,m,n,p,C),5);case 5:F=N.yieldResult;if(z.aborted)return N.return();H=F.stream;q.isLive_()&&!D&&q.changePresentationTimelineToLive_(I);t.minTimestamp=F.minTimestamp;t.maxTimestamp=F.maxTimestamp;t.canSkipSegments=F.canSkipSegments;t.canBlockReload=F.canBlockReload;t.hasEndList=F.hasEndList;
|
|
1940
1941
|
t.mediaSequenceToStartTime=F.mediaSequenceToStartTime;t.nextMediaSequence=F.nextMediaSequence;t.nextPart=F.nextPart;t.loadedOnce=!0;r.segmentIndex=H.segmentIndex;r.encrypted=H.encrypted;r.drmInfos=H.drmInfos;r.keyIds=H.keyIds;r.mimeType=H.mimeType;r.bandwidth=H.bandwidth;r.codecs=H.codecs||r.codecs;r.drmInfos.length&&q.playerInterface_.newDrmInfo(r);J=shaka.util.ManifestParserUtils.ContentType;if(d==J.VIDEO||d==J.AUDIO)for(K=$jscomp.makeIterator(q.uriToStreamInfosMap_.values()),M=K.next();!M.done;M=
|
|
1941
1942
|
K.next())L=M.value,L.loadedOnce||L.type!=d||(L.stream.mimeType=H.mimeType);d==J.TEXT&&(O=H.segmentIndex.get(0))&&O.initSegmentReference&&(r.mimeType="application/mp4");q.hasEnoughInfoToFinalizeStreams_()&&(q.streamsFinalized_?q.finalizeStreams_([t]):(q.streamsFinalized_=!0,P=Array.from(q.uriToStreamInfosMap_.values()),Q=P.filter(function(R){return R.stream.segmentIndex}),q.finalizeStreams_(Q),q.determineDuration_(),S=q.getUpdatePlaylistDelay_(),0<S&&q.updatePlaylistTimer_.tickAfter(S)));N.jumpToEnd()}})},
|
|
1942
|
-
x=null,
|
|
1943
|
+
x=null,y=new AbortController;r.createSegmentIndex=function(){if(x)return x;y=new AbortController;return x=new Promise(function(z){z(v(y.signal))})};r.closeSegmentIndex=function(){x&&!r.segmentIndex&&y.abort();r.segmentIndex&&(r.segmentIndex.release(),r.segmentIndex=null);x=null};return t};
|
|
1943
1944
|
shaka.hls.HlsParser.prototype.getMinDuration_=function(){for(var a=Infinity,b=$jscomp.makeIterator(this.uriToStreamInfosMap_.values()),c=b.next();!c.done;c=b.next())c=c.value,c.stream.segmentIndex&&"text"!=c.stream.type&&(a=Math.min(a,c.maxTimestamp));return a};
|
|
1944
1945
|
shaka.hls.HlsParser.prototype.getLiveDuration_=function(){for(var a=Infinity,b=Infinity,c=$jscomp.makeIterator(this.uriToStreamInfosMap_.values()),d=c.next();!d.done;d=c.next())d=d.value,d.stream.segmentIndex&&"text"!=d.stream.type&&(a=Math.min(a,d.maxTimestamp),b=Math.min(b,d.minTimestamp));return a-b};
|
|
1945
1946
|
shaka.hls.HlsParser.prototype.notifySegmentsForStreams_=function(a){var b=[];a=$jscomp.makeIterator(a);for(var c=a.next();!c.done;c=a.next())c=c.value,c.segmentIndex&&c.segmentIndex.forEachTopLevelReference(function(d){b.push(d)});this.presentationTimeline_.notifySegments(b)};
|
|
1946
1947
|
shaka.hls.HlsParser.prototype.finalizeStreams_=function(a){if(!this.isLive_())for(var b=this.getMinDuration_(),c=$jscomp.makeIterator(a),d=c.next();!d.done;d=c.next())d.value.stream.segmentIndex.fit(0,b);this.notifySegmentsForStreams_(a.map(function(e){return e.stream}));this.config_.hls.ignoreManifestProgramDateTime?this.syncStreamsWithSequenceNumber_(a):this.syncStreamsWithProgramDateTime_(a)};
|
|
1947
1948
|
shaka.hls.HlsParser.prototype.hasEnoughInfoToFinalizeStreams_=function(){if(!this.manifest_)return!1;for(var a=[],b=[],c=$jscomp.makeIterator(this.manifest_.variants),d=c.next();!d.done;d=c.next())d=d.value,d.video&&a.push(d.video),d.audio&&b.push(d.audio);return 0<a.length&&!a.some(function(e){return e.segmentIndex})||0<b.length&&!b.some(function(e){return e.segmentIndex})?!1:!0};
|
|
1948
|
-
shaka.hls.HlsParser.prototype.convertParsedPlaylistIntoStreamInfo_=function(a,b,c,d,e,f,g,h,k,l,m,n,p,q,r,u){var w=this,t,v,x,z,
|
|
1949
|
-
w.parseMediaVariables_(t,d);goog.asserts.assert(null!=b.segments,"Media playlist should have segments!");w.determinePresentationType_(b);w.isLive_()&&w.determineLastTargetDuration_(b);return u?R.jumpTo(2):R.yield(w.guessMimeType_(f,e,b,v,c),3)}2!=R.nextAddress&&(u=R.yieldResult);x=w.parseDrmInfo_(b,u);
|
|
1950
|
-
E=w.makeStreamObject_(a,e,f,g,h,k,l,m,n,p,q,r);E.encrypted=A;E.drmInfos=
|
|
1949
|
+
shaka.hls.HlsParser.prototype.convertParsedPlaylistIntoStreamInfo_=function(a,b,c,d,e,f,g,h,k,l,m,n,p,q,r,u){var w=this,t,v,x,y,z,A,B,E,I,C,G,D,F,H,J,K,M,L,O,P,Q,S,N;return $jscomp.asyncExecutePromiseGeneratorProgram(function(R){if(1==R.nextAddress){if(b.type!=shaka.hls.PlaylistType.MEDIA)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.HLS_INVALID_PLAYLIST_HIERARCHY);t=shaka.hls.Utils.filterTagsByName(b.tags,"EXT-X-DEFINE");v=
|
|
1950
|
+
w.parseMediaVariables_(t,d);goog.asserts.assert(null!=b.segments,"Media playlist should have segments!");w.determinePresentationType_(b);w.isLive_()&&w.determineLastTargetDuration_(b);return u?R.jumpTo(2):R.yield(w.guessMimeType_(f,e,b,v,c),3)}2!=R.nextAddress&&(u=R.yieldResult);x=w.parseDrmInfo_(b,u);y=x.drmInfos;z=x.keyIds;A=x.encrypted;B=x.aesEncrypted;if(A&&!y.length&&!B)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.HLS_KEYFORMATS_NOT_SUPPORTED);
|
|
1951
|
+
E=w.makeStreamObject_(a,e,f,g,h,k,l,m,n,p,q,r);E.encrypted=A;E.drmInfos=y;E.keyIds=z;E.mimeType=u;I=w.isLive_()?w.mediaSequenceToStartTimeByType_.get(f):new Map;C=w.createSegments_(b,E,I,v,c);G=C.segments;D=C.bandwidth;E.bandwidth=D;w.isLive_()&&w.determineLastTargetDuration_(b);F=G[0].startTime;H=G[G.length-1];J=H.endTime;K=new shaka.media.SegmentIndex(G);E.segmentIndex=K;L=(M=shaka.hls.Utils.getFirstTagWithName(b.tags,"EXT-X-SERVER-CONTROL"))?null!=M.getAttribute("CAN-SKIP-UNTIL"):!1;O=M?null!=
|
|
1951
1952
|
M.getAttribute("CAN-BLOCK-RELOAD"):!1;P=shaka.hls.Utils.getFirstTagWithNameAsNumber(b.tags,"EXT-X-MEDIA-SEQUENCE",0);Q=w.getNextMediaSequenceAndPart_(P,G);S=Q.nextMediaSequence;N=Q.nextPart;return R.return({stream:E,type:f,redirectUris:[],getUris:c,minTimestamp:F,maxTimestamp:J,canSkipSegments:L,canBlockReload:O,hasEndList:!1,firstSequenceNumber:-1,nextMediaSequence:S,nextPart:N,mediaSequenceToStartTime:I,loadedOnce:!1})})};
|
|
1952
1953
|
shaka.hls.HlsParser.prototype.getNextMediaSequenceAndPart_=function(a,b){a=a+b.length-1;var c=-1;if(!b.length)return a++,{nextMediaSequence:a,nextPart:c};b=b[b.length-1];var d=b.partialReferences;if(!b.partialReferences.length)return a++,b.hasByterangeOptimization()&&(c=0),{nextMediaSequence:a,nextPart:c};c=d.length-1;d[d.length-1].isPreload()||(a++,c=0);return{nextMediaSequence:a,nextPart:c}};
|
|
1953
1954
|
shaka.hls.HlsParser.prototype.makeStreamObject_=function(a,b,c,d,e,f,g,h,k,l,m,n){a=this.guessMimeTypeBeforeLoading_(c,b)||this.guessMimeTypeFallback_(c);var p=[];if(k){k=$jscomp.makeIterator(k.split(","));for(var q=k.next();!q.done;q=k.next())p.push(q.value)}k=void 0;q=null;c==shaka.util.ManifestParserUtils.ContentType.TEXT?k=p.includes("public.accessibility.transcribes-spoken-dialog")&&p.includes("public.accessibility.describes-music-and-sound")?shaka.util.ManifestParserUtils.TextStreamKind.CLOSED_CAPTION:
|
|
@@ -1969,25 +1970,25 @@ e.id&&(h=this.parseAES128DrmTag_(l,a,c,d)):"EXT-X-BYTERANGE"==l.name&&l.id<e.id&
|
|
|
1969
1970
|
shaka.hls.HlsParser.prototype.createInitSegmentReference_=function(a,b,c,d){var e=0,f=null;b=b.getAttributeValue("BYTERANGE");!b&&c&&(b=c.value);b&&(e=b.split("@"),f=Number(e[0]),e=Number(e[1]),f=e+f-1,d&&(c=f+1-e,c%16&&(f+=16-c%16)));return new shaka.media.InitSegmentReference(function(){return a},e,f,null,null,null,d)};
|
|
1970
1971
|
shaka.hls.HlsParser.prototype.createSegmentReference_=function(a,b,c,d,e,f,g,h,k){var l=c.tags,m=shaka.hls.Utils.getFirstTagWithName(l,"EXTINF"),n=0;f=0;var p=null;c.partialSegments.length&&!this.lowLatencyMode_&&shaka.log.alwaysWarn("Low-latency HLS live stream detected, but low-latency streaming mode is not enabled in Shaka Player. Set streaming.lowLatencyMode configuration to true, and see https://bit.ly/3clctcj for details.");var q=null;if(!this.config_.hls.ignoreManifestProgramDateTime){var r=
|
|
1971
1972
|
shaka.hls.Utils.getFirstTagWithName(l,"EXT-X-PROGRAM-DATE-TIME");r&&r.value&&(q=shaka.util.XmlUtils.parseDate(r.value),goog.asserts.assert(null!=q,"EXT-X-PROGRAM-DATE-TIME format not valid"))}var u=shaka.media.SegmentReference.Status.AVAILABLE;shaka.hls.Utils.getFirstTagWithName(l,"EXT-X-GAP")&&(u=shaka.media.SegmentReference.Status.MISSING);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,
|
|
1972
|
-
"EXTINF");if(!this.lowLatencyMode_)return null}var w=[];r=!1;var t=null,v=!1,x=!1;if(this.lowLatencyMode_&&c.partialSegments.length){n=("video/mp4"==g.mimeType||"audio/mp4"==g.mimeType)&&window.ReadableStream&&this.config_.hls.allowLowLatencyByteRangeOptimization;for(var
|
|
1973
|
-
C=Number(B.getAttributeValue("DURATION"))||this.partialTargetDuration_;if(C){var G=I+C,D=0,F=null;"EXT-X-PRELOAD-HINT"==B.name?(D=(D=B.getAttributeValue("BYTERANGE-START"))?Number(D):0,(E=B.getAttributeValue("BYTERANGE-LENGTH"))?F=D+Number(E)-1:D&&(F=Number.MAX_SAFE_INTEGER)):(D=B.getAttributeValue("BYTERANGE"),F=$jscomp.makeIterator(this.parseByteRange_(E,D)),D=F.next().value,F=F.next().value);
|
|
1974
|
-
"YES"==B.getAttributeValue("GAP")&&(E=shaka.media.SegmentReference.Status.MISSING,v=!0);
|
|
1975
|
-
G,H,D,F,a,0,0,Infinity,[],"",null,
|
|
1973
|
+
"EXTINF");if(!this.lowLatencyMode_)return null}var w=[];r=!1;var t=null,v=!1,x=!1;if(this.lowLatencyMode_&&c.partialSegments.length){n=("video/mp4"==g.mimeType||"audio/mp4"==g.mimeType)&&window.ReadableStream&&this.config_.hls.allowLowLatencyByteRangeOptimization;for(var y=q,z={},A=0;A<c.partialSegments.length;z={$jscomp$loop$prop$uris$681$817:z.$jscomp$loop$prop$uris$681$817,$jscomp$loop$prop$pUri$818:z.$jscomp$loop$prop$pUri$818},A++){var B=c.partialSegments[A],E=0==A?b:w[w.length-1],I=0==A?d:E.endTime,
|
|
1974
|
+
C=Number(B.getAttributeValue("DURATION"))||this.partialTargetDuration_;if(C){var G=I+C,D=0,F=null;"EXT-X-PRELOAD-HINT"==B.name?(D=(D=B.getAttributeValue("BYTERANGE-START"))?Number(D):0,(E=B.getAttributeValue("BYTERANGE-LENGTH"))?F=D+Number(E)-1:D&&(F=Number.MAX_SAFE_INTEGER)):(D=B.getAttributeValue("BYTERANGE"),F=$jscomp.makeIterator(this.parseByteRange_(E,D)),D=F.next().value,F=F.next().value);z.$jscomp$loop$prop$pUri$818=B.getAttributeValue("URI");if(z.$jscomp$loop$prop$pUri$818){E=shaka.media.SegmentReference.Status.AVAILABLE;
|
|
1975
|
+
"YES"==B.getAttributeValue("GAP")&&(E=shaka.media.SegmentReference.Status.MISSING,v=!0);z.$jscomp$loop$prop$uris$681$817=null;var H=function(K){return function(){null==K.$jscomp$loop$prop$uris$681$817&&(goog.asserts.assert(K.$jscomp$loop$prop$pUri$818,"Partial uri should be defined!"),K.$jscomp$loop$prop$uris$681$817=shaka.hls.Utils.constructSegmentUris(h(),K.$jscomp$loop$prop$pUri$818,e));return K.$jscomp$loop$prop$uris$681$817}}(z);n&&0<=D&&null!=F&&(t=H,r=!0);I=new shaka.media.SegmentReference(I,
|
|
1976
|
+
G,H,D,F,a,0,0,Infinity,[],"",null,y,E,k);"EXT-X-PRELOAD-HINT"==B.name&&(I.markAsPreload(),x=!0);"YES"!=B.getAttributeValue("INDEPENDENT")&&0<A&&I.markAsNonIndependent();w.push(I);y&&(y+=C)}}}}if(m){m=m.value.split(",");m=Number(m[0]);if(0==m)return null;n=d+m}else if(w.length)n=w[w.length-1].endTime;else return null;r&&(v||0!=w[0].startByte?(r=!1,t=null):w=[]);(v=shaka.hls.Utils.getFirstTagWithName(l,"EXT-X-BYTERANGE"))?(p=$jscomp.makeIterator(this.parseByteRange_(b,v.value)),f=p.next().value,p=p.next().value):
|
|
1976
1977
|
w.length&&(f=w[0].startByte,p=w[w.length-1].endByte);b="";v=null;g.type==shaka.util.ManifestParserUtils.ContentType.IMAGE&&(b="1x1",g=shaka.hls.Utils.getFirstTagWithName(l,"EXT-X-TILES"))&&(b=g.getRequiredAttrValue("LAYOUT"),(g=g.getAttributeValue("DURATION"))&&(v=Number(g)));var J=null;a=new shaka.media.SegmentReference(d,n,function(){if(t)return t();null==J&&(J=shaka.hls.Utils.constructSegmentUris(h(),c.verbatimSegmentUri,e));return J||[]},f,p,a,0,0,Infinity,w,b,v,q,u,k,0<w.length&&!!c.verbatimSegmentUri);
|
|
1977
1978
|
r&&(this.lowLatencyByterangeOptimization_=!0,a.markAsByterangeOptimization(),x&&a.markAsPreload());return a};shaka.hls.HlsParser.prototype.parseByteRange_=function(a,b){var c=0,d=null;b&&(c=b.split("@"),b=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+b-1);return[c,d]};
|
|
1978
1979
|
shaka.hls.HlsParser.prototype.createSegments_=function(a,b,c,d,e){var f=a.segments;goog.asserts.assert(f.length,"Playlist should have segments!");var g=void 0,h=shaka.hls.Utils.getFirstTagWithNameAsNumber(a.tags,"EXT-X-DISCONTINUITY-SEQUENCE",0),k=shaka.hls.Utils.getFirstTagWithNameAsNumber(a.tags,"EXT-X-MEDIA-SEQUENCE",0),l=shaka.hls.Utils.getFirstTagWithName(a.tags,"EXT-X-SKIP"),m=l?Number(l.getAttributeValue("SKIPPED-SEGMENTS")):0,n=k+m,p=0;this.isLive_()&&c.has(n)&&(p=c.get(n));var q=[],r=null;
|
|
1979
1980
|
l=[];for(var u=0;u<f.length;u++){var w=f[u],t=0==u?p:r.endTime;n=k+m+u;shaka.hls.Utils.getFirstTagWithName(w.tags,"EXT-X-DISCONTINUITY")&&h++;var v=$jscomp.makeIterator(w.tags);for(var x=v.next();!x.done;x=v.next())x=x.value,"EXT-X-KEY"==x.name&&(g="AES-128"==x.getRequiredAttrValue("METHOD")?this.parseAES128DrmTag_(x,a,e,d):void 0);c.set(n,t);v=this.getInitSegmentReference_(a,w.tags,e,d);!this.lowLatencyMode_&&this.playerInterface_.isAutoLowLatencyMode()&&(this.playerInterface_.enableLowLatencyMode(),
|
|
1980
|
-
this.lowLatencyMode_=this.playerInterface_.isLowLatencyMode());if(t=this.createSegmentReference_(v,r,w,t,d,a,b,e,g))(r=shaka.hls.Utils.getFirstTagWithNameAsNumber(w.tags,"EXT-X-BITRATE"))?l.push({bitrate:r,duration:t.endTime-t.startTime}):l.length&&(r=l.pop(),r.duration+=t.endTime-t.startTime,l.push(r)),r=t,t.discontinuitySequence=h,this.config_.hls.ignoreManifestProgramDateTime&&null!=this.minSequenceNumber_&&n<this.minSequenceNumber_||q.push(t)}a=void 0;l.length&&(a=l.reduce(function(z
|
|
1981
|
-
|
|
1982
|
-
c++)if(b.$jscomp$loop$prop$reference$
|
|
1983
|
-
c,e=function(
|
|
1981
|
+
this.lowLatencyMode_=this.playerInterface_.isLowLatencyMode());if(t=this.createSegmentReference_(v,r,w,t,d,a,b,e,g))(r=shaka.hls.Utils.getFirstTagWithNameAsNumber(w.tags,"EXT-X-BITRATE"))?l.push({bitrate:r,duration:t.endTime-t.startTime}):l.length&&(r=l.pop(),r.duration+=t.endTime-t.startTime,l.push(r)),r=t,t.discontinuitySequence=h,this.config_.hls.ignoreManifestProgramDateTime&&null!=this.minSequenceNumber_&&n<this.minSequenceNumber_||q.push(t)}a=void 0;l.length&&(a=l.reduce(function(y,z){return y+
|
|
1982
|
+
z.duration},0),a=Math.round(l.reduce(function(y,z){return y+z.bitrate*z.duration},0)/a*1E3));if(l=q.some(function(y){return null!=y.syncTime}))for(b={},c=0;c<q.length;b={$jscomp$loop$prop$forwardI$820:b.$jscomp$loop$prop$forwardI$820,$jscomp$loop$prop$forwardAdd$821:b.$jscomp$loop$prop$forwardAdd$821,$jscomp$loop$prop$backwardI$822:b.$jscomp$loop$prop$backwardI$822,$jscomp$loop$prop$reference$684$823:b.$jscomp$loop$prop$reference$684$823,$jscomp$loop$prop$backwardAdd$824:b.$jscomp$loop$prop$backwardAdd$824},
|
|
1983
|
+
c++)if(b.$jscomp$loop$prop$reference$684$823=q[c],null==b.$jscomp$loop$prop$reference$684$823.syncTime)for(b.$jscomp$loop$prop$forwardAdd$821=0,b.$jscomp$loop$prop$forwardI$820=c,d=function(y){return function(){var z=q[y.$jscomp$loop$prop$forwardI$820];if(z){if(null!=z.syncTime)return z.syncTime+y.$jscomp$loop$prop$forwardAdd$821;y.$jscomp$loop$prop$forwardAdd$821-=z.endTime-z.startTime;y.$jscomp$loop$prop$forwardI$820+=1}return null}}(b),b.$jscomp$loop$prop$backwardAdd$824=0,b.$jscomp$loop$prop$backwardI$822=
|
|
1984
|
+
c,e=function(y){return function(){var z=q[y.$jscomp$loop$prop$backwardI$822];if(z){z!=y.$jscomp$loop$prop$reference$684$823&&(y.$jscomp$loop$prop$backwardAdd$824+=z.endTime-z.startTime);if(null!=z.syncTime)return z.syncTime+y.$jscomp$loop$prop$backwardAdd$824;--y.$jscomp$loop$prop$backwardI$822}return null}}(b);null==b.$jscomp$loop$prop$reference$684$823.syncTime;)b.$jscomp$loop$prop$reference$684$823.syncTime=e(),null==b.$jscomp$loop$prop$reference$684$823.syncTime&&(b.$jscomp$loop$prop$reference$684$823.syncTime=
|
|
1984
1985
|
d());if(l)for(b=$jscomp.makeIterator(q),c=b.next();!c.done;c=b.next())for(d=c.value,c=d.syncTime,d=$jscomp.makeIterator(d.partialReferences),e=d.next();!e.done;e=d.next())e=e.value,e.syncTime=c,c+=e.endTime-e.startTime;b=this.lowestSyncTime_;if(l&&Infinity!=b)for(l=$jscomp.makeIterator(q),c=l.next();!c.done;c=l.next())c.value.syncAgainst(b);return{segments:q,bandwidth:a}};
|
|
1985
1986
|
shaka.hls.HlsParser.prototype.guessMimeTypeBeforeLoading_=function(a,b){if(a==shaka.util.ManifestParserUtils.ContentType.TEXT){if("vtt"==b||"wvtt"==b)return"text/vtt";if(b&&""!==b)return"application/mp4"}return a!=shaka.util.ManifestParserUtils.ContentType.IMAGE||b&&"jpeg"!=b?a==shaka.util.ManifestParserUtils.ContentType.AUDIO&&"mp4a.40.34"==b?"audio/mpeg":"mjpg"==b?"application/mp4":null:"image/jpeg"};
|
|
1986
1987
|
shaka.hls.HlsParser.prototype.guessMimeTypeFallback_=function(a){return a==shaka.util.ManifestParserUtils.ContentType.TEXT?"text/vtt":shaka.hls.HlsParser.EXTENSION_MAP_BY_CONTENT_TYPE_[a].mp4};
|
|
1987
|
-
shaka.hls.HlsParser.prototype.guessMimeType_=function(a,b,c,d,e){var f=this,g,h,k,l,m,n,p,q,r,u,w,t;return $jscomp.asyncExecutePromiseGeneratorProgram(function(
|
|
1988
|
-
if((q=p[n])||(q=g.RAW_FORMATS_TO_MIME_TYPES_[n])||(q=f.guessMimeTypeBeforeLoading_(a,b)))return
|
|
1989
|
-
shaka.hls.HlsParser.prototype.getRequiredTag_=function(a,b){a=shaka.hls.Utils.getFirstTagWithName(a,b);if(!a)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.HLS_REQUIRED_TAG_MISSING,b);return a};
|
|
1990
|
-
shaka.hls.HlsParser.prototype.requestManifest_=function(a,b){var c=shaka.net.NetworkingEngine.RequestType.MANIFEST;a=shaka.net.NetworkingEngine.makeRequest(a,this.config_.retryParameters);return this.makeNetworkRequest_(a,c,{type:b?shaka.net.NetworkingEngine.AdvancedRequestType.MEDIA_PLAYLIST:shaka.net.NetworkingEngine.AdvancedRequestType.MASTER_PLAYLIST})};
|
|
1988
|
+
shaka.hls.HlsParser.prototype.guessMimeType_=function(a,b,c,d,e){var f=this,g,h,k,l,m,n,p,q,r,u,w,t,v,x;return $jscomp.asyncExecutePromiseGeneratorProgram(function(y){switch(y.nextAddress){case 1:g=shaka.hls.HlsParser;h=shaka.net.NetworkingEngine.RequestType.SEGMENT;goog.asserts.assert(c.segments.length,"Playlist should have segments!");k=Math.trunc((c.segments.length-1)/2);l=shaka.hls.Utils.constructSegmentUris(e(),c.segments[k].verbatimSegmentUri,d);m=new goog.Uri(l[0]);n=m.getPath().split(".").pop();
|
|
1989
|
+
p=g.EXTENSION_MAP_BY_CONTENT_TYPE_[a];if((q=p[n])||(q=g.RAW_FORMATS_TO_MIME_TYPES_[n])||(q=f.guessMimeTypeBeforeLoading_(a,b)))return y.return(q);u=shaka.net.NetworkingEngine.AdvancedRequestType.MEDIA_SEGMENT;w=shaka.net.NetworkingEngine.makeRequest(l,f.config_.retryParameters);y.setCatchFinallyBlocks(2);w.method="HEAD";return y.yield(f.makeNetworkRequest_(w,h,{type:u}),4);case 4:t=y.yieldResult;r=t.headers["content-type"];y.leaveTryBlock(3);break;case 2:v=y.enterCatchBlock();if(!v||v.code!=shaka.util.Error.Code.HTTP_ERROR){y.jumpTo(3);
|
|
1990
|
+
break}w.method="GET";return y.yield(f.makeNetworkRequest_(w,h,{type:u}),6);case 6:x=y.yieldResult,r=x.headers["content-type"];case 3:return r?y.return(r.split(";")[0]):y.return(f.guessMimeTypeFallback_(a))}})};shaka.hls.HlsParser.prototype.getRequiredTag_=function(a,b){a=shaka.hls.Utils.getFirstTagWithName(a,b);if(!a)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.HLS_REQUIRED_TAG_MISSING,b);return a};
|
|
1991
|
+
shaka.hls.HlsParser.prototype.addVideoAttributes_=function(a,b,c,d,e,f){a&&(a.width=Number(b)||void 0,a.height=Number(c)||void 0,a.frameRate=Number(d)||void 0,a.hdr=e||void 0,a.videoLayout=f||void 0)};shaka.hls.HlsParser.prototype.requestManifest_=function(a,b){var c=shaka.net.NetworkingEngine.RequestType.MANIFEST;a=shaka.net.NetworkingEngine.makeRequest(a,this.config_.retryParameters);return this.makeNetworkRequest_(a,c,{type:b?shaka.net.NetworkingEngine.AdvancedRequestType.MEDIA_PLAYLIST:shaka.net.NetworkingEngine.AdvancedRequestType.MASTER_PLAYLIST})};
|
|
1991
1992
|
shaka.hls.HlsParser.prototype.onUpdate_=function(){var a=this,b,c,d,e,f,g;return $jscomp.asyncExecutePromiseGeneratorProgram(function(h){switch(h.nextAddress){case 1:shaka.log.info("Updating manifest...");goog.asserts.assert(0<a.getUpdatePlaylistDelay_(),"We should only call |onUpdate_| when we are suppose to be updating.");if(!a.playerInterface_)return h.return();h.setCatchFinallyBlocks(2);b=Date.now();return h.yield(a.update(),4);case 4:c=Date.now();a.isLive_()&&(d=(c-b)/1E3,a.averageUpdateDuration_.sample(1,
|
|
1992
1993
|
d),e=a.getUpdatePlaylistDelay_(),f=Math.max(0,e-a.averageUpdateDuration_.getEstimate()),a.updatePlaylistTimer_.tickAfter(f));h.leaveTryBlock(3);break;case 2:g=h.enterCatchBlock();if(!a.playerInterface_)return h.return();goog.asserts.assert(g instanceof shaka.util.Error,"Should only receive a Shaka error");if(a.config_.raiseFatalErrorOnManifestUpdateRequestFailure)return a.playerInterface_.onError(g),h.return();g.severity=shaka.util.Error.Severity.RECOVERABLE;a.playerInterface_.onError(g);a.updatePlaylistTimer_.tickAfter(.1);
|
|
1993
1994
|
case 3:if(!a.playerInterface_)return h.return();a.playerInterface_.onManifestUpdated();h.jumpToEnd()}})};shaka.hls.HlsParser.prototype.isLive_=function(){return this.presentationType_!=shaka.hls.HlsParser.PresentationType_.VOD};shaka.hls.HlsParser.prototype.getUpdatePlaylistDelay_=function(){return this.lastTargetDuration_};
|
|
@@ -2077,8 +2078,8 @@ l,d,v);v.mssPrivateData.codecPrivateData=k;switch(l){case "audio":if(!k)return s
|
|
|
2077
2078
|
f.initSegmentDataByStreamId_.set(v.id,x);x=new shaka.media.InitSegmentReference(function(){return[]},0,null,null,void 0,x);x=f.createSegments_(x,v,a,c);v.segmentIndex=new shaka.media.SegmentIndex(x);return Promise.resolve()};v.closeSegmentIndex=function(){v.segmentIndex&&(v.segmentIndex.release(),v.segmentIndex=null)};return v};
|
|
2078
2079
|
shaka.mss.MssParser.prototype.getCodecPrivateData_=function(a,b,c,d){if(a=a.getAttribute("CodecPrivateData"))return a;if("audio"!==b)return null;b=d.channelsCount||2;a=d.audioSamplingRate||44100;var e={96E3:0,88200:1,64E3:2,48E3:3,44100:4,32E3:5,24E3:6,22050:7,16E3:8,12E3:9,11025:10,8E3:11,7350:12};d=e[a];if("AACH"===c)return c=new Uint8Array(4),a=e[2*a],c[0]=40|d>>1,c[1]=d<<7|b<<3|a>>1,c[2]=a<<7|8,c[3]=0,b=new Uint16Array(2),b[0]=(c[0]<<8)+c[1],b[1]=(c[2]<<8)+c[3],b[0].toString(16)+b[1].toString(16);
|
|
2079
2080
|
c=new Uint8Array(2);c[0]=16|d>>1;c[1]=d<<7|b<<3;b=new Uint16Array(1);b[0]=(c[0]<<8)+c[1];return b[0].toString(16)};shaka.mss.MssParser.prototype.getAACCodec_=function(a,b,c){a=0;"AACH"===b&&(a=5);c?0===a&&(a=(parseInt(c.substr(0,2),16)&248)>>3):(a=2,"AACH"===b&&(a=5));return"mp4a.40."+a};shaka.mss.MssParser.prototype.getH264Codec_=function(a,b){a=/00000001[0-9]7/.exec(b);return a.length&&b?"avc1."+b.substr(b.indexOf(a[0])+10,6):""};
|
|
2080
|
-
shaka.mss.MssParser.prototype.createSegments_=function(a,b,c,d){var e=this,f=shaka.util.ManifestParserUtils;c=c.getAttribute("Url");goog.asserts.assert(c,"Missing URL for segments");var g=c.replace("{bitrate}",String(b.bandwidth));c=[];var h={};d=$jscomp.makeIterator(d);for(var k=d.next();!k.done;h={$jscomp$loop$prop$time$
|
|
2081
|
-
String(l.$jscomp$loop$prop$time$
|
|
2081
|
+
shaka.mss.MssParser.prototype.createSegments_=function(a,b,c,d){var e=this,f=shaka.util.ManifestParserUtils;c=c.getAttribute("Url");goog.asserts.assert(c,"Missing URL for segments");var g=c.replace("{bitrate}",String(b.bandwidth));c=[];var h={};d=$jscomp.makeIterator(d);for(var k=d.next();!k.done;h={$jscomp$loop$prop$time$826:h.$jscomp$loop$prop$time$826},k=d.next())h.$jscomp$loop$prop$time$826=k.value,k=function(l){return function(){return f.resolveUris(e.manifestUris_,[g.replace("{start time}",
|
|
2082
|
+
String(l.$jscomp$loop$prop$time$826.unscaledStart))])}}(h),c.push(new shaka.media.SegmentReference(h.$jscomp$loop$prop$time$826.start,h.$jscomp$loop$prop$time$826.end,k,0,null,a,0,0,b.mssPrivateData.duration));return c};
|
|
2082
2083
|
shaka.mss.MssParser.prototype.createTimeline_=function(a,b,c){goog.asserts.assert(0<b&&Infinity>b,"timescale must be a positive, finite integer");goog.asserts.assert(0<c,"duration must be a positive integer");var d=shaka.util.XmlUtils;a=d.findChildren(a,"c");for(var e=[],f=0,g=0;g<a.length;++g){var h=a[g],k=a[g+1],l=d.parseAttr(h,"t",d.parseNonNegativeInt),m=d.parseAttr(h,"d",d.parseNonNegativeInt),n=d.parseAttr(h,"r",d.parseInt);if(!m){shaka.log.warning('"c" element must have a duration:','ignoring the remaining "c" elements.',
|
|
2083
2084
|
h);break}l=null!=l?l:f;n=n||0;if(0>n)if(k){k=d.parseAttr(k,"t",d.parseNonNegativeInt);if(null==k){shaka.log.warning('An "c" element cannot have a negative repeat','if the next "c" element does not have a valid start time:','ignoring the remaining "c" elements.',h);break}else if(l>=k){shaka.log.warning('An "c" element cannot have a negative repeatif its start ','time exceeds the next "c" element\'s start time:','ignoring the remaining "c" elements.',h);break}n=Math.ceil((k-l)/m)-1}else{if(Infinity==
|
|
2084
2085
|
c){shaka.log.warning('The last "c" element cannot have a negative repeat',"if the Period has an infinite duration:",'ignoring the last "c" element.',h);break}else if(l/b>=c){shaka.log.warning('The last "c" element cannot have a negative repeat',"if its start time exceeds the duration:",'igoring the last "c" element.',h);break}n=Math.ceil((c*b-l)/m)-1}for(h=0;h<=n;++h)f=l+m,e.push({start:l/b,end:f/b,unscaledStart:l}),l=f}return e};
|
|
@@ -2087,10 +2088,10 @@ allowedByKeySystem:!0,decodingInfos:[]}};goog.exportSymbol("shaka.mss.MssParser"
|
|
|
2087
2088
|
shaka.net.HttpPluginUtils.makeResponse=function(a,b,c,d,e,f){if(200<=c&&299>=c&&202!=c)return{uri:e||d,originalUri:d,data:b,status:c,headers:a,fromCache:!!a["x-shaka-from-cache"]};e=null;try{e=shaka.util.StringUtils.fromBytesAutoDetect(b)}catch(g){}shaka.log.debug("HTTP error text:",e);throw new shaka.util.Error(401==c||403==c?shaka.util.Error.Severity.CRITICAL:shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.NETWORK,shaka.util.Error.Code.BAD_HTTP_STATUS,d,c,e,a,f);};shaka.net.HttpFetchPlugin=function(){};
|
|
2088
2089
|
shaka.net.HttpFetchPlugin.parse=function(a,b,c,d,e){var f=new shaka.net.HttpFetchPlugin.Headers_;shaka.util.MapUtils.asMap(b.headers).forEach(function(l,m){f.append(m,l)});var g=new shaka.net.HttpFetchPlugin.AbortController_,h={canceled:!1,timedOut:!1};a=shaka.net.HttpFetchPlugin.request_(a,c,{body:b.body||void 0,headers:f,method:b.method,signal:g.signal,credentials:b.allowCrossSiteCredentials?"include":void 0},h,d,e,b.streamDataCallback);a=new shaka.util.AbortableOperation(a,function(){h.canceled=
|
|
2089
2090
|
!0;g.abort();return Promise.resolve()});if(b=b.retryParameters.timeout){var k=new shaka.util.Timer(function(){h.timedOut=!0;g.abort()});k.tickAfter(b/1E3);a.finally(function(){k.stop()})}return a};
|
|
2090
|
-
shaka.net.HttpFetchPlugin.request_=function(a,b,c,d,e,f,g){var h,k,l,m,n,p,q,r,u,w,t,v,x;return $jscomp.asyncExecutePromiseGeneratorProgram(function(
|
|
2091
|
-
r=l.clone().body.getReader();w=(u=l.headers.get("Content-Length"))?parseInt(u,10):0;t=function(
|
|
2092
|
-
5);case 5:I=Date.now();if(100<I-q||B.done)e(I-q,n-p,w-n),p=n,q=I;B.done?(goog.asserts.assert(!B.value,'readObj should be unset when "done" is true.'),
|
|
2093
|
-
if(d.timedOut)throw new shaka.util.Error(shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.NETWORK,shaka.util.Error.Code.TIMEOUT,a,b);throw new shaka.util.Error(shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.NETWORK,shaka.util.Error.Code.HTTP_ERROR,a,v,b);case 3:return x=shaka.net.HttpFetchPlugin.headersToGenericObject_(l.headers),
|
|
2091
|
+
shaka.net.HttpFetchPlugin.request_=function(a,b,c,d,e,f,g){var h,k,l,m,n,p,q,r,u,w,t,v,x;return $jscomp.asyncExecutePromiseGeneratorProgram(function(y){switch(y.nextAddress){case 1:return h=shaka.net.HttpFetchPlugin.fetch_,k=shaka.net.HttpFetchPlugin.ReadableStream_,p=n=0,q=Date.now(),y.setCatchFinallyBlocks(2),y.yield(h(a,c),4);case 4:l=y.yieldResult;f(shaka.net.HttpFetchPlugin.headersToGenericObject_(l.headers));if("HEAD"==c.method){y.jumpTo(5);break}goog.asserts.assert(l.body,"non-HEAD responses should have a body");
|
|
2092
|
+
r=l.clone().body.getReader();w=(u=l.headers.get("Content-Length"))?parseInt(u,10):0;t=function(z){var A=function(){var B,E,I;return $jscomp.asyncExecutePromiseGeneratorProgram(function(C){switch(C.nextAddress){case 1:return C.setCatchFinallyBlocks(2),C.yield(r.read(),4);case 4:B=C.yieldResult;C.leaveTryBlock(3);break;case 2:return E=C.enterCatchBlock(),shaka.log.v1("error reading from stream",E.message),C.return();case 3:if(B.done){C.jumpTo(5);break}n+=B.value.byteLength;if(!g){C.jumpTo(5);break}return C.yield(g(B.value),
|
|
2093
|
+
5);case 5:I=Date.now();if(100<I-q||B.done)e(I-q,n-p,w-n),p=n,q=I;B.done?(goog.asserts.assert(!B.value,'readObj should be unset when "done" is true.'),z.close()):(z.enqueue(B.value),A());C.jumpToEnd()}})};A()};new k({start:t});return y.yield(l.arrayBuffer(),6);case 6:m=y.yieldResult;case 5:y.leaveTryBlock(3);break;case 2:v=y.enterCatchBlock();if(d.canceled)throw new shaka.util.Error(shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.NETWORK,shaka.util.Error.Code.OPERATION_ABORTED,a,b);
|
|
2094
|
+
if(d.timedOut)throw new shaka.util.Error(shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.NETWORK,shaka.util.Error.Code.TIMEOUT,a,b);throw new shaka.util.Error(shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.NETWORK,shaka.util.Error.Code.HTTP_ERROR,a,v,b);case 3:return x=shaka.net.HttpFetchPlugin.headersToGenericObject_(l.headers),y.return(shaka.net.HttpPluginUtils.makeResponse(x,m,l.status,a,l.url,b))}})};
|
|
2094
2095
|
shaka.net.HttpFetchPlugin.headersToGenericObject_=function(a){var b={};a.forEach(function(c,d){b[d.trim()]=c});return b};shaka.net.HttpFetchPlugin.isSupported=function(){if(window.ReadableStream)try{new ReadableStream({})}catch(a){return!1}else return!1;if(window.Response){if(!(new Response("")).body)return!1}else return!1;return!(!window.fetch||!window.AbortController)};goog.exportSymbol("shaka.net.HttpFetchPlugin",shaka.net.HttpFetchPlugin);
|
|
2095
2096
|
goog.exportProperty(shaka.net.HttpFetchPlugin,"isSupported",shaka.net.HttpFetchPlugin.isSupported);goog.exportProperty(shaka.net.HttpFetchPlugin,"parse",shaka.net.HttpFetchPlugin.parse);shaka.net.HttpFetchPlugin.fetch_=window.fetch;shaka.net.HttpFetchPlugin.AbortController_=window.AbortController;shaka.net.HttpFetchPlugin.ReadableStream_=window.ReadableStream;shaka.net.HttpFetchPlugin.Headers_=window.Headers;
|
|
2096
2097
|
shaka.net.HttpFetchPlugin.isSupported()&&(shaka.net.NetworkingEngine.registerScheme("http",shaka.net.HttpFetchPlugin.parse,shaka.net.NetworkingEngine.PluginPriority.PREFERRED,!0),shaka.net.NetworkingEngine.registerScheme("https",shaka.net.HttpFetchPlugin.parse,shaka.net.NetworkingEngine.PluginPriority.PREFERRED,!0),shaka.net.NetworkingEngine.registerScheme("blob",shaka.net.HttpFetchPlugin.parse,shaka.net.NetworkingEngine.PluginPriority.PREFERRED,!0));shaka.net.HttpXHRPlugin=function(){};
|
|
@@ -2117,10 +2118,10 @@ shaka.offline.indexeddb.BaseStorageCell.prototype.getManifests=function(a){var b
|
|
|
2117
2118
|
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):
|
|
2118
2119
|
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))};
|
|
2119
2120
|
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))};
|
|
2120
|
-
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$
|
|
2121
|
-
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$
|
|
2122
|
-
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$
|
|
2123
|
-
h.$jscomp$loop$prop$request$
|
|
2121
|
+
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$828:g.$jscomp$loop$prop$request$828},k=h.next())l=k.value,g.$jscomp$loop$prop$request$828=e.add(l),g.$jscomp$loop$prop$request$828.onsuccess=function(n){return function(p){f.push(n.$jscomp$loop$prop$request$828.result)}}(g);
|
|
2122
|
+
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$830:e.$jscomp$loop$prop$key$830},f=b.next())e.$jscomp$loop$prop$key$830=f.value,d.delete(e.$jscomp$loop$prop$key$830).onsuccess=function(g){return function(){return c(g.$jscomp$loop$prop$key$830)}}(e);return a.promise()};
|
|
2123
|
+
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$832:h.$jscomp$loop$prop$request$832,$jscomp$loop$prop$key$833:h.$jscomp$loop$prop$key$833},l=k.next())h.$jscomp$loop$prop$key$833=l.value,h.$jscomp$loop$prop$request$832=e.get(h.$jscomp$loop$prop$key$833),
|
|
2124
|
+
h.$jscomp$loop$prop$request$832.onsuccess=function(n){return function(){void 0==n.$jscomp$loop$prop$request$832.result&&g.push(n.$jscomp$loop$prop$key$833);f[n.$jscomp$loop$prop$key$833]=n.$jscomp$loop$prop$request$832.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()};
|
|
2124
2125
|
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)})};
|
|
2125
2126
|
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()};
|
|
2126
2127
|
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)};
|
|
@@ -2203,22 +2204,22 @@ shaka.offline.Storage.prototype.configure=function(a,b){goog.asserts.assert("obj
|
|
|
2203
2204
|
shaka.offline.Storage.prototype.getConfiguration=function(){goog.asserts.assert(this.config_,"Config must not be null!");var a=shaka.util.PlayerConfiguration.createDefault();shaka.util.PlayerConfiguration.mergeConfigObjects(a,this.config_,shaka.util.PlayerConfiguration.createDefault());return a};shaka.offline.Storage.prototype.getNetworkingEngine=function(){return this.networkingEngine_};
|
|
2204
2205
|
shaka.offline.Storage.prototype.store=function(a,b,c){var d=this;goog.asserts.assert(this.networkingEngine_,"Cannot call |store| after calling |destroy|.");var e=this.getConfiguration(),f=new shaka.offline.DownloadManager(this.networkingEngine_);this.openDownloadManagers_.push(f);b=this.store_(a,b||{},function(){var g;return $jscomp.asyncExecutePromiseGeneratorProgram(function(h){if(1==h.nextAddress)return goog.asserts.assert(d.networkingEngine_,"Should not call |store| after |destroy|"),c?h.jumpTo(2):
|
|
2205
2206
|
h.yield(shaka.net.NetworkingUtils.getMimeType(a,d.networkingEngine_,e.manifest.retryParameters),3);2!=h.nextAddress&&(c=h.yieldResult);g=shaka.media.ManifestParser.getFactory(a,c||null);return h.return(g())})},e,f);b=new shaka.util.AbortableOperation(b,function(){return f.abortAll()});b.finally(function(){shaka.util.ArrayUtils.remove(d.openDownloadManagers_,f)});return this.startAbortableOperation_(b)};
|
|
2206
|
-
shaka.offline.Storage.prototype.store_=function(a,b,c,d,e){var f=this,g,h,k,l,m,n,p,q,r,u,w,t,v,x;return $jscomp.asyncExecutePromiseGeneratorProgram(function(
|
|
2207
|
-
shaka.util.Error.Category.STORAGE,shaka.util.Error.Code.CANNOT_STORE_LIVE_OFFLINE,a);return
|
|
2208
|
-
w=r.toDownload,
|
|
2209
|
-
break}return
|
|
2210
|
-
shaka.offline.Storage.prototype.downloadSegments_=function(a,b,c,d,e,f,g,h){var k=this,l,m,n,p,q,r,u,w,t,v;return $jscomp.asyncExecutePromiseGeneratorProgram(function(x){switch(x.nextAddress){case 1:l={};m=0;n=function(z
|
|
2211
|
-
E.value,I=A.$jscomp$loop$prop$download$
|
|
2212
|
-
d.queue(A.$jscomp$loop$prop$download$
|
|
2207
|
+
shaka.offline.Storage.prototype.store_=function(a,b,c,d,e){var f=this,g,h,k,l,m,n,p,q,r,u,w,t,v,x;return $jscomp.asyncExecutePromiseGeneratorProgram(function(y){switch(y.nextAddress){case 1:return f.requireSupport_(),h=g=null,k=new shaka.offline.StorageMuxer,n=m=l=null,y.setCatchFinallyBlocks(2,3),y.yield(c(),5);case 5:return g=y.yieldResult,y.yield(f.parseManifest(a,g,d),6);case 6:p=y.yieldResult;f.ensureNotDestroyed_();q=!p.presentationTimeline.isLive()&&!p.presentationTimeline.isInProgress();if(!q)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,
|
|
2208
|
+
shaka.util.Error.Category.STORAGE,shaka.util.Error.Code.CANNOT_STORE_LIVE_OFFLINE,a);return y.yield(f.createDrmEngine(p,function(z){n=n||z},d),7);case 7:h=y.yieldResult;f.ensureNotDestroyed_();if(n)throw n;return y.yield(f.filterManifest_(p,h,d),8);case 8:return y.yield(k.init(),9);case 9:return f.ensureNotDestroyed_(),y.yield(k.getActive(),10);case 10:return l=y.yieldResult,f.ensureNotDestroyed_(),goog.asserts.assert(h,"drmEngine should be non-null here."),r=f.makeManifestDB_(h,p,a,b,d,e),u=r.manifestDB,
|
|
2209
|
+
w=r.toDownload,y.yield(l.cell.addManifests([u]),11);case 11:t=y.yieldResult;f.ensureNotDestroyed_();m=t[0];goog.asserts.assert(h,"drmEngine should be non-null here.");f.ensureNotDestroyed_();if(n)throw n;return y.yield(f.downloadSegments_(w,m,u,e,d,l.cell,p,h),12);case 12:return f.ensureNotDestroyed_(),v=shaka.offline.OfflineUri.manifest(l.path.mechanism,l.path.cell,m),y.return(shaka.offline.StoredContentUtils.fromManifestDB(v,u));case 3:return y.enterFinallyBlock(),y.yield(k.destroy(),13);case 13:if(!g){y.jumpTo(14);
|
|
2210
|
+
break}return y.yield(g.stop(),14);case 14:if(!h){y.jumpTo(16);break}return y.yield(h.destroy(),16);case 16:y.leaveFinallyBlock(0);break;case 2:x=y.enterCatchBlock();if(null==m){y.jumpTo(18);break}return y.yield(shaka.offline.Storage.cleanStoredManifest(m),18);case 18:throw n||x;}})};
|
|
2211
|
+
shaka.offline.Storage.prototype.downloadSegments_=function(a,b,c,d,e,f,g,h){var k=this,l,m,n,p,q,r,u,w,t,v;return $jscomp.asyncExecutePromiseGeneratorProgram(function(x){switch(x.nextAddress){case 1:l={};m=0;n=function(y,z){var A,B,E,I,C,G,D;return $jscomp.asyncExecutePromiseGeneratorProgram(function(F){if(1==F.nextAddress){A={};B=$jscomp.makeIterator(y);for(E=B.next();!E.done;A={$jscomp$loop$prop$download$713$835:A.$jscomp$loop$prop$download$713$835},E=B.next())A.$jscomp$loop$prop$download$713$835=
|
|
2212
|
+
E.value,I=A.$jscomp$loop$prop$download$713$835.makeSegmentRequest(e),C=A.$jscomp$loop$prop$download$713$835.estimateId,G=A.$jscomp$loop$prop$download$713$835.isInitSegment,D=function(H){return function(J){var K,M,L;return $jscomp.asyncExecutePromiseGeneratorProgram(function(O){if(1==O.nextAddress)return O.yield(f.addSegments([{data:J}]),2);K=O.yieldResult;k.ensureNotDestroyed_();M=H.$jscomp$loop$prop$download$713$835.ref;L=shaka.offline.DownloadInfo.idForSegmentRef(M);l[L]=K[0];m+=J.byteLength;O.jumpToEnd()})}}(A),
|
|
2213
|
+
d.queue(A.$jscomp$loop$prop$download$713$835.groupId,I,C,G,D);return F.yield(d.waitToFinish(),2)}if(!z)return F.jumpTo(0);k.ensureNotDestroyed_();k.setManifestDrmFields_(g,c,h,e);return F.yield(f.updateManifest(b,c),0)})};p=!1;x.setCatchFinallyBlocks(2);if(!k.getManifestIsEncrypted_(g)||!p||k.getManifestIncludesInitData_(g)){x.jumpTo(4);break}return x.yield(n(a.filter(function(y){return y.isInitSegment}),!0),5);case 5:return k.ensureNotDestroyed_(),a=a.filter(function(y){return!y.isInitSegment}),
|
|
2213
2214
|
q=l,r=m,l={},m=0,x.yield(shaka.offline.Storage.assignSegmentsToManifest(f,b,c,q,r,function(){return k.ensureNotDestroyed_()}),6);case 6:k.ensureNotDestroyed_();case 4:if(p){x.jumpTo(7);break}return x.yield(n(a,!1),8);case 8:return k.ensureNotDestroyed_(),u=l,w=m,l={},m=0,x.yield(shaka.offline.Storage.assignSegmentsToManifest(f,b,c,u,w,function(){return k.ensureNotDestroyed_()}),9);case 9:k.ensureNotDestroyed_(),goog.asserts.assert(!c.isIncomplete,"The manifest should be complete by now");case 7:x.leaveTryBlock(0);
|
|
2214
|
-
break;case 2:return t=x.enterCatchBlock(),v=Object.values(l),x.yield(f.removeSegments(v,function(
|
|
2215
|
+
break;case 2:return t=x.enterCatchBlock(),v=Object.values(l),x.yield(f.removeSegments(v,function(y){}),10);case 10:throw t;}})};
|
|
2215
2216
|
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)}})};
|
|
2216
2217
|
shaka.offline.Storage.assignSegmentsToManifest=function(a,b,c,d,e,f){var g,h,k,l,m,n,p,q,r,u,w;return $jscomp.asyncExecutePromiseGeneratorProgram(function(t){switch(t.nextAddress){case 1:g=!1;t.setCatchFinallyBlocks(2);h=!0;k=$jscomp.makeIterator(c.streams);for(l=k.next();!l.done;l=k.next())for(m=l.value,n=$jscomp.makeIterator(m.segments),p=n.next();!p.done;p=n.next())q=p.value,r=q.pendingSegmentRefId?d[q.pendingSegmentRefId]:null,null!=r&&(q.dataKey=r,q.pendingSegmentRefId=void 0),r=q.pendingInitSegmentRefId?
|
|
2217
2218
|
d[q.pendingInitSegmentRefId]:null,null!=r&&(q.initSegmentKey=r,q.pendingInitSegmentRefId=void 0),q.pendingSegmentRefId&&(h=!1),q.pendingInitSegmentRefId&&(h=!1);c.size+=e;h&&(c.isIncomplete=!1);return t.yield(a.updateManifest(b,c),4);case 4:g=!0;f();t.leaveTryBlock(0);break;case 2:return u=t.enterCatchBlock(),t.yield(shaka.offline.Storage.cleanStoredManifest(b),5);case 5:if(g){t.jumpTo(6);break}w=Object.values(d);return t.yield(a.removeSegments(w,function(v){}),6);case 6:throw u;}})};
|
|
2218
|
-
shaka.offline.Storage.prototype.filterManifest_=function(a,b,c){var d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,z,
|
|
2219
|
+
shaka.offline.Storage.prototype.filterManifest_=function(a,b,c){var d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,y,z,A,B,E,I,C,G,D,F,H;return $jscomp.asyncExecutePromiseGeneratorProgram(function(J){switch(J.nextAddress){case 1:return d={width:Infinity,height:Infinity},shaka.util.StreamUtils.filterByRestrictions(a,c.restrictions,d),J.yield(shaka.util.StreamUtils.filterManifestByMediaCapabilities(b,a,c.offline.usePersistentLicense),2);case 2:e=[];f=c.preferredDecodingAttributes;g=c.preferredVideoCodecs;h=c.preferredAudioCodecs;
|
|
2219
2220
|
shaka.util.StreamUtils.chooseCodecsAndFilterManifest(a,g,h,f);k=$jscomp.makeIterator(a.variants);for(l=k.next();!l.done;l=k.next())m=l.value,goog.asserts.assert(shaka.util.StreamUtils.isPlayable(m),'We should have already filtered by "is playable"'),e.push(shaka.util.StreamUtils.variantToTrack(m));n=$jscomp.makeIterator(a.textStreams);for(p=n.next();!p.done;p=n.next())q=p.value,e.push(shaka.util.StreamUtils.textStreamToTrack(q));r=$jscomp.makeIterator(a.imageStreams);for(u=r.next();!u.done;u=r.next())w=
|
|
2220
|
-
u.value,e.push(shaka.util.StreamUtils.imageStreamToTrack(w));return J.yield(c.offline.trackSelectionCallback(e),3);case 3:t=J.yieldResult;v=a.presentationTimeline.getDuration();x=0;
|
|
2221
|
-
J.leaveTryBlock(5);break;case 4:I=J.enterCatchBlock();if(I instanceof shaka.util.Error)throw I;shaka.log.warning("downloadSizeCallback has produced an unexpected error",I);throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.STORAGE,shaka.util.Error.Code.DOWNLOAD_SIZE_CALLBACK_ERROR);case 5:C=new Set;G=new Set;D=new Set;F=$jscomp.makeIterator(t);for(
|
|
2221
|
+
u.value,e.push(shaka.util.StreamUtils.imageStreamToTrack(w));return J.yield(c.offline.trackSelectionCallback(e),3);case 3:t=J.yieldResult;v=a.presentationTimeline.getDuration();x=0;y=$jscomp.makeIterator(t);for(z=y.next();!z.done;z=y.next())A=z.value,B=A.bandwidth*v/8,x+=B;J.setCatchFinallyBlocks(4);return J.yield(c.offline.downloadSizeCallback(x),6);case 6:E=J.yieldResult;if(!E)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.STORAGE,shaka.util.Error.Code.STORAGE_LIMIT_REACHED);
|
|
2222
|
+
J.leaveTryBlock(5);break;case 4:I=J.enterCatchBlock();if(I instanceof shaka.util.Error)throw I;shaka.log.warning("downloadSizeCallback has produced an unexpected error",I);throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.STORAGE,shaka.util.Error.Code.DOWNLOAD_SIZE_CALLBACK_ERROR);case 5:C=new Set;G=new Set;D=new Set;F=$jscomp.makeIterator(t);for(z=F.next();!z.done;z=F.next())H=z.value,"variant"==H.type&&C.add(H.id),"text"==H.type&&G.add(H.id),"image"==H.type&&
|
|
2222
2223
|
D.add(H.id);a.variants=a.variants.filter(function(K){return C.has(K.id)});a.textStreams=a.textStreams.filter(function(K){return G.has(K.id)});a.imageStreams=a.imageStreams.filter(function(K){return D.has(K.id)});shaka.offline.Storage.validateManifest_(a);J.jumpToEnd()}})};
|
|
2223
2224
|
shaka.offline.Storage.prototype.makeManifestDB_=function(a,b,c,d,e,f){var g=shaka.offline.StoredContentUtils.fromManifest(c,b,0,d),h=e.offline.progressCallback;f.setCallbacks(function(q,r){g.size=r;h(g,q)},function(q,r){k&&e.offline.usePersistentLicense&&l==r&&a.newInitData("cenc",q)});var k=this.getManifestIsEncrypted_(b)&&!this.getManifestIncludesInitData_(b),l=null;if(k){var m=a.getDrmInfo();l=shaka.offline.Storage.defaultSystemIds_.get(m.keySystem)}m=new shaka.offline.StreamBandwidthEstimator;
|
|
2224
2225
|
for(var n=$jscomp.makeIterator(b.textStreams),p=n.next();!p.done;p=n.next())m.addText(p.value);n=$jscomp.makeIterator(b.imageStreams);for(p=n.next();!p.done;p=n.next())m.addImage(p.value);p=$jscomp.makeIterator(b.variants);for(n=p.next();!n.done;n=p.next())m.addVariant(n.value);m=this.createStreams_(f,m,a,b,e);f=m.streams;m=m.toDownload;p=a.getDrmInfo();n=e.offline.usePersistentLicense;p&&n&&(p.initData=[]);return{manifestDB:{creationTime:Date.now(),originalManifestUri:c,duration:b.presentationTimeline.getDuration(),
|
|
@@ -2268,11 +2269,11 @@ document.webkitFullscreenElement}}),Object.defineProperty(document,"fullscreenEn
|
|
|
2268
2269
|
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.MediaCapabilities=function(){};
|
|
2269
2270
|
shaka.polyfill.MediaCapabilities.install=function(){var a=!0;if(shaka.util.Platform.isApple()||shaka.util.Platform.isPS5()||shaka.util.Platform.isPS4()||shaka.util.Platform.isWebOS()||shaka.util.Platform.isTizen()||shaka.util.Platform.isChromecast()||shaka.util.Platform.isEOS()||shaka.util.Platform.isHisense())a=!1;a&&navigator.mediaCapabilities?shaka.log.info("MediaCapabilities: Native mediaCapabilities support found."):(shaka.log.info("MediaCapabilities: install"),navigator.mediaCapabilities||(navigator.mediaCapabilities=
|
|
2270
2271
|
{}),shaka.polyfill.MediaCapabilities.originalMcap=navigator.mediaCapabilities,navigator.mediaCapabilities.decodingInfo=shaka.polyfill.MediaCapabilities.decodingInfo_)};
|
|
2271
|
-
shaka.polyfill.MediaCapabilities.decodingInfo_=function(a){var b,c,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,
|
|
2272
|
-
shaka.util.Platform.isTizen()?(g=c.contentType,c.width&&c.height&&(g+="; width="+c.width,g+="; height="+c.height),c.framerate&&(g+="; framerate="+c.framerate),c.bitrate&&(g+="; bitrate="+c.bitrate),f=e.isTypeSupported(g)):f=e.isTypeSupported(c.contentType),!f)||d&&(h=d.contentType,k=e.isTypeSupported(h),!k))return
|
|
2273
|
-
if(!a.keySystemConfiguration)return b.supported=!0,
|
|
2274
|
-
u);x=shaka.polyfill.MediaCapabilities.generateKeySystemCacheKey_(a.video?a.video.contentType:"",a.audio?a.audio.contentType:"",a.keySystemConfiguration.keySystem);
|
|
2275
|
-
|
|
2272
|
+
shaka.polyfill.MediaCapabilities.decodingInfo_=function(a){var b,c,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,y;return $jscomp.asyncExecutePromiseGeneratorProgram(function(z){switch(z.nextAddress){case 1:b={supported:!1,powerEfficient:!0,smooth:!0,keySystemAccess:null,configuration:a};if(!a)return z.return(b);c=a.video;d=a.audio;e=shaka.media.Capabilities;if("media-source"==a.type){if(!shaka.util.Platform.supportsMediaSource()||c&&(shaka.util.Platform.isChromecast()?f=shaka.polyfill.MediaCapabilities.canCastDisplayType_(c):
|
|
2273
|
+
shaka.util.Platform.isTizen()?(g=c.contentType,c.width&&c.height&&(g+="; width="+c.width,g+="; height="+c.height),c.framerate&&(g+="; framerate="+c.framerate),c.bitrate&&(g+="; bitrate="+c.bitrate),f=e.isTypeSupported(g)):f=e.isTypeSupported(c.contentType),!f)||d&&(h=d.contentType,k=e.isTypeSupported(h),!k))return z.return(b)}else if("file"==a.type){if(c&&(l=c.contentType,m=shaka.util.Platform.supportsMediaType(l),!m)||d&&(n=d.contentType,p=shaka.util.Platform.supportsMediaType(n),!p))return z.return(b)}else return z.return(b);
|
|
2274
|
+
if(!a.keySystemConfiguration)return b.supported=!0,z.return(Promise.resolve(b));q=a.keySystemConfiguration;r=[];u=[];q.audio&&(w={robustness:q.audio.robustness||"",contentType:a.audio.contentType},r.push(w));q.video&&(t={robustness:q.video.robustness||"",contentType:a.video.contentType},u.push(t));v={initDataTypes:[q.initDataType],distinctiveIdentifier:q.distinctiveIdentifier,persistentState:q.persistentState,sessionTypes:q.sessionTypes};r.length&&(v.audioCapabilities=r);u.length&&(v.videoCapabilities=
|
|
2275
|
+
u);x=shaka.polyfill.MediaCapabilities.generateKeySystemCacheKey_(a.video?a.video.contentType:"",a.audio?a.audio.contentType:"",a.keySystemConfiguration.keySystem);z.setCatchFinallyBlocks(3);if(x in shaka.polyfill.MediaCapabilities.memoizedMediaKeySystemAccessRequests_){y=shaka.polyfill.MediaCapabilities.memoizedMediaKeySystemAccessRequests_[x];z.jumpTo(5);break}return z.yield(navigator.requestMediaKeySystemAccess(q.keySystem,[v]),6);case 6:y=z.yieldResult,shaka.polyfill.MediaCapabilities.memoizedMediaKeySystemAccessRequests_[x]=
|
|
2276
|
+
y;case 5:z.leaveTryBlock(4);break;case 3:z.enterCatchBlock(),shaka.log.info("navigator.requestMediaKeySystemAccess failed.");case 4:y&&(b.supported=!0,b.keySystemAccess=y);case 2:return z.return(b)}})};
|
|
2276
2277
|
shaka.polyfill.MediaCapabilities.canCastDisplayType_=function(a){if(!(window.cast&&cast.__platform__&&cast.__platform__.canDisplayType))return shaka.log.warning("Expected cast APIs to be available! Falling back to shaka.media.Capabilities.isTypeSupported() for type support."),shaka.media.Capabilities.isTypeSupported(a.contentType);var b=a.contentType;a.width&&a.height&&(b+="; width="+a.width+"; height="+a.height);a.framerate&&(b+="; framerate="+a.framerate);"pq"===a.transferFunction&&(b+="; eotf=smpte2084");
|
|
2277
2278
|
return cast.__platform__.canDisplayType(b)};shaka.polyfill.MediaCapabilities.generateKeySystemCacheKey_=function(a,b,c){return a+"#"+b+"#"+c};goog.exportProperty(shaka.polyfill,"MediaCapabilities",shaka.polyfill.MediaCapabilities);goog.exportProperty(shaka.polyfill.MediaCapabilities,"install",shaka.polyfill.MediaCapabilities.install);shaka.polyfill.MediaCapabilities.originalMcap=null;goog.exportProperty(shaka.polyfill.MediaCapabilities,"originalMcap",shaka.polyfill.MediaCapabilities.originalMcap);
|
|
2278
2279
|
shaka.polyfill.MediaCapabilities.memoizedMediaKeySystemAccessRequests_={};goog.exportProperty(shaka.polyfill.MediaCapabilities,"memoizedMediaKeySystemAccessRequests_",shaka.polyfill.MediaCapabilities.memoizedMediaKeySystemAccessRequests_);shaka.polyfill.register(shaka.polyfill.MediaCapabilities.install,-1);shaka.polyfill.MediaSource=function(){};
|
|
@@ -2382,10 +2383,10 @@ f,"subFrameRate"),n=e.getAttributeNSList(k,f,"frameRateMultiplier"),p=e.getAttri
|
|
|
2382
2383
|
e.getChildren(n):[];p=Array.from(k.getElementsByTagName("style"));k=Array.from(k.getElementsByTagName("region"));q=[];r=$jscomp.makeIterator(k);for(var u=r.next();!u.done;u=r.next())(u=d.parseCueRegion_(u.value,p,f))&&q.push(u);if(e.findChildren(h,"p").length)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.TEXT,shaka.util.Error.Code.INVALID_TEXT_CUE,"<p> can only be inside <div> in TTML");f=$jscomp.makeIterator(e.findChildren(h,"div"));for(r=f.next();!r.done;r=
|
|
2383
2384
|
f.next())if(e.findChildren(r.value,"span").length)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.TEXT,shaka.util.Error.Code.INVALID_TEXT_CUE,"<span> can only be inside <p> in TTML");if(b=d.parseCue_(h,b,l,n,p,k,q,g,m,null,!1,c))b.backgroundColor||(b.backgroundColor="transparent"),a.push(b);return a};
|
|
2384
2385
|
shaka.text.TtmlTextParser.parseCue_=function(a,b,c,d,e,f,g,h,k,l,m,n){var p=a.parentNode;if(a.nodeType==Node.COMMENT_NODE)return null;if(a.nodeType==Node.TEXT_NODE){if(!m)return null;var q=document.createElement("span");q.textContent=a.textContent}else goog.asserts.assert(a.nodeType==Node.ELEMENT_NODE,"nodeType should be ELEMENT_NODE!"),q=a;goog.asserts.assert(q,"cueElement should be non-null!");for(var r=null,u=$jscomp.makeIterator(shaka.text.TtmlTextParser.smpteNsList_),w=u.next();!w.done&&!(r=
|
|
2385
|
-
shaka.text.TtmlTextParser.getElementsFromCollection_(q,"backgroundImage",d,"#",w.value)[0]);w=u.next());u=null;var t=shaka.util.XmlUtils.getAttributeNSList(q,shaka.text.TtmlTextParser.smpteNsList_,"backgroundImage");n&&t&&!t.startsWith("#")&&(w=new goog.Uri(n),t=new goog.Uri(t),(w=w.resolve(t).toString())&&(u=w));if("p"==a.nodeName||r||u)m=!0;a=m;w="default"==(q.getAttribute("xml:space")||(h?"default":"preserve"));t=Array.from(q.childNodes).every(function(
|
|
2386
|
+
shaka.text.TtmlTextParser.getElementsFromCollection_(q,"backgroundImage",d,"#",w.value)[0]);w=u.next());u=null;var t=shaka.util.XmlUtils.getAttributeNSList(q,shaka.text.TtmlTextParser.smpteNsList_,"backgroundImage");n&&t&&!t.startsWith("#")&&(w=new goog.Uri(n),t=new goog.Uri(t),(w=w.resolve(t).toString())&&(u=w));if("p"==a.nodeName||r||u)m=!0;a=m;w="default"==(q.getAttribute("xml:space")||(h?"default":"preserve"));t=Array.from(q.childNodes).every(function(z){return z.nodeType==Node.TEXT_NODE});h=
|
|
2386
2387
|
[];if(!t)for(var v=$jscomp.makeIterator(q.childNodes),x=v.next();!x.done;x=v.next())(x=shaka.text.TtmlTextParser.parseCue_(x.value,b,c,d,e,f,g,w,k,q,m,n))&&h.push(x);d=null!=l;n=/\S/.test(q.textContent);x=q.hasAttribute("begin")||q.hasAttribute("end")||q.hasAttribute("dur");if(!(x||n||"br"==q.tagName||0!=h.length||d&&!w))return null;v=shaka.text.TtmlTextParser.parseTime_(q,c);n=v.start;for(v=v.end;p&&p.nodeType==Node.ELEMENT_NODE&&"tt"!=p.tagName;)v=shaka.text.TtmlTextParser.resolveTime_(p,c,n,v),
|
|
2387
2388
|
n=v.start,v=v.end,p=p.parentNode;null==n&&(n=0);n+=b.periodStart;v=null==v?Infinity:v+b.periodStart;n=Math.max(n,b.segmentStart);v=Math.min(v,b.segmentEnd);if(!x&&0<h.length)for(n=Infinity,v=0,b=$jscomp.makeIterator(h),c=b.next();!c.done;c=b.next())c=c.value,n=Math.min(n,c.startTime),v=Math.max(v,c.endTime);if("br"==q.tagName)return e=new shaka.text.Cue(n,v,""),e.lineBreak=!0,e;b="";t&&(b=q.textContent,w&&(b=b.trim(),b=b.replace(/\s+/g," ")));b=new shaka.text.Cue(n,v,b);b.nestedCues=h;m||(b.isContainer=
|
|
2388
|
-
!0);k&&(b.cellResolution=k);k=shaka.text.TtmlTextParser.getElementsFromCollection_(q,"region",f,"")[0];if(q.hasAttribute("region")&&k&&k.getAttribute("xml:id")){var
|
|
2389
|
+
!0);k&&(b.cellResolution=k);k=shaka.text.TtmlTextParser.getElementsFromCollection_(q,"region",f,"")[0];if(q.hasAttribute("region")&&k&&k.getAttribute("xml:id")){var y=k.getAttribute("xml:id");b.region=g.filter(function(z){return z.id==y})[0]}g=k;l&&d&&!q.getAttribute("region")&&!q.getAttribute("style")&&(g=shaka.text.TtmlTextParser.getElementsFromCollection_(l,"region",f,"")[0]);shaka.text.TtmlTextParser.addStyle_(b,q,g,r,u,e,a,0==h.length);return b};
|
|
2389
2390
|
shaka.text.TtmlTextParser.parseCueRegion_=function(a,b,c){var d=shaka.text.TtmlTextParser,e=new shaka.text.CueRegion,f=a.getAttribute("xml:id");if(!f)return shaka.log.warning("TtmlTextParser parser encountered a region with no id. Region will be ignored."),null;e.id=f;f=null;c&&(f=d.percentValues_.exec(c)||d.pixelValues_.exec(c));c=f?Number(f[1]):null;f=f?Number(f[2]):null;var g,h;if(g=d.getStyleAttributeFromRegion_(a,b,"extent"))g=(h=d.percentValues_.exec(g))||d.pixelValues_.exec(g),null!=g&&(e.width=
|
|
2390
2391
|
Number(g[1]),e.height=Number(g[2]),h||(null!=c&&(e.width=100*e.width/c),null!=f&&(e.height=100*e.height/f)),e.widthUnits=h||null!=c?shaka.text.CueRegion.units.PERCENTAGE:shaka.text.CueRegion.units.PX,e.heightUnits=h||null!=f?shaka.text.CueRegion.units.PERCENTAGE:shaka.text.CueRegion.units.PX);if(a=d.getStyleAttributeFromRegion_(a,b,"origin"))g=(h=d.percentValues_.exec(a))||d.pixelValues_.exec(a),null!=g&&(e.viewportAnchorX=Number(g[1]),e.viewportAnchorY=Number(g[2]),h||(null!=f&&(e.viewportAnchorY=
|
|
2391
2392
|
100*e.viewportAnchorY/f),null!=c&&(e.viewportAnchorX=100*e.viewportAnchorX/c)),e.viewportAnchorUnits=h||null!=c?shaka.text.CueRegion.units.PERCENTAGE:shaka.text.CueRegion.units.PX);return e};
|
|
@@ -2470,8 +2471,8 @@ shaka.text.SrtTextParser.convertSrtCue_=function(a){a=a.split(/\n/);a[0].match(/
|
|
|
2470
2471
|
goog.exportProperty(shaka.text.SrtTextParser.prototype,"parseMedia",shaka.text.SrtTextParser.prototype.parseMedia);goog.exportProperty(shaka.text.SrtTextParser.prototype,"setManifestType",shaka.text.SrtTextParser.prototype.setManifestType);goog.exportProperty(shaka.text.SrtTextParser.prototype,"setSequenceMode",shaka.text.SrtTextParser.prototype.setSequenceMode);goog.exportProperty(shaka.text.SrtTextParser.prototype,"parseInit",shaka.text.SrtTextParser.prototype.parseInit);
|
|
2471
2472
|
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")};shaka.text.SsaTextParser.prototype.setSequenceMode=function(a){};shaka.text.SsaTextParser.prototype.setManifestType=function(a){};
|
|
2472
2473
|
shaka.text.SsaTextParser.prototype.parseMedia=function(a,b){b=shaka.text.SsaTextParser;var c="",d="";a=shaka.util.StringUtils.fromUTF8(a).split(/\r?\n\s*\r?\n/);a=$jscomp.makeIterator(a);for(var e=a.next();!e.done;e=a.next()){e=e.value;var f=b.ssaContent_.exec(e);if(f){var g=f[1];f=f[2];if("V4 Styles"==g||"V4+ Styles"==g){c=f;continue}if("Events"==g){d=f;continue}}shaka.log.warning("SsaTextParser parser encountered an unknown part.",e)}a=[];e=null;c=c.split(/\r?\n/);c=$jscomp.makeIterator(c);for(f=
|
|
2473
|
-
c.next();!f.done;f=c.next())if(g=f.value,!/^\s*;/.test(g)&&(f=b.lineParts_.exec(g)))if(g=f[1].trim(),f=f[2].trim(),"Format"==g)e=f.split(b.valuesFormat_);else if("Style"==g){g=f.split(b.valuesFormat_);f={};for(var h=0;h<e.length&&h<g.length;h++)f[e[h]]=g[h];a.push(f)}e=[];c=null;g=d.split(/\r?\n/);d={};g=$jscomp.makeIterator(g);for(f=g.next();!f.done;d={$jscomp$loop$prop$styleName$
|
|
2474
|
-
h=h[2].trim(),"Format"==f)c=h.split(b.valuesFormat_);else if("Dialogue"==f){h=h.split(b.valuesFormat_);f={};for(var k=0;k<c.length&&k<h.length;k++)f[c[k]]=h[k];k=b.parseTime_(f.Start);var l=b.parseTime_(f.End);h=h.slice(c.length-1).join(",").replace(/\\N/g,"\n").replace(/\{[^}]+\}/g,"");h=new shaka.text.Cue(k,l,h);d.$jscomp$loop$prop$styleName$
|
|
2474
|
+
c.next();!f.done;f=c.next())if(g=f.value,!/^\s*;/.test(g)&&(f=b.lineParts_.exec(g)))if(g=f[1].trim(),f=f[2].trim(),"Format"==g)e=f.split(b.valuesFormat_);else if("Style"==g){g=f.split(b.valuesFormat_);f={};for(var h=0;h<e.length&&h<g.length;h++)f[e[h]]=g[h];a.push(f)}e=[];c=null;g=d.split(/\r?\n/);d={};g=$jscomp.makeIterator(g);for(f=g.next();!f.done;d={$jscomp$loop$prop$styleName$837:d.$jscomp$loop$prop$styleName$837},f=g.next())if(f=f.value,!/^\s*;/.test(f)&&(h=b.lineParts_.exec(f)))if(f=h[1].trim(),
|
|
2475
|
+
h=h[2].trim(),"Format"==f)c=h.split(b.valuesFormat_);else if("Dialogue"==f){h=h.split(b.valuesFormat_);f={};for(var k=0;k<c.length&&k<h.length;k++)f[c[k]]=h[k];k=b.parseTime_(f.Start);var l=b.parseTime_(f.End);h=h.slice(c.length-1).join(",").replace(/\\N/g,"\n").replace(/\{[^}]+\}/g,"");h=new shaka.text.Cue(k,l,h);d.$jscomp$loop$prop$styleName$837=f.Style;(f=a.find(function(m){return function(n){return n.Name==m.$jscomp$loop$prop$styleName$837}}(d)))&&b.addStyle_(h,f);e.push(h)}return e};
|
|
2475
2476
|
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,
|
|
2476
2477
|
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=
|
|
2477
2478
|
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(b=b.AlphaLevel)a.opacity=parseFloat(b)};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};
|
|
@@ -2519,15 +2520,15 @@ shaka.transmuxer.H265.parseInfo=function(a){var b=shaka.transmuxer.H265;if(!a.le
|
|
|
2519
2520
|
generalProfileSpace:a.generalProfileSpace,generalTierFlag:a.generalTierFlag,generalLevelIdc:a.generalLevelIdc,generalProfileIdc:a.generalProfileIdc,generalProfileCompatibilityFlags1:a.generalProfileCompatibilityFlags1,generalProfileCompatibilityFlags2:a.generalProfileCompatibilityFlags2,generalProfileCompatibilityFlags3:a.generalProfileCompatibilityFlags3,generalProfileCompatibilityFlags4:a.generalProfileCompatibilityFlags4,generalConstraintIndicatorFlags1:a.generalConstraintIndicatorFlags1,generalConstraintIndicatorFlags2:a.generalConstraintIndicatorFlags2,
|
|
2520
2521
|
generalConstraintIndicatorFlags3:a.generalConstraintIndicatorFlags3,generalConstraintIndicatorFlags4:a.generalConstraintIndicatorFlags4,generalConstraintIndicatorFlags5:a.generalConstraintIndicatorFlags5,generalConstraintIndicatorFlags6:a.generalConstraintIndicatorFlags6,constantFrameRate:a.constantFrameRate,minSpatialSegmentationIdc:a.minSpatialSegmentationIdc,chromaFormatIdc:a.chromaFormatIdc,bitDepthLumaMinus8:a.bitDepthLumaMinus8,bitDepthChromaMinus8:a.bitDepthChromaMinus8,parallelismType:g.parallelismType});
|
|
2521
2522
|
return{height:a.height,width:a.width,videoConfig:c}};shaka.transmuxer.H265.parseVPS_=function(a){var b=new shaka.util.ExpGolomb(a,!0);b.readUnsignedByte();b.readUnsignedByte();b.readBits(4);b.readBits(2);b.readBits(6);a=b.readBits(3);b=b.readBoolean();return{numTemporalLayers:a+1,temporalIdNested:b}};
|
|
2522
|
-
shaka.transmuxer.H265.parseSPS_=function(a){a=new shaka.util.ExpGolomb(a,!0);a.readUnsignedByte();a.readUnsignedByte();var b=0,c=0,d=0,e=0;a.readBits(4);var f=a.readBits(3);a.readBoolean();for(var g=a.readBits(2),h=a.readBits(1),k=a.readBits(5),l=a.readUnsignedByte(),m=a.readUnsignedByte(),n=a.readUnsignedByte(),p=a.readUnsignedByte(),q=a.readUnsignedByte(),r=a.readUnsignedByte(),u=a.readUnsignedByte(),w=a.readUnsignedByte(),t=a.readUnsignedByte(),v=a.readUnsignedByte(),x=a.readUnsignedByte(),
|
|
2523
|
-
|
|
2523
|
+
shaka.transmuxer.H265.parseSPS_=function(a){a=new shaka.util.ExpGolomb(a,!0);a.readUnsignedByte();a.readUnsignedByte();var b=0,c=0,d=0,e=0;a.readBits(4);var f=a.readBits(3);a.readBoolean();for(var g=a.readBits(2),h=a.readBits(1),k=a.readBits(5),l=a.readUnsignedByte(),m=a.readUnsignedByte(),n=a.readUnsignedByte(),p=a.readUnsignedByte(),q=a.readUnsignedByte(),r=a.readUnsignedByte(),u=a.readUnsignedByte(),w=a.readUnsignedByte(),t=a.readUnsignedByte(),v=a.readUnsignedByte(),x=a.readUnsignedByte(),y=[],
|
|
2524
|
+
z=[],A=0;A<f;A++)y.push(a.readBoolean()),z.push(a.readBoolean());if(0<f)for(A=f;8>A;A++)a.readBits(2);for(A=0;A<f;A++)y[A]&&a.readBits(88),z[A]&&a.readUnsignedByte();a.readUnsignedExpGolomb();y=a.readUnsignedExpGolomb();3==y&&a.readBits(1);z=a.readUnsignedExpGolomb();A=a.readUnsignedExpGolomb();a.readBoolean()&&(b+=a.readUnsignedExpGolomb(),c+=a.readUnsignedExpGolomb(),d+=a.readUnsignedExpGolomb(),e+=a.readUnsignedExpGolomb());var B=a.readUnsignedExpGolomb(),E=a.readUnsignedExpGolomb(),I=a.readUnsignedExpGolomb();
|
|
2524
2525
|
if(a.readBoolean())for(var C=0;C<=f;C++)a.readUnsignedExpGolomb(),a.readUnsignedExpGolomb(),a.readUnsignedExpGolomb();else a.readUnsignedExpGolomb(),a.readUnsignedExpGolomb(),a.readUnsignedExpGolomb();a.readUnsignedExpGolomb();a.readUnsignedExpGolomb();a.readUnsignedExpGolomb();a.readUnsignedExpGolomb();a.readUnsignedExpGolomb();a.readUnsignedExpGolomb();if(a.readBoolean()&&a.readBoolean())for(C=0;4>C;C++)for(var G=0;G<(3===C?2:6);G++)if(a.readBoolean()){var D=Math.min(64,1<<4+(C<<1));1<C&&a.readExpGolomb();
|
|
2525
2526
|
for(var F=0;F<D;F++)a.readExpGolomb()}else a.readUnsignedExpGolomb();a.readBoolean();a.readBoolean();a.readBoolean()&&(a.readUnsignedByte(),a.readUnsignedExpGolomb(),a.readUnsignedExpGolomb(),a.readBoolean());C=a.readUnsignedExpGolomb();for(D=G=0;D<C;D++)if(F=!1,0!==D&&(F=a.readBoolean()),F){D===C&&a.readUnsignedExpGolomb();a.readBoolean();a.readUnsignedExpGolomb();for(var H=F=0;H<=G;H++){var J=a.readBoolean(),K=!1;J||(K=a.readBoolean());(J||K)&&F++}G=F}else{H=a.readUnsignedExpGolomb();F=a.readUnsignedExpGolomb();
|
|
2526
2527
|
G=H+F;for(J=0;J<H;J++)a.readUnsignedExpGolomb(),a.readBoolean();for(H=0;H<F;H++)a.readUnsignedExpGolomb(),a.readBoolean()}if(a.readBoolean())for(C=a.readUnsignedExpGolomb(),G=0;G<C;G++){for(D=0;D<I+4;D++)a.readBits(1);a.readBits(1)}I=0;a.readBoolean();a.readBoolean();if(a.readBoolean()){a.readBoolean()&&255===a.readUnsignedByte()&&(a.readBits(16),a.readBits(16));a.readBoolean()&&a.readBoolean();a.readBoolean()&&(a.readBits(3),a.readBoolean(),a.readBoolean()&&(a.readUnsignedByte(),a.readUnsignedByte(),
|
|
2527
2528
|
a.readUnsignedByte()));a.readBoolean()&&(a.readUnsignedExpGolomb(),a.readUnsignedExpGolomb());a.readBoolean();a.readBoolean();a.readBoolean();if(C=a.readBoolean())a.readUnsignedExpGolomb(),a.readUnsignedExpGolomb(),a.readUnsignedExpGolomb(),a.readUnsignedExpGolomb();if(a.readBoolean()&&(a.readBits(32),a.readBits(32),a.readBoolean()&&a.readUnsignedExpGolomb(),a.readBoolean())){D=!1;C=a.readBoolean();G=a.readBoolean();if(C||G){if(D=a.readBoolean())a.readUnsignedByte(),a.readBits(5),a.readBoolean(),
|
|
2528
2529
|
a.readBits(5);a.readBits(4);a.readBits(4);D&&a.readBits(4);a.readBits(5);a.readBits(5);a.readBits(5)}for(F=0;F<=f;F++){J=!0;H=1;a.readBoolean()||(J=a.readBoolean());K=!1;J?a.readUnsignedExpGolomb():K=a.readBoolean();K||(H=a.readUnsignedExpGolomb()+1);if(C){for(J=0;J<H;J++)a.readUnsignedExpGolomb(),a.readUnsignedExpGolomb(),D&&(a.readUnsignedExpGolomb(),a.readUnsignedExpGolomb());a.readBoolean()}if(G){for(J=0;J<H;J++)a.readUnsignedExpGolomb(),a.readUnsignedExpGolomb(),D&&(a.readUnsignedExpGolomb(),
|
|
2529
2530
|
a.readUnsignedExpGolomb());a.readBoolean()}}}a.readBoolean()&&(a.readBoolean(),a.readBoolean(),a.readBoolean(),I=a.readUnsignedExpGolomb(),a.readUnsignedExpGolomb(),a.readUnsignedExpGolomb(),a.readUnsignedExpGolomb(),a.readUnsignedExpGolomb())}return{generalLevelIdc:x,generalProfileSpace:g,generalTierFlag:h,generalProfileIdc:k,generalProfileCompatibilityFlags1:l,generalProfileCompatibilityFlags2:m,generalProfileCompatibilityFlags3:n,generalProfileCompatibilityFlags4:p,generalConstraintIndicatorFlags1:q,
|
|
2530
|
-
generalConstraintIndicatorFlags2:r,generalConstraintIndicatorFlags3:u,generalConstraintIndicatorFlags4:w,generalConstraintIndicatorFlags5:t,generalConstraintIndicatorFlags6:v,minSpatialSegmentationIdc:I,constantFrameRate:0,chromaFormatIdc:
|
|
2531
|
+
generalConstraintIndicatorFlags2:r,generalConstraintIndicatorFlags3:u,generalConstraintIndicatorFlags4:w,generalConstraintIndicatorFlags5:t,generalConstraintIndicatorFlags6:v,minSpatialSegmentationIdc:I,constantFrameRate:0,chromaFormatIdc:y,bitDepthLumaMinus8:B,bitDepthChromaMinus8:E,width:z-(b+c)*(1===y||2===y?2:1),height:A-(d+e)*(1===y?2:1)}};
|
|
2531
2532
|
shaka.transmuxer.H265.parsePPS_=function(a){var b=new shaka.util.ExpGolomb(a,!0);b.readUnsignedByte();b.readUnsignedByte();b.readUnsignedExpGolomb();b.readUnsignedExpGolomb();b.readBoolean();b.readBoolean();b.readBits(3);b.readBoolean();b.readBoolean();b.readUnsignedExpGolomb();b.readUnsignedExpGolomb();b.readExpGolomb();b.readBoolean();b.readBoolean();b.readBoolean()&&b.readUnsignedExpGolomb();b.readExpGolomb();b.readExpGolomb();b.readBoolean();b.readBoolean();b.readBoolean();b.readBoolean();a=b.readBoolean();
|
|
2532
2533
|
b=b.readBoolean();var c=1;b&&a?c=0:b?c=3:a&&(c=2);return{parallelismType:c}};
|
|
2533
2534
|
shaka.transmuxer.H265.getVideoConfiguration_=function(a,b,c,d){var e=shaka.transmuxer.H265,f=new Uint8Array(23+(5+a.byteLength)+(5+b.byteLength)+(5+c.byteLength));f[0]=1;f[1]=(d.generalProfileSpace&3)<<6|(d.generalTierFlag?1:0)<<5|d.generalProfileIdc&31;f[2]=d.generalProfileCompatibilityFlags1;f[3]=d.generalProfileCompatibilityFlags2;f[4]=d.generalProfileCompatibilityFlags3;f[5]=d.generalProfileCompatibilityFlags4;f[6]=d.generalConstraintIndicatorFlags1;f[7]=d.generalConstraintIndicatorFlags2;f[8]=
|