shaka-player 4.8.11 → 4.8.12
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/dist/locales.js +34 -34
- package/dist/shaka-player.compiled.debug.js +12 -12
- package/dist/shaka-player.compiled.debug.map +2 -2
- package/dist/shaka-player.compiled.js +10 -10
- package/dist/shaka-player.compiled.map +1 -1
- package/dist/shaka-player.ui.debug.js +15 -15
- package/dist/shaka-player.ui.debug.map +2 -2
- package/dist/shaka-player.ui.js +10 -10
- package/dist/shaka-player.ui.map +1 -1
- package/lib/abr/simple_abr_manager.js +19 -1
- package/lib/hls/hls_parser.js +3 -3
- package/lib/player.js +1 -1
- package/package.json +1 -1
package/dist/locales.js
CHANGED
|
@@ -732,48 +732,48 @@ shaka.ui.Locales.addTo = function(localization) {
|
|
|
732
732
|
* @const
|
|
733
733
|
*/
|
|
734
734
|
shaka.ui.Locales.Ids = {
|
|
735
|
-
SEEK: 'SEEK',
|
|
736
|
-
PAUSE: 'PAUSE',
|
|
737
|
-
PLAY: 'PLAY',
|
|
738
|
-
SKIP_AD: 'SKIP_AD',
|
|
739
|
-
UNMUTE: 'UNMUTE',
|
|
740
|
-
FAST_FORWARD: 'FAST_FORWARD',
|
|
741
|
-
MULTIPLE_LANGUAGES: 'MULTIPLE_LANGUAGES',
|
|
742
735
|
VOLUME: 'VOLUME',
|
|
743
|
-
|
|
744
|
-
|
|
736
|
+
PAUSE: 'PAUSE',
|
|
737
|
+
EXIT_FULL_SCREEN: 'EXIT_FULL_SCREEN',
|
|
738
|
+
SUBTITLE_FORCED: 'SUBTITLE_FORCED',
|
|
745
739
|
QUALITY: 'QUALITY',
|
|
746
|
-
|
|
740
|
+
LANGUAGE: 'LANGUAGE',
|
|
747
741
|
FULL_SCREEN: 'FULL_SCREEN',
|
|
748
|
-
RECENTER_VR: 'RECENTER_VR',
|
|
749
|
-
AD_PROGRESS: 'AD_PROGRESS',
|
|
750
|
-
LOOP: 'LOOP',
|
|
751
|
-
UNDETERMINED_LANGUAGE: 'UNDETERMINED_LANGUAGE',
|
|
752
|
-
SKIP_TO_LIVE: 'SKIP_TO_LIVE',
|
|
753
|
-
ENTER_LOOP_MODE: 'ENTER_LOOP_MODE',
|
|
754
|
-
LIVE: 'LIVE',
|
|
755
|
-
ON: 'ON',
|
|
756
|
-
STATISTICS: 'STATISTICS',
|
|
757
|
-
NOT_APPLICABLE: 'NOT_APPLICABLE',
|
|
758
742
|
BACK: 'BACK',
|
|
759
|
-
|
|
760
|
-
MUTE: 'MUTE',
|
|
761
|
-
SUBTITLE_FORCED: 'SUBTITLE_FORCED',
|
|
762
|
-
CAST: 'CAST',
|
|
763
|
-
AUTO_QUALITY: 'AUTO_QUALITY',
|
|
764
|
-
MORE_SETTINGS: 'MORE_SETTINGS',
|
|
765
|
-
CAPTIONS: 'CAPTIONS',
|
|
743
|
+
EXIT_PICTURE_IN_PICTURE: 'EXIT_PICTURE_IN_PICTURE',
|
|
766
744
|
PLAYBACK_RATE: 'PLAYBACK_RATE',
|
|
745
|
+
CAPTIONS: 'CAPTIONS',
|
|
767
746
|
RESOLUTION: 'RESOLUTION',
|
|
747
|
+
FAST_FORWARD: 'FAST_FORWARD',
|
|
748
|
+
AD_PROGRESS: 'AD_PROGRESS',
|
|
749
|
+
REPLAY: 'REPLAY',
|
|
750
|
+
MUTE: 'MUTE',
|
|
751
|
+
STATISTICS: 'STATISTICS',
|
|
752
|
+
EXIT_LOOP_MODE: 'EXIT_LOOP_MODE',
|
|
753
|
+
OFF: 'OFF',
|
|
754
|
+
UNDETERMINED_LANGUAGE: 'UNDETERMINED_LANGUAGE',
|
|
755
|
+
LIVE: 'LIVE',
|
|
756
|
+
RECENTER_VR: 'RECENTER_VR',
|
|
757
|
+
TOGGLE_STEREOSCOPIC: 'TOGGLE_STEREOSCOPIC',
|
|
768
758
|
AD_TIME: 'AD_TIME',
|
|
759
|
+
CAST: 'CAST',
|
|
760
|
+
SEEK: 'SEEK',
|
|
761
|
+
AD_DURATION: 'AD_DURATION',
|
|
769
762
|
PICTURE_IN_PICTURE: 'PICTURE_IN_PICTURE',
|
|
770
|
-
|
|
771
|
-
|
|
772
|
-
UNRECOGNIZED_LANGUAGE: 'UNRECOGNIZED_LANGUAGE',
|
|
773
|
-
EXIT_FULL_SCREEN: 'EXIT_FULL_SCREEN',
|
|
763
|
+
ENTER_LOOP_MODE: 'ENTER_LOOP_MODE',
|
|
764
|
+
SKIP_AD: 'SKIP_AD',
|
|
774
765
|
SURROUND: 'SURROUND',
|
|
775
|
-
|
|
776
|
-
|
|
766
|
+
PLAY: 'PLAY',
|
|
767
|
+
MULTIPLE_LANGUAGES: 'MULTIPLE_LANGUAGES',
|
|
768
|
+
ON: 'ON',
|
|
769
|
+
SKIP_TO_LIVE: 'SKIP_TO_LIVE',
|
|
770
|
+
UNMUTE: 'UNMUTE',
|
|
771
|
+
MORE_SETTINGS: 'MORE_SETTINGS',
|
|
772
|
+
REWIND: 'REWIND',
|
|
773
|
+
AIRPLAY: 'AIRPLAY',
|
|
774
|
+
UNRECOGNIZED_LANGUAGE: 'UNRECOGNIZED_LANGUAGE',
|
|
777
775
|
ENTER_PICTURE_IN_PICTURE: 'ENTER_PICTURE_IN_PICTURE',
|
|
778
|
-
|
|
776
|
+
NOT_APPLICABLE: 'NOT_APPLICABLE',
|
|
777
|
+
LOOP: 'LOOP',
|
|
778
|
+
AUTO_QUALITY: 'AUTO_QUALITY',
|
|
779
779
|
};
|
|
@@ -367,7 +367,7 @@ shaka.abr.SimpleAbrManager.prototype.stop=function(){this.switch_=null;this.enab
|
|
|
367
367
|
shaka.abr.SimpleAbrManager.prototype.chooseVariant=function(a){a=void 0===a?!1:a;var b=Infinity,c=Infinity;this.config_.restrictToScreenSize&&(c=this.config_.ignoreDevicePixelRatio?1:window.devicePixelRatio,b=window.screen.height*c,c*=window.screen.width);if(this.resizeObserver_&&this.config_.restrictToElementSize){var d=this.config_.ignoreDevicePixelRatio?1:window.devicePixelRatio;b=Math.min(b,this.mediaElement_.clientHeight*d);c=Math.min(c,this.mediaElement_.clientWidth*d)}var e=this.variants_.filter(function(m){return!shaka.util.StreamUtils.isFastSwitching(m)});
|
|
368
368
|
e.length||(e=this.variants_);d=e;a&&e.length!=this.variants_.length&&(d=this.variants_.filter(function(m){return shaka.util.StreamUtils.isFastSwitching(m)}));a=this.filterAndSortVariants_(this.config_.restrictions,d,Infinity,Infinity);if(Infinity!=b||Infinity!=c){a=this.getResolutionList_(a);a=$jscomp.makeIterator(a);for(e=a.next();!e.done;e=a.next())if(e=e.value,e.height>=b&&e.width>=c){b=e.height;c=e.width;break}a=this.filterAndSortVariants_(this.config_.restrictions,d,b,c)}b=this.getBandwidthEstimate();
|
|
369
369
|
d.length&&!a.length&&(shaka.log.warning("No variants met the ABR restrictions. Choosing a variant by lowest bandwidth."),a=this.filterAndSortVariants_(null,d,Infinity,Infinity),a=[a[0]]);c=a[0]||null;for(d=0;d<a.length;d++){e=a[d];for(var f=isNaN(this.playbackRate_)?1:Math.abs(this.playbackRate_),g=f*e.bandwidth,h=g/this.config_.bandwidthDowngradeTarget,k={bandwidth:Infinity},l=d+1;l<a.length;l++)if(e.bandwidth!=a[l].bandwidth){k=a[l];break}f=f*k.bandwidth/this.config_.bandwidthUpgradeTarget;shaka.log.v2("Bandwidth ranges:",
|
|
370
|
-
(g/1E6).toFixed(3),(h/1E6).toFixed(3),(f/1E6).toFixed(3));b>=h&&b<=f&&c.bandwidth!=e.bandwidth&&(c=e)}this.lastTimeChosenMs_=Date.now();return c};shaka.abr.SimpleAbrManager.prototype.enable=function(){this.enabled_=!0};shaka.abr.SimpleAbrManager.prototype.disable=function(){this.enabled_=!1};
|
|
370
|
+
(g/1E6).toFixed(3),(h/1E6).toFixed(3),(f/1E6).toFixed(3));b>=h&&b<=f&&(c.bandwidth!=e.bandwidth||this.isSameBandwidthAndHigherResolution_(c,e))&&(c=e)}this.lastTimeChosenMs_=Date.now();return c};shaka.abr.SimpleAbrManager.prototype.enable=function(){this.enabled_=!0};shaka.abr.SimpleAbrManager.prototype.disable=function(){this.enabled_=!1};
|
|
371
371
|
shaka.abr.SimpleAbrManager.prototype.segmentDownloaded=function(a,b,c,d){shaka.log.v2("Segment downloaded:","contentType="+(d&&d.contentType),"deltaTimeMs="+a,"numBytes="+b,"lastTimeChosenMs="+this.lastTimeChosenMs_,"enabled="+this.enabled_);goog.asserts.assert(0<=a,"expected a non-negative duration");this.bandwidthEstimator_.sample(a,b);c&&null!=this.lastTimeChosenMs_&&this.enabled_&&this.suggestStreams_()};
|
|
372
372
|
shaka.abr.SimpleAbrManager.prototype.trySuggestStreams=function(){null!=this.lastTimeChosenMs_&&this.enabled_&&this.suggestStreams_()};shaka.abr.SimpleAbrManager.prototype.getBandwidthEstimate=function(){var a=this.getDefaultBandwidth_();a=this.bandwidthEstimator_.getBandwidthEstimate(a);return this.cmsdManager_?this.cmsdManager_.getBandwidthEstimate(a):a};shaka.abr.SimpleAbrManager.prototype.setVariants=function(a){this.variants_=a};
|
|
373
373
|
shaka.abr.SimpleAbrManager.prototype.playbackRateChanged=function(a){this.playbackRate_=a};shaka.abr.SimpleAbrManager.prototype.setMediaElement=function(a){var b=this;this.mediaElement_=a;this.resizeObserver_&&(this.resizeObserver_.disconnect(),this.resizeObserver_=null);this.mediaElement_&&"ResizeObserver"in window&&(this.resizeObserver_=new ResizeObserver(function(){b.resizeObserverTimer_.tickAfter(shaka.abr.SimpleAbrManager.RESIZE_OBSERVER_BATCH_TIME)}),this.resizeObserver_.observe(this.mediaElement_))};
|
|
@@ -375,11 +375,11 @@ shaka.abr.SimpleAbrManager.prototype.setCmsdManager=function(a){this.cmsdManager
|
|
|
375
375
|
shaka.abr.SimpleAbrManager.prototype.suggestStreams_=function(){shaka.log.v2("Suggesting Streams...");goog.asserts.assert(null!=this.lastTimeChosenMs_,"lastTimeChosenMs_ should not be null");if(!this.startupComplete_){if(!this.bandwidthEstimator_.hasGoodEstimate()){shaka.log.v2("Still waiting for a good estimate...");return}this.startupComplete_=!0}else if(Date.now()-this.lastTimeChosenMs_<1E3*this.config_.switchInterval){shaka.log.v2("Still within switch interval...");return}var a=this.chooseVariant(),
|
|
376
376
|
b=this.getBandwidthEstimate();b=Math.round(b/1E3);a&&(shaka.log.debug("Calling switch_(), bandwidth="+b+" kbps"),this.switch_(a,this.config_.clearBufferSwitch,this.config_.safeMarginSwitch))};shaka.abr.SimpleAbrManager.prototype.getDefaultBandwidth_=function(){var a=this.config_.defaultBandwidthEstimate;navigator.connection&&navigator.connection.downlink&&this.config_.useNetworkInformation&&(a=1E6*navigator.connection.downlink);return a};
|
|
377
377
|
shaka.abr.SimpleAbrManager.prototype.filterAndSortVariants_=function(a,b,c,d){if(this.cmsdManager_){var e=this.cmsdManager_.getMaxBitrate();e&&(b=b.filter(function(f){return f.bandwidth&&e?f.bandwidth<=e:!0}))}a&&(b=b.filter(function(f){goog.asserts.assert(a,"Restrictions should exist!");return shaka.util.StreamUtils.meetsRestrictions(f,a,{width:d,height:c})}));return b.sort(function(f,g){return f.bandwidth-g.bandwidth})};
|
|
378
|
-
shaka.abr.SimpleAbrManager.prototype.getResolutionList_=function(a){var b=[];a=$jscomp.makeIterator(a);for(var c=a.next();!c.done;c=a.next())(c=c.value.video)&&c.height&&c.width&&b.push({height:c.height,width:c.width});return b.sort(function(d,e){return d.width-e.width})};
|
|
379
|
-
goog.
|
|
380
|
-
goog.exportProperty(shaka.abr.SimpleAbrManager.prototype,"
|
|
381
|
-
goog.exportProperty(shaka.abr.SimpleAbrManager.prototype,"
|
|
382
|
-
goog.exportProperty(shaka.abr.SimpleAbrManager.prototype,"stop",shaka.abr.SimpleAbrManager.prototype.stop);shaka.abr.SimpleAbrManager.RESIZE_OBSERVER_BATCH_TIME=1;shaka.config={};shaka.config.AutoShowText={NEVER:0,ALWAYS:1,IF_PREFERRED_TEXT_LANGUAGE:2,IF_SUBTITLES_MAY_BE_NEEDED:3};goog.exportSymbol("shaka.config.AutoShowText",shaka.config.AutoShowText);shaka.config.CodecSwitchingStrategy={RELOAD:"reload",SMOOTH:"smooth"};goog.exportSymbol("shaka.config.CodecSwitchingStrategy",shaka.config.CodecSwitchingStrategy);shaka.media.AdaptationSet=function(a,b,c,d){c=void 0===c?!0:c;d=void 0===d?!1:d;this.root_=a;this.variants_=new Set([a]);b=b||[];a=$jscomp.makeIterator(b);for(b=a.next();!b.done;b=a.next())this.add(b.value,c,d)};shaka.media.AdaptationSet.prototype.add=function(a,b,c){if(this.canInclude(a,b,c))return this.variants_.add(a),!0;shaka.log.warning("Rejecting variant - not compatible with root.");return!1};
|
|
378
|
+
shaka.abr.SimpleAbrManager.prototype.getResolutionList_=function(a){var b=[];a=$jscomp.makeIterator(a);for(var c=a.next();!c.done;c=a.next())(c=c.value.video)&&c.height&&c.width&&b.push({height:c.height,width:c.width});return b.sort(function(d,e){return d.width-e.width})};shaka.abr.SimpleAbrManager.prototype.isSameBandwidthAndHigherResolution_=function(a,b){return a.bandwidth==b.bandwidth&&a.video&&b.video?a.video.width<b.video.width||a.video.height<b.video.height:!1};
|
|
379
|
+
goog.exportSymbol("shaka.abr.SimpleAbrManager",shaka.abr.SimpleAbrManager);goog.exportProperty(shaka.abr.SimpleAbrManager.prototype,"configure",shaka.abr.SimpleAbrManager.prototype.configure);goog.exportProperty(shaka.abr.SimpleAbrManager.prototype,"setCmsdManager",shaka.abr.SimpleAbrManager.prototype.setCmsdManager);goog.exportProperty(shaka.abr.SimpleAbrManager.prototype,"setMediaElement",shaka.abr.SimpleAbrManager.prototype.setMediaElement);
|
|
380
|
+
goog.exportProperty(shaka.abr.SimpleAbrManager.prototype,"playbackRateChanged",shaka.abr.SimpleAbrManager.prototype.playbackRateChanged);goog.exportProperty(shaka.abr.SimpleAbrManager.prototype,"setVariants",shaka.abr.SimpleAbrManager.prototype.setVariants);goog.exportProperty(shaka.abr.SimpleAbrManager.prototype,"getBandwidthEstimate",shaka.abr.SimpleAbrManager.prototype.getBandwidthEstimate);goog.exportProperty(shaka.abr.SimpleAbrManager.prototype,"trySuggestStreams",shaka.abr.SimpleAbrManager.prototype.trySuggestStreams);
|
|
381
|
+
goog.exportProperty(shaka.abr.SimpleAbrManager.prototype,"segmentDownloaded",shaka.abr.SimpleAbrManager.prototype.segmentDownloaded);goog.exportProperty(shaka.abr.SimpleAbrManager.prototype,"disable",shaka.abr.SimpleAbrManager.prototype.disable);goog.exportProperty(shaka.abr.SimpleAbrManager.prototype,"enable",shaka.abr.SimpleAbrManager.prototype.enable);goog.exportProperty(shaka.abr.SimpleAbrManager.prototype,"chooseVariant",shaka.abr.SimpleAbrManager.prototype.chooseVariant);
|
|
382
|
+
goog.exportProperty(shaka.abr.SimpleAbrManager.prototype,"init",shaka.abr.SimpleAbrManager.prototype.init);goog.exportProperty(shaka.abr.SimpleAbrManager.prototype,"release",shaka.abr.SimpleAbrManager.prototype.release);goog.exportProperty(shaka.abr.SimpleAbrManager.prototype,"stop",shaka.abr.SimpleAbrManager.prototype.stop);shaka.abr.SimpleAbrManager.RESIZE_OBSERVER_BATCH_TIME=1;shaka.config={};shaka.config.AutoShowText={NEVER:0,ALWAYS:1,IF_PREFERRED_TEXT_LANGUAGE:2,IF_SUBTITLES_MAY_BE_NEEDED:3};goog.exportSymbol("shaka.config.AutoShowText",shaka.config.AutoShowText);shaka.config.CodecSwitchingStrategy={RELOAD:"reload",SMOOTH:"smooth"};goog.exportSymbol("shaka.config.CodecSwitchingStrategy",shaka.config.CodecSwitchingStrategy);shaka.media.AdaptationSet=function(a,b,c,d){c=void 0===c?!0:c;d=void 0===d?!1:d;this.root_=a;this.variants_=new Set([a]);b=b||[];a=$jscomp.makeIterator(b);for(b=a.next();!b.done;b=a.next())this.add(b.value,c,d)};shaka.media.AdaptationSet.prototype.add=function(a,b,c){if(this.canInclude(a,b,c))return this.variants_.add(a),!0;shaka.log.warning("Rejecting variant - not compatible with root.");return!1};
|
|
383
383
|
shaka.media.AdaptationSet.prototype.canInclude=function(a,b,c){return shaka.media.AdaptationSet.areAdaptable(this.root_,a,void 0===b?!0:b,void 0===c?!1:c)};
|
|
384
384
|
shaka.media.AdaptationSet.areAdaptable=function(a,b,c,d){var e=shaka.media.AdaptationSet;if(!!a.audio!=!!b.audio||!!a.video!=!!b.video||a.language!=b.language)return!1;goog.asserts.assert(!!a.audio==!!b.audio,"Both should either have audio or not have audio.");if(a.audio&&b.audio&&!e.areAudiosCompatible_(a.audio,b.audio,c,d))return!1;goog.asserts.assert(!!a.video==!!b.video,"Both should either have video or not have video.");return a.video&&b.video&&!e.areVideosCompatible_(a.video,b.video,c)?!1:!0};
|
|
385
385
|
shaka.media.AdaptationSet.prototype.values=function(){return this.variants_.values()};shaka.media.AdaptationSet.areAudiosCompatible_=function(a,b,c,d){var e=shaka.media.AdaptationSet;return(!a.channelsCount||!b.channelsCount||2<a.channelsCount||2<b.channelsCount)&&a.channelsCount!=b.channelsCount||c&&!e.canTransitionBetween_(a,b)||!e.areRolesEqual_(a.roles,b.roles)||d&&a.groupId!==b.groupId?!1:!0};
|
|
@@ -1412,7 +1412,7 @@ goog.exportProperty(shaka.Player.prototype,"getAssetUri",shaka.Player.prototype.
|
|
|
1412
1412
|
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,"releaseAllMutexes",shaka.Player.prototype.releaseAllMutexes);
|
|
1413
1413
|
goog.exportProperty(shaka.Player.prototype,"preload",shaka.Player.prototype.preload);goog.exportProperty(shaka.Player.prototype,"unloadAndSavePreload",shaka.Player.prototype.unloadAndSavePreload);goog.exportProperty(shaka.Player.prototype,"load",shaka.Player.prototype.load);goog.exportProperty(shaka.Player.prototype,"updateStartTime",shaka.Player.prototype.updateStartTime);goog.exportProperty(shaka.Player.prototype,"unload",shaka.Player.prototype.unload);
|
|
1414
1414
|
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);goog.exportProperty(shaka.Player,"setAdManagerFactory",shaka.Player.setAdManagerFactory);
|
|
1415
|
-
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.8.
|
|
1415
|
+
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.8.12-debug";goog.exportProperty(shaka.Player,"version",shaka.Player.version);shaka.Deprecate.init(shaka.Player.version);
|
|
1416
1416
|
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_++};
|
|
1417
1417
|
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()};
|
|
1418
1418
|
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()};
|
|
@@ -2037,8 +2037,8 @@ h=d.some(function(n){return 0==n.hasEndList});d.length&&!h&&(k=shaka.hls.HlsPars
|
|
|
2037
2037
|
shaka.hls.HlsParser.prototype.updateStream_=function(a){var b=this,c,d,e,f,g,h,k,l,m,n,p,q,r,t,x,w,u,y,v,z,A,B,G,F,E,D,H,C,I,K;return $jscomp.asyncExecutePromiseGeneratorProgram(function(J){if(1==J.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",
|
|
2038
2038
|
"YES"),h.getCount()&&g.setQueryData(h),c.push(g.toString());return J.yield(b.requestManifest_(c,!0),2)}if(3!=J.nextAddress){k=J.yieldResult;if(!a.stream.segmentIndex)return J.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,
|
|
2039
2039
|
"EXT-X-DEFINE");p=b.parseMediaVariables_(n,m);q=a.stream;r=b.getMediaSequenceToStartTimeFor_(a);return J.yield(b.parseDrmInfo_(l,q.mimeType,a.getUris,p),3)}t=J.yieldResult;x=t.keyIds;w=t.drmInfos;u=function(M,L){return M.size===L.size&&[].concat($jscomp.arrayFromIterable(M)).every(function(O){return L.has(O)})};u(q.keyIds,x)||(q.keyIds=x,q.drmInfos=w,b.playerInterface_.newDrmInfo(q));y=b.createSegments_(l,q,r,p,a.getUris,a.type);v=y.segments;if(z=y.bandwidth)q.bandwidth=z;q.segmentIndex.mergeAndEvict(v,
|
|
2040
|
-
b.presentationTimeline_.getSegmentAvailabilityStart());v.length&&(A=shaka.hls.Utils.getFirstTagWithNameAsNumber(l.tags,"EXT-X-MEDIA-SEQUENCE",0),G=(B=shaka.hls.Utils.getFirstTagWithName(l.tags,"EXT-X-SKIP"))?Number(B.getAttributeValue("SKIPPED-SEGMENTS")):0,F=b.getNextMediaSequenceAndPart_(A,v),E=F.nextMediaSequence,D=F.nextPart,a.nextMediaSequence=E+G,a.nextPart=D,H=r.get(A),q.segmentIndex.evict(H));C=
|
|
2041
|
-
goog.asserts.assert(I,"Should have segments!");a.maxTimestamp=I.endTime;if(K=shaka.hls.Utils.getFirstTagWithName(l.tags,"EXT-X-ENDLIST"))a.hasEndList=!0;b.determineLastTargetDuration_(l);J.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)};
|
|
2040
|
+
b.presentationTimeline_.getSegmentAvailabilityStart());v.length&&(A=shaka.hls.Utils.getFirstTagWithNameAsNumber(l.tags,"EXT-X-MEDIA-SEQUENCE",0),G=(B=shaka.hls.Utils.getFirstTagWithName(l.tags,"EXT-X-SKIP"))?Number(B.getAttributeValue("SKIPPED-SEGMENTS")):0,F=b.getNextMediaSequenceAndPart_(A,v),E=F.nextMediaSequence,D=F.nextPart,a.nextMediaSequence=E+G,a.nextPart=D,H=r.get(A),q.segmentIndex.evict(H));C=q.segmentIndex.earliestReference();goog.asserts.assert(C,"Should have segments!");a.minTimestamp=
|
|
2041
|
+
C.startTime;I=v[v.length-1];goog.asserts.assert(I,"Should have segments!");a.maxTimestamp=I.endTime;if(K=shaka.hls.Utils.getFirstTagWithName(l.tags,"EXT-X-ENDLIST"))a.hasEndList=!0;b.determineLastTargetDuration_(l);J.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)};
|
|
2042
2042
|
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;shaka.log.warning(g==e.startTime,"Sequence number map is not ordered as expected!")}f=$jscomp.makeIterator(f);for(g=
|
|
2043
2043
|
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,this.ignoreManifestProgramDateTimeFor_(b.type)&&(c=b.stream.segmentIndex))if(d=this.minSequenceNumber_-
|
|
2044
2044
|
b.firstSequenceNumber,0<d&&(c.dropFirstReferences(d),c=c.earliestReference()))c=-c.startTime,b.stream.segmentIndex.offset(c),this.offsetStreamInfo_(b,c)};
|
|
@@ -2165,9 +2165,9 @@ shaka.hls.HlsParser.prototype.setPresentationType_=function(a){this.presentation
|
|
|
2165
2165
|
shaka.hls.HlsParser.prototype.makeNetworkRequest_=function(a,b,c){if(!this.operationManager_)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.PLAYER,shaka.util.Error.Code.OPERATION_ABORTED);a=this.playerInterface_.networkingEngine.request(b,a,c);this.operationManager_.manage(a);return a.promise};shaka.hls.HlsParser.prototype.isAesMethod_=function(a){return"AES-128"==a||"AES-256"==a||"AES-256-CTR"==a};
|
|
2166
2166
|
shaka.hls.HlsParser.fairplayDrmParser_=function(a,b){if("video/mp2t"==b)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.HLS_MSE_ENCRYPTED_MP2T_NOT_SUPPORTED);if(shaka.util.Platform.isMediaKeysPolyfilled())throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.HLS_MSE_ENCRYPTED_LEGACY_APPLE_MEDIA_KEYS_NOT_SUPPORTED);a=a.getRequiredAttrValue("METHOD");b=["SAMPLE-AES",
|
|
2167
2167
|
"SAMPLE-AES-CTR"];if(!b.includes(a))return shaka.log.error("FairPlay in HLS is only supported with [",b.join(", "),"], not",a),null;b="cenc";"SAMPLE-AES"==a&&(b="cbcs");return shaka.util.ManifestParserUtils.createDrmInfo("com.apple.fps",b,[{initDataType:"sinf",initData:new Uint8Array(0),keyId:null}])};
|
|
2168
|
-
shaka.hls.HlsParser.widevineDrmParser_=function(a){var b=a.getRequiredAttrValue("METHOD"),c=["SAMPLE-AES","SAMPLE-AES-CTR"];if(!c.includes(b))return shaka.log.error("Widevine in HLS is only supported with [",c.join(", "),"], not",b),null;c="cenc";"SAMPLE-AES"==b&&(c="cbcs");b=a.getRequiredAttrValue("URI");b=shaka.net.DataUriPlugin.parseRaw(b);b=shaka.util.BufferUtils.toUint8(b.data);c=shaka.util.ManifestParserUtils.createDrmInfo("com.widevine.alpha",c,[{initDataType:"cenc",initData:b}]);
|
|
2169
|
-
a.toLowerCase(),goog.asserts.assert(a.startsWith("0x"),"Incorrect KEYID format!"),c.keyIds=new Set([a.substr(2)]);return c};
|
|
2170
|
-
shaka.hls.HlsParser.playreadyDrmParser_=function(a){var b=a.getRequiredAttrValue("METHOD"),c=["SAMPLE-AES","SAMPLE-AES-CTR"];if(!c.includes(b))return shaka.log.error("PlayReady in HLS is only supported with [",c.join(", "),"], not",b),null;c="cenc";"SAMPLE-AES"==b&&(c="cbcs");a=a.getRequiredAttrValue("URI");a=shaka.net.DataUriPlugin.parseRaw(a);a=shaka.util.BufferUtils.toUint8(a.data);b=new Uint8Array([154,4,240,121,152,64,66,134,171,146,230,91,224,136,95,149]);var d=new Set;a=shaka.util.Pssh.createPssh(a,
|
|
2168
|
+
shaka.hls.HlsParser.widevineDrmParser_=function(a){var b=a.getRequiredAttrValue("METHOD"),c=["SAMPLE-AES","SAMPLE-AES-CTR"];if(!c.includes(b))return shaka.log.error("Widevine in HLS is only supported with [",c.join(", "),"], not",b),null;c="cenc";"SAMPLE-AES"==b&&(c="cbcs");b=a.getRequiredAttrValue("URI");b=shaka.net.DataUriPlugin.parseRaw(b.split("?")[0]);b=shaka.util.BufferUtils.toUint8(b.data);c=shaka.util.ManifestParserUtils.createDrmInfo("com.widevine.alpha",c,[{initDataType:"cenc",initData:b}]);
|
|
2169
|
+
if(a=a.getAttributeValue("KEYID"))a=a.toLowerCase(),goog.asserts.assert(a.startsWith("0x"),"Incorrect KEYID format!"),c.keyIds=new Set([a.substr(2)]);return c};
|
|
2170
|
+
shaka.hls.HlsParser.playreadyDrmParser_=function(a){var b=a.getRequiredAttrValue("METHOD"),c=["SAMPLE-AES","SAMPLE-AES-CTR"];if(!c.includes(b))return shaka.log.error("PlayReady in HLS is only supported with [",c.join(", "),"], not",b),null;c="cenc";"SAMPLE-AES"==b&&(c="cbcs");a=a.getRequiredAttrValue("URI");a=shaka.net.DataUriPlugin.parseRaw(a.split("?")[0]);a=shaka.util.BufferUtils.toUint8(a.data);b=new Uint8Array([154,4,240,121,152,64,66,134,171,146,230,91,224,136,95,149]);var d=new Set;a=shaka.util.Pssh.createPssh(a,
|
|
2171
2171
|
b,d,0);return shaka.util.ManifestParserUtils.createDrmInfo("com.microsoft.playready",c,[{initDataType:"cenc",initData:a}])};
|
|
2172
2172
|
shaka.hls.HlsParser.prototype.identityDrmParser_=function(a,b,c,d,e){var f=this,g,h,k,l,m,n,p,q,r,t,x,w,u,y,v,z,A;return $jscomp.asyncExecutePromiseGeneratorProgram(function(B){switch(B.nextAddress){case 1:if("video/mp2t"==b)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.HLS_MSE_ENCRYPTED_MP2T_NOT_SUPPORTED);if(shaka.util.Platform.isMediaKeysPolyfilled())throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,
|
|
2173
2173
|
shaka.util.Error.Code.HLS_MSE_ENCRYPTED_LEGACY_APPLE_MEDIA_KEYS_NOT_SUPPORTED);g=a.getRequiredAttrValue("METHOD");h=["SAMPLE-AES","SAMPLE-AES-CTR"];if(!h.includes(g))return shaka.log.error("Identity (ClearKey) in HLS is only supported with [",h.join(", "),"], not",g),B.return(null);k=shaka.hls.Utils.constructSegmentUris(c(),a.getRequiredAttrValue("URI"),e);if(k[0].startsWith("data:text/plain;base64,")){l=shaka.util.Uint8ArrayUtils.toHex(shaka.util.Uint8ArrayUtils.fromBase64(k[0].split("data:text/plain;base64,").pop()));
|