shaka-player 4.9.10 → 4.9.11
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/deps.js +1 -1
- package/dist/locales.js +34 -34
- package/dist/shaka-player.compiled.d.ts +1 -1
- package/dist/shaka-player.compiled.debug.d.ts +1 -1
- package/dist/shaka-player.compiled.debug.js +23 -21
- package/dist/shaka-player.compiled.debug.map +4 -4
- package/dist/shaka-player.compiled.js +612 -612
- package/dist/shaka-player.compiled.map +3 -3
- package/dist/shaka-player.ui.d.ts +1 -1
- package/dist/shaka-player.ui.debug.d.ts +1 -1
- package/dist/shaka-player.ui.debug.js +26 -24
- package/dist/shaka-player.ui.debug.map +4 -4
- package/dist/shaka-player.ui.js +773 -773
- package/dist/shaka-player.ui.map +3 -3
- package/externs/mediatailor.js +2 -2
- package/lib/ads/media_tailor_ad.js +47 -3
- package/lib/player.js +13 -4
- package/package.json +1 -1
package/dist/deps.js
CHANGED
|
@@ -25,7 +25,7 @@ goog.addDependency('../../../../lib/ads/ad_manager.js', ['shaka.ads.AdManager'],
|
|
|
25
25
|
goog.addDependency('../../../../lib/ads/ads_stats.js', ['shaka.ads.AdsStats'], [], {'lang': 'es6'});
|
|
26
26
|
goog.addDependency('../../../../lib/ads/client_side_ad.js', ['shaka.ads.ClientSideAd'], ['shaka.util.EventManager'], {'lang': 'es6'});
|
|
27
27
|
goog.addDependency('../../../../lib/ads/client_side_ad_manager.js', ['shaka.ads.ClientSideAdManager'], ['goog.asserts', 'shaka.ads.ClientSideAd', 'shaka.log', 'shaka.util.Dom', 'shaka.util.EventManager', 'shaka.util.FakeEvent', 'shaka.util.IReleasable'], {'lang': 'es6'});
|
|
28
|
-
goog.addDependency('../../../../lib/ads/media_tailor_ad.js', ['shaka.ads.MediaTailorAd'], [], {'lang': 'es6'});
|
|
28
|
+
goog.addDependency('../../../../lib/ads/media_tailor_ad.js', ['shaka.ads.MediaTailorAd'], ['shaka.util.TextParser'], {'lang': 'es6'});
|
|
29
29
|
goog.addDependency('../../../../lib/ads/media_tailor_ad_manager.js', ['shaka.ads.MediaTailorAdManager'], ['goog.Uri', 'goog.asserts', 'shaka.ads.MediaTailorAd', 'shaka.log', 'shaka.net.NetworkingEngine', 'shaka.util.Error', 'shaka.util.EventManager', 'shaka.util.FakeEvent', 'shaka.util.IReleasable', 'shaka.util.PublicPromise', 'shaka.util.StringUtils'], {'lang': 'es8'});
|
|
30
30
|
goog.addDependency('../../../../lib/ads/server_side_ad.js', ['shaka.ads.ServerSideAd'], [], {'lang': 'es6'});
|
|
31
31
|
goog.addDependency('../../../../lib/ads/server_side_ad_manager.js', ['shaka.ads.ServerSideAdManager'], ['goog.asserts', 'shaka.ads.ServerSideAd', 'shaka.log', 'shaka.util.Error', 'shaka.util.EventManager', 'shaka.util.FakeEvent', 'shaka.util.IReleasable', 'shaka.util.PublicPromise'], {'lang': 'es6'});
|
package/dist/locales.js
CHANGED
|
@@ -761,49 +761,49 @@ shaka.ui.Locales.addTo = function(localization) {
|
|
|
761
761
|
* @const
|
|
762
762
|
*/
|
|
763
763
|
shaka.ui.Locales.Ids = {
|
|
764
|
-
|
|
765
|
-
|
|
766
|
-
SURROUND: 'SURROUND',
|
|
767
|
-
ENTER_LOOP_MODE: 'ENTER_LOOP_MODE',
|
|
768
|
-
SKIP_AD: 'SKIP_AD',
|
|
769
|
-
LOOP: 'LOOP',
|
|
770
|
-
RESOLUTION: 'RESOLUTION',
|
|
771
|
-
AUTO_QUALITY: 'AUTO_QUALITY',
|
|
772
|
-
SEEK: 'SEEK',
|
|
764
|
+
CAST: 'CAST',
|
|
765
|
+
EXIT_LOOP_MODE: 'EXIT_LOOP_MODE',
|
|
773
766
|
TOGGLE_STEREOSCOPIC: 'TOGGLE_STEREOSCOPIC',
|
|
774
|
-
MORE_SETTINGS: 'MORE_SETTINGS',
|
|
775
|
-
ENTER_PICTURE_IN_PICTURE: 'ENTER_PICTURE_IN_PICTURE',
|
|
776
767
|
PLAYBACK_RATE: 'PLAYBACK_RATE',
|
|
777
|
-
|
|
768
|
+
EXIT_FULL_SCREEN: 'EXIT_FULL_SCREEN',
|
|
769
|
+
AD_TIME: 'AD_TIME',
|
|
770
|
+
MUTE: 'MUTE',
|
|
771
|
+
PAUSE: 'PAUSE',
|
|
772
|
+
AD_STATISTICS: 'AD_STATISTICS',
|
|
773
|
+
SUBTITLE_FORCED: 'SUBTITLE_FORCED',
|
|
774
|
+
LIVE: 'LIVE',
|
|
775
|
+
PICTURE_IN_PICTURE: 'PICTURE_IN_PICTURE',
|
|
776
|
+
LOOP: 'LOOP',
|
|
777
|
+
CAPTIONS: 'CAPTIONS',
|
|
778
|
+
MORE_SETTINGS: 'MORE_SETTINGS',
|
|
778
779
|
REWIND: 'REWIND',
|
|
780
|
+
ON: 'ON',
|
|
779
781
|
UNRECOGNIZED_LANGUAGE: 'UNRECOGNIZED_LANGUAGE',
|
|
780
|
-
|
|
781
|
-
|
|
782
|
-
EXIT_LOOP_MODE: 'EXIT_LOOP_MODE',
|
|
782
|
+
EXIT_PICTURE_IN_PICTURE: 'EXIT_PICTURE_IN_PICTURE',
|
|
783
|
+
NOT_APPLICABLE: 'NOT_APPLICABLE',
|
|
783
784
|
OFF: 'OFF',
|
|
785
|
+
AIRPLAY: 'AIRPLAY',
|
|
786
|
+
AD_PROGRESS: 'AD_PROGRESS',
|
|
787
|
+
SKIP_TO_LIVE: 'SKIP_TO_LIVE',
|
|
784
788
|
PLAY: 'PLAY',
|
|
785
|
-
|
|
786
|
-
VOLUME: 'VOLUME',
|
|
787
|
-
LANGUAGE: 'LANGUAGE',
|
|
788
|
-
NOT_APPLICABLE: 'NOT_APPLICABLE',
|
|
789
|
-
ON: 'ON',
|
|
790
|
-
PICTURE_IN_PICTURE: 'PICTURE_IN_PICTURE',
|
|
789
|
+
STATISTICS: 'STATISTICS',
|
|
791
790
|
BACK: 'BACK',
|
|
792
|
-
|
|
793
|
-
|
|
791
|
+
FULL_SCREEN: 'FULL_SCREEN',
|
|
792
|
+
UNDETERMINED_LANGUAGE: 'UNDETERMINED_LANGUAGE',
|
|
794
793
|
UNMUTE: 'UNMUTE',
|
|
795
|
-
|
|
794
|
+
ENTER_PICTURE_IN_PICTURE: 'ENTER_PICTURE_IN_PICTURE',
|
|
795
|
+
ENTER_LOOP_MODE: 'ENTER_LOOP_MODE',
|
|
796
|
+
AD_DURATION: 'AD_DURATION',
|
|
797
|
+
RESOLUTION: 'RESOLUTION',
|
|
796
798
|
RECENTER_VR: 'RECENTER_VR',
|
|
797
|
-
|
|
798
|
-
FAST_FORWARD: 'FAST_FORWARD',
|
|
799
|
-
SUBTITLE_FORCED: 'SUBTITLE_FORCED',
|
|
800
|
-
AD_STATISTICS: 'AD_STATISTICS',
|
|
799
|
+
SEEK: 'SEEK',
|
|
801
800
|
MULTIPLE_LANGUAGES: 'MULTIPLE_LANGUAGES',
|
|
802
|
-
|
|
803
|
-
|
|
804
|
-
|
|
801
|
+
LANGUAGE: 'LANGUAGE',
|
|
802
|
+
VOLUME: 'VOLUME',
|
|
803
|
+
AUTO_QUALITY: 'AUTO_QUALITY',
|
|
805
804
|
REPLAY: 'REPLAY',
|
|
806
|
-
|
|
807
|
-
|
|
808
|
-
|
|
805
|
+
QUALITY: 'QUALITY',
|
|
806
|
+
FAST_FORWARD: 'FAST_FORWARD',
|
|
807
|
+
SURROUND: 'SURROUND',
|
|
808
|
+
SKIP_AD: 'SKIP_AD',
|
|
809
809
|
};
|
|
@@ -4258,7 +4258,7 @@ declare namespace ಠ_ಠ.clutz {
|
|
|
4258
4258
|
}
|
|
4259
4259
|
// Generated from /home/runner/work/shaka-player/shaka-player/externs/mediatailor.js
|
|
4260
4260
|
declare namespace mediaTailor {
|
|
4261
|
-
type Ad = { adId : string , adParameters : string , adSystem : string , adTitle : string , creativeId : string , creativeSequence : string , durationInSeconds : number , nonLinearAdList : mediaTailor.NonLinearAd [] , skipOffset :
|
|
4261
|
+
type Ad = { adId : string , adParameters : string , adSystem : string , adTitle : string , creativeId : string , creativeSequence : string , durationInSeconds : number , nonLinearAdList : mediaTailor.NonLinearAd [] , skipOffset : string | null , startTimeInSeconds : number , trackingEvents : mediaTailor.TrackingEvent [] } ;
|
|
4262
4262
|
}
|
|
4263
4263
|
// Generated from /home/runner/work/shaka-player/shaka-player/externs/mediatailor.js
|
|
4264
4264
|
declare namespace mediaTailor {
|
|
@@ -4258,7 +4258,7 @@ declare namespace ಠ_ಠ.clutz {
|
|
|
4258
4258
|
}
|
|
4259
4259
|
// Generated from /home/runner/work/shaka-player/shaka-player/externs/mediatailor.js
|
|
4260
4260
|
declare namespace mediaTailor {
|
|
4261
|
-
type Ad = { adId : string , adParameters : string , adSystem : string , adTitle : string , creativeId : string , creativeSequence : string , durationInSeconds : number , nonLinearAdList : mediaTailor.NonLinearAd [] , skipOffset :
|
|
4261
|
+
type Ad = { adId : string , adParameters : string , adSystem : string , adTitle : string , creativeId : string , creativeSequence : string , durationInSeconds : number , nonLinearAdList : mediaTailor.NonLinearAd [] , skipOffset : string | null , startTimeInSeconds : number , trackingEvents : mediaTailor.TrackingEvent [] } ;
|
|
4262
4262
|
}
|
|
4263
4263
|
// Generated from /home/runner/work/shaka-player/shaka-player/externs/mediatailor.js
|
|
4264
4264
|
declare namespace mediaTailor {
|
|
@@ -1287,8 +1287,8 @@ this.bufferObserver_.update(b,a)&&this.updateBufferState_()};shaka.Player.protot
|
|
|
1287
1287
|
shaka.Player.prototype.createCmcd_=function(){var a=this;return new shaka.util.CmcdManager({getBandwidthEstimate:function(){return a.abrManager_?a.abrManager_.getBandwidthEstimate():NaN},getBufferedInfo:function(){return a.getBufferedInfo()},getCurrentTime:function(){return a.video_?a.video_.currentTime:0},getPlaybackRate:function(){return a.getPlaybackRate()},getNetworkingEngine:function(){return a.getNetworkingEngine()},getVariantTracks:function(){return a.getVariantTracks()},isLive:function(){return a.isLive()}},
|
|
1288
1288
|
this.config_.cmcd)};shaka.Player.prototype.createCmsd_=function(){return new shaka.util.CmsdManager(this.config_.cmsd)};
|
|
1289
1289
|
shaka.Player.prototype.createStreamingEngine=function(){var a=this;goog.asserts.assert(this.abrManager_&&this.mediaSourceEngine_&&this.manifest_,"Must not be destroyed");return new shaka.media.StreamingEngine(this.manifest_,{getPresentationTime:function(){return a.playhead_?a.playhead_.getTime():0},getBandwidthEstimate:function(){return a.abrManager_.getBandwidthEstimate()},getPlaybackRate:function(){return a.getPlaybackRate()},mediaSourceEngine:this.mediaSourceEngine_,netEngine:this.networkingEngine_,
|
|
1290
|
-
onError:function(b){return a.onError_(b)},onEvent:function(b){return a.dispatchEvent(b)},onManifestUpdate:function(){return a.onManifestUpdate_()},onSegmentAppended:function(b,c){a.onSegmentAppended_(b.startTime,b.endTime,c.type);a.abrManager_&&c.fastSwitching&&b.isPartial()&&b.isLastPartial()&&a.abrManager_.trySuggestStreams()},onInitSegmentAppended:function(b,c){(c=c.getMediaQuality())&&a.qualityObserver_&&a.qualityObserver_.addMediaQualityChange(c,b)},beforeAppendSegment:function(b,
|
|
1291
|
-
c)},onMetadata:function(b,c,d){a.processTimedMetadataMediaSrc_(b,c,d)},disableStream:function(b,c){return a.disableStream(b,c)}})};
|
|
1290
|
+
onError:function(b){return a.onError_(b)},onEvent:function(b){return a.dispatchEvent(b)},onManifestUpdate:function(){return a.onManifestUpdate_()},onSegmentAppended:function(b,c){a.onSegmentAppended_(b.startTime,b.endTime,c.type,c.codecs.includes(","));a.abrManager_&&c.fastSwitching&&b.isPartial()&&b.isLastPartial()&&a.abrManager_.trySuggestStreams()},onInitSegmentAppended:function(b,c){(c=c.getMediaQuality())&&a.qualityObserver_&&a.qualityObserver_.addMediaQualityChange(c,b)},beforeAppendSegment:function(b,
|
|
1291
|
+
c){return a.drmEngine_.parseInbandPssh(b,c)},onMetadata:function(b,c,d){a.processTimedMetadataMediaSrc_(b,c,d)},disableStream:function(b,c){return a.disableStream(b,c)}})};
|
|
1292
1292
|
shaka.Player.prototype.configure=function(a,b){goog.asserts.assert(this.config_,"Config must not be null!");goog.asserts.assert("object"==typeof a||2==arguments.length,"String configs should have values!");2==arguments.length&&"string"==typeof a&&(a=shaka.util.ConfigUtils.convertToConfigObject(a,b));goog.asserts.assert("object"==typeof a,"Should be an object!");a.streaming&&"forceTransmuxTS"in a.streaming&&(shaka.Deprecate.deprecateFeature(5,"streaming.forceTransmuxTS configuration","Please Use mediaSource.forceTransmux instead."),
|
|
1293
1293
|
a.mediaSource.mediaSource=a.streaming.forceTransmuxTS,delete a.streaming.forceTransmuxTS);a.streaming&&"forceTransmux"in a.streaming&&(shaka.Deprecate.deprecateFeature(5,"streaming.forceTransmux configuration","Please Use mediaSource.forceTransmux instead."),a.mediaSource.mediaSource=a.streaming.forceTransmux,delete a.streaming.forceTransmux);a.streaming&&"useNativeHlsOnSafari"in a.streaming&&shaka.Deprecate.deprecateFeature(5,"streaming.useNativeHlsOnSafari configuration","Please Use streaming.useNativeHlsForFairPlay or streaming.preferNativeHls instead.");
|
|
1294
1294
|
if(a.mediaSource&&"sourceBufferExtraFeatures"in a.mediaSource){shaka.Deprecate.deprecateFeature(5,"mediaSource.sourceBufferExtraFeatures configuration","Please Use mediaSource.addExtraFeaturesToSourceBuffer() instead.");var c=a.mediaSource.sourceBufferExtraFeatures;a.mediaSource.addExtraFeaturesToSourceBuffer=function(){return c};delete a.mediaSource.sourceBufferExtraFeatures}a.streaming&&a.streaming.lowLatencyMode&&(void 0==a.streaming.inaccurateManifestTolerance&&(a.streaming.inaccurateManifestTolerance=
|
|
@@ -1404,7 +1404,7 @@ shaka.Player.prototype.switchHtml5Track_=function(a){goog.asserts.assert(this.vi
|
|
|
1404
1404
|
shaka.Player.prototype.setInitialTextState_=function(a,b){b?(a.audio&&this.shouldInitiallyShowText_(a.audio,b)&&(this.isTextVisible_=!0),this.isTextVisible_&&(this.mediaSourceEngine_.getTextDisplayer().setTextVisibility(!0),goog.asserts.assert(this.shouldStreamText_(),"Should be streaming text")),this.onTextTrackVisibility_()):this.isTextVisible_=!1};
|
|
1405
1405
|
shaka.Player.prototype.shouldInitiallyShowText_=function(a,b){var c=shaka.config.AutoShowText;if(this.config_.autoShowText==c.NEVER)return!1;if(this.config_.autoShowText==c.ALWAYS)return!0;var d=shaka.util.LanguageUtils,e=d.normalize(this.config_.preferredTextLanguage);b=d.normalize(b.language);if(this.config_.autoShowText==c.IF_PREFERRED_TEXT_LANGUAGE)return d.areLanguageCompatible(b,e);if(this.config_.autoShowText==c.IF_SUBTITLES_MAY_BE_NEEDED)return a=d.normalize(a.language),d.areLanguageCompatible(b,
|
|
1406
1406
|
e)&&!d.areLanguageCompatible(a,b);shaka.log.alwaysWarn("Invalid autoShowText setting!");return!1};shaka.Player.prototype.onManifestUpdate_=function(){this.parser_&&this.parser_.update&&this.parser_.update()};
|
|
1407
|
-
shaka.Player.prototype.onSegmentAppended_=function(a,b,c){if(this.playhead_){this.playhead_.notifyOfBufferingChange();var
|
|
1407
|
+
shaka.Player.prototype.onSegmentAppended_=function(a,b,c,d){if(this.playhead_){this.playhead_.notifyOfBufferingChange();var e=this.mediaSourceEngine_.bufferStart(c);!this.isLive()&&this.video_.paused&&null!=e&&0<e&&this.playhead_.getTime()<e&&this.playhead_.setStartTime(e)}this.pollBufferState_();a=(new Map).set("start",a).set("end",b).set("contentType",c).set("isMuxed",d);this.dispatchEvent(shaka.Player.makeEvent_(shaka.util.FakeEvent.EventName.SegmentAppended,a))};
|
|
1408
1408
|
shaka.Player.prototype.switch_=function(a,b,c){b=void 0===b?!1:b;c=void 0===c?0:c;shaka.log.debug("switch_");goog.asserts.assert(this.config_.abr.enabled,"AbrManager should not call switch while disabled!");this.manifest_&&this.streamingEngine_&&a!=this.streamingEngine_.getCurrentVariant()&&this.switchVariant_(a,!0,b,c)};
|
|
1409
1409
|
shaka.Player.prototype.onAdaptation_=function(a,b){a=(new Map).set("oldTrack",a).set("newTrack",b);this.lcevcDec_&&this.lcevcDec_.updateVariant(b,this.getManifestType());b=shaka.Player.makeEvent_(shaka.util.FakeEvent.EventName.Adaptation,a);this.delayDispatchEvent_(b)};shaka.Player.prototype.onTracksChanged_=function(){var a=shaka.Player.makeEvent_(shaka.util.FakeEvent.EventName.TracksChanged);this.delayDispatchEvent_(a)};
|
|
1410
1410
|
shaka.Player.prototype.onVariantChanged_=function(a,b){a=(new Map).set("oldTrack",a).set("newTrack",b);this.lcevcDec_&&this.lcevcDec_.updateVariant(b,this.getManifestType());b=shaka.Player.makeEvent_(shaka.util.FakeEvent.EventName.VariantChanged,a);this.delayDispatchEvent_(b)};shaka.Player.prototype.onTextChanged_=function(){var a=shaka.Player.makeEvent_(shaka.util.FakeEvent.EventName.TextChanged);this.delayDispatchEvent_(a)};
|
|
@@ -1443,7 +1443,7 @@ goog.exportProperty(shaka.Player.prototype,"resetConfiguration",shaka.Player.pro
|
|
|
1443
1443
|
goog.exportProperty(shaka.Player.prototype,"releaseAllMutexes",shaka.Player.prototype.releaseAllMutexes);goog.exportProperty(shaka.Player.prototype,"preload",shaka.Player.prototype.preload);goog.exportProperty(shaka.Player.prototype,"detachAndSavePreload",shaka.Player.prototype.detachAndSavePreload);goog.exportProperty(shaka.Player.prototype,"unloadAndSavePreload",shaka.Player.prototype.unloadAndSavePreload);goog.exportProperty(shaka.Player.prototype,"load",shaka.Player.prototype.load);
|
|
1444
1444
|
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,"attachCanvas",shaka.Player.prototype.attachCanvas);goog.exportProperty(shaka.Player.prototype,"attach",shaka.Player.prototype.attach);goog.exportProperty(shaka.Player,"probeSupport",shaka.Player.probeSupport);
|
|
1445
1445
|
goog.exportProperty(shaka.Player,"isBrowserSupported",shaka.Player.isBrowserSupported);goog.exportProperty(shaka.Player,"setAdManagerFactory",shaka.Player.setAdManagerFactory);goog.exportProperty(shaka.Player,"registerSupportPlugin",shaka.Player.registerSupportPlugin);goog.exportProperty(shaka.Player.prototype,"destroy",shaka.Player.prototype.destroy);shaka.Player.LoadMode={DESTROYED:0,NOT_LOADED:1,MEDIA_SOURCE:2,SRC_EQUALS:3};goog.exportProperty(shaka.Player,"LoadMode",shaka.Player.LoadMode);
|
|
1446
|
-
shaka.Player.TYPICAL_BUFFERING_THRESHOLD_=.5;shaka.Player.version="v4.9.
|
|
1446
|
+
shaka.Player.TYPICAL_BUFFERING_THRESHOLD_=.5;shaka.Player.version="v4.9.11-debug";goog.exportProperty(shaka.Player,"version",shaka.Player.version);shaka.Deprecate.init(shaka.Player.version);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_++};
|
|
1447
1447
|
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()};
|
|
1448
1448
|
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()};
|
|
1449
1449
|
shaka.ads.ClientSideAd.prototype.getTimeUntilSkippable=function(){var a=this.ad_.getSkipTimeOffset();a=this.getRemainingTime()-a;return Math.max(a,0)};shaka.ads.ClientSideAd.prototype.canSkipNow=function(){return this.manager_.getAdSkippableState()};shaka.ads.ClientSideAd.prototype.skip=function(){return this.manager_.skip()};shaka.ads.ClientSideAd.prototype.setPaused=function(a){this.isPaused_=a};shaka.ads.ClientSideAd.prototype.pause=function(){return this.manager_.pause()};
|
|
@@ -1481,20 +1481,24 @@ shaka.ads.AdManager.AD_LOADED)});this.eventManager_.listen(this.imaAdsManager_,g
|
|
|
1481
1481
|
function(c){b(c,shaka.ads.AdManager.AD_RECOVERABLE_ERROR)});this.eventManager_.listen(this.imaAdsManager_,google.ima.AdEvent.Type.AD_BREAK_READY,function(c){b(c,shaka.ads.AdManager.AD_BREAK_READY)});this.eventManager_.listen(this.imaAdsManager_,google.ima.AdEvent.Type.INTERACTION,function(c){b(c,shaka.ads.AdManager.AD_INTERACTION)})};
|
|
1482
1482
|
shaka.ads.ClientSideAdManager.prototype.onAdStart_=function(a){goog.asserts.assert(this.imaAdsManager_,"Should have an ads manager at this point!");var b=a.getAd();b?(this.ad_=new shaka.ads.ClientSideAd(b,this.imaAdsManager_,this.video_),a=(new Map).set("ad",this.ad_).set("sdkAdObject",b).set("originalEvent",a),this.onEvent_(new shaka.util.FakeEvent(shaka.ads.AdManager.AD_STARTED,a)),this.ad_.isLinear()&&(this.adContainer_.setAttribute("ad-active","true"),this.config_.customPlayheadTracker||this.video_.pause(),
|
|
1483
1483
|
this.video_.muted?this.ad_.setInitialMuted(this.video_.volume):this.ad_.setVolume(this.video_.volume))):shaka.log.alwaysWarn("The IMA SDK fired a "+a.type+" event with no associated ad. Unable to play ad!")};
|
|
1484
|
-
shaka.ads.ClientSideAdManager.prototype.onAdComplete_=function(a){this.onEvent_(new shaka.util.FakeEvent(shaka.ads.AdManager.AD_STOPPED,(new Map).set("originalEvent",a)));this.ad_&&this.ad_.isLinear()&&(this.adContainer_.removeAttribute("ad-active"),this.config_.customPlayheadTracker||this.video_.ended||this.video_.play())};shaka.
|
|
1485
|
-
shaka.
|
|
1486
|
-
shaka.
|
|
1487
|
-
shaka.ads.MediaTailorAd.prototype.
|
|
1488
|
-
shaka.ads.MediaTailorAd.prototype.
|
|
1489
|
-
shaka.ads.MediaTailorAd.prototype.
|
|
1490
|
-
|
|
1491
|
-
|
|
1492
|
-
|
|
1493
|
-
|
|
1494
|
-
goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"
|
|
1495
|
-
goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"
|
|
1496
|
-
goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"
|
|
1497
|
-
goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"
|
|
1484
|
+
shaka.ads.ClientSideAdManager.prototype.onAdComplete_=function(a){this.onEvent_(new shaka.util.FakeEvent(shaka.ads.AdManager.AD_STOPPED,(new Map).set("originalEvent",a)));this.ad_&&this.ad_.isLinear()&&(this.adContainer_.removeAttribute("ad-active"),this.config_.customPlayheadTracker||this.video_.ended||this.video_.play())};shaka.util.TextParser=function(a){this.data_=a||"";this.position_=0};shaka.util.TextParser.prototype.atEnd=function(){return this.position_==this.data_.length};shaka.util.TextParser.prototype.readLine=function(){return this.readRegexReturnCapture_(/(.*?)(\n|$)/gm,1)};shaka.util.TextParser.prototype.readWord=function(){return this.readRegexReturnCapture_(/[^ \t\n]*/gm,0)};shaka.util.TextParser.prototype.skipWhitespace=function(){this.readRegex(/[ \t]+/gm)};
|
|
1485
|
+
shaka.util.TextParser.prototype.readRegex=function(a){a=this.indexOf_(a);if(this.atEnd()||null==a||a.position!=this.position_)return null;this.position_+=a.length;return a.results};shaka.util.TextParser.prototype.readRegexReturnCapture_=function(a,b){return this.atEnd()?null:(a=this.readRegex(a))?a[b]:null};
|
|
1486
|
+
shaka.util.TextParser.prototype.indexOf_=function(a){goog.asserts.assert(a.global,"global flag should be set");a.lastIndex=this.position_;a=a.exec(this.data_);return null==a?null:{position:a.index,length:a[0].length,results:a}};shaka.ads.MediaTailorAd=function(a,b,c,d,e){this.ad_=a;this.skipOffset_=this.parseTime_(this.ad_.skipOffset);this.video_=e;this.adPosition_=b;this.totalAds_=c;this.isLinear_=d;this.isSkipped_=!1};shaka.ads.MediaTailorAd.prototype.getDuration=function(){return this.ad_.durationInSeconds};shaka.ads.MediaTailorAd.prototype.getMinSuggestedDuration=function(){return this.getDuration()};
|
|
1487
|
+
shaka.ads.MediaTailorAd.prototype.getRemainingTime=function(){return this.ad_.startTimeInSeconds+this.ad_.durationInSeconds-this.video_.currentTime};shaka.ads.MediaTailorAd.prototype.isPaused=function(){return this.video_.paused};shaka.ads.MediaTailorAd.prototype.isSkippable=function(){return"number"==typeof this.skipOffset_?!0:!1};
|
|
1488
|
+
shaka.ads.MediaTailorAd.prototype.getTimeUntilSkippable=function(){if("number"!=typeof this.skipOffset_)return this.getRemainingTime();var a=this.getRemainingTime()+this.skipOffset_-this.getDuration();return Math.max(a,0)};shaka.ads.MediaTailorAd.prototype.canSkipNow=function(){return 0==this.getTimeUntilSkippable()};shaka.ads.MediaTailorAd.prototype.skip=function(){this.isSkipped_=!0;this.video_.currentTime+=this.getRemainingTime()};shaka.ads.MediaTailorAd.prototype.pause=function(){return this.video_.pause()};
|
|
1489
|
+
shaka.ads.MediaTailorAd.prototype.play=function(){return this.video_.play()};shaka.ads.MediaTailorAd.prototype.getVolume=function(){return this.video_.volume};shaka.ads.MediaTailorAd.prototype.setVolume=function(a){this.video_.volume=a};shaka.ads.MediaTailorAd.prototype.isMuted=function(){return this.video_.muted};shaka.ads.MediaTailorAd.prototype.isLinear=function(){return this.isLinear_};shaka.ads.MediaTailorAd.prototype.resize=function(a,b){};
|
|
1490
|
+
shaka.ads.MediaTailorAd.prototype.setMuted=function(a){this.video_.muted=a};shaka.ads.MediaTailorAd.prototype.getSequenceLength=function(){return this.totalAds_?this.totalAds_:1};shaka.ads.MediaTailorAd.prototype.getPositionInSequence=function(){return this.adPosition_?this.adPosition_:1};shaka.ads.MediaTailorAd.prototype.getTitle=function(){return this.ad_.adTitle};shaka.ads.MediaTailorAd.prototype.getDescription=function(){return""};shaka.ads.MediaTailorAd.prototype.getVastMediaBitrate=function(){return 0};
|
|
1491
|
+
shaka.ads.MediaTailorAd.prototype.getVastMediaHeight=function(){return 0};shaka.ads.MediaTailorAd.prototype.getVastMediaWidth=function(){return 0};shaka.ads.MediaTailorAd.prototype.getAdId=function(){return this.ad_.adId};shaka.ads.MediaTailorAd.prototype.getCreativeAdId=function(){return this.ad_.creativeId};shaka.ads.MediaTailorAd.prototype.getAdvertiserName=function(){return""};shaka.ads.MediaTailorAd.prototype.getMediaUrl=function(){return null};
|
|
1492
|
+
shaka.ads.MediaTailorAd.prototype.getTimeOffset=function(){return 0};shaka.ads.MediaTailorAd.prototype.getPodIndex=function(){return 0};shaka.ads.MediaTailorAd.prototype.release=function(){this.totalAds_=this.adPosition_=this.video_=this.ad_=null};shaka.ads.MediaTailorAd.prototype.isSkipped=function(){return this.isSkipped_};
|
|
1493
|
+
shaka.ads.MediaTailorAd.prototype.parseTime_=function(a){if(!a)return null;a=(new shaka.util.TextParser(a)).readRegex(shaka.ads.MediaTailorAd.timeFormat_);if(null==a)return null;var b=Number(a[2]),c=Number(a[3]);return 59<b||59<c?null:(Number(a[4])||0)/1E3+c+60*b+3600*(Number(a[1])||0)};goog.exportSymbol("shaka.ads.MediaTailorAd",shaka.ads.MediaTailorAd);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"release",shaka.ads.MediaTailorAd.prototype.release);
|
|
1494
|
+
goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"getPodIndex",shaka.ads.MediaTailorAd.prototype.getPodIndex);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"getTimeOffset",shaka.ads.MediaTailorAd.prototype.getTimeOffset);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"getMediaUrl",shaka.ads.MediaTailorAd.prototype.getMediaUrl);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"getAdvertiserName",shaka.ads.MediaTailorAd.prototype.getAdvertiserName);
|
|
1495
|
+
goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"getCreativeAdId",shaka.ads.MediaTailorAd.prototype.getCreativeAdId);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"getAdId",shaka.ads.MediaTailorAd.prototype.getAdId);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"getVastMediaWidth",shaka.ads.MediaTailorAd.prototype.getVastMediaWidth);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"getVastMediaHeight",shaka.ads.MediaTailorAd.prototype.getVastMediaHeight);
|
|
1496
|
+
goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"getVastMediaBitrate",shaka.ads.MediaTailorAd.prototype.getVastMediaBitrate);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"getDescription",shaka.ads.MediaTailorAd.prototype.getDescription);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"getTitle",shaka.ads.MediaTailorAd.prototype.getTitle);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"getPositionInSequence",shaka.ads.MediaTailorAd.prototype.getPositionInSequence);
|
|
1497
|
+
goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"getSequenceLength",shaka.ads.MediaTailorAd.prototype.getSequenceLength);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"setMuted",shaka.ads.MediaTailorAd.prototype.setMuted);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"resize",shaka.ads.MediaTailorAd.prototype.resize);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"isLinear",shaka.ads.MediaTailorAd.prototype.isLinear);
|
|
1498
|
+
goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"isMuted",shaka.ads.MediaTailorAd.prototype.isMuted);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"setVolume",shaka.ads.MediaTailorAd.prototype.setVolume);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"getVolume",shaka.ads.MediaTailorAd.prototype.getVolume);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"play",shaka.ads.MediaTailorAd.prototype.play);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"pause",shaka.ads.MediaTailorAd.prototype.pause);
|
|
1499
|
+
goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"skip",shaka.ads.MediaTailorAd.prototype.skip);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"canSkipNow",shaka.ads.MediaTailorAd.prototype.canSkipNow);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"getTimeUntilSkippable",shaka.ads.MediaTailorAd.prototype.getTimeUntilSkippable);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"isSkippable",shaka.ads.MediaTailorAd.prototype.isSkippable);
|
|
1500
|
+
goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"isPaused",shaka.ads.MediaTailorAd.prototype.isPaused);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"getRemainingTime",shaka.ads.MediaTailorAd.prototype.getRemainingTime);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"getMinSuggestedDuration",shaka.ads.MediaTailorAd.prototype.getMinSuggestedDuration);goog.exportProperty(shaka.ads.MediaTailorAd.prototype,"getDuration",shaka.ads.MediaTailorAd.prototype.getDuration);
|
|
1501
|
+
shaka.ads.MediaTailorAd.timeFormat_=/(?:(\d{1,}):)?(\d{2}):(\d{2})((\.(\d{1,3})))?/g;shaka.ads.MediaTailorAdManager=function(a,b,c,d){this.adContainer_=a;this.networkingEngine_=b;this.video_=c;this.streamPromise_=null;this.streamRequestStartTime_=NaN;this.onEvent_=d;this.isLive_=!1;this.snapForwardTime_=null;this.adBreaks_=[];this.playedAds_=[];this.mediaTailorAdBreak_=this.mediaTailorAd_=this.ad_=null;this.staticResources_=new Map;this.adListeners_=[];this.eventsSent=[];this.trackingUrl_="";this.firstTrackingRequest_=!0;this.backupUrl_="";this.currentCuePoints_=[];this.eventManager_=
|
|
1498
1502
|
new shaka.util.EventManager};shaka.ads.MediaTailorAdManager.prototype.streamRequest=function(a,b,c){if(this.streamPromise_)return Promise.reject(new shaka.util.Error(shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.ADS,shaka.util.Error.Code.CURRENT_DAI_REQUEST_NOT_FINISHED));this.streamPromise_=new shaka.util.PublicPromise;this.requestSessionInfo_(a,b);this.backupUrl_=c||"";this.streamRequestStartTime_=Date.now()/1E3;return this.streamPromise_};
|
|
1499
1503
|
shaka.ads.MediaTailorAdManager.prototype.addTrackingUrl=function(a){this.trackingUrl_=a;this.onEvent_(new shaka.util.FakeEvent(shaka.ads.AdManager.ADS_LOADED,(new Map).set("loadTime",0)))};
|
|
1500
1504
|
shaka.ads.MediaTailorAdManager.prototype.stop=function(){for(var a=$jscomp.makeIterator(this.adListeners_),b=a.next();!b.done;b=a.next())b=b.value,this.eventManager_.unlisten(b.target,b.type,b.listener);this.onEnded_();this.adListeners_=[];this.eventsSent=[];this.trackingUrl_="";this.firstTrackingRequest_=!0;this.backupUrl_="";this.snapForwardTime_=null;this.adBreaks_=[];this.playedAds_=[];this.staticResources_.clear()};
|
|
@@ -2072,9 +2076,7 @@ shaka.hls.Tag.prototype.addAttribute=function(a){this.attributes.push(a)};shaka.
|
|
|
2072
2076
|
shaka.hls.Tag.prototype.getRequiredAttrValue=function(a){var b=this.getAttribute(a);if(!b)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.HLS_REQUIRED_ATTRIBUTE_MISSING,a);return b.value};shaka.hls.Tag.prototype.setName=function(a){this.name=a};shaka.hls.Segment=function(a,b,c){c=void 0===c?[]:c;this.tags=b;this.verbatimSegmentUri=a;this.partialSegments=c};shaka.hls.Attribute=function(a,b){this.name=a;this.value=b};shaka.hls.Utils=function(){};shaka.hls.Utils.filterTagsByName=function(a,b){return a.filter(function(c){return c.name==b})};shaka.hls.Utils.filterTagsByType=function(a,b){return a.filter(function(c){return c.getRequiredAttrValue("TYPE")==b})};shaka.hls.Utils.getFirstTagWithName=function(a,b){a=$jscomp.makeIterator(a);for(var c=a.next();!c.done;c=a.next())if(c=c.value,c.name===b)return c;return null};
|
|
2073
2077
|
shaka.hls.Utils.getFirstTagWithNameAsNumber=function(a,b,c){c=void 0===c?0:c;return(a=shaka.hls.Utils.getFirstTagWithName(a,b))?Number(a.value):c};shaka.hls.Utils.constructSegmentUris=function(a,b,c){return b?shaka.hls.Utils.constructUris(a,[b],c):[]};shaka.hls.Utils.constructUris=function(a,b,c){if(!b.length)return[];b=shaka.util.ManifestParserUtils.resolveUris(a,b);a=[];b=$jscomp.makeIterator(b);for(var d=b.next();!d.done;d=b.next())a.push(shaka.hls.Utils.variableSubstitution(d.value,c));return a};
|
|
2074
2078
|
shaka.hls.Utils.variableSubstitution=function(a,b){if(!b||!b.size)return a;a=String(a).replace(/%7B/g,"{").replace(/%7D/g,"}");var c=a.match(/{\$\w*}/g);if(c){c=$jscomp.makeIterator(c);for(var d=c.next();!d.done;d=c.next()){d=d.value;var e=d.slice(2,d.length-1),f=b.get(e);if(f)a=a.replace(d,f);else throw shaka.log.error("A variable has been found that is not declared",e),new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.HLS_VARIABLE_NOT_FOUND,
|
|
2075
|
-
e);}}return a};shaka.hls.Utils.isComment=function(a){return/^#(?!EXT)/m.test(a)};shaka.
|
|
2076
|
-
shaka.util.TextParser.prototype.readRegex=function(a){a=this.indexOf_(a);if(this.atEnd()||null==a||a.position!=this.position_)return null;this.position_+=a.length;return a.results};shaka.util.TextParser.prototype.readRegexReturnCapture_=function(a,b){return this.atEnd()?null:(a=this.readRegex(a))?a[b]:null};
|
|
2077
|
-
shaka.util.TextParser.prototype.indexOf_=function(a){goog.asserts.assert(a.global,"global flag should be set");a.lastIndex=this.position_;a=a.exec(this.data_);return null==a?null:{position:a.index,length:a[0].length,results:a}};shaka.hls.ManifestTextParser=function(){this.globalId_=0};
|
|
2079
|
+
e);}}return a};shaka.hls.Utils.isComment=function(a){return/^#(?!EXT)/m.test(a)};shaka.hls.ManifestTextParser=function(){this.globalId_=0};
|
|
2078
2080
|
shaka.hls.ManifestTextParser.prototype.parsePlaylist=function(a){var b=shaka.hls.ManifestTextParser.MEDIA_PLAYLIST_TAGS,c=shaka.hls.ManifestTextParser.SEGMENT_TAGS;a=shaka.util.StringUtils.fromUTF8(a);a=a.replace(/\r\n|\r(?=[^\n]|$)/gm,"\n").trim();var d=a.split(/\n+/m);if(!/^#EXTM3U($|[ \t\n])/m.test(d[0]))throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.HLS_PLAYLIST_HEADER_MISSING);a=shaka.hls.PlaylistType.MASTER;for(var e=!0,
|
|
2079
2081
|
f=$jscomp.makeIterator(d),g=f.next();!g.done;g=f.next())if(g=g.value,shaka.hls.Utils.isComment(g)||e)e=!1;else if(g=this.parseTag_(g),--this.globalId_,b.includes(g.name)){a=shaka.hls.PlaylistType.MEDIA;break}else"EXT-X-STREAM-INF"==g.name&&(e=!0);b=[];e=!0;for(f=0;f<d.length;f++){var h=d[f];g=d[f+1];if(shaka.hls.Utils.isComment(h)||e)e=!1;else{h=this.parseTag_(h);if(c.includes(h.name)){if(a!=shaka.hls.PlaylistType.MEDIA)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,
|
|
2080
2082
|
shaka.util.Error.Code.HLS_INVALID_PLAYLIST_HIERARCHY);c=d.splice(f,d.length-f);c=this.parseSegments_(c,b);return new shaka.hls.Playlist(a,b,c)}b.push(h);"EXT-X-STREAM-INF"==h.name&&(e=new shaka.hls.Attribute("URI",g),h.addAttribute(e),e=!0)}}return new shaka.hls.Playlist(a,b)};
|