shaka-player 4.2.0 → 4.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/workflows/selenium-lab-tests.yaml +158 -53
- package/CHANGELOG.md +11 -0
- package/dist/controls.css +1 -1
- package/dist/controls.css.map +1 -1
- package/dist/locales.js +32 -32
- package/dist/shaka-player.compiled.d.ts +0 -2
- package/dist/shaka-player.compiled.debug.d.ts +0 -2
- package/dist/shaka-player.compiled.debug.externs.js +0 -2
- package/dist/shaka-player.compiled.debug.js +55 -56
- package/dist/shaka-player.compiled.debug.map +3 -3
- package/dist/shaka-player.compiled.externs.js +0 -2
- package/dist/shaka-player.compiled.js +372 -373
- package/dist/shaka-player.compiled.map +3 -3
- package/dist/shaka-player.ui.d.ts +0 -2
- package/dist/shaka-player.ui.debug.d.ts +0 -2
- package/dist/shaka-player.ui.debug.externs.js +0 -2
- package/dist/shaka-player.ui.debug.js +57 -58
- package/dist/shaka-player.ui.debug.map +3 -3
- package/dist/shaka-player.ui.externs.js +0 -2
- package/dist/shaka-player.ui.js +698 -700
- package/dist/shaka-player.ui.map +3 -3
- package/lib/hls/hls_parser.js +24 -74
- package/lib/player.js +13 -1
- package/lib/text/ui_text_displayer.js +8 -0
- package/lib/util/error.js +2 -10
- package/lib/util/player_configuration.js +1 -0
- package/package.json +1 -1
- package/test/hls/hls_parser_unit.js +52 -1
- package/test/media/drm_engine_unit.js +29 -0
- package/test/player_src_equals_integration.js +2 -0
- package/test/player_unit.js +39 -1
- package/test/test/assets/small.mp4 +0 -0
- package/ui/less/ad_controls.less +4 -0
|
@@ -170,10 +170,10 @@ shaka.util.Error.Code={UNSUPPORTED_SCHEME:1E3,BAD_HTTP_STATUS:1001,HTTP_ERROR:10
|
|
|
170
170
|
CANNOT_ADD_EXTERNAL_TEXT_TO_SRC_EQUALS:2012,TEXT_ONLY_WEBVTT_SRC_EQUALS:2013,MISSING_TEXT_PLUGIN:2014,CHAPTERS_TRACK_FAILED:2015,BUFFER_READ_OUT_OF_BOUNDS:3E3,JS_INTEGER_OVERFLOW:3001,EBML_OVERFLOW:3002,EBML_BAD_FLOATING_POINT_SIZE:3003,MP4_SIDX_WRONG_BOX_TYPE:3004,MP4_SIDX_INVALID_TIMESCALE:3005,MP4_SIDX_TYPE_NOT_SUPPORTED:3006,WEBM_CUES_ELEMENT_MISSING:3007,WEBM_EBML_HEADER_ELEMENT_MISSING:3008,WEBM_SEGMENT_ELEMENT_MISSING:3009,WEBM_INFO_ELEMENT_MISSING:3010,WEBM_DURATION_ELEMENT_MISSING:3011,WEBM_CUE_TRACK_POSITIONS_ELEMENT_MISSING:3012,
|
|
171
171
|
WEBM_CUE_TIME_ELEMENT_MISSING:3013,MEDIA_SOURCE_OPERATION_FAILED:3014,MEDIA_SOURCE_OPERATION_THREW:3015,VIDEO_ERROR:3016,QUOTA_EXCEEDED_ERROR:3017,TRANSMUXING_FAILED:3018,CONTENT_TRANSFORMATION_FAILED:3019,UNABLE_TO_GUESS_MANIFEST_TYPE:4E3,DASH_INVALID_XML:4001,DASH_NO_SEGMENT_INFO:4002,DASH_EMPTY_ADAPTATION_SET:4003,DASH_EMPTY_PERIOD:4004,DASH_WEBM_MISSING_INIT:4005,DASH_UNSUPPORTED_CONTAINER:4006,DASH_PSSH_BAD_ENCODING:4007,DASH_NO_COMMON_KEY_SYSTEM:4008,DASH_MULTIPLE_KEY_IDS_NOT_SUPPORTED:4009,
|
|
172
172
|
DASH_CONFLICTING_KEY_IDS:4010,RESTRICTIONS_CANNOT_BE_MET:4012,HLS_PLAYLIST_HEADER_MISSING:4015,INVALID_HLS_TAG:4016,HLS_INVALID_PLAYLIST_HIERARCHY:4017,DASH_DUPLICATE_REPRESENTATION_ID:4018,HLS_MULTIPLE_MEDIA_INIT_SECTIONS_FOUND:4020,HLS_REQUIRED_ATTRIBUTE_MISSING:4023,HLS_REQUIRED_TAG_MISSING:4024,HLS_COULD_NOT_GUESS_CODECS:4025,HLS_KEYFORMATS_NOT_SUPPORTED:4026,DASH_UNSUPPORTED_XLINK_ACTUATE:4027,DASH_XLINK_DEPTH_LIMIT:4028,CONTENT_UNSUPPORTED_BY_BROWSER:4032,CANNOT_ADD_EXTERNAL_TEXT_TO_LIVE_STREAM:4033,
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
173
|
+
NO_VARIANTS:4036,PERIOD_FLATTENING_FAILED:4037,INCONSISTENT_DRM_ACROSS_PERIODS:4038,HLS_VARIABLE_NOT_FOUND:4039,HLS_MSE_ENCRYPTED_MP2T_NOT_SUPPORTED:4040,HLS_MSE_ENCRYPTED_LEGACY_APPLE_MEDIA_KEYS_NOT_SUPPORTED:4041,NO_WEB_CRYPTO_API:4042,HLS_AES_128_INVALID_IV_LENGTH:4043,HLS_AES_128_INVALID_KEY_LENGTH:4044,STREAMING_ENGINE_STARTUP_INVALID_STATE:5006,NO_RECOGNIZED_KEY_SYSTEMS:6E3,REQUESTED_KEY_SYSTEM_CONFIG_UNAVAILABLE:6001,FAILED_TO_CREATE_CDM:6002,FAILED_TO_ATTACH_TO_VIDEO:6003,INVALID_SERVER_CERTIFICATE:6004,
|
|
174
|
+
FAILED_TO_CREATE_SESSION:6005,FAILED_TO_GENERATE_LICENSE_REQUEST:6006,LICENSE_REQUEST_FAILED:6007,LICENSE_RESPONSE_REJECTED:6008,ENCRYPTED_CONTENT_WITHOUT_DRM_INFO:6010,NO_LICENSE_SERVER_GIVEN:6012,OFFLINE_SESSION_REMOVED:6013,EXPIRED:6014,SERVER_CERTIFICATE_REQUIRED:6015,INIT_DATA_TRANSFORM_ERROR:6016,SERVER_CERTIFICATE_REQUEST_FAILED:6017,LOAD_INTERRUPTED:7E3,OPERATION_ABORTED:7001,NO_VIDEO_ELEMENT:7002,OBJECT_DESTROYED:7003,CONTENT_NOT_LOADED:7004,CAST_API_UNAVAILABLE:8E3,NO_CAST_RECEIVERS:8001,
|
|
175
|
+
ALREADY_CASTING:8002,UNEXPECTED_CAST_ERROR:8003,CAST_CANCELED_BY_USER:8004,CAST_CONNECTION_TIMED_OUT:8005,CAST_RECEIVER_APP_UNAVAILABLE:8006,STORAGE_NOT_SUPPORTED:9E3,INDEXED_DB_ERROR:9001,DEPRECATED_OPERATION_ABORTED:9002,REQUESTED_ITEM_NOT_FOUND:9003,MALFORMED_OFFLINE_URI:9004,CANNOT_STORE_LIVE_OFFLINE:9005,NO_INIT_DATA_FOR_OFFLINE:9007,LOCAL_PLAYER_INSTANCE_REQUIRED:9008,NEW_KEY_OPERATION_NOT_SUPPORTED:9011,KEY_NOT_FOUND:9012,MISSING_STORAGE_CELL:9013,STORAGE_LIMIT_REACHED:9014,DOWNLOAD_SIZE_CALLBACK_ERROR:9015,
|
|
176
|
+
MODIFY_OPERATION_NOT_SUPPORTED:9016,CS_IMA_SDK_MISSING:1E4,CS_AD_MANAGER_NOT_INITIALIZED:10001,SS_IMA_SDK_MISSING:10002,SS_AD_MANAGER_NOT_INITIALIZED:10003,CURRENT_DAI_REQUEST_NOT_FINISHED:10004};goog.exportProperty(shaka.util.Error,"Code",shaka.util.Error.Code);/*
|
|
177
177
|
@license
|
|
178
178
|
Copyright 2008 The Closure Library Authors
|
|
179
179
|
SPDX-License-Identifier: Apache-2.0
|
|
@@ -840,8 +840,8 @@ shaka.text.UITextDisplayer.prototype.getRegionElement_=function(a){var b=a.regio
|
|
|
840
840
|
d;c.style.left=b.viewportAnchorX+d;c.style.display="flex";c.style.flexDirection="column";c.style.alignItems="center";c.style.justifyContent=a.displayAlign==shaka.text.Cue.displayAlign.BEFORE?"flex-start":a.displayAlign==shaka.text.Cue.displayAlign.CENTER?"center":"flex-end";this.regionElements_.set(b.id,c);return c};
|
|
841
841
|
shaka.text.UITextDisplayer.prototype.createCue_=function(a,b){var c=1<b.length,d=c?"span":"div";a.lineBreak&&(d="br");c=!c&&0<a.nestedCues.length;var e=shaka.util.Dom.createHTMLElement(d);"br"!=d&&this.setCaptionStyles_(e,a,b,c);d=null;a.region&&a.region.id&&(d=this.getRegionElement_(a));var f=e;c&&(f=shaka.util.Dom.createHTMLElement("span"),f.classList.add("shaka-text-wrapper"),f.style.backgroundColor=a.backgroundColor,e.appendChild(f));this.currentCuesMap_.set(a,{cueElement:e,wrapper:f,regionElement:d})};
|
|
842
842
|
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=
|
|
843
|
-
shaka.text.UITextDisplayer.convertLengthValue_(b.linePadding,b,this.videoContainer_);f.textShadow=b.textShadow;if(b.backgroundImage)f.backgroundImage="url('"+b.backgroundImage+"')",f.backgroundRepeat="no-repeat",f.backgroundSize="contain",f.backgroundPosition="center";else{if(b.nestedCues.length)var l=a;else l=shaka.util.Dom.createHTMLElement("span"),a.appendChild(l);b.border&&(l.style.border=b.border);d||((a=shaka.text.UITextDisplayer.inheritProperty_(c,function(m){return m.backgroundColor}))?
|
|
844
|
-
a:k&&(l.style.backgroundColor="rgba(0, 0, 0, 0.8)"));k&&(l.textContent=k)}h&&!c[c.length-1].isContainer?f.display="inline":(f.display="flex",f.flexDirection="column",f.alignItems="center",f.justifyContent=b.displayAlign==e.displayAlign.BEFORE?"flex-start":b.displayAlign==e.displayAlign.CENTER?"center":"flex-end");g||(f.margin="0");f.fontFamily=b.fontFamily;f.fontWeight=b.fontWeight.toString();f.fontStyle=b.fontStyle;f.letterSpacing=b.letterSpacing;f.fontSize=shaka.text.UITextDisplayer.convertLengthValue_(b.fontSize,
|
|
843
|
+
shaka.text.UITextDisplayer.convertLengthValue_(b.linePadding,b,this.videoContainer_);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,function(m){return m.backgroundColor}))?
|
|
844
|
+
l.style.backgroundColor=a:k&&(l.style.backgroundColor="rgba(0, 0, 0, 0.8)"));k&&(l.textContent=k)}h&&!c[c.length-1].isContainer?f.display="inline":(f.display="flex",f.flexDirection="column",f.alignItems="center",f.justifyContent=b.displayAlign==e.displayAlign.BEFORE?"flex-start":b.displayAlign==e.displayAlign.CENTER?"center":"flex-end");g||(f.margin="0");f.fontFamily=b.fontFamily;f.fontWeight=b.fontWeight.toString();f.fontStyle=b.fontStyle;f.letterSpacing=b.letterSpacing;f.fontSize=shaka.text.UITextDisplayer.convertLengthValue_(b.fontSize,
|
|
845
845
|
b,this.videoContainer_);b.line&&b.lineInterpretation==e.lineInterpretation.PERCENTAGE&&(f.position="absolute",f.left="0",f.top="0",b.writingMode==e.writingMode.HORIZONTAL_TOP_TO_BOTTOM?(f.width="100%",b.lineAlign==e.lineAlign.START?f.top=b.line+"%":b.lineAlign==e.lineAlign.END&&(f.bottom=b.line+"%")):b.writingMode==e.writingMode.VERTICAL_LEFT_TO_RIGHT?(f.height="100%",b.lineAlign==e.lineAlign.START?f.left=b.line+"%":b.lineAlign==e.lineAlign.END&&(f.right=b.line+"%")):(f.height="100%",b.lineAlign==
|
|
846
846
|
e.lineAlign.START?f.right=b.line+"%":b.lineAlign==e.lineAlign.END&&(f.left=b.line+"%")));f.lineHeight=b.lineHeight;b.position&&(b.writingMode==e.writingMode.HORIZONTAL_TOP_TO_BOTTOM?f.paddingLeft=b.position:f.paddingTop=b.position);b.positionAlign==e.positionAlign.LEFT?f.cssFloat="left":b.positionAlign==e.positionAlign.RIGHT&&(f.cssFloat="right");f.textAlign=b.textAlign;f.textDecoration=b.textDecoration.join(" ");f.writingMode=b.writingMode;"writingMode"in document.documentElement.style&&f.writingMode==
|
|
847
847
|
b.writingMode||(f.webkitWritingMode=b.writingMode);b.size&&(b.writingMode==e.writingMode.HORIZONTAL_TOP_TO_BOTTOM?f.width=b.size+"%":f.height=b.size+"%")};shaka.text.UITextDisplayer.getLengthValueInfo_=function(a){return(a=(new RegExp(/(\d*\.?\d+)([a-z]+|%+)/)).exec(a))?{value:Number(a[1]),unit:a[2]}:null};
|
|
@@ -881,7 +881,8 @@ safeSeekOffset:5,stallEnabled:!0,stallThreshold:1,stallSkip:.1,useNativeHlsOnSaf
|
|
|
881
881
|
downloadSizeCallback:function(g){var h;return $jscomp.asyncExecutePromiseGeneratorProgram(function(k){if(1==k.nextAddress)return navigator.storage&&navigator.storage.estimate?k.yield(navigator.storage.estimate(),3):k["return"](!0);h=k.yieldResult;return k["return"](h.usage+g<.95*h.quota)})},progressCallback:function(g,h){return shaka.util.ConfigUtils.referenceParametersAndReturn([g,h],void 0)},usePersistentLicense:!0,numberOfParallelDownloads:5},f={drm:b,manifest:c,streaming:d,offline:e,abrFactory:function(){return new shaka.abr.SimpleAbrManager},
|
|
882
882
|
abr:{enabled:!0,useNetworkInformation:!0,defaultBandwidthEstimate:1E6,switchInterval:8,bandwidthUpgradeTarget:.85,bandwidthDowngradeTarget:.95,restrictions:{minWidth:0,maxWidth:Infinity,minHeight:0,maxHeight:a,minPixels:0,maxPixels:Infinity,minFrameRate:0,maxFrameRate:Infinity,minBandwidth:0,maxBandwidth:Infinity},advanced:{minTotalBytes:128E3,minBytes:16E3,fastHalfLife:2,slowHalfLife:5},restrictToElementSize:!1,ignoreDevicePixelRatio:!1},preferredAudioLanguage:"",preferredTextLanguage:"",preferredVariantRole:"",
|
|
883
883
|
preferredTextRole:"",preferredAudioChannelCount:2,preferredVideoCodecs:[],preferredAudioCodecs:[],preferForcedSubs:!1,preferredDecodingAttributes:[],restrictions:{minWidth:0,maxWidth:Infinity,minHeight:0,maxHeight:Infinity,minPixels:0,maxPixels:Infinity,minFrameRate:0,maxFrameRate:Infinity,minBandwidth:0,maxBandwidth:Infinity},playRangeStart:0,playRangeEnd:Infinity,textDisplayFactory:function(){return null},cmcd:{enabled:!1,sessionId:"",contentId:"",useHeaders:!1}};e.trackSelectionCallback=function(g){return $jscomp.asyncExecutePromiseGeneratorProgram(function(h){return h["return"](shaka.util.PlayerConfiguration.defaultTrackSelect(g,
|
|
884
|
-
f.preferredAudioLanguage))})};return f};
|
|
884
|
+
f.preferredAudioLanguage))})};return f};
|
|
885
|
+
shaka.util.PlayerConfiguration.mergeConfigObjects=function(a,b,c){var d={".drm.keySystemsMapping":"",".drm.servers":"",".drm.clearKeys":"",".drm.advanced":{distinctiveIdentifierRequired:!1,persistentStateRequired:!1,videoRobustness:"",audioRobustness:"",sessionType:"",serverCertificate:new Uint8Array(0),serverCertificateUri:"",individualizationServer:""}};return shaka.util.ConfigUtils.mergeConfigObjects(a,b,c||shaka.util.PlayerConfiguration.createDefault(),d,"")};
|
|
885
886
|
shaka.util.PlayerConfiguration.defaultTrackSelect=function(a,b){var c=shaka.util.ManifestParserUtils.ContentType,d=shaka.util.LanguageUtils,e=a.filter(function(l){return"variant"==l.type}),f=[],g=d.findClosestLocale(b,e.map(function(l){return l.language}));g&&(f=e.filter(function(l){return d.normalize(l.language)==g}));0==f.length&&(f=e.filter(function(l){return l.primary}));0==f.length&&(1<(new Set(e.map(function(l){return l.language}))).size&&shaka.log.warning("Could not choose a good audio track based on language preferences or primary tracks. An arbitrary language will be stored!"),
|
|
886
887
|
f=e);var h=f.filter(function(l){return l.height&&480>=l.height});h.length&&(h.sort(function(l,m){goog.asserts.assert(null!=l.height,"Null height");goog.asserts.assert(null!=m.height,"Null height");return m.height-l.height}),f=h.filter(function(l){return l.height==h[0].height}));e=[];if(f.length){var k=Math.floor(f.length/2);f.sort(function(l,m){return l.bandwidth-m.bandwidth});e.push(f[k])}f=$jscomp.makeIterator(a);for(k=f.next();!k.done;k=f.next())k=k.value,k.type!=c.TEXT&&k.type!=c.IMAGE||e.push(k);
|
|
887
888
|
return e};goog.exportSymbol("shaka.util.PlayerConfiguration",shaka.util.PlayerConfiguration);goog.exportProperty(shaka.util.PlayerConfiguration,"mergeConfigObjects",shaka.util.PlayerConfiguration.mergeConfigObjects);goog.exportProperty(shaka.util.PlayerConfiguration,"createDefault",shaka.util.PlayerConfiguration.createDefault);shaka.util.StateHistory=function(){this.open_=null;this.closed_=[]};shaka.util.StateHistory.prototype.update=function(a){null==this.open_?this.start_(a):this.update_(a)};shaka.util.StateHistory.prototype.getTimeSpentIn=function(a){var b=0;this.open_&&this.open_.state==a&&(b+=this.open_.duration);for(var c=$jscomp.makeIterator(this.closed_),d=c.next();!d.done;d=c.next())d=d.value,b+=d.state==a?d.duration:0;return b};
|
|
@@ -1020,8 +1021,9 @@ shaka.Player.prototype.getPlayheadTimeAsDate=function(){if(!this.isLive())return
|
|
|
1020
1021
|
shaka.Player.prototype.getPresentationStartTimeAsDate=function(){if(!this.isLive())return shaka.log.warning("getPresentationStartTimeAsDate is for live streams!"),null;if(this.manifest_){var a=this.manifest_.presentationTimeline.getPresentationStartTime();goog.asserts.assert(null!=a,"Presentation start time should not be null!");return new Date(1E3*a)}if(this.video_&&this.video_.getStartDate)return a=this.video_.getStartDate(),isNaN(a.getTime())?(shaka.log.warning("EXT-X-PROGRAM-DATETIME required to get presentation start time as Date!"),
|
|
1021
1022
|
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};
|
|
1022
1023
|
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()));
|
|
1023
|
-
a.getVideoPlaybackQuality&&(
|
|
1024
|
-
|
|
1024
|
+
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&&
|
|
1025
|
+
b.video&&this.stats_.setResolution(b.video.width||NaN,b.video.height||NaN);this.isLive()&&(b=this.getPresentationStartTimeAsDate().valueOf()+1E3*this.seekRange().end,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||
|
|
1026
|
+
NaN,a.videoHeight||NaN);return this.stats_.getBlob()};
|
|
1025
1027
|
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,v,t,x;return $jscomp.asyncExecutePromiseGeneratorProgram(function(w){switch(w.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);
|
|
1026
1028
|
if(d){w.jumpTo(2);break}return w.yield(h.getTextMimetype_(a),3);case 3:d=w.yieldResult;case 2:k=[];if(h.adManager_)try{k=h.adManager_.getServerSideCuePoints()}catch(y){}if(h.loadMode_!=shaka.Player.LoadMode.SRC_EQUALS){w.jumpTo(4);break}g&&(c="forced");return w.yield(h.addSrcTrackElement_(a,b,c,d,f||"",k),5);case 5:l=h.getTextTracks();if(m=l.find(function(y){return y.language==b&&y.label==(f||"")&&y.kind==c}))return h.onTracksChanged_(),w["return"](m);shaka.log.error("Cannot add this text when loaded with src=");
|
|
1027
1029
|
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:n=shaka.util.ManifestParserUtils.ContentType;p=h.manifest_.presentationTimeline.getDuration();if(Infinity==p)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){w.jumpTo(6);break}goog.asserts.assert(h.networkingEngine_,
|
|
@@ -1065,9 +1067,9 @@ shaka.Player.prototype.switch_=function(a,b,c){b=void 0===b?!1:b;c=void 0===c?0:
|
|
|
1065
1067
|
shaka.Player.prototype.onAdaptation_=function(a,b){var c=(new Map).set("oldTrack",a).set("newTrack",b);c=this.makeEvent_(shaka.util.FakeEvent.EventName.Adaptation,c);this.delayDispatchEvent_(c)};shaka.Player.prototype.onTracksChanged_=function(){var a=this.makeEvent_(shaka.util.FakeEvent.EventName.TracksChanged);this.delayDispatchEvent_(a)};
|
|
1066
1068
|
shaka.Player.prototype.onVariantChanged_=function(a,b){var c=(new Map).set("oldTrack",a).set("newTrack",b);c=this.makeEvent_(shaka.util.FakeEvent.EventName.VariantChanged,c);this.delayDispatchEvent_(c)};shaka.Player.prototype.onTextChanged_=function(){var a=this.makeEvent_(shaka.util.FakeEvent.EventName.TextChanged);this.delayDispatchEvent_(a)};shaka.Player.prototype.onTextTrackVisibility_=function(){var a=this.makeEvent_(shaka.util.FakeEvent.EventName.TextTrackVisibility);this.delayDispatchEvent_(a)};
|
|
1067
1069
|
shaka.Player.prototype.onAbrStatusChanged_=function(){var a=(new Map).set("newStatus",this.config_.abr.enabled);this.delayDispatchEvent_(this.makeEvent_(shaka.util.FakeEvent.EventName.AbrStatusChanged,a))};
|
|
1068
|
-
shaka.Player.prototype.tryToRecoverFromError_=function(a){if(a.code!=shaka.util.Error.Code.HTTP_ERROR&&a.code!=shaka.util.Error.Code.SEGMENT_MISSING||a.category!=shaka.util.Error.Category.NETWORK)return!1;var b=this.config_.streaming.maxDisabledTime;if(0==b)if(a.code==shaka.util.Error.Code.SEGMENT_MISSING)b=1;else return!1;a.code==shaka.util.Error.Code.HTTP_ERROR&&shaka.log.debug("Recoverable NETWORK HTTP_ERROR, trying to recover...");a=this.getVariantTracks().find(function(f){return f.active});
|
|
1069
|
-
"Active variant should be found");for(var c=this.manifest_,d=$jscomp.makeIterator(c.variants),e=d.next();!e.done;e=d.next())e=e.value,e.id===a.id&&(e.disabledUntilTime=Date.now()/1E3+b);shaka.util.StreamUtils.applyRestrictions(c.variants,this.config_.restrictions,this.maxHwRes_);a=this.chooseVariant_();if(!a)return shaka.log.warning("Not enough variants to recover from error"),!1;c=this.getBufferedInfo().video.reduce(function(f,g){return f+g.end-g.start},0);this.switchVariant_(a
|
|
1070
|
-
return!0};shaka.Player.prototype.onError_=function(a){goog.asserts.assert(a instanceof shaka.util.Error,"Wrong error type!");if(this.loadMode_!=shaka.Player.LoadMode.DESTROYED)if(this.tryToRecoverFromError_(a))a.handled=!0;else{var b=this.makeEvent_(shaka.util.FakeEvent.EventName.Error,(new Map).set("detail",a));this.dispatchEvent(b);b.defaultPrevented&&(a.handled=!0)}};
|
|
1070
|
+
shaka.Player.prototype.tryToRecoverFromError_=function(a){if(a.code!=shaka.util.Error.Code.HTTP_ERROR&&a.code!=shaka.util.Error.Code.SEGMENT_MISSING||a.category!=shaka.util.Error.Category.NETWORK||!navigator.onLine)return!1;var b=this.config_.streaming.maxDisabledTime;if(0==b)if(a.code==shaka.util.Error.Code.SEGMENT_MISSING)b=1;else return!1;a.code==shaka.util.Error.Code.HTTP_ERROR&&shaka.log.debug("Recoverable NETWORK HTTP_ERROR, trying to recover...");a=this.getVariantTracks().find(function(f){return f.active});
|
|
1071
|
+
goog.asserts.assert(a,"Active variant should be found");for(var c=this.manifest_,d=$jscomp.makeIterator(c.variants),e=d.next();!e.done;e=d.next())e=e.value,e.id===a.id&&(e.disabledUntilTime=Date.now()/1E3+b);shaka.util.StreamUtils.applyRestrictions(c.variants,this.config_.restrictions,this.maxHwRes_);a=this.chooseVariant_();if(!a)return shaka.log.warning("Not enough variants to recover from error"),!1;c=this.getBufferedInfo().video.reduce(function(f,g){return f+g.end-g.start},0);this.switchVariant_(a,
|
|
1072
|
+
!1,!0,c);this.checkVariantsTimer_.tickAfter(b);return!0};shaka.Player.prototype.onError_=function(a){goog.asserts.assert(a instanceof shaka.util.Error,"Wrong error type!");if(this.loadMode_!=shaka.Player.LoadMode.DESTROYED)if(this.tryToRecoverFromError_(a))a.handled=!0;else{var b=this.makeEvent_(shaka.util.FakeEvent.EventName.Error,(new Map).set("detail",a));this.dispatchEvent(b);b.defaultPrevented&&(a.handled=!0)}};
|
|
1071
1073
|
shaka.Player.prototype.onRegionEvent_=function(a,b){var c={schemeIdUri:b.schemeIdUri,value:b.value,startTime:b.startTime,endTime:b.endTime,id:b.id,eventElement:b.eventElement};c=(new Map).set("detail",c);this.dispatchEvent(this.makeEvent_(a,c))};
|
|
1072
1074
|
shaka.Player.prototype.onMediaQualityChange_=function(a,b){var c={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};c=(new Map).set("mediaQuality",c).set("position",b);this.dispatchEvent(this.makeEvent_(shaka.util.FakeEvent.EventName.MediaQualityChanged,c))};
|
|
1073
1075
|
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)};
|
|
@@ -1101,7 +1103,7 @@ goog.exportProperty(shaka.Player.prototype,"goToLive",shaka.Player.prototype.goT
|
|
|
1101
1103
|
goog.exportProperty(shaka.Player.prototype,"getAdManager",shaka.Player.prototype.getAdManager);goog.exportProperty(shaka.Player.prototype,"getAssetUri",shaka.Player.prototype.getAssetUri);goog.exportProperty(shaka.Player.prototype,"getNetworkingEngine",shaka.Player.prototype.getNetworkingEngine);goog.exportProperty(shaka.Player.prototype,"getMediaElement",shaka.Player.prototype.getMediaElement);goog.exportProperty(shaka.Player.prototype,"getLoadMode",shaka.Player.prototype.getLoadMode);
|
|
1102
1104
|
goog.exportProperty(shaka.Player.prototype,"resetConfiguration",shaka.Player.prototype.resetConfiguration);goog.exportProperty(shaka.Player.prototype,"getBufferFullness",shaka.Player.prototype.getBufferFullness);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,"load",shaka.Player.prototype.load);
|
|
1103
1105
|
goog.exportProperty(shaka.Player.prototype,"updateStartTime",shaka.Player.prototype.updateStartTime);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,"attach",shaka.Player.prototype.attach);goog.exportProperty(shaka.Player,"probeSupport",shaka.Player.probeSupport);goog.exportProperty(shaka.Player,"isBrowserSupported",shaka.Player.isBrowserSupported);
|
|
1104
|
-
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.2.
|
|
1106
|
+
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.2.1-debug";
|
|
1105
1107
|
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;
|
|
1106
1108
|
shaka.Player.SRC_EQUAL_EXTENSIONS_TO_MIME_TYPES_={mp4:"video/mp4",m4v:"video/mp4",m4a:"audio/mp4",webm:"video/webm",weba:"audio/webm",mkv:"video/webm",ts:"video/mp2t",ogv:"video/ogg",ogg:"audio/ogg",mpg:"video/mpeg",mpeg:"video/mpeg",m3u8:"application/x-mpegurl",mpd:"application/dash+xml",mp3:"audio/mpeg",aac:"audio/aac",flac:"audio/flac",wav:"audio/wav"};
|
|
1107
1109
|
shaka.Player.TEXT_EXTENSIONS_TO_MIME_TYPES_={sbv:"text/x-subviewer",srt:"text/srt",vtt:"text/vtt",webvtt:"text/vtt",ttml:"application/ttml+xml",lrc:"application/x-subtitle-lrc",ssa:"text/x-ssa",ass:"text/x-ssa"};shaka.Player.TextTrackLabel="Shaka Player TextTrack";shaka.ads={};shaka.ads.AdsStats=function(){this.loadTimes_=[];this.skipped_=this.playedCompletely_=this.started_=0};shaka.ads.AdsStats.prototype.addLoadTime=function(a){this.loadTimes_.push(a)};shaka.ads.AdsStats.prototype.incrementStarted=function(){this.started_++};shaka.ads.AdsStats.prototype.incrementPlayedCompletely=function(){this.playedCompletely_++};shaka.ads.AdsStats.prototype.incrementSkipped=function(){this.skipped_++};
|
|
@@ -1376,7 +1378,7 @@ a.representation),new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.
|
|
|
1376
1378
|
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,a.bandwidth||null,null);f=f.resolveUris(a.representation.baseUris,[e]);return shaka.dash.SegmentBase.generateSegmentIndexFromUris(a,b,c,f,0,null,d.scaledPresentationTimeOffset)};
|
|
1377
1379
|
shaka.dash.SegmentTemplate.generateSegmentIndexFromDuration_=function(a,b,c,d,e){goog.asserts.assert(b.mediaTemplate,"There should be a media template with duration");var f=shaka.dash.MpdUtils,g=shaka.util.ManifestParserUtils,h=a.presentationTimeline,k=a.periodInfo.start,l=a.period.id,m=a.periodInfo.duration,n=function(){var E=null!=l&&e[l]||m;return E?k+E:Infinity},p=b.segmentDuration;goog.asserts.assert(null!=p,"Segment duration must not be null!");var q=b.startNumber,r=b.timescale,u=b.mediaTemplate,
|
|
1378
1380
|
v=a.bandwidth||null,t=a.representation.id,x=a.representation.baseUris,w=k-b.scaledPresentationTimeOffset,y=function(){var E=[Math.max(h.getSegmentAvailabilityStart(),k),Math.min(h.getSegmentAvailabilityEnd(),n())];goog.asserts.assert(E.every(isFinite),"Available presentation times must be finite!");goog.asserts.assert(E.every(function(F){return 0<=F}),"Available presentation times must be positive!");goog.asserts.assert(null!=p,"Segment duration must not be null!");E=E.map(function(F){return F-k});
|
|
1379
|
-
return[Math.ceil(E[0]/p),Math.ceil(E[1]/p)-1].map(function(F){return F+q})},z=y();a=a.dynamic?Math.max(z[0],z[1]-c+1):z[0];z=z[1];c=[];for(var A=function(E){goog.asserts.assert(null!=p,"Segment duration must not be null!");var F=(E-q)*p,I=F+b.scaledPresentationTimeOffset,H=F+k;F=H+p;var J=Math.min(F,n());goog.asserts.assert(H<J,"Generated a segment outside of the period!");H=new shaka.media.SegmentReference(H,J,function(){var
|
|
1381
|
+
return[Math.ceil(E[0]/p),Math.ceil(E[1]/p)-1].map(function(F){return F+q})},z=y();a=a.dynamic?Math.max(z[0],z[1]-c+1):z[0];z=z[1];c=[];for(var A=function(E){goog.asserts.assert(null!=p,"Segment duration must not be null!");var F=(E-q)*p,I=F+b.scaledPresentationTimeOffset,H=F+k;F=H+p;var J=Math.min(F,n());goog.asserts.assert(H<J,"Generated a segment outside of the period!");H=new shaka.media.SegmentReference(H,J,function(){var K=f.fillUriTemplate(u,t,E,v,I*r);return g.resolveUris(x,[K])},0,null,d,
|
|
1380
1382
|
w,k,n());H.trueEndTime=F;return H},C=a;C<=z;++C){var D=A(C);c.push(D)}var G=new shaka.media.SegmentIndex(c);c=h.getSegmentAvailabilityEnd()<n();C=h.isLive();if(c||C){var B=Math.max(a,z+1);G.updateEvery(p,function(){var E=h.getSegmentAvailabilityStart();G.evict(E);var F=$jscomp.makeIterator(y());F.next();F=F.next().value;for(var I=[];B<=F;){var H=A(B);I.push(H);B++}return E>n()&&!I.length?null:I})}return Promise.resolve(G)};
|
|
1381
1383
|
shaka.dash.SegmentTemplate.createFromTimeline_=function(a,b,c){var d=shaka.dash.MpdUtils,e=shaka.util.ManifestParserUtils,f=a.periodInfo.start,g=a.periodInfo.duration,h=f-b.scaledPresentationTimeOffset;g=g?f+g:Infinity;for(var k=[],l={},m=0;m<b.timeline.length;l={$jscomp$loop$prop$mediaTemplate$636:l.$jscomp$loop$prop$mediaTemplate$636,$jscomp$loop$prop$repId$637:l.$jscomp$loop$prop$repId$637,$jscomp$loop$prop$segmentReplacement$638:l.$jscomp$loop$prop$segmentReplacement$638,$jscomp$loop$prop$bandwidth$639:l.$jscomp$loop$prop$bandwidth$639,
|
|
1382
1384
|
$jscomp$loop$prop$timeReplacement$640:l.$jscomp$loop$prop$timeReplacement$640,$jscomp$loop$prop$baseUris$641:l.$jscomp$loop$prop$baseUris$641},m++){var n=b.timeline[m],p=n.start,q=n.unscaledStart;n=n.end;l.$jscomp$loop$prop$segmentReplacement$638=m+b.startNumber;l.$jscomp$loop$prop$timeReplacement$640=q+b.unscaledPresentationTimeOffset;l.$jscomp$loop$prop$repId$637=a.representation.id;l.$jscomp$loop$prop$bandwidth$639=a.bandwidth||null;l.$jscomp$loop$prop$mediaTemplate$636=b.mediaTemplate;l.$jscomp$loop$prop$baseUris$641=
|
|
@@ -1386,12 +1388,12 @@ shaka.dash.SegmentTemplate.createInitSegment_=function(a){var b=shaka.dash.MpdUt
|
|
|
1386
1388
|
[h])},0,null,a)};shaka.util.PeriodCombiner=function(){this.variants_=[];this.audioStreams_=[];this.videoStreams_=[];this.textStreams_=[];this.imageStreams_=[];this.usedPeriodIds_=new Set};
|
|
1387
1389
|
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()};
|
|
1388
1390
|
shaka.util.PeriodCombiner.prototype.getImageStreams=function(){return this.imageStreams_};
|
|
1389
|
-
shaka.util.PeriodCombiner.prototype.combinePeriods=function(a,b){var c=this,d,e,f,g,h,k,l,m,n,p,q,r,u,v,t,x,w,y,z,A,C,D,G,B,E,F,I,H,J,
|
|
1390
|
-
if(!b&&1==a.length){e=a[0];c.audioStreams_=e.audioStreams;c.videoStreams_=e.videoStreams;c.textStreams_=e.textStreams;c.imageStreams_=e.imageStreams;
|
|
1391
|
-
for(q=p.next();!q.done;q=p.next())r=q.value,r.push(shaka.util.PeriodCombiner.dummyStream_(d.TEXT));u=$jscomp.makeIterator(n);for(v=u.next();!v.done;v=u.next())t=v.value,t.push(shaka.util.PeriodCombiner.dummyStream_(d.IMAGE));return
|
|
1392
|
-
4);case 4:return
|
|
1393
|
-
I=F.next();!I.done;I=F.next())H=I.value,J=shaka.media.DrmEngine.getCommonDrmInfos(E.drmInfos,H.drmInfos),E.drmInfos.length&&H.drmInfos.length&&!J.length?shaka.log.warning("Incompatible DRM in audio & video, skipping variant creation.",E,H):(
|
|
1394
|
-
A=z.next();!A.done;A=z.next())C=A.value,D=x++,w.push({id:D,language:C.language,primary:C.primary,audio:C.type==d.AUDIO?C:null,video:C.type==d.VIDEO?C:null,bandwidth:C.bandwidth||0,drmInfos:C.drmInfos,allowedByApplication:!0,allowedByKeySystem:!0,decodingInfos:[]});c.variants_=w;
|
|
1391
|
+
shaka.util.PeriodCombiner.prototype.combinePeriods=function(a,b){var c=this,d,e,f,g,h,k,l,m,n,p,q,r,u,v,t,x,w,y,z,A,C,D,G,B,E,F,I,H,J,K;return $jscomp.asyncExecutePromiseGeneratorProgram(function(L){switch(L.nextAddress){case 1:d=shaka.util.ManifestParserUtils.ContentType;shaka.util.PeriodCombiner.filterOutAudioStreamDuplicates_(a);shaka.util.PeriodCombiner.filterOutVideoStreamDuplicates_(a);shaka.util.PeriodCombiner.filterOutTextStreamDuplicates_(a);shaka.util.PeriodCombiner.filterOutImageStreamDuplicates_(a);
|
|
1392
|
+
if(!b&&1==a.length){e=a[0];c.audioStreams_=e.audioStreams;c.videoStreams_=e.videoStreams;c.textStreams_=e.textStreams;c.imageStreams_=e.imageStreams;L.jumpTo(2);break}f=-1;for(g=0;g<a.length;g++)h=a[g],c.usedPeriodIds_.has(h.id)||(c.usedPeriodIds_.add(h.id),-1==f&&(f=g));if(-1==f)return L["return"]();k=a.map(function(M){return M.audioStreams});l=a.map(function(M){return M.videoStreams});m=a.map(function(M){return M.textStreams});n=a.map(function(M){return M.imageStreams});p=$jscomp.makeIterator(m);
|
|
1393
|
+
for(q=p.next();!q.done;q=p.next())r=q.value,r.push(shaka.util.PeriodCombiner.dummyStream_(d.TEXT));u=$jscomp.makeIterator(n);for(v=u.next();!v.done;v=u.next())t=v.value,t.push(shaka.util.PeriodCombiner.dummyStream_(d.IMAGE));return L.yield(shaka.util.PeriodCombiner.combine_(c.audioStreams_,k,f,shaka.util.PeriodCombiner.cloneStream_,shaka.util.PeriodCombiner.concatenateStreams_),3);case 3:return L.yield(shaka.util.PeriodCombiner.combine_(c.videoStreams_,l,f,shaka.util.PeriodCombiner.cloneStream_,shaka.util.PeriodCombiner.concatenateStreams_),
|
|
1394
|
+
4);case 4:return L.yield(shaka.util.PeriodCombiner.combine_(c.textStreams_,m,f,shaka.util.PeriodCombiner.cloneStream_,shaka.util.PeriodCombiner.concatenateStreams_),5);case 5:return L.yield(shaka.util.PeriodCombiner.combine_(c.imageStreams_,n,f,shaka.util.PeriodCombiner.cloneStream_,shaka.util.PeriodCombiner.concatenateStreams_),2);case 2:x=0;w=[];if(c.videoStreams_.length&&c.audioStreams_.length)for(G=$jscomp.makeIterator(c.audioStreams_),B=G.next();!B.done;B=G.next())for(E=B.value,F=$jscomp.makeIterator(c.videoStreams_),
|
|
1395
|
+
I=F.next();!I.done;I=F.next())H=I.value,J=shaka.media.DrmEngine.getCommonDrmInfos(E.drmInfos,H.drmInfos),E.drmInfos.length&&H.drmInfos.length&&!J.length?shaka.log.warning("Incompatible DRM in audio & video, skipping variant creation.",E,H):(K=x++,w.push({id:K,language:E.language,primary:E.primary,audio:E,video:H,bandwidth:(E.bandwidth||0)+(H.bandwidth||0),drmInfos:J,allowedByApplication:!0,allowedByKeySystem:!0,decodingInfos:[]}));else for(y=c.videoStreams_.concat(c.audioStreams_),z=$jscomp.makeIterator(y),
|
|
1396
|
+
A=z.next();!A.done;A=z.next())C=A.value,D=x++,w.push({id:D,language:C.language,primary:C.primary,audio:C.type==d.AUDIO?C:null,video:C.type==d.VIDEO?C:null,bandwidth:C.bandwidth||0,drmInfos:C.drmInfos,allowedByApplication:!0,allowedByKeySystem:!0,decodingInfos:[]});c.variants_=w;L.jumpToEnd()}})};
|
|
1395
1397
|
shaka.util.PeriodCombiner.filterOutAudioStreamDuplicates_=function(a){var b=shaka.util.ArrayUtils;a=$jscomp.makeIterator(a);for(var c=a.next();!c.done;c=a.next()){c=c.value;for(var d=[],e=$jscomp.makeIterator(c.audioStreams),f=e.next();!f.done;f=e.next()){f=f.value;for(var g=!1,h=$jscomp.makeIterator(d),k=h.next();!k.done;k=h.next())k=k.value,f.id!=k.id&&f.channelsCount==k.channelsCount&&f.language==k.language&&f.bandwidth==k.bandwidth&&f.label==k.label&&f.codecs==k.codecs&&f.mimeType==k.mimeType&&
|
|
1396
1398
|
b.hasSameElements(f.roles,k.roles)&&f.audioSamplingRate==k.audioSamplingRate&&f.primary==k.primary&&(g=!0);g||d.push(f)}c.audioStreams=d}};
|
|
1397
1399
|
shaka.util.PeriodCombiner.filterOutTextStreamDuplicates_=function(a){var b=shaka.util.ArrayUtils;a=$jscomp.makeIterator(a);for(var c=a.next();!c.done;c=a.next()){c=c.value;for(var d=[],e=$jscomp.makeIterator(c.textStreams),f=e.next();!f.done;f=e.next()){f=f.value;for(var g=!1,h=$jscomp.makeIterator(d),k=h.next();!k.done;k=h.next())k=k.value,f.id!=k.id&&f.language==k.language&&f.label==k.label&&f.codecs==k.codecs&&f.mimeType==k.mimeType&&f.bandwidth==k.bandwidth&&b.hasSameElements(f.roles,k.roles)&&
|
|
@@ -1445,13 +1447,13 @@ shaka.dash.DashParser.prototype.requestManifest_=function(){var a=this,b,c,d,e,f
|
|
|
1445
1447
|
m.yield(g.promise,2);if(3!=m.nextAddress){h=m.yieldResult;if(!a.playerInterface_)return m["return"](0);h.uri&&!a.manifestUris_.includes(h.uri)&&a.manifestUris_.unshift(h.uri);return m.yield(a.parseManifest_(h.data,h.uri),3)}k=Date.now();l=(k-f)/1E3;a.averageUpdateDuration_.sample(1,l);return m["return"](l)})};
|
|
1446
1448
|
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,
|
|
1447
1449
|
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))})};
|
|
1448
|
-
shaka.dash.DashParser.prototype.processManifest_=function(a,b){var c=this,d,e,f,g,h,k,l,m,n,p,q,r,u,v,t,x,w,y,z,A,C,D,G,B,E,F,I,H,J,L,
|
|
1450
|
+
shaka.dash.DashParser.prototype.processManifest_=function(a,b){var c=this,d,e,f,g,h,k,l,m,n,p,q,r,u,v,t,x,w,y,z,A,C,D,G,B,E,F,I,H,J,K,L,M,P,R,S;return $jscomp.asyncExecutePromiseGeneratorProgram(function(N){switch(N.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_=k);l=e.findChildren(a,
|
|
1449
1451
|
"BaseURL");m=l.map(e.getContents);n=shaka.util.ManifestParserUtils.resolveUris(g,m);p=0;l&&l.length&&(p=e.parseAttr(l[0],"availabilityTimeOffset",e.parseFloat)||0);q=c.config_.dash.ignoreMinBufferTime;r=0;q||(r=e.parseAttr(a,"minBufferTime",e.parseDuration)||0);c.updatePeriod_=e.parseAttr(a,"minimumUpdatePeriod",e.parseDuration,-1);u=e.parseAttr(a,"availabilityStartTime",e.parseDate);v=e.parseAttr(a,"timeShiftBufferDepth",e.parseDuration);t=c.config_.dash.ignoreSuggestedPresentationDelay;x=null;t||
|
|
1450
1452
|
(x=e.parseAttr(a,"suggestedPresentationDelay",e.parseDuration));w=c.config_.dash.ignoreMaxSegmentDuration;y=null;w||(y=e.parseAttr(a,"maxSegmentDuration",e.parseDuration));z=a.getAttribute("type")||"static";if(c.manifest_)for(A=c.manifest_.presentationTimeline,C=$jscomp.makeIterator(Object.values(c.streamMap_)),D=C.next();!D.done;D=C.next())G=D.value,G.segmentIndex&&G.segmentIndex.evict(A.getSegmentAvailabilityStart());else B=c.config_.defaultPresentationDelay||1.5*r,E=null!=x?x:B,A=new shaka.media.PresentationTimeline(u,
|
|
1451
|
-
E,c.config_.dash.autoCorrectDrift);A.setStatic("static"==z);(F=A.isLive())&&!isNaN(c.config_.availabilityWindowOverride)&&(v=c.config_.availabilityWindowOverride);null==v&&(v=Infinity);A.setSegmentAvailabilityDuration(v);I=a.getAttribute("profiles")||"";H={dynamic:"static"!=z,presentationTimeline:A,period:null,periodInfo:null,adaptationSet:null,representation:null,bandwidth:0,indexRangeWarningGiven:!1,availabilityTimeOffset:p,profiles:I.split(",")};J=c.parsePeriods_(H,n,a);
|
|
1452
|
-
"static"!=z&&J.durationDerivedFromPeriods||A.setDuration(
|
|
1453
|
-
A.notifyMaxSegmentDuration(y||1);goog.DEBUG&&A.assertIsValid();return N.yield(c.periodCombiner_.combinePeriods(
|
|
1454
|
-
imageStreams:c.periodCombiner_.getImageStreams(),offlineSessionIds:[],minBufferTime:r||0,sequenceMode:!1};if(!A.usingPresentationStartTime()){N.jumpTo(4);break}P=shaka.util.XmlUtils;
|
|
1453
|
+
E,c.config_.dash.autoCorrectDrift);A.setStatic("static"==z);(F=A.isLive())&&!isNaN(c.config_.availabilityWindowOverride)&&(v=c.config_.availabilityWindowOverride);null==v&&(v=Infinity);A.setSegmentAvailabilityDuration(v);I=a.getAttribute("profiles")||"";H={dynamic:"static"!=z,presentationTimeline:A,period:null,periodInfo:null,adaptationSet:null,representation:null,bandwidth:0,indexRangeWarningGiven:!1,availabilityTimeOffset:p,profiles:I.split(",")};J=c.parsePeriods_(H,n,a);K=J.duration;L=J.periods;
|
|
1454
|
+
"static"!=z&&J.durationDerivedFromPeriods||A.setDuration(K||Infinity);c.minTotalAvailabilityTimeOffset_&&!c.lowLatencyMode_&&(M=c.playerInterface_.isAutoLowLatencyMode())&&(c.playerInterface_.enableLowLatencyMode(),c.lowLatencyMode_=c.playerInterface_.isLowLatencyMode());c.lowLatencyMode_?A.setAvailabilityTimeOffset(c.minTotalAvailabilityTimeOffset_):c.minTotalAvailabilityTimeOffset_&&shaka.log.alwaysWarn("Low-latency DASH 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.");
|
|
1455
|
+
A.notifyMaxSegmentDuration(y||1);goog.DEBUG&&A.assertIsValid();return N.yield(c.periodCombiner_.combinePeriods(L,H.dynamic),2);case 2:if(c.manifest_){c.manifest_.variants=c.periodCombiner_.getVariants();c.manifest_.textStreams=c.periodCombiner_.getTextStreams();c.manifest_.imageStreams=c.periodCombiner_.getImageStreams();c.playerInterface_.filter(c.manifest_);N.jumpTo(3);break}c.manifest_={presentationTimeline:A,variants:c.periodCombiner_.getVariants(),textStreams:c.periodCombiner_.getTextStreams(),
|
|
1456
|
+
imageStreams:c.periodCombiner_.getImageStreams(),offlineSessionIds:[],minBufferTime:r||0,sequenceMode:!1};if(!A.usingPresentationStartTime()){N.jumpTo(4);break}P=shaka.util.XmlUtils;R=P.findChildren(a,"UTCTiming");return N.yield(c.parseUtcTiming_(n,R),5);case 5:S=N.yieldResult;if(!c.playerInterface_)return N["return"]();A.setClockOffset(S);case 4:A.lockStartTime();case 3:c.playerInterface_.makeTextStreamsForClosedCaptions(c.manifest_),N.jumpToEnd()}})};
|
|
1455
1457
|
shaka.dash.DashParser.prototype.parsePeriods_=function(a,b,c){var d=shaka.util.XmlUtils,e=d.parseAttr(c,"mediaPresentationDuration",d.parseDuration),f=[],g=0;c=d.findChildren(c,"Period");for(var h=0;h<c.length;h++){var k=c[h],l=c[h+1],m=d.parseAttr(k,"start",d.parseDuration,g),n=k.id,p=d.parseAttr(k,"duration",d.parseDuration),q=null;if(l){var r=d.parseAttr(l,"start",d.parseDuration);null!=r&&(q=r-m)}else null!=e&&(q=e-m);r=shaka.util.ManifestParserUtils.GAP_OVERLAP_TOLERANCE_SECONDS;q&&p&&Math.abs(q-
|
|
1456
1458
|
p)>r&&shaka.log.warning("There is a gap/overlap between Periods",k);null==q&&(q=p);if(null!==this.largestPeriodStartTime_&&null!==n&&null!==m&&m<this.largestPeriodStartTime_&&!this.lastManifestUpdatePeriodIds_.includes(n)&&h+1!=c.length)shaka.log.debug("Skipping Period with ID "+n+" as its start time is smaller than the largest period start time that has been seen, and ID is unseen before");else{null!==m&&(null===this.largestPeriodStartTime_||m>this.largestPeriodStartTime_)&&(this.largestPeriodStartTime_=
|
|
1457
1459
|
m);g=this.parsePeriod_(a,b,{start:m,duration:q,node:k,isLastPeriod:null==q||!l});f.push(g);a.period.id&&q&&(this.periodDurations_[a.period.id]=q);if(null==q){l&&shaka.log.warning("Skipping Period",h+1,"and any subsequent Periods:","Period",h+1,"does not have a valid start time.",l);g=null;break}g=m+q}}this.lastManifestUpdatePeriodIds_=f.map(function(u){return u.id});return null!=e?(g!=e&&shaka.log.warning("@mediaPresentationDuration does not match the total duration of ","all Periods."),{periods:f,
|
|
@@ -1514,7 +1516,7 @@ shaka.hls.ManifestTextParser.parseTag=function(a,b){var c=b.match(/^#(EXT[^:]*)(
|
|
|
1514
1516
|
d,c,f)};shaka.hls.ManifestTextParser.MEDIA_PLAYLIST_TAGS="EXT-X-TARGETDURATION EXT-X-MEDIA-SEQUENCE EXT-X-DISCONTINUITY-SEQUENCE EXT-X-PLAYLIST-TYPE EXT-X-I-FRAMES-ONLY EXT-X-ENDLIST EXT-X-SERVER-CONTROL EXT-X-SKIP".split(" ");shaka.hls.ManifestTextParser.SEGMENT_TAGS="EXTINF EXT-X-BYTERANGE EXT-X-DISCONTINUITY EXT-X-PROGRAM-DATE-TIME EXT-X-KEY EXT-X-DATERANGE EXT-X-MAP".split(" ");shaka.net.DataUriPlugin=function(){};shaka.net.DataUriPlugin.parse=function(a,b,c,d){try{var e=shaka.net.DataUriPlugin.parseRaw(a);return shaka.util.AbortableOperation.completed({uri:a,originalUri:a,data:e.data,headers:{"content-type":e.contentType}})}catch(f){return shaka.util.AbortableOperation.failed(f)}};
|
|
1515
1517
|
shaka.net.DataUriPlugin.parseRaw=function(a){var b=a.split(":");if(2>b.length||"data"!=b[0])throw shaka.log.error("Bad data URI, failed to parse scheme"),new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.NETWORK,shaka.util.Error.Code.MALFORMED_DATA_URI,a);b=b.slice(1).join(":").split(",");if(2>b.length)throw shaka.log.error("Bad data URI, failed to extract encoding and MIME type"),new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.NETWORK,
|
|
1516
1518
|
shaka.util.Error.Code.MALFORMED_DATA_URI,a);var c=b[0];a=window.decodeURIComponent(b.slice(1).join(","));b=c.split(";");c=b[0];var d=!1;1<b.length&&"base64"==b[b.length-1]&&(d=!0,b.pop());return{data:d?shaka.util.Uint8ArrayUtils.fromBase64(a):shaka.util.StringUtils.toUTF8(a),contentType:c}};goog.exportSymbol("shaka.net.DataUriPlugin",shaka.net.DataUriPlugin);goog.exportProperty(shaka.net.DataUriPlugin,"parse",shaka.net.DataUriPlugin.parse);shaka.net.NetworkingEngine.registerScheme("data",shaka.net.DataUriPlugin.parse);shaka.hls.HlsParser=function(){var a=this;this.config_=this.playerInterface_=null;this.globalId_=1;this.globalVariables_=new Map;this.groupIdToStreamInfosMap_=new Map;this.variantUriSet_=new Set;this.uriToStreamInfosMap_=new Map;this.presentationTimeline_=null;this.masterPlaylistUri_="";this.manifestTextParser_=new shaka.hls.ManifestTextParser;this.updatePlaylistDelay_=0;this.streamsSynced_=!1;this.minSequenceNumber_=null;this.updatePlaylistTimer_=new shaka.util.Timer(function(){a.onUpdate_()});this.presentationType_=
|
|
1517
|
-
shaka.hls.HlsParser.PresentationType_.VOD;this.manifest_=null;this.maxTargetDuration_=0;this.minTargetDuration_=Infinity;this.lowLatencyPresentationDelay_=this.partialTargetDuration_=0;this.operationManager_=new shaka.util.OperationManager;this.segmentsToNotifyByStream_=[];this.groupIdToClosedCaptionsMap_=new Map;this.
|
|
1519
|
+
shaka.hls.HlsParser.PresentationType_.VOD;this.manifest_=null;this.maxTargetDuration_=0;this.minTargetDuration_=Infinity;this.lowLatencyPresentationDelay_=this.partialTargetDuration_=0;this.operationManager_=new shaka.util.OperationManager;this.segmentsToNotifyByStream_=[];this.groupIdToClosedCaptionsMap_=new Map;this.groupIdToCodecsMap_=new Map;this.mapTagToInitSegmentRefMap_=new Map;this.lowLatencyMode_=!1};shaka.hls.HlsParser.prototype.configure=function(a){this.config_=a};
|
|
1518
1520
|
shaka.hls.HlsParser.prototype.start=function(a,b){var c=this,d,e;return $jscomp.asyncExecutePromiseGeneratorProgram(function(f){if(1==f.nextAddress)return goog.asserts.assert(c.config_,"Must call configure() before start()!"),c.playerInterface_=b,c.lowLatencyMode_=b.isLowLatencyMode(),f.yield(c.requestManifest_(a),2);if(3!=f.nextAddress)return d=f.yieldResult,c.masterPlaylistUri_=d.uri,goog.asserts.assert(d.data,"Response data should be non-null!"),f.yield(c.parseManifest_(d.data,a),3);e=c.updatePlaylistDelay_;
|
|
1519
1521
|
0<e&&c.updatePlaylistTimer_.tickAfter(e);goog.asserts.assert(c.manifest_,"Manifest should be non-null");return f["return"](c.manifest_)})};
|
|
1520
1522
|
shaka.hls.HlsParser.prototype.stop=function(){this.updatePlaylistTimer_&&(this.updatePlaylistTimer_.stop(),this.updatePlaylistTimer_=null);var a=[];this.operationManager_&&(a.push(this.operationManager_.destroy()),this.operationManager_=null);this.config_=this.playerInterface_=null;this.variantUriSet_.clear();this.manifest_=null;this.uriToStreamInfosMap_.clear();this.groupIdToStreamInfosMap_.clear();this.groupIdToCodecsMap_.clear();this.globalVariables_.clear();return Promise.all(a)};
|
|
@@ -1528,30 +1530,27 @@ this.streamsSynced_=!0}}};
|
|
|
1528
1530
|
shaka.hls.HlsParser.prototype.syncStreamsWithProgramDateTime_=function(){if(!this.streamsSynced_){for(var a=Infinity,b=$jscomp.makeIterator(this.uriToStreamInfosMap_.values()),c=b.next();!c.done;c=b.next())if(c=c.value.stream.segmentIndex)c=c.earliestReference(),null!=c&&null!=c.syncTime&&(a=Math.min(a,c.syncTime));if(Infinity!=a){shaka.log.debug("Syncing HLS streams against base time:",a);b=$jscomp.makeIterator(this.uriToStreamInfosMap_.values());for(c=b.next();!c.done;c=b.next()){c=c.value;var d=
|
|
1529
1531
|
c.stream.segmentIndex;null!=d&&(d=d.earliestReference(),null==d.syncTime?shaka.log.alwaysError("Missing EXT-X-PROGRAM-DATE-TIME for stream",c.verbatimMediaPlaylistUri,"Expect AV sync issues!"):this.offsetStream_(c,d.syncTime-a-d.startTime))}this.streamsSynced_=!0}}};
|
|
1530
1532
|
shaka.hls.HlsParser.prototype.offsetStream_=function(a,b){a.stream.segmentIndex.offset(b);a.maxTimestamp+=b;goog.asserts.assert(0<=a.maxTimestamp,"Negative maxTimestamp after adjustment!");for(var c=$jscomp.makeIterator(a.mediaSequenceToStartTime),d=c.next();!d.done;d=c.next()){var e=$jscomp.makeIterator(d.value);d=e.next().value;e=e.next().value;a.mediaSequenceToStartTime.set(d,e+b)}shaka.log.debug("Offset",b,"applied to",a.verbatimMediaPlaylistUri)};
|
|
1531
|
-
shaka.hls.HlsParser.prototype.parseManifest_=function(a,b){var c=this,d,e,f,g,h,k,l,m,n,p,q,r,u,v,t,x,w,y,z,A,C,D,G,B,E,F,I,H,J,L,
|
|
1533
|
+
shaka.hls.HlsParser.prototype.parseManifest_=function(a,b){var c=this,d,e,f,g,h,k,l,m,n,p,q,r,u,v,t,x,w,y,z,A,C,D,G,B,E,F,I,H,J,K,L,M,P,R,S,N,U,V,Q,W,T,Y;return $jscomp.asyncExecutePromiseGeneratorProgram(function(O){switch(O.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,c.masterPlaylistUri_);f=d.filterTagsByName(e.tags,"EXT-X-DEFINE");c.parseMasterVariables_(f);
|
|
1532
1534
|
g=[];h=[];k=[];if(e.type==shaka.hls.PlaylistType.MEDIA)return A=c.config_.hls.mediaPlaylistFullMimeType,C=shaka.util.MimeUtils.getBasicType(A),D=C.split("/")[0],G=shaka.util.MimeUtils.getCodecs(A),B=new Map,O.yield(c.convertParsedPlaylistIntoStreamInfo_(e,b,b,G,D,"",!0,"Media Playlist",null,B,null,!1,!1,C),8);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");c.parseCodecs_(m);p=d.filterTagsByName(e.tags,
|
|
1533
1535
|
"EXT-X-SESSION-DATA");q=$jscomp.makeIterator(p);for(r=q.next();!r.done;r=q.next())if(u=r.value,v=u.getAttributeValue("DATA-ID"),t=u.getAttributeValue("URI"),x=u.getAttributeValue("LANGUAGE"),w=u.getAttributeValue("VALUE"),y=(new Map).set("id",v),t&&y.set("uri",shaka.hls.Utils.constructAbsoluteUri(c.masterPlaylistUri_,t)),x&&y.set("language",x),w&&y.set("value",w),z=new shaka.util.FakeEvent("sessiondata",y),c.playerInterface_)c.playerInterface_.onEvent(z);return O.yield(c.createStreamInfosFromMediaTags_(l),
|
|
1534
|
-
4);case 4:return c.parseClosedCaptions_(l),O.yield(c.createVariantsForTags_(m),5);case 5:return g=O.yieldResult,O.yield(c.parseTexts_(l),6);case 6:return h=O.yieldResult,O.yield(c.parseImages_(n),7);case 7:k=O.yieldResult;O.jumpTo(3);break;case 8:E=O.yieldResult,
|
|
1535
|
-
|
|
1536
|
-
shaka.
|
|
1537
|
-
c.
|
|
1538
|
-
|
|
1539
|
-
"We should not be using the presentation start time in HLS!");c.manifest_={presentationTimeline:c.presentationTimeline_,variants:g,textStreams:h,imageStreams:k,offlineSessionIds:[],minBufferTime:0,sequenceMode:!0};c.playerInterface_.makeTextStreamsForClosedCaptions(c.manifest_);O.jumpToEnd()}})};
|
|
1536
|
+
4);case 4:return c.parseClosedCaptions_(l),O.yield(c.createVariantsForTags_(m),5);case 5:return g=O.yieldResult,O.yield(c.parseTexts_(l),6);case 6:return h=O.yieldResult,O.yield(c.parseImages_(n),7);case 7:k=O.yieldResult;O.jumpTo(3);break;case 8:E=O.yieldResult,c.uriToStreamInfosMap_.set(b,E),g.push({id:0,language:"und",disabledUntilTime:0,primary:!0,audio:"audio"==D?E.stream:null,video:"video"==D?E.stream:null,bandwidth:0,allowedByApplication:!0,allowedByKeySystem:!0,decodingInfos:[]});case 3:if(!c.playerInterface_)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,
|
|
1537
|
+
shaka.util.Error.Category.PLAYER,shaka.util.Error.Code.OPERATION_ABORTED);c.config_.hls.ignoreManifestProgramDateTime?c.syncStreamsWithSequenceNumber_():c.syncStreamsWithProgramDateTime_();F=Infinity;I=$jscomp.makeIterator(c.uriToStreamInfosMap_.values());for(H=I.next();!H.done;H=I.next())J=H.value,"text"!=J.stream.type&&(F=Math.min(F,J.maxTimestamp));goog.asserts.assert(null==c.presentationTimeline_,"Presentation timeline created early!");c.createPresentationTimeline_();goog.asserts.assert(c.presentationTimeline_,
|
|
1538
|
+
"Presentation timeline not created!");if(c.isLive_())c.updatePlaylistDelay_=c.minTargetDuration_,K=shaka.hls.HlsParser.PresentationType_,c.presentationType_==K.LIVE&&(L=c.presentationTimeline_.getDelay(),isNaN(c.config_.availabilityWindowOverride)||(L=c.config_.availabilityWindowOverride),c.presentationTimeline_.setSegmentAvailabilityDuration(L));else for(c.presentationTimeline_.setDuration(F),M=$jscomp.makeIterator(c.uriToStreamInfosMap_.values()),H=M.next();!H.done;H=M.next())P=H.value,P.stream.segmentIndex.fit(0,
|
|
1539
|
+
F);c.segmentsToNotifyByStream_=[];R=[];S=$jscomp.makeIterator(g);for(N=S.next();!N.done;N=S.next())for(U=N.value,V=$jscomp.makeIterator([U.video,U.audio]),Q=V.next();!Q.done;Q=V.next())(W=Q.value)&&R.push(W);return O.yield(Promise.all(R.map(function(Z){return $jscomp.asyncExecutePromiseGeneratorProgram(function(aa){return aa.yield(Z.createSegmentIndex(),0)})})),9);case 9:T=$jscomp.makeIterator(R);for(Q=T.next();!Q.done;Q=T.next())Y=Q.value,c.segmentsToNotifyByStream_.push(Y.segmentIndex.references);
|
|
1540
|
+
c.notifySegments_();c.presentationTimeline_.lockStartTime();goog.asserts.assert(!c.presentationTimeline_.usingPresentationStartTime(),"We should not be using the presentation start time in HLS!");c.manifest_={presentationTimeline:c.presentationTimeline_,variants:g,textStreams:h,imageStreams:k,offlineSessionIds:[],minBufferTime:0,sequenceMode:!0};c.playerInterface_.makeTextStreamsForClosedCaptions(c.manifest_);O.jumpToEnd()}})};
|
|
1540
1541
|
shaka.hls.HlsParser.prototype.parseMasterVariables_=function(a){a=$jscomp.makeIterator(a);for(var b=a.next();!b.done;b=a.next()){var c=b.value;b=c.getAttributeValue("NAME");c=c.getAttributeValue("VALUE");b&&c&&(this.globalVariables_.has(b)||this.globalVariables_.set(b,c))}};
|
|
1541
1542
|
shaka.hls.HlsParser.prototype.parseMediaVariables_=function(a){var b=new Map;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("IMPORT");c&&e&&b.set(c,e);d&&(c=this.globalVariables_.get(d))&&b.set(d,c)}return b};
|
|
1542
1543
|
shaka.hls.HlsParser.prototype.parseCodecs_=function(a){var b=shaka.util.ManifestParserUtils.ContentType;a=$jscomp.makeIterator(a);for(var c=a.next();!c.done;c=a.next()){var d=c.value,e=d.getAttributeValue("AUDIO");c=d.getAttributeValue("VIDEO");var f=d.getAttributeValue("SUBTITLES");d=this.getCodecsForVariantTag_(d);if(f){var g=shaka.util.ManifestParserUtils.guessCodecsSafe(b.TEXT,d);goog.asserts.assert(null!=g,"Text codecs should be valid.");this.groupIdToCodecsMap_.set(f,g);shaka.util.ArrayUtils.remove(d,
|
|
1543
1544
|
g)}e&&(f=shaka.util.ManifestParserUtils.guessCodecs(b.AUDIO,d),this.groupIdToCodecsMap_.set(e,f));c&&(e=shaka.util.ManifestParserUtils.guessCodecs(b.VIDEO,d),this.groupIdToCodecsMap_.set(c,e))}};
|
|
1544
1545
|
shaka.hls.HlsParser.prototype.parseTexts_=function(a){var b=this,c,d,e,f,g,h,k,l,m,n,p,q;return $jscomp.asyncExecutePromiseGeneratorProgram(function(r){if(1==r.nextAddress)return c=shaka.hls.Utils.filterTagsByType(a,"SUBTITLES"),d=c.map(function(u){var v,t,x;return $jscomp.asyncExecutePromiseGeneratorProgram(function(w){if(1==w.nextAddress){if(v=b.config_.disableText)return w["return"](null);w.setCatchFinallyBlocks(2);return w.yield(b.createStreamInfoFromMediaTag_(u),4)}if(2!=w.nextAddress)return t=
|
|
1545
|
-
w.yieldResult,
|
|
1546
|
-
|
|
1547
|
-
shaka.hls.HlsParser.prototype.
|
|
1548
|
-
|
|
1549
|
-
|
|
1550
|
-
shaka.hls.HlsParser.prototype.createVariantsForTags_=function(a){var b=this,c,d,e;return $jscomp.asyncExecutePromiseGeneratorProgram(function(f){if(1==f.nextAddress)return c=a.map(function(g){var h,k,l,m,n,p,q,r;return $jscomp.asyncExecutePromiseGeneratorProgram(function(u){return 1==u.nextAddress?(h=g.getAttributeValue("FRAME-RATE"),k=Number(g.getAttributeValue("AVERAGE-BANDWIDTH"))||Number(g.getRequiredAttrValue("BANDWIDTH")),l=g.getAttributeValue("RESOLUTION"),m=$jscomp.makeIterator(l?l.split("x"):
|
|
1551
|
-
[null,null]),n=m.next().value,p=m.next().value,q=g.getAttributeValue("VIDEO-RANGE"),u.yield(b.createStreamInfosForVariantTag_(g,l,h),2)):(r=u.yieldResult)?(goog.asserts.assert(r.audio.length||r.video.length,"We should have created a stream!"),u["return"](b.createVariants_(r.audio,r.video,k,n,p,h,q))):u["return"]([])})}),f.yield(Promise.all(c),2);d=f.yieldResult;e=d.reduce(shaka.util.Functional.collapseArrays,[]);e=e.filter(function(g){return null!=g});return f["return"](e)})};
|
|
1546
|
+
w.yieldResult,w["return"](t.stream);x=w.enterCatchBlock();if(b.config_.hls.ignoreTextStreamFailures)return w["return"](null);throw x;})}),r.yield(Promise.all(d),2);e=r.yieldResult;f=$jscomp.makeIterator(c);for(g=f.next();!g.done;g=f.next())if(h=g.value,k=h.getRequiredAttrValue("GROUP-ID"),l=b.groupIdToCodecsMap_.get(k))if(m=b.groupIdToStreamInfosMap_.get(k))for(n=$jscomp.makeIterator(m),p=n.next();!p.done;p=n.next())q=p.value,q.stream.codecs=l;return r["return"](e.filter(function(u){return u}))})};
|
|
1547
|
+
shaka.hls.HlsParser.prototype.parseImages_=function(a){var b=this,c,d;return $jscomp.asyncExecutePromiseGeneratorProgram(function(e){if(1==e.nextAddress)return c=a.map(function(f){var g,h,k;return $jscomp.asyncExecutePromiseGeneratorProgram(function(l){if(1==l.nextAddress){if(g=b.config_.disableThumbnails)return l["return"](null);l.setCatchFinallyBlocks(2);return l.yield(b.createStreamInfoFromImageTag_(f),4)}if(2!=l.nextAddress)return h=l.yieldResult,l["return"](h.stream);k=l.enterCatchBlock();if(b.config_.hls.ignoreImageStreamFailures)return l["return"](null);
|
|
1548
|
+
throw k;})}),e.yield(Promise.all(c),2);d=e.yieldResult;return e["return"](d.filter(function(f){return f}))})};shaka.hls.HlsParser.prototype.createStreamInfosFromMediaTags_=function(a){var b=this,c;return $jscomp.asyncExecutePromiseGeneratorProgram(function(d){a=a.filter(function(e){var f=e.getAttributeValue("URI")||"";return"SUBTITLES"!=e.getAttributeValue("TYPE")&&""!=f});c=a.map(function(e){return b.createStreamInfoFromMediaTag_(e)});return d.yield(Promise.all(c),0)})};
|
|
1549
|
+
shaka.hls.HlsParser.prototype.createVariantsForTags_=function(a){var b=this,c,d,e;return $jscomp.asyncExecutePromiseGeneratorProgram(function(f){if(1==f.nextAddress)return c=a.map(function(g){var h,k,l,m,n,p,q,r;return $jscomp.asyncExecutePromiseGeneratorProgram(function(u){if(1==u.nextAddress)return h=g.getAttributeValue("FRAME-RATE"),k=Number(g.getAttributeValue("AVERAGE-BANDWIDTH"))||Number(g.getRequiredAttrValue("BANDWIDTH")),l=g.getAttributeValue("RESOLUTION"),m=$jscomp.makeIterator(l?l.split("x"):
|
|
1550
|
+
[null,null]),n=m.next().value,p=m.next().value,q=g.getAttributeValue("VIDEO-RANGE"),u.yield(b.createStreamInfosForVariantTag_(g,l,h),2);r=u.yieldResult;goog.asserts.assert(r.audio.length||r.video.length,"We should have created a stream!");return u["return"](b.createVariants_(r.audio,r.video,k,n,p,h,q))})}),f.yield(Promise.all(c),2);d=f.yieldResult;e=d.reduce(shaka.util.Functional.collapseArrays,[]);e=e.filter(function(g){return null!=g});return f["return"](e)})};
|
|
1552
1551
|
shaka.hls.HlsParser.prototype.createStreamInfosForVariantTag_=function(a,b,c){var d=this,e,f,g,h,k,l,m,n,p,q,r,u,v,t;return $jscomp.asyncExecutePromiseGeneratorProgram(function(x){if(1==x.nextAddress)return e=shaka.util.ManifestParserUtils.ContentType,f=d.getCodecsForVariantTag_(a),g=a.getAttributeValue("AUDIO"),h=a.getAttributeValue("VIDEO"),goog.asserts.assert(null==g||null==h,"Unexpected: both video and audio described by media tags!"),l=(k=g||h)&&d.groupIdToStreamInfosMap_.has(k)?d.groupIdToStreamInfosMap_.get(k):
|
|
1553
1552
|
[],m={audio:g?l:[],video:h?l:[]},shaka.log.debug("Guessing stream type for",a.toString()),p=!1,q=a.getRequiredAttrValue("URI"),r=m.audio.find(function(w){return w&&w.verbatimMediaPlaylistUri==q}),u=shaka.util.ManifestParserUtils.guessCodecsSafe(e.VIDEO,f),(v=shaka.util.ManifestParserUtils.guessCodecsSafe(e.AUDIO,f))&&!u?(n=e.AUDIO,shaka.log.debug("Guessing audio-only.")):!l.length&&v&&u?(shaka.log.debug("Guessing multiplexed audio+video."),n=e.VIDEO,f=[[u,v].join()]):m.audio.length&&r?(shaka.log.debug("Guessing audio-only."),
|
|
1554
|
-
n=e.AUDIO,p=!0):m.video.length?(shaka.log.debug("Guessing audio-only."),n=e.AUDIO):(shaka.log.debug("Guessing video-only."),n=e.VIDEO),p?x.jumpTo(2):x.yield(d.createStreamInfoFromVariantTag_(a,f,n),3);2!=x.nextAddress&&(t=x.yieldResult
|
|
1553
|
+
n=e.AUDIO,p=!0):m.video.length?(shaka.log.debug("Guessing audio-only."),n=e.AUDIO):(shaka.log.debug("Guessing video-only."),n=e.VIDEO),p?x.jumpTo(2):x.yield(d.createStreamInfoFromVariantTag_(a,f,n),3);2!=x.nextAddress&&(t=x.yieldResult,m[t.stream.type]=[t]);d.filterLegacyCodecs_(m);return x["return"](m)})};
|
|
1555
1554
|
shaka.hls.HlsParser.prototype.getCodecsForVariantTag_=function(a){var b=[];this.config_.disableVideo||b.push(this.config_.hls.defaultVideoCodec);this.config_.disableAudio||b.push(this.config_.hls.defaultAudioCodec);b=b.join(",");var c=a.getAttributeValue("CODECS",b).split(/\s*,\s*/);a=new Set;b=[];c=$jscomp.makeIterator(c);for(var d=c.next();!d.done;d=c.next()){d=d.value;var e=shaka.util.MimeUtils.getCodecBase(d);a.has(e)?shaka.log.debug("Ignoring duplicate codec"):(b.push(d),a.add(e))}return b};
|
|
1556
1555
|
shaka.hls.HlsParser.prototype.getChannelsCount_=function(a){a=a.getAttributeValue("CHANNELS");if(!a)return null;a=a.split("/")[0];return parseInt(a,10)};shaka.hls.HlsParser.prototype.isSpatialAudio_=function(a){return(a=a.getAttributeValue("CHANNELS"))?a.includes("/JOC"):!1};
|
|
1557
1556
|
shaka.hls.HlsParser.prototype.getClosedCaptions_=function(a,b){var c=shaka.util.ManifestParserUtils.ContentType,d=a.getAttributeValue("CLOSED-CAPTIONS");return b==c.VIDEO&&d&&"NONE"!=d?this.groupIdToClosedCaptionsMap_.get(d):null};shaka.hls.HlsParser.prototype.getLanguage_=function(a){var b=shaka.util.LanguageUtils;a=a.getAttributeValue("LANGUAGE")||"und";return b.normalize(a)};
|
|
@@ -1563,19 +1562,19 @@ shaka.hls.HlsParser.prototype.parseClosedCaptions_=function(a){a=shaka.hls.Utils
|
|
|
1563
1562
|
b)}};
|
|
1564
1563
|
shaka.hls.HlsParser.prototype.createStreamInfoFromMediaTag_=function(a){var b=this,c,d,e,f,g,h,k,l,m,n,p,q,r,u;return $jscomp.asyncExecutePromiseGeneratorProgram(function(v){if(1==v.nextAddress){goog.asserts.assert("EXT-X-MEDIA"==a.name,"Should only be called on media tags!");c=a.getRequiredAttrValue("GROUP-ID");d="";e=b.getType_(a);e!=shaka.util.ManifestParserUtils.ContentType.TEXT&&c&&b.groupIdToCodecsMap_.has(c)&&(d=b.groupIdToCodecsMap_.get(c));f=b.variableSubstitution_(a.getRequiredAttrValue("URI"),b.globalVariables_);
|
|
1565
1564
|
if(b.uriToStreamInfosMap_.has(f))return v["return"](b.uriToStreamInfosMap_.get(f));g=b.getLanguage_(a);h=a.getAttributeValue("NAME");k=a.getAttributeValue("DEFAULT");l="YES"==k;m="audio"==e?b.getChannelsCount_(a):null;n="audio"==e?b.isSpatialAudio_(a):!1;p=a.getAttributeValue("CHARACTERISTICS");q=a.getAttributeValue("FORCED");r="YES"==q;return v.yield(b.createStreamInfo_(f,d,e,g,l,h,m,null,p,r,n),2)}u=v.yieldResult;b.groupIdToStreamInfosMap_.has(c)?b.groupIdToStreamInfosMap_.get(c).push(u):b.groupIdToStreamInfosMap_.set(c,
|
|
1566
|
-
[u]);if(
|
|
1565
|
+
[u]);if(b.uriToStreamInfosMap_.has(f))return v["return"](b.uriToStreamInfosMap_.get(f));b.uriToStreamInfosMap_.set(f,u);return v["return"](u)})};
|
|
1567
1566
|
shaka.hls.HlsParser.prototype.createStreamInfoFromImageTag_=function(a){var b=this,c,d,e,f,g,h,k,l,m,n,p;return $jscomp.asyncExecutePromiseGeneratorProgram(function(q){if(1==q.nextAddress){goog.asserts.assert("EXT-X-IMAGE-STREAM-INF"==a.name,"Should only be called on image tags!");c=shaka.util.ManifestParserUtils.ContentType.IMAGE;d=b.variableSubstitution_(a.getRequiredAttrValue("URI"),b.globalVariables_);e=a.getAttributeValue("CODECS","jpeg")||"";if(b.uriToStreamInfosMap_.has(d))return q["return"](b.uriToStreamInfosMap_.get(d));
|
|
1568
|
-
f=b.getLanguage_(a);g=a.getAttributeValue("NAME");h=a.getAttributeValue("CHARACTERISTICS");return q.yield(b.createStreamInfo_(d,e,c,f,!1,g,null,null,h,!1,!1),2)}k=q.yieldResult;if(
|
|
1569
|
-
|
|
1567
|
+
f=b.getLanguage_(a);g=a.getAttributeValue("NAME");h=a.getAttributeValue("CHARACTERISTICS");return q.yield(b.createStreamInfo_(d,e,c,f,!1,g,null,null,h,!1,!1),2)}k=q.yieldResult;if(b.uriToStreamInfosMap_.has(d))return q["return"](b.uriToStreamInfosMap_.get(d));if(l=a.getAttributeValue("RESOLUTION"))if(m=k.stream.segmentIndex.get(0),n=m.getTilesLayout())k.stream.width=Number(l.split("x")[0])*Number(n.split("x")[0]),k.stream.height=Number(l.split("x")[1])*Number(n.split("x")[1]);if(p=a.getAttributeValue("BANDWIDTH"))k.stream.bandwidth=
|
|
1568
|
+
Number(p);b.uriToStreamInfosMap_.set(d,k);return q["return"](k)})};
|
|
1570
1569
|
shaka.hls.HlsParser.prototype.createStreamInfoFromVariantTag_=function(a,b,c){var d=this,e,f,g,h;return $jscomp.asyncExecutePromiseGeneratorProgram(function(k){if(1==k.nextAddress){goog.asserts.assert("EXT-X-STREAM-INF"==a.name,"Should only be called on variant tags!");e=d.variableSubstitution_(a.getRequiredAttrValue("URI"),d.globalVariables_);if(d.uriToStreamInfosMap_.has(e))return k["return"](d.uriToStreamInfosMap_.get(e));f=d.getClosedCaptions_(a,c);g=shaka.util.ManifestParserUtils.guessCodecs(c,
|
|
1571
|
-
b);return k.yield(d.createStreamInfo_(e,g,c,"und",!1,null,null,f,null,!1,!1),2)}h=k.yieldResult;if(
|
|
1570
|
+
b);return k.yield(d.createStreamInfo_(e,g,c,"und",!1,null,null,f,null,!1,!1),2)}h=k.yieldResult;if(d.uriToStreamInfosMap_.has(e))return k["return"](d.uriToStreamInfosMap_.get(e));d.uriToStreamInfosMap_.set(e,h);return k["return"](h)})};
|
|
1572
1571
|
shaka.hls.HlsParser.prototype.createStreamInfo_=function(a,b,c,d,e,f,g,h,k,l,m){var n=this,p,q,r;return $jscomp.asyncExecutePromiseGeneratorProgram(function(u){if(1==u.nextAddress)return p=shaka.hls.Utils.constructAbsoluteUri(n.masterPlaylistUri_,a),u.yield(n.requestManifest_(p),2);q=u.yieldResult;p=q.uri;r=n.manifestTextParser_.parsePlaylist(q.data,p);return u["return"](n.convertParsedPlaylistIntoStreamInfo_(r,a,p,b,c,d,e,f,g,h,k,l,m))})};
|
|
1573
|
-
shaka.hls.HlsParser.prototype.convertParsedPlaylistIntoStreamInfo_=function(a,b,c,d,e,f,g,h,k,l,m,n,p,q){var r=this,u,v,t,x,w,y,z,A,C,D,G,B,E,F,I,H,J,L,
|
|
1574
|
-
v=r.parseMediaVariables_(u);goog.asserts.assert(null!=a.segments,"Media playlist should have segments!");r.determinePresentationType_(a);return q?
|
|
1575
|
-
B.
|
|
1576
|
-
shaka.
|
|
1577
|
-
|
|
1578
|
-
|
|
1572
|
+
shaka.hls.HlsParser.prototype.convertParsedPlaylistIntoStreamInfo_=function(a,b,c,d,e,f,g,h,k,l,m,n,p,q){var r=this,u,v,t,x,w,y,z,A,C,D,G,B,E,F,I,H,J,K,L,M,P,R,S,N,U,V,Q,W,T,Y,O,Z,aa;return $jscomp.asyncExecutePromiseGeneratorProgram(function(X){if(1==X.nextAddress){if(a.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);u=shaka.hls.Utils.filterTagsByName(a.tags,"EXT-X-DEFINE");
|
|
1573
|
+
v=r.parseMediaVariables_(u);goog.asserts.assert(null!=a.segments,"Media playlist should have segments!");r.determinePresentationType_(a);return q?X.jumpTo(2):X.yield(r.guessMimeType_(e,d,a,v),3)}2!=X.nextAddress&&(q=X.yieldResult);t=[];if(a.segments)for(x=$jscomp.makeIterator(a.segments),w=x.next();!w.done;w=x.next())y=w.value,z=shaka.hls.Utils.filterTagsByName(y.tags,"EXT-X-KEY"),t.push.apply(t,$jscomp.arrayFromIterable(z));C=A=!1;D=[];G=new Set;B=$jscomp.makeIterator(t);for(E=B.next();!E.done;E=
|
|
1574
|
+
B.next())if(F=E.value,I=F.getRequiredAttrValue("METHOD"),"NONE"!=I)if(A=!0,"AES-128"==I)C=!0;else if(H=F.getRequiredAttrValue("KEYFORMAT"),K=(J=shaka.hls.HlsParser.KEYFORMATS_TO_DRM_PARSERS_[H])?J(F,q):null){if(K.keyIds)for(L=$jscomp.makeIterator(K.keyIds),M=L.next();!M.done;M=L.next())P=M.value,G.add(P);D.push(K)}else shaka.log.warning("Unsupported HLS KEYFORMAT",H);if(A&&!D.length&&!C)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.HLS_KEYFORMATS_NOT_SUPPORTED);
|
|
1575
|
+
shaka.media.MediaSourceEngine.RAW_FORMATS.includes(q)&&(d="");R=new Map;S=r.createSegments_(b,a,e,q,R,v,d);N=S[S.length-1].endTime;U=new shaka.media.SegmentIndex(S);V=e==shaka.util.ManifestParserUtils.ContentType.TEXT?shaka.util.ManifestParserUtils.TextStreamKind.SUBTITLE:void 0;Q=[];if(m)for(W=$jscomp.makeIterator(m.split(",")),T=W.next();!T.done;T=W.next())Y=T.value,Q.push(Y);Z=(O=shaka.hls.Utils.getFirstTagWithName(a.tags,"EXT-X-SERVER-CONTROL"))?null!=O.getAttribute("CAN-SKIP-UNTIL"):!1;aa={id:r.globalId_++,
|
|
1576
|
+
originalId:h,createSegmentIndex:function(){return Promise.resolve()},segmentIndex:U,mimeType:q,codecs:d,kind:V,encrypted:A,drmInfos:D,keyIds:G,language:f,label:h,type:e,primary:g,trickModeVideo:null,emsgSchemeIdUris:null,frameRate:void 0,pixelAspectRatio:void 0,width:void 0,height:void 0,bandwidth:void 0,roles:Q,forced:n,channelsCount:k,audioSamplingRate:null,spatialAudio:p,closedCaptions:l,hdr:void 0,tilesLayout:void 0};return X["return"]({stream:aa,verbatimMediaPlaylistUri:b,absoluteMediaPlaylistUri:c,
|
|
1577
|
+
maxTimestamp:N,mediaSequenceToStartTime:R,canSkipSegments:Z})})};
|
|
1579
1578
|
shaka.hls.HlsParser.prototype.parseAES128DrmTag_=function(a,b){var c=this;if(!window.crypto||!window.crypto.subtle)throw shaka.log.alwaysWarn("Web Crypto API is not available to decrypt AES-128. (Web Crypto only exists in secure origins like https)"),new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.NO_WEB_CRYPTO_API);var d=0,e=a.getAttributeValue("IV","");if(e){var f=shaka.util.Uint8ArrayUtils.fromHex(e.substr(2));if(16!=f.byteLength)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,
|
|
1580
1579
|
shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.HLS_AES_128_INVALID_IV_LENGTH);}else d=shaka.hls.Utils.getFirstTagWithNameAsNumber(b.tags,"EXT-X-MEDIA-SEQUENCE",0);e=shaka.hls.Utils.constructAbsoluteUri(b.absoluteUri,a.getRequiredAttrValue("URI"));var g=shaka.net.NetworkingEngine.RequestType.KEY,h=shaka.net.NetworkingEngine.makeRequest([e],this.config_.retryParameters),k={method:"AES-128",iv:f,firstMediaSequenceNumber:d,fetchKey:function(){var l,m;return $jscomp.asyncExecutePromiseGeneratorProgram(function(n){if(1==
|
|
1581
1580
|
n.nextAddress)return n.yield(c.makeNetworkRequest_(h,g),2);if(3!=n.nextAddress){l=n.yieldResult;if(!l.data||16!=l.data.byteLength)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.HLS_AES_128_INVALID_KEY_LENGTH);m=k;return n.yield(window.crypto.subtle.importKey("raw",l.data,"AES-CBC",!0,["decrypt"]),3)}m.cryptoKey=n.yieldResult;k.fetchKey=void 0;n.jumpToEnd()})}};return k};
|
|
@@ -1739,18 +1738,18 @@ shaka.util.Error.Category.STORAGE,shaka.util.Error.Code.CANNOT_STORE_LIVE_OFFLIN
|
|
|
1739
1738
|
v=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_(v,m,u,e,d,l.cell,p,h),12);case 12:return f.ensureNotDestroyed_(),x=shaka.offline.OfflineUri.manifest(l.path.mechanism,l.path.cell,m),y["return"](shaka.offline.StoredContentUtils.fromManifestDB(x,u));case 3:return y.enterFinallyBlock(),y.yield(k.destroy(),13);case 13:if(!g){y.jumpTo(14);
|
|
1740
1739
|
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:w=y.enterCatchBlock();if(null==m){y.jumpTo(18);break}return y.yield(shaka.offline.Storage.cleanStoredManifest(m),18);case 18:throw n||w;}})};
|
|
1741
1740
|
shaka.offline.Storage.prototype.downloadSegments_=function(a,b,c,d,e,f,g,h){var k=this,l,m,n,p,q,r,u,v,t,x;return $jscomp.asyncExecutePromiseGeneratorProgram(function(w){switch(w.nextAddress){case 1:l={};m=0;n=function(y,z){var A,C,D,G,B,E,F;return $jscomp.asyncExecutePromiseGeneratorProgram(function(I){if(1==I.nextAddress){A={};C=$jscomp.makeIterator(y);for(D=C.next();!D.done;A={$jscomp$loop$prop$download$562$662:A.$jscomp$loop$prop$download$562$662},D=C.next())A.$jscomp$loop$prop$download$562$662=
|
|
1742
|
-
D.value,G=A.$jscomp$loop$prop$download$562$662.makeSegmentRequest(e),B=A.$jscomp$loop$prop$download$562$662.estimateId,E=A.$jscomp$loop$prop$download$562$662.isInitSegment,F=function(H){return function(J){var L,
|
|
1741
|
+
D.value,G=A.$jscomp$loop$prop$download$562$662.makeSegmentRequest(e),B=A.$jscomp$loop$prop$download$562$662.estimateId,E=A.$jscomp$loop$prop$download$562$662.isInitSegment,F=function(H){return function(J){var K,L,M;return $jscomp.asyncExecutePromiseGeneratorProgram(function(P){if(1==P.nextAddress)return P.yield(f.addSegments([{data:J}]),2);K=P.yieldResult;k.ensureNotDestroyed_();L=H.$jscomp$loop$prop$download$562$662.ref;M=shaka.offline.DownloadInfo.idForSegmentRef(L);l[M]=K[0];m+=J.byteLength;P.jumpToEnd()})}}(A),
|
|
1743
1742
|
d.queue(A.$jscomp$loop$prop$download$562$662.groupId,G,B,E,F);return I.yield(d.waitToFinish(),2)}if(!z)return I.jumpTo(0);k.ensureNotDestroyed_();k.setManifestDrmFields_(g,c,h,e);return I.yield(f.updateManifest(b,c),0)})};p=!1;w.setCatchFinallyBlocks(2);if(!k.getManifestIsEncrypted_(g)||!p||k.getManifestIncludesInitData_(g)){w.jumpTo(4);break}return w.yield(n(a.filter(function(y){return y.isInitSegment}),!0),5);case 5:return k.ensureNotDestroyed_(),a=a.filter(function(y){return!y.isInitSegment}),
|
|
1744
1743
|
q=l,r=m,l={},m=0,w.yield(shaka.offline.Storage.assignSegmentsToManifest(f,b,c,q,r,function(){return k.ensureNotDestroyed_()}),6);case 6:k.ensureNotDestroyed_();case 4:if(p){w.jumpTo(7);break}return w.yield(n(a,!1),8);case 8:return k.ensureNotDestroyed_(),u=l,v=m,l={},m=0,w.yield(shaka.offline.Storage.assignSegmentsToManifest(f,b,c,u,v,function(){return k.ensureNotDestroyed_()}),9);case 9:k.ensureNotDestroyed_(),goog.asserts.assert(!c.isIncomplete,"The manifest should be complete by now");case 7:w.leaveTryBlock(0);
|
|
1745
1744
|
break;case 2:return t=w.enterCatchBlock(),x=Object.values(l),w.yield(f.removeSegments(x,function(y){}),10);case 10:throw t;}})};
|
|
1746
1745
|
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)}})};
|
|
1747
1746
|
shaka.offline.Storage.assignSegmentsToManifest=function(a,b,c,d,e,f){var g,h,k,l,m,n,p,q,r,u,v;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?
|
|
1748
1747
|
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}v=Object.values(d);return t.yield(a.removeSegments(v,function(x){}),6);case 6:throw u;}})};
|
|
1749
|
-
shaka.offline.Storage.prototype.filterManifest_=function(a,b,c){var d,e,f,g,h,k,l,m,n,p,q,r,u,v,t,x,w,y,z,A,C,D,G,B,E,F,I,H,J;return $jscomp.asyncExecutePromiseGeneratorProgram(function(
|
|
1748
|
+
shaka.offline.Storage.prototype.filterManifest_=function(a,b,c){var d,e,f,g,h,k,l,m,n,p,q,r,u,v,t,x,w,y,z,A,C,D,G,B,E,F,I,H,J;return $jscomp.asyncExecutePromiseGeneratorProgram(function(K){switch(K.nextAddress){case 1:return d={width:Infinity,height:Infinity},shaka.util.StreamUtils.filterByRestrictions(a,c.restrictions,d),K.yield(shaka.util.StreamUtils.filterManifestByMediaCapabilities(a,c.offline.usePersistentLicense),2);case 2:e=[];f=c.preferredAudioChannelCount;g=c.preferredDecodingAttributes;
|
|
1750
1749
|
h=c.preferredVideoCodecs;k=c.preferredAudioCodecs;shaka.util.StreamUtils.chooseCodecsAndFilterManifest(a,h,k,f,g);l=$jscomp.makeIterator(a.variants);for(m=l.next();!m.done;m=l.next())n=m.value,goog.asserts.assert(shaka.util.StreamUtils.isPlayable(n),'We should have already filtered by "is playable"'),e.push(shaka.util.StreamUtils.variantToTrack(n));p=$jscomp.makeIterator(a.textStreams);for(q=p.next();!q.done;q=p.next())r=q.value,e.push(shaka.util.StreamUtils.textStreamToTrack(r));u=$jscomp.makeIterator(a.imageStreams);
|
|
1751
|
-
for(v=u.next();!v.done;v=u.next())t=v.value,e.push(shaka.util.StreamUtils.imageStreamToTrack(t));return
|
|
1752
|
-
shaka.util.Error.Code.STORAGE_LIMIT_REACHED);
|
|
1753
|
-
"text"==J.type&&F.add(J.id),"image"==J.type&&I.add(J.id);a.variants=a.variants.filter(function(
|
|
1750
|
+
for(v=u.next();!v.done;v=u.next())t=v.value,e.push(shaka.util.StreamUtils.imageStreamToTrack(t));return K.yield(c.offline.trackSelectionCallback(e),3);case 3:x=K.yieldResult;w=a.presentationTimeline.getDuration();y=0;z=$jscomp.makeIterator(x);for(A=z.next();!A.done;A=z.next())C=A.value,D=C.bandwidth*w/8,y+=D;K.setCatchFinallyBlocks(4);return K.yield(c.offline.downloadSizeCallback(y),6);case 6:G=K.yieldResult;if(!G)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.STORAGE,
|
|
1751
|
+
shaka.util.Error.Code.STORAGE_LIMIT_REACHED);K.leaveTryBlock(5);break;case 4:B=K.enterCatchBlock();if(B instanceof shaka.util.Error)throw B;shaka.log.warning("downloadSizeCallback has produced an unexpected error",B);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:E=new Set;F=new Set;I=new Set;H=$jscomp.makeIterator(x);for(A=H.next();!A.done;A=H.next())J=A.value,"variant"==J.type&&E.add(J.id),
|
|
1752
|
+
"text"==J.type&&F.add(J.id),"image"==J.type&&I.add(J.id);a.variants=a.variants.filter(function(L){return E.has(L.id)});a.textStreams=a.textStreams.filter(function(L){return F.has(L.id)});a.imageStreams=a.imageStreams.filter(function(L){return I.has(L.id)});shaka.offline.Storage.validateManifest_(a);K.jumpToEnd()}})};
|
|
1754
1753
|
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;
|
|
1755
1754
|
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(),
|
|
1756
1755
|
size:0,expiration:a.getExpiration(),streams:f,sessionIds:n?a.getSessionIds():[],drmInfo:p,appMetadata:d,isIncomplete:!0,sequenceMode:b.sequenceMode},toDownload:m}};shaka.offline.Storage.prototype.getManifestIsEncrypted_=function(a){return a.variants.some(function(b){var c=b.audio&&b.audio.encrypted;return b.video&&b.video.encrypted||c})};
|