shaka-player 4.6.4 → 4.6.6
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/AUTHORS +1 -0
- package/CHANGELOG.md +31 -0
- package/CONTRIBUTORS +1 -0
- package/dist/deps.js +1 -1
- package/dist/locales.js +29 -29
- package/dist/shaka-player.compiled.debug.js +52 -53
- package/dist/shaka-player.compiled.debug.map +3 -3
- package/dist/shaka-player.compiled.js +630 -627
- package/dist/shaka-player.compiled.map +4 -4
- package/dist/shaka-player.ui.debug.js +114 -115
- package/dist/shaka-player.ui.debug.map +3 -3
- package/dist/shaka-player.ui.js +730 -729
- package/dist/shaka-player.ui.map +3 -3
- package/docs/tutorials/fairplay.md +2 -2
- package/externs/isoboxer.js +20 -12
- package/externs/shaka/codecs.js +4 -0
- package/lib/ads/media_tailor_ad_manager.js +3 -2
- package/lib/hls/hls_parser.js +2 -0
- package/lib/media/media_source_engine.js +1 -1
- package/lib/media/segment_prefetch.js +2 -2
- package/lib/net/networking_utils.js +12 -3
- package/lib/player.js +2 -2
- package/lib/text/ui_text_displayer.js +7 -0
- package/lib/transmuxer/mss_transmuxer.js +3 -2
- package/lib/transmuxer/ts_transmuxer.js +4 -4
- package/lib/util/mp4_generator.js +14 -10
- package/lib/util/platform.js +20 -1
- package/lib/util/ts_parser.js +27 -24
- package/lib/util/uint8array_utils.js +12 -7
- package/package.json +1 -1
- package/test/player_unit.js +31 -0
- package/test/text/ui_text_displayer_unit.js +9 -0
- package/ui/controls.js +2 -1
- package/ui/volume_bar.js +10 -6
package/AUTHORS
CHANGED
|
@@ -21,6 +21,7 @@ Alugha GmbH <*@alugha.com>
|
|
|
21
21
|
Alvaro Velad Galvan <ladvan91@hotmail.com>
|
|
22
22
|
Amila Sampath <lucksy@gmail.com>
|
|
23
23
|
Anthony Stansbridge <github@anthonystansbridge.co.uk>
|
|
24
|
+
Antonio Diaz Correa <hello@antoniodiaz.me>
|
|
24
25
|
Armand Zangue <armand.zangue@gmail.com>
|
|
25
26
|
Benjamin Wallberg <me@bwallberg.com>
|
|
26
27
|
Bonnier Broadcasting <*@bonnierbroadcasting.com>
|
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,36 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [4.6.6](https://github.com/shaka-project/shaka-player/compare/v4.6.5...v4.6.6) (2024-01-08)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Bug Fixes
|
|
7
|
+
|
|
8
|
+
* APL set-top box wrongly identifies as an Apple device. ([#6026](https://github.com/shaka-project/shaka-player/issues/6026)) ([ca751a1](https://github.com/shaka-project/shaka-player/commit/ca751a100126aaff49af03b8171d355d3268a711))
|
|
9
|
+
* avoid uiTextDisplayer.destroy crashing if called more than once ([#6022](https://github.com/shaka-project/shaka-player/issues/6022)) ([bb4f88b](https://github.com/shaka-project/shaka-player/commit/bb4f88b41652988b8397c86d22282db7530df54b))
|
|
10
|
+
* ENCRYPTED CONTENT WITHOUT DRM INFO on comcast X1 due to safari blocklist ([#6034](https://github.com/shaka-project/shaka-player/issues/6034)) ([a75f6bc](https://github.com/shaka-project/shaka-player/commit/a75f6bc90e3be4045a4586667eb0720d753d3ff5))
|
|
11
|
+
* Fix untrusted types in MediaTailorAdManager ([#5996](https://github.com/shaka-project/shaka-player/issues/5996)) ([18891ea](https://github.com/shaka-project/shaka-player/commit/18891ea0c1f8f16531faeb1b766f5f78697df498))
|
|
12
|
+
* **HLS:** Fix clear init segment mapping ([#6000](https://github.com/shaka-project/shaka-player/issues/6000)) ([61d5298](https://github.com/shaka-project/shaka-player/commit/61d52984637c4327c33e44ee74c2b9728df0f8f0))
|
|
13
|
+
* log prefetch miss for missing segments ([#6012](https://github.com/shaka-project/shaka-player/issues/6012)) ([1528eef](https://github.com/shaka-project/shaka-player/commit/1528eefd9b9320190b1dabfb5edf1735a22c2084))
|
|
14
|
+
* **UI:** Fix disable PiP when using documentPictureInPicture ([#5992](https://github.com/shaka-project/shaka-player/issues/5992)) ([521bbe2](https://github.com/shaka-project/shaka-player/commit/521bbe25f0cf5503d9e7f2fb09416cc45741941d))
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Performance Improvements
|
|
18
|
+
|
|
19
|
+
* **mp4generator:** stop nesting concat in methods ([#6041](https://github.com/shaka-project/shaka-player/issues/6041)) ([2bc303b](https://github.com/shaka-project/shaka-player/commit/2bc303b325c7ed005df7a9176b988e9e3601176f))
|
|
20
|
+
* **transmuxer:** various performance improvements ([#6003](https://github.com/shaka-project/shaka-player/issues/6003)) ([dd8e507](https://github.com/shaka-project/shaka-player/commit/dd8e50710905790987ae1dcb0516250218a338f9))
|
|
21
|
+
* ts parser O(n^2) performance bug. ([#6035](https://github.com/shaka-project/shaka-player/issues/6035)) ([d3081f6](https://github.com/shaka-project/shaka-player/commit/d3081f656bda6be274a1f465d9fbde7126034d06))
|
|
22
|
+
|
|
23
|
+
## [4.6.5](https://github.com/shaka-project/shaka-player/compare/v4.6.4...v4.6.5) (2023-12-05)
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
### Bug Fixes
|
|
27
|
+
|
|
28
|
+
* Fix liveLatency in stats ([#5982](https://github.com/shaka-project/shaka-player/issues/5982)) ([b9b6f82](https://github.com/shaka-project/shaka-player/commit/b9b6f8275901e6c0b238fed4e95dea8d7da0f24e))
|
|
29
|
+
* Fix transmuxer when some PES has the same pts and dts value ([#5985](https://github.com/shaka-project/shaka-player/issues/5985)) ([b81ca1a](https://github.com/shaka-project/shaka-player/commit/b81ca1abb8ddd362a0b7070062c071b4336d2d87))
|
|
30
|
+
* **HLS:** Fix variant synchronization in HLS after selectVariantTrack ([#5984](https://github.com/shaka-project/shaka-player/issues/5984)) ([4068b4e](https://github.com/shaka-project/shaka-player/commit/4068b4e72bb5e4b8c77f072cec854deea0607fcd))
|
|
31
|
+
* Provide a fallback to GET request when HEAD request fails ([#5986](https://github.com/shaka-project/shaka-player/issues/5986)) ([bbb7433](https://github.com/shaka-project/shaka-player/commit/bbb74335959ad686c48d7fcee2195852676cc249))
|
|
32
|
+
* **UI:** Fix keyboard navigation of volume bar on Firefox ([#5981](https://github.com/shaka-project/shaka-player/issues/5981)) ([bf939bf](https://github.com/shaka-project/shaka-player/commit/bf939bfc1c498ba012de40dfc0a8655a66f46702))
|
|
33
|
+
|
|
3
34
|
## [4.6.4](https://github.com/shaka-project/shaka-player/compare/v4.6.3...v4.6.4) (2023-12-04)
|
|
4
35
|
|
|
5
36
|
|
package/CONTRIBUTORS
CHANGED
|
@@ -32,6 +32,7 @@ Alvaro Velad Galvan <ladvan91@hotmail.com>
|
|
|
32
32
|
Amila Sampath <lucksy@gmail.com>
|
|
33
33
|
Andy Hochhaus <ahochhaus@samegoal.com>
|
|
34
34
|
Anthony Stansbridge <github@anthonystansbridge.co.uk>
|
|
35
|
+
Antonio Diaz Correa <hello@antoniodiaz.me>
|
|
35
36
|
Armand Zangue <armand.zangue@gmail.com>
|
|
36
37
|
Ashutosh Kumar Mukhiya <ashukm4@gmail.com>
|
|
37
38
|
Benjamin Wallberg <benjamin.wallberg@bonnierbroadcasting.com>
|
package/dist/deps.js
CHANGED
|
@@ -99,7 +99,7 @@ goog.addDependency('../../../../lib/net/http_fetch_plugin.js', ['shaka.net.HttpF
|
|
|
99
99
|
goog.addDependency('../../../../lib/net/http_plugin_utils.js', ['shaka.net.HttpPluginUtils'], ['shaka.log', 'shaka.util.Error', 'shaka.util.StringUtils'], {'lang': 'es6'});
|
|
100
100
|
goog.addDependency('../../../../lib/net/http_xhr_plugin.js', ['shaka.net.HttpXHRPlugin'], ['goog.asserts', 'shaka.net.HttpPluginUtils', 'shaka.net.NetworkingEngine', 'shaka.util.AbortableOperation', 'shaka.util.Error'], {'lang': 'es6'});
|
|
101
101
|
goog.addDependency('../../../../lib/net/networking_engine.js', ['shaka.net.NetworkingEngine', 'shaka.net.NetworkingEngine.AdvancedRequestType', 'shaka.net.NetworkingEngine.PendingRequest', 'shaka.net.NetworkingEngine.RequestType'], ['goog.Uri', 'goog.asserts', 'shaka.net.Backoff', 'shaka.util.AbortableOperation', 'shaka.util.BufferUtils', 'shaka.util.Error', 'shaka.util.FakeEvent', 'shaka.util.FakeEventTarget', 'shaka.util.IDestroyable', 'shaka.util.ObjectUtils', 'shaka.util.OperationManager', 'shaka.util.Timer'], {'lang': 'es6'});
|
|
102
|
-
goog.addDependency('../../../../lib/net/networking_utils.js', ['shaka.net.NetworkingUtils'], ['goog.Uri', 'shaka.net.NetworkingEngine'], {'lang': 'es8'});
|
|
102
|
+
goog.addDependency('../../../../lib/net/networking_utils.js', ['shaka.net.NetworkingUtils'], ['goog.Uri', 'shaka.net.NetworkingEngine', 'shaka.util.Error'], {'lang': 'es8'});
|
|
103
103
|
goog.addDependency('../../../../lib/offline/download_info.js', ['shaka.offline.DownloadInfo'], ['shaka.util.Networking'], {'lang': 'es6'});
|
|
104
104
|
goog.addDependency('../../../../lib/offline/download_manager.js', ['shaka.offline.DownloadManager'], ['shaka.net.NetworkingEngine', 'shaka.offline.DownloadProgressEstimator', 'shaka.util.ArrayUtils', 'shaka.util.BufferUtils', 'shaka.util.Destroyer', 'shaka.util.Error', 'shaka.util.IDestroyable', 'shaka.util.Pssh'], {'lang': 'es8'});
|
|
105
105
|
goog.addDependency('../../../../lib/offline/download_progress_estimator.js', ['shaka.offline.DownloadProgressEstimator'], [], {'lang': 'es6'});
|
package/dist/locales.js
CHANGED
|
@@ -724,46 +724,46 @@ shaka.ui.Locales.addTo = function(localization) {
|
|
|
724
724
|
* @const
|
|
725
725
|
*/
|
|
726
726
|
shaka.ui.Locales.Ids = {
|
|
727
|
-
SURROUND: 'SURROUND',
|
|
728
727
|
REPLAY: 'REPLAY',
|
|
729
|
-
AD_TIME: 'AD_TIME',
|
|
730
|
-
RESOLUTION: 'RESOLUTION',
|
|
731
|
-
LOOP: 'LOOP',
|
|
732
|
-
SKIP_TO_LIVE: 'SKIP_TO_LIVE',
|
|
733
|
-
ON: 'ON',
|
|
734
|
-
MUTE: 'MUTE',
|
|
735
728
|
CAPTIONS: 'CAPTIONS',
|
|
729
|
+
EXIT_LOOP_MODE: 'EXIT_LOOP_MODE',
|
|
736
730
|
FULL_SCREEN: 'FULL_SCREEN',
|
|
737
|
-
NOT_APPLICABLE: 'NOT_APPLICABLE',
|
|
738
731
|
AIRPLAY: 'AIRPLAY',
|
|
732
|
+
BACK: 'BACK',
|
|
733
|
+
SKIP_AD: 'SKIP_AD',
|
|
734
|
+
UNRECOGNIZED_LANGUAGE: 'UNRECOGNIZED_LANGUAGE',
|
|
735
|
+
LANGUAGE: 'LANGUAGE',
|
|
739
736
|
LIVE: 'LIVE',
|
|
740
737
|
OFF: 'OFF',
|
|
741
|
-
|
|
742
|
-
ENTER_PICTURE_IN_PICTURE: 'ENTER_PICTURE_IN_PICTURE',
|
|
738
|
+
PICTURE_IN_PICTURE: 'PICTURE_IN_PICTURE',
|
|
743
739
|
AD_DURATION: 'AD_DURATION',
|
|
744
740
|
PLAYBACK_RATE: 'PLAYBACK_RATE',
|
|
745
|
-
|
|
746
|
-
|
|
747
|
-
|
|
748
|
-
|
|
741
|
+
RESOLUTION: 'RESOLUTION',
|
|
742
|
+
SKIP_TO_LIVE: 'SKIP_TO_LIVE',
|
|
743
|
+
REWIND: 'REWIND',
|
|
744
|
+
UNDETERMINED_LANGUAGE: 'UNDETERMINED_LANGUAGE',
|
|
749
745
|
AUTO_QUALITY: 'AUTO_QUALITY',
|
|
750
|
-
|
|
746
|
+
UNMUTE: 'UNMUTE',
|
|
747
|
+
ON: 'ON',
|
|
748
|
+
NOT_APPLICABLE: 'NOT_APPLICABLE',
|
|
749
|
+
ENTER_LOOP_MODE: 'ENTER_LOOP_MODE',
|
|
750
|
+
PLAY: 'PLAY',
|
|
751
|
+
MULTIPLE_LANGUAGES: 'MULTIPLE_LANGUAGES',
|
|
752
|
+
SUBTITLE_FORCED: 'SUBTITLE_FORCED',
|
|
753
|
+
SURROUND: 'SURROUND',
|
|
754
|
+
FAST_FORWARD: 'FAST_FORWARD',
|
|
751
755
|
MORE_SETTINGS: 'MORE_SETTINGS',
|
|
752
|
-
AD_PROGRESS: 'AD_PROGRESS',
|
|
753
|
-
SKIP_AD: 'SKIP_AD',
|
|
754
756
|
EXIT_PICTURE_IN_PICTURE: 'EXIT_PICTURE_IN_PICTURE',
|
|
755
|
-
|
|
756
|
-
EXIT_FULL_SCREEN: 'EXIT_FULL_SCREEN',
|
|
757
|
-
MULTIPLE_LANGUAGES: 'MULTIPLE_LANGUAGES',
|
|
757
|
+
SEEK: 'SEEK',
|
|
758
758
|
QUALITY: 'QUALITY',
|
|
759
|
-
|
|
760
|
-
|
|
761
|
-
|
|
762
|
-
|
|
763
|
-
|
|
764
|
-
|
|
765
|
-
|
|
766
|
-
|
|
759
|
+
LOOP: 'LOOP',
|
|
760
|
+
STATISTICS: 'STATISTICS',
|
|
761
|
+
EXIT_FULL_SCREEN: 'EXIT_FULL_SCREEN',
|
|
762
|
+
AD_PROGRESS: 'AD_PROGRESS',
|
|
763
|
+
AD_TIME: 'AD_TIME',
|
|
764
|
+
ENTER_PICTURE_IN_PICTURE: 'ENTER_PICTURE_IN_PICTURE',
|
|
765
|
+
VOLUME: 'VOLUME',
|
|
766
|
+
MUTE: 'MUTE',
|
|
767
767
|
PAUSE: 'PAUSE',
|
|
768
|
-
|
|
768
|
+
CAST: 'CAST',
|
|
769
769
|
};
|
|
@@ -4,7 +4,12 @@
|
|
|
4
4
|
Copyright 2016 Google LLC
|
|
5
5
|
SPDX-License-Identifier: Apache-2.0
|
|
6
6
|
*/
|
|
7
|
-
(function(){var innerGlobal=typeof window!="undefined"?window:global;var exportTo={};(function(window,global,module){
|
|
7
|
+
(function(){var innerGlobal=typeof window!="undefined"?window:global;var exportTo={};(function(window,global,module){/*
|
|
8
|
+
|
|
9
|
+
Copyright The Closure Library Authors.
|
|
10
|
+
SPDX-License-Identifier: Apache-2.0
|
|
11
|
+
*/
|
|
12
|
+
var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.arrayIteratorImpl=function(a){var b=0;return function(){return b<a.length?{done:!1,value:a[b++]}:{done:!0}}};$jscomp.arrayIterator=function(a){return{next:$jscomp.arrayIteratorImpl(a)}};$jscomp.ASSUME_ES5=!1;$jscomp.ASSUME_NO_NATIVE_MAP=!1;$jscomp.ASSUME_NO_NATIVE_SET=!1;$jscomp.SIMPLE_FROUND_POLYFILL=!1;$jscomp.ISOLATE_POLYFILLS=!1;$jscomp.FORCE_POLYFILL_PROMISE=!1;$jscomp.FORCE_POLYFILL_PROMISE_WHEN_NO_UNHANDLED_REJECTION=!1;
|
|
8
13
|
$jscomp.defineProperty=$jscomp.ASSUME_ES5||"function"==typeof Object.defineProperties?Object.defineProperty:function(a,b,c){if(a==Array.prototype||a==Object.prototype)return a;a[b]=c.value;return a};$jscomp.getGlobal=function(a){a=["object"==typeof globalThis&&globalThis,a,"object"==typeof window&&window,"object"==typeof self&&self,"object"==typeof global&&global];for(var b=0;b<a.length;++b){var c=a[b];if(c&&c.Math==Math)return c}throw Error("Cannot find global object");};$jscomp.global=$jscomp.getGlobal(this);
|
|
9
14
|
$jscomp.IS_SYMBOL_NATIVE="function"===typeof Symbol&&"symbol"===typeof Symbol("x");$jscomp.TRUST_ES6_POLYFILLS=!$jscomp.ISOLATE_POLYFILLS||$jscomp.IS_SYMBOL_NATIVE;$jscomp.polyfills={};$jscomp.propertyToPolyfillSymbol={};$jscomp.POLYFILL_PREFIX="$jscp$";var $jscomp$lookupPolyfilledValue=function(a,b){var c=$jscomp.propertyToPolyfillSymbol[b];if(null==c)return a[b];c=a[c];return void 0!==c?c:a[b]};
|
|
10
15
|
$jscomp.polyfill=function(a,b,c,d){b&&($jscomp.ISOLATE_POLYFILLS?$jscomp.polyfillIsolated(a,b,c,d):$jscomp.polyfillUnisolated(a,b,c,d))};$jscomp.polyfillUnisolated=function(a,b,c,d){c=$jscomp.global;a=a.split(".");for(d=0;d<a.length-1;d++){var e=a[d];if(!(e in c))return;c=c[e]}a=a[a.length-1];d=c[a];b=b(d);b!=d&&null!=b&&$jscomp.defineProperty(c,a,{configurable:!0,writable:!0,value:b})};
|
|
@@ -67,12 +72,8 @@ $jscomp.polyfill("WeakSet",function(a){function b(){if(!a||!Object.seal)return!1
|
|
|
67
72
|
!0);return this};c.prototype.has=function(d){return this.map_.has(d)};c.prototype.delete=function(d){return this.map_.delete(d)};return c},"es6","es3");$jscomp.polyfill("Array.prototype.entries",function(a){return a?a:function(){return $jscomp.iteratorFromArray(this,function(b,c){return[b,c]})}},"es6","es3");
|
|
68
73
|
$jscomp.polyfill("String.prototype.repeat",function(a){return a?a:function(b){var c=$jscomp.checkStringArgs(this,null,"repeat");if(0>b||1342177279<b)throw new RangeError("Invalid count value");b|=0;for(var d="";b;)if(b&1&&(d+=c),b>>>=1)c+=c;return d}},"es6","es3");$jscomp.polyfill("Number.isNaN",function(a){return a?a:function(b){return"number"===typeof b&&isNaN(b)}},"es6","es3");
|
|
69
74
|
$jscomp.polyfill("Number.isFinite",function(a){return a?a:function(b){return"number"!==typeof b?!1:!isNaN(b)&&Infinity!==b&&-Infinity!==b}},"es6","es3");$jscomp.polyfill("Object.values",function(a){return a?a:function(b){var c=[],d;for(d in b)$jscomp.owns(b,d)&&c.push(b[d]);return c}},"es8","es3");$jscomp.polyfill("Math.log2",function(a){return a?a:function(b){return Math.log(b)/Math.LN2}},"es6","es3");$jscomp.polyfill("Number.MAX_SAFE_INTEGER",function(){return 9007199254740991},"es6","es3");
|
|
70
|
-
$jscomp.polyfill("Math.trunc",function(a){return a?a:function(b){b=Number(b);if(isNaN(b)||Infinity===b||-Infinity===b||0===b)return b;var c=Math.floor(Math.abs(b));return 0>b?-c:c}},"es6","es3");$jscomp.polyfill("Object.entries",function(a){return a?a:function(b){var c=[],d;for(d in b)$jscomp.owns(b,d)&&c.push([d,b[d]]);return c}},"es8","es3")
|
|
71
|
-
|
|
72
|
-
Copyright The Closure Library Authors.
|
|
73
|
-
SPDX-License-Identifier: Apache-2.0
|
|
74
|
-
*/
|
|
75
|
-
var COMPILED=!0,goog=goog||{};goog.global=this||self;goog.exportPath_=function(a,b,c,d){a=a.split(".");d=d||goog.global;a[0]in d||"undefined"==typeof d.execScript||d.execScript("var "+a[0]);for(var e;a.length&&(e=a.shift());)if(a.length||void 0===b)d=d[e]&&d[e]!==Object.prototype[e]?d[e]:d[e]={};else if(!c&&goog.isObject(b)&&goog.isObject(d[e]))for(var f in b)b.hasOwnProperty(f)&&(d[e][f]=b[f]);else d[e]=b};
|
|
75
|
+
$jscomp.polyfill("Math.trunc",function(a){return a?a:function(b){b=Number(b);if(isNaN(b)||Infinity===b||-Infinity===b||0===b)return b;var c=Math.floor(Math.abs(b));return 0>b?-c:c}},"es6","es3");$jscomp.polyfill("Object.entries",function(a){return a?a:function(b){var c=[],d;for(d in b)$jscomp.owns(b,d)&&c.push([d,b[d]]);return c}},"es8","es3");var COMPILED=!0,goog=goog||{};goog.global=this||self;
|
|
76
|
+
goog.exportPath_=function(a,b,c,d){a=a.split(".");d=d||goog.global;a[0]in d||"undefined"==typeof d.execScript||d.execScript("var "+a[0]);for(var e;a.length&&(e=a.shift());)if(a.length||void 0===b)d=d[e]&&d[e]!==Object.prototype[e]?d[e]:d[e]={};else if(!c&&goog.isObject(b)&&goog.isObject(d[e]))for(var f in b)b.hasOwnProperty(f)&&(d[e][f]=b[f]);else d[e]=b};
|
|
76
77
|
goog.define=function(a,b){if(!COMPILED){var c=goog.global.CLOSURE_UNCOMPILED_DEFINES,d=goog.global.CLOSURE_DEFINES;c&&void 0===c.nodeType&&Object.prototype.hasOwnProperty.call(c,a)?b=c[a]:d&&void 0===d.nodeType&&Object.prototype.hasOwnProperty.call(d,a)&&(b=d[a])}return b};goog.FEATURESET_YEAR=2012;goog.DEBUG=!0;goog.LOCALE="en";goog.getLocale=function(){return goog.LOCALE};goog.TRUSTED_SITE=!0;goog.DISALLOW_TEST_ONLY_CODE=COMPILED&&!goog.DEBUG;goog.ENABLE_CHROME_APP_SAFE_SCRIPT_LOADING=!1;
|
|
77
78
|
goog.provide=function(a){if(goog.isInModuleLoader_())throw Error("goog.provide cannot be used within a module.");if(!COMPILED&&goog.isProvided_(a))throw Error('Namespace "'+a+'" already declared.');goog.constructNamespace_(a)};goog.constructNamespace_=function(a,b,c){if(!COMPILED){delete goog.implicitNamespaces_[a];for(var d=a;(d=d.substring(0,d.lastIndexOf(".")))&&!goog.getObjectByName(d);)goog.implicitNamespaces_[d]=!0}goog.exportPath_(a,b,c)};goog.NONCE_PATTERN_=/^[\w+/_-]+[=]{0,2}$/;
|
|
78
79
|
goog.getScriptNonce_=function(a){a=(a||goog.global).document;return(a=a.querySelector&&a.querySelector("script[nonce]"))&&(a=a.nonce||a.getAttribute("nonce"))&&goog.NONCE_PATTERN_.test(a)?a:""};goog.VALID_MODULE_RE_=/^[a-zA-Z_$][a-zA-Z0-9._$]*$/;
|
|
@@ -257,16 +258,16 @@ goog.exportProperty(shaka.util.Timer.prototype,"stop",shaka.util.Timer.prototype
|
|
|
257
258
|
shaka.util.Platform.isXboxOne=function(){return shaka.util.Platform.userAgentContains_("Xbox One")};shaka.util.Platform.isTizen=function(){return shaka.util.Platform.userAgentContains_("Tizen")};shaka.util.Platform.isTizen4=function(){return shaka.util.Platform.userAgentContains_("Tizen 4")};shaka.util.Platform.isTizen3=function(){return shaka.util.Platform.userAgentContains_("Tizen 3")};shaka.util.Platform.isTizen2=function(){return shaka.util.Platform.userAgentContains_("Tizen 2")};
|
|
258
259
|
shaka.util.Platform.isWebOS=function(){return shaka.util.Platform.userAgentContains_("Web0S")};shaka.util.Platform.isWebOS3=function(){return shaka.util.Platform.userAgentContains_("Web0S")&&shaka.util.Platform.userAgentContains_("Chrome/38.0.2125.122 Safari/537.36")};shaka.util.Platform.isWebOS4=function(){return!!navigator.userAgent.match(/webOS\/4/i)};shaka.util.Platform.isWebOS5=function(){return!!navigator.userAgent.match(/webOS\/5/i)};shaka.util.Platform.isChromecast=function(){return shaka.util.Platform.userAgentContains_("CrKey")};
|
|
259
260
|
shaka.util.Platform.chromeVersion=function(){if(!shaka.util.Platform.isChrome())return null;var a=navigator.userAgent.match(/Chrome\/(\d+)/);return a?parseInt(a[1],10):null};shaka.util.Platform.isChrome=function(){return shaka.util.Platform.userAgentContains_("Chrome")&&!shaka.util.Platform.isLegacyEdge()};
|
|
260
|
-
shaka.util.Platform.isApple=function(){return!!navigator.vendor&&navigator.vendor.includes("Apple")&&!shaka.util.Platform.isTizen()&&!shaka.util.Platform.isEOS()&&!shaka.util.Platform.isVirginMedia()&&!shaka.util.Platform.isOrange()&&!shaka.util.Platform.isPS4()&&!shaka.util.Platform.isAmazonFireTV()};shaka.util.Platform.isPS5=function(){return shaka.util.Platform.userAgentContains_("PlayStation 5")};shaka.util.Platform.isPS4=function(){return shaka.util.Platform.userAgentContains_("PlayStation 4")};
|
|
261
|
-
shaka.util.Platform.isHisense=function(){return shaka.util.Platform.userAgentContains_("Hisense")||shaka.util.Platform.userAgentContains_("VIDAA")};shaka.util.Platform.isVirginMedia=function(){return shaka.util.Platform.userAgentContains_("VirginMedia")};shaka.util.Platform.isOrange=function(){return shaka.util.Platform.userAgentContains_("SOPOpenBrowser")};shaka.util.Platform.isAmazonFireTV=function(){return shaka.util.Platform.userAgentContains_("AFT")};
|
|
262
|
-
shaka.util.Platform.safariVersion=function(){if(!shaka.util.Platform.isApple())return null;var a=navigator.userAgent.match(/Version\/(\d+)/);return a?parseInt(a[1],10):(a=navigator.userAgent.match(/OS (\d+)(?:_\d+)?/))?parseInt(a[1],10):null};shaka.util.Platform.isSafari=function(){return!!shaka.util.Platform.safariVersion()};shaka.util.Platform.isEOS=function(){return shaka.util.Platform.userAgentContains_("PC=EOS")};
|
|
261
|
+
shaka.util.Platform.isApple=function(){return!!navigator.vendor&&navigator.vendor.includes("Apple")&&!shaka.util.Platform.isTizen()&&!shaka.util.Platform.isEOS()&&!shaka.util.Platform.isAPL()&&!shaka.util.Platform.isVirginMedia()&&!shaka.util.Platform.isOrange()&&!shaka.util.Platform.isPS4()&&!shaka.util.Platform.isAmazonFireTV()&&!shaka.util.Platform.isWPE()};shaka.util.Platform.isPS5=function(){return shaka.util.Platform.userAgentContains_("PlayStation 5")};shaka.util.Platform.isPS4=function(){return shaka.util.Platform.userAgentContains_("PlayStation 4")};
|
|
262
|
+
shaka.util.Platform.isHisense=function(){return shaka.util.Platform.userAgentContains_("Hisense")||shaka.util.Platform.userAgentContains_("VIDAA")};shaka.util.Platform.isVirginMedia=function(){return shaka.util.Platform.userAgentContains_("VirginMedia")};shaka.util.Platform.isOrange=function(){return shaka.util.Platform.userAgentContains_("SOPOpenBrowser")};shaka.util.Platform.isAmazonFireTV=function(){return shaka.util.Platform.userAgentContains_("AFT")};shaka.util.Platform.isWPE=function(){return shaka.util.Platform.userAgentContains_("WPE")};
|
|
263
|
+
shaka.util.Platform.safariVersion=function(){if(!shaka.util.Platform.isApple())return null;var a=navigator.userAgent.match(/Version\/(\d+)/);return a?parseInt(a[1],10):(a=navigator.userAgent.match(/OS (\d+)(?:_\d+)?/))?parseInt(a[1],10):null};shaka.util.Platform.isSafari=function(){return!!shaka.util.Platform.safariVersion()};shaka.util.Platform.isEOS=function(){return shaka.util.Platform.userAgentContains_("PC=EOS")};shaka.util.Platform.isAPL=function(){return shaka.util.Platform.userAgentContains_("PC=APL")};
|
|
263
264
|
shaka.util.Platform.isMobile=function(){return/(?:iPhone|iPad|iPod|Android)/.test(navigator.userAgent)?!0:shaka.util.Platform.isApple()&&1<navigator.maxTouchPoints};shaka.util.Platform.isMac=function(){return navigator.userAgentData&&navigator.userAgentData.platform?"macos"==navigator.userAgentData.platform.toLowerCase():navigator.platform.toLowerCase().includes("mac")};
|
|
264
265
|
shaka.util.Platform.isWindows=function(){return navigator.userAgentData&&navigator.userAgentData.platform?"windows"==navigator.userAgentData.platform.toLowerCase():navigator.platform.toLowerCase().includes("windows")};shaka.util.Platform.userAgentContains_=function(a){return(navigator.userAgent||"").includes(a)};
|
|
265
266
|
shaka.util.Platform.anyMediaElement=function(){var a=shaka.util.Platform;if(a.cachedMediaElement_)return a.cachedMediaElement_;a.cacheExpirationTimer_||(a.cacheExpirationTimer_=new shaka.util.Timer(function(){a.cachedMediaElement_=null}));a.cachedMediaElement_=document.getElementsByTagName("video")[0]||document.getElementsByTagName("audio")[0];a.cachedMediaElement_||(a.cachedMediaElement_=document.createElement("video"));a.cacheExpirationTimer_.tickAfter(1);return a.cachedMediaElement_};
|
|
266
267
|
shaka.util.Platform.requiresEncryptionInfoInAllInitSegments=function(){var a=shaka.util.Platform;return a.isTizen()||a.isXboxOne()||a.isOrange()};shaka.util.Platform.supportsSequenceMode=function(){var a=shaka.util.Platform;return a.isTizen3()||a.isTizen2()||a.isWebOS3()||a.isPS4()?!1:!0};shaka.util.Platform.supportsSmoothCodecSwitching=function(){var a=shaka.util.Platform;return a.isTizen2()||a.isTizen3()||a.isTizen4()||a.isWebOS3()||a.isWebOS4()||a.isWebOS5()?!1:!0};
|
|
267
268
|
shaka.util.Platform.isMediaKeysPolyfilled=function(){return window.shakaMediaKeysPolyfill?!0:!1};shaka.util.Platform.cacheExpirationTimer_=null;shaka.util.Platform.cachedMediaElement_=null;shaka.util.StreamUtils=function(){};
|
|
268
|
-
shaka.util.StreamUtils.chooseCodecsAndFilterManifest=function(a,b,c,d){var e=shaka.util.StreamUtils,f=shaka.util.MimeUtils,g=a.variants;if(b.length||c.length)g=e.choosePreferredCodecs(g,b,c);if(d.length){b=new shaka.util.MultiMap;c=$jscomp.makeIterator(g);for(g=c.next();!g.done;g=c.next())g=g.value,b.push(String(g.video.width||0),g);var h=[];b.forEach(function(u,w){u=0;var t=[],v={};w=$jscomp.makeIterator(w);for(var x=w.next();!x.done;v={$jscomp$loop$prop$variant$
|
|
269
|
-
w.next())v.$jscomp$loop$prop$variant$
|
|
269
|
+
shaka.util.StreamUtils.chooseCodecsAndFilterManifest=function(a,b,c,d){var e=shaka.util.StreamUtils,f=shaka.util.MimeUtils,g=a.variants;if(b.length||c.length)g=e.choosePreferredCodecs(g,b,c);if(d.length){b=new shaka.util.MultiMap;c=$jscomp.makeIterator(g);for(g=c.next();!g.done;g=c.next())g=g.value,b.push(String(g.video.width||0),g);var h=[];b.forEach(function(u,w){u=0;var t=[],v={};w=$jscomp.makeIterator(w);for(var x=w.next();!x.done;v={$jscomp$loop$prop$variant$490$771:v.$jscomp$loop$prop$variant$490$771},x=
|
|
270
|
+
w.next())v.$jscomp$loop$prop$variant$490$771=x.value,x=d.filter(function(y){return function(z){return y.$jscomp$loop$prop$variant$490$771.decodingInfos[0][z]}}(v)).length,x>u?(u=x,t=[v.$jscomp$loop$prop$variant$490$771]):x==u&&t.push(v.$jscomp$loop$prop$variant$490$771);h.push.apply(h,$jscomp.arrayFromIterable(t))});g=h}c=new Set;b=new Set;e=$jscomp.makeIterator(g);for(g=e.next();!g.done;g=e.next())g=g.value,g.audio&&c.add(g.audio),g.video&&b.add(g.video);c=Array.from(c).sort(function(u,w){return u.bandwidth-
|
|
270
271
|
w.bandwidth});var k=[];g=new Map;c=$jscomp.makeIterator(c);for(e=c.next();!e.done;e=c.next()){e=e.value;var l=e.language+(e.channelsCount||0)+(e.audioSamplingRate||0)+e.roles.join(",")+e.label+e.groupId+e.fastSwitching,m=g.get(l)||[];if(m.length){var n=m[m.length-1],p=f.getNormalizedCodec(n.codecs),q=f.getNormalizedCodec(e.codecs);p==q&&e.bandwidth>n.bandwidth&&(m.push(e),k.push(e.id))}else m.push(e),k.push(e.id);g.set(l,m)}c=Array.from(b).sort(function(u,w){return u.bandwidth&&w.bandwidth?u.bandwidth-
|
|
271
272
|
w.bandwidth:u.width-w.width});b=shaka.media.Capabilities.isChangeTypeSupported();var r=[];g=new Map;c=$jscomp.makeIterator(c);for(e=c.next();!e.done;e=c.next()){e=e.value;l=Math.round(e.frameRate||0)+(e.hdr||"")+e.fastSwitching;m=g.get(l)||[];if(m.length){n=m[m.length-1];if(!b&&(p=f.getNormalizedCodec(n.codecs),q=f.getNormalizedCodec(e.codecs),p!==q))continue;e.width>n.width||e.height>n.height?(m.push(e),r.push(e.id)):e.width==n.width&&e.height==n.height&&(p=f.getNormalizedCodec(n.codecs),q=f.getNormalizedCodec(e.codecs),
|
|
272
273
|
p==q&&e.bandwidth<n.bandwidth&&(m.push(e),r.push(e.id)))}else m.push(e),r.push(e.id);g.set(l,m)}a.variants=a.variants.filter(function(u){var w=u.audio,t=u.video;return w&&!k.includes(w.id)||t&&!r.includes(t.id)?(shaka.log.debug("Dropping Variant (better codec available)",u),!1):!0})};
|
|
@@ -438,14 +439,13 @@ goog.exportProperty(shaka.util.Mp4Parser,"children",shaka.util.Mp4Parser.childre
|
|
|
438
439
|
goog.exportProperty(shaka.util.Mp4Parser.prototype,"box",shaka.util.Mp4Parser.prototype.box);shaka.util.Mp4Parser.BoxType_={BASIC_BOX:0,FULL_BOX:1};shaka.util.Uint8ArrayUtils=function(){};shaka.util.Uint8ArrayUtils.toStandardBase64=function(a){a=shaka.util.StringUtils.fromCharCode(shaka.util.BufferUtils.toUint8(a));return btoa(a)};shaka.util.Uint8ArrayUtils.toBase64=function(a,b){b=void 0==b?!0:b;a=shaka.util.Uint8ArrayUtils.toStandardBase64(a).replace(/\+/g,"-").replace(/\//g,"_");return b?a:a.replace(/[=]*$/,"")};
|
|
439
440
|
shaka.util.Uint8ArrayUtils.fromBase64=function(a){a=window.atob(a.replace(/-/g,"+").replace(/_/g,"/"));for(var b=new Uint8Array(a.length),c=0;c<a.length;++c)b[c]=a.charCodeAt(c);return b};shaka.util.Uint8ArrayUtils.fromHex=function(a){for(var b=a.length/2,c=new Uint8Array(b),d=0;d<b;d++)c[d]=window.parseInt(a.substr(2*d,2),16);return c};
|
|
440
441
|
shaka.util.Uint8ArrayUtils.toHex=function(a){var b=shaka.util.BufferUtils.toUint8(a);a="";b=$jscomp.makeIterator(b);for(var c=b.next();!c.done;c=b.next())c=c.value,c=c.toString(16),1==c.length&&(c="0"+c),a+=c;return a};
|
|
441
|
-
shaka.util.Uint8ArrayUtils.concat=function(){for(var a=$jscomp.getRestArguments.apply(0,arguments),b=
|
|
442
|
-
goog.exportProperty(shaka.util.Uint8ArrayUtils,"
|
|
443
|
-
goog.exportProperty(shaka.util.Uint8ArrayUtils,"toStandardBase64",shaka.util.Uint8ArrayUtils.toStandardBase64);shaka.util.Pssh=function(a){var b=this;this.systemIds=[];this.cencKeyIds=[];this.data=[];(new shaka.util.Mp4Parser).box("moov",shaka.util.Mp4Parser.children).box("moof",shaka.util.Mp4Parser.children).fullBox("pssh",function(c){return b.parsePsshBox_(c)}).parse(a);0==this.data.length&&shaka.log.v2("No pssh box found!")};
|
|
442
|
+
shaka.util.Uint8ArrayUtils.concat=function(){for(var a=$jscomp.getRestArguments.apply(0,arguments),b=shaka.util.BufferUtils,c=0,d=0;d<a.length;++d)c+=a[d].byteLength;c=new Uint8Array(c);for(var e=d=0;e<a.length;++e){var f=a[e];f instanceof Uint8Array?c.set(f,d):c.set(b.toUint8(f),d);d+=f.byteLength}return c};goog.exportSymbol("shaka.util.Uint8ArrayUtils",shaka.util.Uint8ArrayUtils);goog.exportProperty(shaka.util.Uint8ArrayUtils,"concat",shaka.util.Uint8ArrayUtils.concat);
|
|
443
|
+
goog.exportProperty(shaka.util.Uint8ArrayUtils,"toHex",shaka.util.Uint8ArrayUtils.toHex);goog.exportProperty(shaka.util.Uint8ArrayUtils,"fromHex",shaka.util.Uint8ArrayUtils.fromHex);goog.exportProperty(shaka.util.Uint8ArrayUtils,"fromBase64",shaka.util.Uint8ArrayUtils.fromBase64);goog.exportProperty(shaka.util.Uint8ArrayUtils,"toBase64",shaka.util.Uint8ArrayUtils.toBase64);goog.exportProperty(shaka.util.Uint8ArrayUtils,"toStandardBase64",shaka.util.Uint8ArrayUtils.toStandardBase64);shaka.util.Pssh=function(a){var b=this;this.systemIds=[];this.cencKeyIds=[];this.data=[];(new shaka.util.Mp4Parser).box("moov",shaka.util.Mp4Parser.children).box("moof",shaka.util.Mp4Parser.children).fullBox("pssh",function(c){return b.parsePsshBox_(c)}).parse(a);0==this.data.length&&shaka.log.v2("No pssh box found!")};
|
|
444
444
|
shaka.util.Pssh.prototype.parsePsshBox_=function(a){goog.asserts.assert(null!=a.version,"PSSH boxes are full boxes and must have a valid version");goog.asserts.assert(null!=a.flags,"PSSH boxes are full boxes and must have a valid flag");if(1<a.version)shaka.log.warning("Unrecognized PSSH version found!");else{var b=a.reader.getDataView();goog.asserts.assert(12<=b.byteOffset,"DataView at incorrect position");b=shaka.util.BufferUtils.toUint8(b,-12,a.size);this.data.push(b);this.systemIds.push(shaka.util.Uint8ArrayUtils.toHex(a.reader.readBytes(16)));
|
|
445
445
|
if(0<a.version){b=a.reader.readUint32();for(var c=0;c<b;c++){var d=shaka.util.Uint8ArrayUtils.toHex(a.reader.readBytes(16));this.cencKeyIds.push(d)}}}};
|
|
446
446
|
shaka.util.Pssh.createPssh=function(a,b,c,d){goog.asserts.assert(16==b.byteLength,"Invalid system ID length");var e=a.length,f=12+b.length+4+e;0<d&&(f+=4+16*c.size);var g=new Uint8Array(f),h=shaka.util.BufferUtils.toDataView(g),k=0;h.setUint32(k,f);k+=4;h.setUint32(k,1886614376);k+=4;1>d?h.setUint32(k,0):h.setUint32(k,16777216);k+=4;g.set(b,k);k+=b.length;if(0<d)for(h.setUint32(k,c.size),k+=4,b=shaka.util.Uint8ArrayUtils,c=$jscomp.makeIterator(c),d=c.next();!d.done;d=c.next())d=b.fromHex(d.value),
|
|
447
447
|
g.set(d,k),k+=d.length;h.setUint32(k,e);k+=4;g.set(a,k);goog.asserts.assert(k+e===f,"PSSH invalid length.");return g};
|
|
448
|
-
shaka.util.Pssh.normaliseInitData=function(a){if(!a)return a;var b=new shaka.util.Pssh(a);if(1>=b.data.length)return a;a=[];var c={};b=$jscomp.makeIterator(b.data);for(var d=b.next();!d.done;c={$jscomp$loop$prop$initData$
|
|
448
|
+
shaka.util.Pssh.normaliseInitData=function(a){if(!a)return a;var b=new shaka.util.Pssh(a);if(1>=b.data.length)return a;a=[];var c={};b=$jscomp.makeIterator(b.data);for(var d=b.next();!d.done;c={$jscomp$loop$prop$initData$513$783:c.$jscomp$loop$prop$initData$513$783},d=b.next())c.$jscomp$loop$prop$initData$513$783=d.value,a.some(function(e){return function(f){return shaka.util.BufferUtils.equal(f,e.$jscomp$loop$prop$initData$513$783)}}(c))||a.push(c.$jscomp$loop$prop$initData$513$783);return shaka.util.Uint8ArrayUtils.concat.apply(shaka.util.Uint8ArrayUtils,
|
|
449
449
|
$jscomp.arrayFromIterable(a))};shaka.util.XmlUtils=function(){};shaka.util.XmlUtils.findChild=function(a,b){a=shaka.util.XmlUtils.findChildren(a,b);return 1!=a.length?null:a[0]};shaka.util.XmlUtils.findChildNS=function(a,b,c){a=shaka.util.XmlUtils.findChildrenNS(a,b,c);return 1!=a.length?null:a[0]};shaka.util.XmlUtils.findChildren=function(a,b){var c=[];a=$jscomp.makeIterator(a.childNodes);for(var d=a.next();!d.done;d=a.next())d=d.value,d instanceof Element&&d.tagName==b&&c.push(d);return c};
|
|
450
450
|
shaka.util.XmlUtils.getChildren=function(a){return Array.from(a.childNodes).filter(function(b){return b instanceof Element})};shaka.util.XmlUtils.findChildrenNS=function(a,b,c){var d=[];a=$jscomp.makeIterator(a.childNodes);for(var e=a.next();!e.done;e=a.next())e=e.value,e instanceof Element&&e.localName==c&&e.namespaceURI==b&&d.push(e);return d};shaka.util.XmlUtils.getAttributeNS=function(a,b,c){return a.hasAttributeNS(b,c)?a.getAttributeNS(b,c):null};
|
|
451
451
|
shaka.util.XmlUtils.getAttributeNSList=function(a,b,c){b=$jscomp.makeIterator(b);for(var d=b.next();!d.done;d=b.next())if(d=d.value,a.hasAttributeNS(d,c))return a.getAttributeNS(d,c);return null};shaka.util.XmlUtils.getContents=function(a){var b=shaka.util.XmlUtils;return Array.from(a.childNodes).every(b.isText)?a.textContent.trim():null};shaka.util.XmlUtils.isText=function(a){return a.nodeType==Node.TEXT_NODE||a.nodeType==Node.CDATA_SECTION_NODE};
|
|
@@ -628,22 +628,21 @@ shaka.util.ExpGolomb.prototype.readBits=function(a){var b=Math.min(this.workingB
|
|
|
628
628
|
shaka.util.ExpGolomb.prototype.skipLeadingZeros_=function(){var a;for(a=0;a<this.workingBitsAvailable_;++a)if(0!==(this.workingWord_&2147483648>>>a))return this.workingWord_<<=a,this.workingBitsAvailable_-=a,a;this.loadWord_();return a+this.skipLeadingZeros_()};shaka.util.ExpGolomb.prototype.skipExpGolomb=function(){this.skipBits(1+this.skipLeadingZeros_())};shaka.util.ExpGolomb.prototype.readUnsignedExpGolomb=function(){var a=this.skipLeadingZeros_();return this.readBits(a+1)-1};
|
|
629
629
|
shaka.util.ExpGolomb.prototype.readExpGolomb=function(){var a=this.readUnsignedExpGolomb();return 1&a?1+a>>>1:-1*(a>>>1)};shaka.util.ExpGolomb.prototype.readBoolean=function(){return 1===this.readBits(1)};shaka.util.ExpGolomb.prototype.readUnsignedByte=function(){return this.readBits(8)};shaka.util.ExpGolomb.prototype.skipScalingList=function(a){for(var b=8,c=8,d=0;d<a;d++)0!==c&&(c=this.readExpGolomb(),c=(b+c+256)%256),b=0===c?b:c};
|
|
630
630
|
shaka.util.ExpGolomb.prototype.readSliceType=function(){this.readUnsignedByte();this.readUnsignedExpGolomb();return this.readUnsignedExpGolomb()};goog.exportSymbol("shaka.util.ExpGolomb",shaka.util.ExpGolomb);shaka.util.TsParser=function(){this.pmtId_=null;this.pmtParsed_=!1;this.videoCodec_=this.videoPid_=null;this.videoData_=[];this.videoPes_=[];this.audioCodec_=this.audioPid_=null;this.audioData_=[];this.audioPes_=[];this.id3Pid_=null;this.id3Data_=[]};shaka.util.TsParser.prototype.clearData=function(){this.videoData_=[];this.videoPes_=[];this.audioData_=[];this.audioPes_=[];this.id3Data_=[]};
|
|
631
|
-
shaka.util.TsParser.prototype.parse=function(a){var b=shaka.util.TsParser.PacketLength_
|
|
632
|
-
|
|
633
|
-
|
|
634
|
-
shaka.util.TsParser.prototype.getPmtId_=function(a,b){return(a[b+10]&31)<<8|a[b+11]};
|
|
631
|
+
shaka.util.TsParser.prototype.parse=function(a){var b=shaka.util.TsParser.PacketLength_;if(a.length<3*b)return this;for(var c=Math.max(0,shaka.util.TsParser.syncOffset(a)),d=a.length-(a.length+c)%b,e=!1,f=c;f<d;f+=b)if(71==a[f]){var g=!!(a[f+1]&64),h=((a[f+1]&31)<<8)+a[f+2];if(1<(a[f+3]&48)>>4){var k=f+5+a[f+4];if(k==f+b)continue}else k=f+4;switch(h){case 0:g&&(k+=a[k]+1);this.pmtId_=this.getPmtId_(a,k);break;case 17:case 8191:break;case this.pmtId_:g&&(k+=a[k]+1);g=this.parsePMT_(a,k);-1!=g.video&&
|
|
632
|
+
(this.videoPid_=g.video,this.videoCodec_=g.videoCodec);-1!=g.audio&&(this.audioPid_=g.audio,this.audioCodec_=g.audioCodec);-1!=g.id3&&(this.id3Pid_=g.id3);e&&!this.pmtParsed_&&(shaka.log.debug("reparse from beginning"),e=!1,f=c-b);this.pmtParsed_=!0;break;case this.videoPid_:h=a.subarray(k,f+b);g?this.videoData_.push([h]):this.videoData_.length&&this.videoData_[this.videoData_.length-1]&&this.videoData_[this.videoData_.length-1].push(h);break;case this.audioPid_:h=a.subarray(k,f+b);g?this.audioData_.push([h]):
|
|
633
|
+
this.audioData_.length&&this.audioData_[this.audioData_.length-1]&&this.audioData_[this.audioData_.length-1].push(h);break;case this.id3Pid_:h=a.subarray(k,f+b);g?this.id3Data_.push([h]):this.id3Data_.length&&this.id3Data_[this.id3Data_.length-1]&&this.id3Data_[this.id3Data_.length-1].push(h);break;default:e=!0}}else shaka.log.warning("Found TS packet that do not start with 0x47");return this};shaka.util.TsParser.prototype.getPmtId_=function(a,b){return(a[b+10]&31)<<8|a[b+11]};
|
|
635
634
|
shaka.util.TsParser.prototype.parsePMT_=function(a,b){var c={audio:-1,video:-1,id3:-1,audioCodec:"",videoCodec:""},d=b+3+((a[b+1]&15)<<8|a[b+2])-4;for(b+=12+((a[b+10]&15)<<8|a[b+11]);b<d;){var e=(a[b+1]&31)<<8|a[b+2],f=(a[b+3]&15)<<8|a[b+4];switch(a[b]){case 6:if(-1==c.audio&&0<f)for(var g=b+5,h=f;2<h;){switch(a[g]){case 106:c.audio=e;c.audioCodec="ac3";break;case 122:c.audio=e,c.audioCodec="ec3"}var k=a[g+1]+2;g+=k;h-=k}break;case 15:-1==c.audio&&(c.audio=e,c.audioCodec="aac");break;case 21:-1==
|
|
636
635
|
c.id3&&(c.id3=e);break;case 27:-1==c.video&&(c.video=e,c.videoCodec="avc");break;case 3:case 4:-1==c.audio&&(c.audio=e,c.audioCodec="mp3");break;case 36:-1==c.video&&(c.video=e,c.videoCodec="hvc");break;case 129:-1==c.audio&&(c.audio=e,c.audioCodec="ac3");break;case 132:case 135:-1==c.audio&&(c.audio=e,c.audioCodec="ec3")}b+=f+5}return c};
|
|
637
636
|
shaka.util.TsParser.prototype.parsePES_=function(a){if(1!==(a[0]<<16|a[1]<<8|a[2]))return null;var b={data:new Uint8Array(0),packetLength:a[4]<<8|a[5],pts:null,dts:null,nalus:[]};if(b.packetLength&&b.packetLength>a.byteLength-6)return null;var c=a[7];c&192&&(b.pts=536870912*(a[9]&14)+4194304*(a[10]&255)+16384*(a[11]&254)+128*(a[12]&255)+(a[13]&254)/2,b.dts=b.pts,c&64&&(b.dts=536870912*(a[14]&14)+4194304*(a[15]&255)+16384*(a[16]&254)+128*(a[17]&255)+(a[18]&254)/2));c=a[8]+9;if(a.byteLength<=c)return null;
|
|
638
637
|
b.data=a.subarray(c);return b};shaka.util.TsParser.prototype.parseAvcNalus=function(a,b){shaka.Deprecate.deprecateFeature(5,"TsParser","Please use parseNalus function instead.");return this.parseNalus(a)};
|
|
639
638
|
shaka.util.TsParser.prototype.parseNalus=function(a,b){var c=shaka.util.TsParser.Timescale;c=a.pts?a.pts/c:null;a=a.data;var d=a.byteLength,e=1;"hvc"==this.videoCodec_&&(e=2);for(var f=0,g=[],h=-1,k=0,l,m=0;m<d;++m){var n=a[m];if(n){if(2<=f&&1==n){b&&!g.length&&-1==h&&(n=m-(3<f?3:f),0!=n&&(n=a.subarray(0,n),b.data=shaka.util.Uint8ArrayUtils.concat(b.data,n),b.fullData=shaka.util.Uint8ArrayUtils.concat(b.fullData,n)));0<=h?(f=m-((3<f?3:f)+1),h={data:a.subarray(h+e,f+1),fullData:a.subarray(h,f+1),type:k,
|
|
640
639
|
time:c},g.push(h)):b&&!g.length&&(h=m-f,0<h&&(h=a.subarray(0,h),b.data=shaka.util.Uint8ArrayUtils.concat(b.data,h),b.fullData=shaka.util.Uint8ArrayUtils.concat(b.fullData,h)));if(m>=d-e)return shaka.log.warning("Malformed TS, incomplete NALU, ignoring."),g;m++;h=m;k="hvc"==this.videoCodec_?a[m]>>1&63:a[m]&31}f=0}else f++;m>=d-1&&0<=h&&0<=f&&(l={data:a.subarray(h+e,d),fullData:a.subarray(h,d),type:k,time:c})}l&&g.push(l);!g.length&&b&&(b.data=shaka.util.Uint8ArrayUtils.concat(b.data,a),b.fullData=
|
|
641
|
-
shaka.util.Uint8ArrayUtils.concat(b.fullData,a));return g};shaka.util.TsParser.prototype.getMetadata=function(){for(var a=shaka.util.TsParser.Timescale,b=[],c=$jscomp.makeIterator(this.id3Data_),d=c.next();!d.done;d=c.next())(d=this.parsePES_(d
|
|
642
|
-
shaka.util.TsParser.prototype.getAudioData=function(){if(this.audioData_.length&&!this.audioPes_.length){for(var a=!1,b=$jscomp.makeIterator(this.audioData_),c=b.next();!c.done;c=b.next()){
|
|
643
|
-
(this.audioPes_=this.audioPes_.sort(function(
|
|
644
|
-
shaka.util.TsParser.prototype.getVideoData=function(a){a=void 0===a?!0:a;if(this.videoData_.length&&!this.videoPes_.length){for(var b=!1,c=$jscomp.makeIterator(this.videoData_),d=c.next();!d.done;d=c.next()){
|
|
645
|
-
c=$jscomp.makeIterator(this.videoPes_);for(d=c.next();!d.done;d=c.next())d=d.value,d.nalus=this.parseNalus(d,
|
|
646
|
-
shaka.util.TsParser.prototype.getStartTime=function(a){var b=shaka.util.TsParser.Timescale;if("audio"==a){a=null;var c=this.getAudioData();c.length&&(a=c[0],a=Math.min(a.dts,a.pts)/b);return a}return"video"==a?(a=null,c=this.getVideoData(!1),c.length&&(a=c[0],a=Math.min(a.dts,a.pts)/b),a):null};shaka.util.TsParser.prototype.getCodecs=function(){return{audio:this.audioCodec_,video:this.videoCodec_}};
|
|
640
|
+
shaka.util.Uint8ArrayUtils.concat(b.fullData,a));return g};shaka.util.TsParser.prototype.getMetadata=function(){for(var a=shaka.util.TsParser.Timescale,b=[],c=$jscomp.makeIterator(this.id3Data_),d=c.next();!d.done;d=c.next())d=shaka.util.Uint8ArrayUtils.concat.apply(shaka.util.Uint8ArrayUtils,$jscomp.arrayFromIterable(d.value)),(d=this.parsePES_(d))&&b.push({cueTime:d.pts?d.pts/a:null,data:d.data,frames:shaka.util.Id3Utils.getID3Frames(d.data),dts:d.dts,pts:d.pts});return b};
|
|
641
|
+
shaka.util.TsParser.prototype.getAudioData=function(){if(this.audioData_.length&&!this.audioPes_.length){for(var a=!1,b=$jscomp.makeIterator(this.audioData_),c=b.next();!c.done;c=b.next()){var d=shaka.util.Uint8ArrayUtils.concat.apply(shaka.util.Uint8ArrayUtils,$jscomp.arrayFromIterable(c.value)),e=this.parsePES_(d);c=this.audioPes_.length?this.audioPes_[this.audioPes_.length-1]:null;e&&null!=e.pts&&null!=e.dts&&(!c||c.pts!=e.pts&&c.dts!=e.dts)?(this.audioPes_.length&&e.dts<(c.dts||0)&&(a=!0),this.audioPes_.push(e)):
|
|
642
|
+
this.audioPes_.length&&(d=e?e.data:d)&&(c=this.audioPes_.pop(),c.data=shaka.util.Uint8ArrayUtils.concat(c.data,d),this.audioPes_.push(c))}a&&(this.audioPes_=this.audioPes_.sort(function(f,g){var h=(f.pts||0)-(g.pts||0);return(f.dts||0)-(g.dts||0)||h}))}return this.audioPes_};
|
|
643
|
+
shaka.util.TsParser.prototype.getVideoData=function(a){a=void 0===a?!0:a;if(this.videoData_.length&&!this.videoPes_.length){for(var b=!1,c=$jscomp.makeIterator(this.videoData_),d=c.next();!d.done;d=c.next()){var e=shaka.util.Uint8ArrayUtils.concat.apply(shaka.util.Uint8ArrayUtils,$jscomp.arrayFromIterable(d.value)),f=this.parsePES_(e);d=this.videoPes_.length?this.videoPes_[this.videoPes_.length-1]:null;f&&null!=f.pts&&null!=f.dts&&(!d||d.pts!=f.pts&&d.dts!=f.dts)?(this.videoPes_.length&&f.dts<(d.dts||
|
|
644
|
+
0)&&(b=!0),this.videoPes_.push(f)):this.videoPes_.length&&(e=f?f.data:e)&&(d=this.videoPes_.pop(),d.data=shaka.util.Uint8ArrayUtils.concat(d.data,e),this.videoPes_.push(d))}if(a){var g;c=$jscomp.makeIterator(this.videoPes_);for(d=c.next();!d.done;d=c.next())d=d.value,d.nalus=this.parseNalus(d,g),d.nalus.length&&(g=d.nalus[d.nalus.length-1]);this.videoPes_=this.videoPes_.filter(function(h){return h.nalus.length})}b&&(this.videoPes_=this.videoPes_.sort(function(h,k){var l=(h.pts||0)-(k.pts||0);return(h.dts||
|
|
645
|
+
0)-(k.dts||0)||l}))}return a?this.videoPes_:(a=this.videoPes_,this.videoPes_=[],a)};shaka.util.TsParser.prototype.getStartTime=function(a){var b=shaka.util.TsParser.Timescale;if("audio"==a){a=null;var c=this.getAudioData();c.length&&(a=c[0],a=Math.min(a.dts,a.pts)/b);return a}return"video"==a?(a=null,c=this.getVideoData(!1),c.length&&(a=c[0],a=Math.min(a.dts,a.pts)/b),a):null};shaka.util.TsParser.prototype.getCodecs=function(){return{audio:this.audioCodec_,video:this.videoCodec_}};
|
|
647
646
|
shaka.util.TsParser.prototype.getVideoNalus=function(){for(var a=[],b=$jscomp.makeIterator(this.getVideoData()),c=b.next();!c.done;c=b.next())a.push.apply(a,$jscomp.arrayFromIterable(c.value.nalus));return a};shaka.util.TsParser.prototype.getVideoResolution=function(){shaka.Deprecate.deprecateFeature(5,"TsParser","Please use getVideoInfo function instead.");var a=this.getVideoInfo();return{height:a.height,width:a.width}};
|
|
648
647
|
shaka.util.TsParser.prototype.getVideoInfo=function(){return"hvc"==this.videoCodec_?this.getHvcInfo_():this.getAvcInfo_()};
|
|
649
648
|
shaka.util.TsParser.prototype.getAvcInfo_=function(){var a=shaka.util.TsParser,b={height:null,width:null,codec:null},c=this.getVideoNalus();if(!c.length)return b;c=c.find(function(q){return q.type==a.H264_NALU_TYPE_SPS_});if(!c)return b;c=new shaka.util.ExpGolomb(c.data);var d=c.readUnsignedByte(),e=c.readUnsignedByte(),f=c.readUnsignedByte();c.skipExpGolomb();if(a.PROFILES_WITH_OPTIONAL_SPS_DATA_.includes(d)){var g=c.readUnsignedExpGolomb();3===g&&c.skipBits(1);c.skipExpGolomb();c.skipExpGolomb();
|
|
@@ -690,7 +689,7 @@ c&&0==c.timestampOffset&&c.initSegmentReference&&c.initSegmentReference.timescal
|
|
|
690
689
|
shaka.util.TsParser.probe(g)&&(g=(new shaka.util.TsParser).parse(g),a=g.getStartTime(a),null!=a&&(f=a),g=g.getMetadata(),g.length))this.onMetadata_(g,e,c?c.endTime:null);return f};
|
|
691
690
|
shaka.media.MediaSourceEngine.prototype.appendBuffer=function(a,b,c,d,e,f,g,h,k){f=void 0===f?!1:f;g=void 0===g?!1:g;h=void 0===h?!1:h;k=void 0===k?!1:k;var l=this,m,n,p,q,r,u,w,t,v,x,y,z,A,B,E,I;return $jscomp.asyncExecutePromiseGeneratorProgram(function(C){switch(C.nextAddress){case 1:m=shaka.util.ManifestParserUtils.ContentType;if(a!=m.TEXT){C.jumpTo(2);break}if(!l.sequenceMode_){C.jumpTo(3);break}return C.yield(l.textSequenceModeOffset_,4);case 4:n=C.yieldResult,l.textEngine_.setTimestampOffset(n);
|
|
692
691
|
case 3:return C.yield(l.textEngine_.appendBuffer(b,c?c.startTime:null,c?c.endTime:null,c?c.getUris()[0]:null),5);case 5:return C.return();case 2:if(k||!l.needSplitMuxedContent_){C.jumpTo(6);break}return C.yield(l.appendBuffer(m.AUDIO,b,c,d,e,f,g,h,!0),7);case 7:return C.yield(l.appendBuffer(m.VIDEO,b,c,d,e,f,g,h,!0),8);case 8:return C.return();case 6:if(!l.sourceBuffers_[a])return shaka.log.warning("Attempted to restore a non-existent source buffer"),C.return();p=l.sourceBuffers_[a].timestampOffset;
|
|
693
|
-
q=l.sourceBufferTypes_[a];l.transmuxers_[a]&&(q=l.transmuxers_[a].getOriginalMimeType());c&&(r=l.getTimestampAndDispatchMetadata_(a,b,c,q,p),null!=r&&(u=c.startTime-r,w=Math.abs(p-u),(.
|
|
692
|
+
q=l.sourceBufferTypes_[a];l.transmuxers_[a]&&(q=l.transmuxers_[a].getOriginalMimeType());c&&(r=l.getTimestampAndDispatchMetadata_(a,b,c,q,p),null!=r&&(u=c.startTime-r,w=Math.abs(p-u),(.001<=w||f||g)&&(!h||0<u||!p)&&(p=u,l.attemptTimestampOffsetCalculation_&&(l.enqueueOperation_(a,function(){return l.abort_(a)}),l.enqueueOperation_(a,function(){return l.setTimestampOffset_(a,p)}))),t=a==m.VIDEO||!(m.VIDEO in l.sourceBuffers_),l.sequenceMode_&&t&&l.textSequenceModeOffset_.resolve(p)));e&&a==m.VIDEO&&
|
|
694
693
|
(l.textEngine_||l.reinitText(shaka.util.MimeUtils.CEA608_CLOSED_CAPTION_MIMETYPE,l.sequenceMode_,!1),l.captionParser_||(v=q.split(";",1)[0],l.captionParser_=l.getCaptionParser(v)),c?(x=l.captionParser_.parseFrom(b),x.length&&l.textEngine_.storeAndAppendClosedCaptions(x,c.startTime,c.endTime,p)):l.captionParser_.init(b));if(!l.transmuxers_[a]){C.jumpTo(9);break}return C.yield(l.transmuxers_[a].transmux(b,d,c,l.mediaSource_.duration,a),10);case 10:b=C.yieldResult;case 9:return b=l.workAroundBrokenPlatforms_(b,
|
|
695
694
|
c?c.startTime:null,a),c&&l.sequenceMode_&&a!=m.TEXT&&(f||g)&&(y=c.startTime,l.enqueueOperation_(a,function(){return l.abort_(a)}),l.enqueueOperation_(a,function(){return l.setTimestampOffset_(a,y)})),z=null,C.yield(l.enqueueOperation_(a,function(){goog.DEBUG&&c&&!c.isPreload()&&!h&&(z=l.getBuffered_(a));l.append_(a,b,p)}),11);case 11:goog.DEBUG&&c&&!c.isPreload()&&!h&&(A=l.getBuffered_(a),B=shaka.media.TimeRangesUtils.computeAddedRange(z,A))&&(E=c.endTime-c.startTime,I=Math.abs(B.end-c.endTime),.1<
|
|
696
695
|
E&&I>E/2&&shaka.log.error("Possible encoding problem detected!","Unexpected buffered range for reference",c,"from URIs",c.getUris(),"should be",{start:c.startTime,end:c.endTime},"but got",B)),C.jumpToEnd()}})};shaka.media.MediaSourceEngine.prototype.setSelectedClosedCaptionId=function(a){var b=this.bufferEnd(shaka.util.ManifestParserUtils.ContentType.VIDEO)||0;this.textEngine_.setSelectedClosedCaptionId(a,b)};
|
|
@@ -833,7 +832,7 @@ shaka.media.SegmentPrefetch.prototype.prefetchSegments=function(a,b){b=void 0===
|
|
|
833
832
|
null!=d;)a=!0,d.isPreload()&&null!=d.endByte&&(a=!1),d.getStatus()==shaka.media.SegmentReference.Status.MISSING&&(a=!1),a&&!this.segmentPrefetchMap_.has(d)&&(a=new shaka.media.SegmentPrefetchOperation(this.fetchDispatcher_),a.dispatchFetch(d,this.stream_),this.segmentPrefetchMap_.set(d,a)),this.prefetchPosTime_=d.startTime,d=c.next().value}}else shaka.log.info(c,"missing segmentIndex")};
|
|
834
833
|
shaka.media.SegmentPrefetch.prototype.prefetchInitSegment=function(a){goog.asserts.assert(0<this.prefetchLimit_,"SegmentPrefetch can not be used when prefetchLimit <= 0.");var b=shaka.media.SegmentPrefetch.logPrefix_(this.stream_);this.stream_.segmentIndex?this.segmentPrefetchMap_.size<this.prefetchLimit_&&!this.segmentPrefetchMap_.has(a)&&(b=new shaka.media.SegmentPrefetchOperation(this.fetchDispatcher_),b.dispatchFetch(a,this.stream_),this.segmentPrefetchMap_.set(a,b)):shaka.log.info(b,"missing segmentIndex")};
|
|
835
834
|
shaka.media.SegmentPrefetch.prototype.getPrefetchedSegment=function(a,b){goog.asserts.assert(0<this.prefetchLimit_,"SegmentPrefetch can not be used when prefetchLimit <= 0.");var c=shaka.media.SegmentPrefetch.logPrefix_(this.stream_);if(this.segmentPrefetchMap_.has(a)){var d=this.segmentPrefetchMap_.get(a);b&&d.setStreamDataCallback(b);this.segmentPrefetchMap_.delete(a);a instanceof shaka.media.SegmentReference?shaka.log.debug(c,"reused prefetched segment at time:",a.startTime,"mapSize",this.segmentPrefetchMap_.size):
|
|
836
|
-
shaka.log.debug(c,"reused prefetched init segment at time, mapSize",this.segmentPrefetchMap_.size);return d.getOperation()}a instanceof shaka.media.SegmentReference?shaka.log.debug(c,"
|
|
835
|
+
shaka.log.debug(c,"reused prefetched init segment at time, mapSize",this.segmentPrefetchMap_.size);return d.getOperation()}a instanceof shaka.media.SegmentReference?shaka.log.debug(c,"missed segment at time:",a.startTime,"mapSize",this.segmentPrefetchMap_.size):shaka.log.debug(c,"missed init segment at time, mapSize",this.segmentPrefetchMap_.size);return null};
|
|
837
836
|
shaka.media.SegmentPrefetch.prototype.clearAll=function(){if(0!==this.segmentPrefetchMap_.size){for(var a=shaka.media.SegmentPrefetch.logPrefix_(this.stream_),b=$jscomp.makeIterator(this.segmentPrefetchMap_.keys()),c=b.next();!c.done;c=b.next())(c=c.value)&&this.abortPrefetchedSegment_(c);shaka.log.info(a,"cleared all");this.prefetchPosTime_=0}};
|
|
838
837
|
shaka.media.SegmentPrefetch.prototype.resetLimit=function(a){goog.asserts.assert(0<=a,"The new prefetch limit must be >= 0.");this.prefetchLimit_=a;for(var b=Array.from(this.segmentPrefetchMap_.keys());b.length>a;){var c=b.pop();c&&this.abortPrefetchedSegment_(c)}};shaka.media.SegmentPrefetch.prototype.switchStream=function(a){a&&a!==this.stream_&&(this.clearAll(),this.stream_=a)};
|
|
839
838
|
shaka.media.SegmentPrefetch.prototype.abortPrefetchedSegment_=function(a){var b=shaka.media.SegmentPrefetch.logPrefix_(this.stream_),c=this.segmentPrefetchMap_.get(a);this.segmentPrefetchMap_.delete(a);c&&(c.abort(),a instanceof shaka.media.SegmentReference?shaka.log.info(b,"pop and abort prefetched segment at time:",a.startTime):shaka.log.info(b,"pop and abort prefetched init segment"))};shaka.media.SegmentPrefetch.logPrefix_=function(a){return"SegmentPrefetch("+a.type+":"+a.id+")"};
|
|
@@ -926,8 +925,8 @@ g.yield(c.onUpdate_(a),4);if(2!=g.nextAddress)return g.leaveTryBlock(0);f=g.ente
|
|
|
926
925
|
shaka.media.StreamingEngine.prototype.abortOperations_=function(a){return $jscomp.asyncExecutePromiseGeneratorProgram(function(b){return a.operation?b.yield(a.operation.abort(),0):b.jumpTo(0)})};
|
|
927
926
|
shaka.media.StreamingEngine.prototype.handleStreamingError_=function(a,b){var c=this,d;return $jscomp.asyncExecutePromiseGeneratorProgram(function(e){if(1==e.nextAddress)return e.yield(c.failureCallbackBackoff_.attempt(),2);c.destroyer_.ensureNotDestroyed();d=c.getDisabledTime_(b);b.category===shaka.util.Error.Category.NETWORK&&0<d&&(b.handled=c.playerInterface_.disableStream(a.stream,d),b.handled&&(b.severity=shaka.util.Error.Severity.RECOVERABLE));c.playerInterface_.onError(b);b.handled||c.config_.failureCallback(b);
|
|
928
927
|
e.jumpToEnd()})};shaka.media.StreamingEngine.prototype.getDisabledTime_=function(a){return 0===this.config_.maxDisabledTime&&a.code==shaka.util.Error.Code.SEGMENT_MISSING?1:this.config_.maxDisabledTime};shaka.media.StreamingEngine.logPrefix_=function(a){return"("+a.type+":"+a.stream.id+")"};shaka.media.StreamingEngine.APPEND_WINDOW_START_FUDGE_=.1;shaka.media.StreamingEngine.APPEND_WINDOW_END_FUDGE_=.01;shaka.media.StreamingEngine.MAX_RUN_AHEAD_SEGMENTS_=1;shaka.net.NetworkingUtils=function(){};
|
|
929
|
-
shaka.net.NetworkingUtils.getMimeType=function(a,b,c){var d,e,f,g,h;return $jscomp.asyncExecutePromiseGeneratorProgram(function(
|
|
930
|
-
"")})};shaka.net.NetworkingUtils.getExtension_=function(a){a=(new goog.Uri(a)).getPath().split("/").pop().split(".");return 1==a.length?"":a.pop().toLowerCase()};
|
|
928
|
+
shaka.net.NetworkingUtils.getMimeType=function(a,b,c){var d,e,f,g,h,k,l;return $jscomp.asyncExecutePromiseGeneratorProgram(function(m){switch(m.nextAddress){case 1:d=shaka.net.NetworkingUtils.getExtension_(a);if(e=shaka.net.NetworkingUtils.EXTENSIONS_TO_MIME_TYPES_[d])return m.return(e);f=shaka.net.NetworkingEngine.RequestType.MANIFEST;g=shaka.net.NetworkingEngine.makeRequest([a],c);m.setCatchFinallyBlocks(2);g.method="HEAD";return m.yield(b.request(f,g).promise,4);case 4:h=m.yieldResult;e=h.headers["content-type"];
|
|
929
|
+
m.leaveTryBlock(3);break;case 2:k=m.enterCatchBlock();if(!k||k.code!=shaka.util.Error.Code.HTTP_ERROR){m.jumpTo(3);break}g.method="GET";return m.yield(b.request(f,g).promise,6);case 6:l=m.yieldResult,e=l.headers["content-type"];case 3:return m.return(e?e.toLowerCase().split(";").shift():"")}})};shaka.net.NetworkingUtils.getExtension_=function(a){a=(new goog.Uri(a)).getPath().split("/").pop().split(".");return 1==a.length?"":a.pop().toLowerCase()};
|
|
931
930
|
shaka.net.NetworkingUtils.EXTENSIONS_TO_MIME_TYPES_={mp4:"video/mp4",m4v:"video/mp4",m4a:"audio/mp4",webm:"video/webm",weba:"audio/webm",mkv:"video/webm",ts:"video/mp2t",ogv:"video/ogg",ogg:"audio/ogg",mpg:"video/mpeg",mpeg:"video/mpeg",m3u8:"application/x-mpegurl",mpd:"application/dash+xml",ism:"application/vnd.ms-sstr+xml",mp3:"audio/mpeg",aac:"audio/aac",flac:"audio/flac",wav:"audio/wav",sbv:"text/x-subviewer",srt:"text/srt",vtt:"text/vtt",webvtt:"text/vtt",ttml:"application/ttml+xml",lrc:"application/x-subtitle-lrc",
|
|
932
931
|
ssa:"text/x-ssa",ass:"text/x-ssa"};shaka.text.Utils=function(){};
|
|
933
932
|
shaka.text.Utils.flattenPayload_=function(a,b){if(a.lineBreak)return"\n";if(a.nestedCues.length)return a.nestedCues.map(function(g){return shaka.text.Utils.flattenPayload_(g,a)}).join("");var c=[],d=a.fontWeight>=shaka.text.Cue.fontWeight.BOLD,e=a.fontStyle==shaka.text.Cue.fontStyle.ITALIC,f=a.textDecoration.includes(shaka.text.Cue.textDecoration.UNDERLINE);d&&c.push(["b"]);e&&c.push(["i"]);f&&c.push(["u"]);e=a.color;""==e&&b&&(e=b.color);d="";(e=shaka.text.Utils.getColorName_(e))&&(d+="."+e);e=a.backgroundColor;
|
|
@@ -955,7 +954,7 @@ shaka.util.Dom.removeAllChildren=function(a){for(;a.firstChild;)a.removeChild(a.
|
|
|
955
954
|
this.textContainer_.style.justifyContent="flex-end";this.videoContainer_.appendChild(this.textContainer_);this.captionsTimer_=(new shaka.util.Timer(function(){c.updateCaptions_()})).tickEvery(.25);this.currentCuesMap_=new Map;this.eventManager_=new shaka.util.EventManager;this.eventManager_.listen(document,"fullscreenchange",function(){c.updateCaptions_(!0)});this.eventManager_.listen(this.video_,"resize",function(){var d=c.video_,e=d.videoWidth;d=d.videoHeight;c.aspectRatio_=e&&d?e/d:null});this.resizeObserver_=
|
|
956
955
|
null;"ResizeObserver"in window&&(this.resizeObserver_=new ResizeObserver(function(){c.updateCaptions_(!0)}),this.resizeObserver_.observe(this.textContainer_));this.regionElements_=new Map};
|
|
957
956
|
shaka.text.UITextDisplayer.prototype.append=function(a){var b=[].concat($jscomp.arrayFromIterable(this.cues_)),c={};a=$jscomp.makeIterator(a);for(var d=a.next();!d.done;c={$jscomp$loop$prop$cue$795:c.$jscomp$loop$prop$cue$795},d=a.next())c.$jscomp$loop$prop$cue$795=d.value,b.some(function(e){return function(f){return shaka.text.Cue.equal(f,e.$jscomp$loop$prop$cue$795)}}(c))||this.cues_.push(c.$jscomp$loop$prop$cue$795);this.updateCaptions_()};
|
|
958
|
-
shaka.text.UITextDisplayer.prototype.destroy=function(){this.videoContainer_.removeChild(this.textContainer_);this.textContainer_=null;this.isTextVisible_=!1;this.cues_=[];this.captionsTimer_&&this.captionsTimer_.stop();this.currentCuesMap_.clear();this.eventManager_&&(this.eventManager_.release(),this.eventManager_=null);this.resizeObserver_&&(this.resizeObserver_.disconnect(),this.resizeObserver_=null)};
|
|
957
|
+
shaka.text.UITextDisplayer.prototype.destroy=function(){if(!this.textContainer_)return Promise.resolve();this.videoContainer_.removeChild(this.textContainer_);this.textContainer_=null;this.isTextVisible_=!1;this.cues_=[];this.captionsTimer_&&this.captionsTimer_.stop();this.currentCuesMap_.clear();this.eventManager_&&(this.eventManager_.release(),this.eventManager_=null);this.resizeObserver_&&(this.resizeObserver_.disconnect(),this.resizeObserver_=null);return Promise.resolve()};
|
|
959
958
|
shaka.text.UITextDisplayer.prototype.remove=function(a,b){if(!this.textContainer_)return!1;var c=this.cues_.length;this.cues_=this.cues_.filter(function(d){return d.startTime<a||d.endTime>=b});this.updateCaptions_(c>this.cues_.length);return!0};shaka.text.UITextDisplayer.prototype.isTextVisible=function(){return this.isTextVisible_};shaka.text.UITextDisplayer.prototype.setTextVisibility=function(a){this.isTextVisible_=a};
|
|
960
959
|
shaka.text.UITextDisplayer.prototype.isElementUnderTextContainer_=function(a){for(;null!=a;){if(a==this.textContainer_)return!0;a=a.parentElement}return!1};
|
|
961
960
|
shaka.text.UITextDisplayer.prototype.updateCuesRecursive_=function(a,b,c,d){var e=!1,f=[],g=[];a=$jscomp.makeIterator(a);for(var h=a.next();!h.done;h=a.next()){h=h.value;d.push(h);var k=this.currentCuesMap_.get(h),l=h.startTime<=c&&h.endTime>c,m=k?k.wrapper:null;k&&(f.push(k.cueElement),k.regionElement&&f.push(k.regionElement),l||(e=!0,this.currentCuesMap_.delete(h),k=null));l&&(g.push(h),k?this.isElementUnderTextContainer_(m)||(e=!0):(this.createCue_(h,d),k=this.currentCuesMap_.get(h),m=k.wrapper,
|
|
@@ -1178,7 +1177,7 @@ shaka.Player.prototype.getPresentationStartTimeAsDate=function(){if(!this.isLive
|
|
|
1178
1177
|
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};
|
|
1179
1178
|
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()));
|
|
1180
1179
|
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&&
|
|
1181
|
-
b.video&&this.stats_.setResolution(b.video.width||NaN,b.video.height||NaN);this.isLive()&&(b=this.getPresentationStartTimeAsDate().valueOf()+1E3*
|
|
1180
|
+
b.video&&this.stats_.setResolution(b.video.width||NaN,b.video.height||NaN);this.isLive()&&(b=this.getPresentationStartTimeAsDate().valueOf()+1E3*a.currentTime,b=(Date.now()-b)/1E3,this.stats_.setLiveLatency(b));this.manifest_&&this.manifest_.presentationTimeline&&(b=this.manifest_.presentationTimeline.getMaxSegmentDuration(),this.stats_.setMaxSegmentDuration(b));b=this.abrManager_.getBandwidthEstimate();this.stats_.setBandwidthEstimate(b)}this.loadMode_==shaka.Player.LoadMode.SRC_EQUALS&&this.stats_.setResolution(a.videoWidth||
|
|
1182
1181
|
NaN,a.videoHeight||NaN);return this.stats_.getBlob()};
|
|
1183
1182
|
shaka.Player.prototype.addTextTrackAsync=function(a,b,c,d,e,f,g){g=void 0===g?!1:g;var h=this,k,l,m,n,p,q,r,u,w,t,v,x,y;return $jscomp.asyncExecutePromiseGeneratorProgram(function(z){switch(z.nextAddress){case 1:if(h.loadMode_!=shaka.Player.LoadMode.MEDIA_SOURCE&&h.loadMode_!=shaka.Player.LoadMode.SRC_EQUALS)throw shaka.log.error("Must call load() and wait for it to resolve before adding text tracks."),new shaka.util.Error(shaka.util.Error.Severity.RECOVERABLE,shaka.util.Error.Category.PLAYER,shaka.util.Error.Code.CONTENT_NOT_LOADED);
|
|
1184
1183
|
if(d){z.jumpTo(2);break}return z.yield(h.getTextMimetype_(a),3);case 3:d=z.yieldResult;case 2:k=[];h.adManager_&&(k=h.adManager_.getCuePoints());if(h.loadMode_!=shaka.Player.LoadMode.SRC_EQUALS){z.jumpTo(4);break}g&&(c="forced");return z.yield(h.addSrcTrackElement_(a,b,c,d,f||"",k),5);case 5:l=shaka.util.LanguageUtils;m=l.normalize(b);n=h.getTextTracks();if(p=n.find(function(A){return l.normalize(A.language)==m&&A.label==(f||"")&&A.kind==c}))return h.onTracksChanged_(),z.return(p);shaka.log.error("Cannot add this text when loaded with src=");
|
|
@@ -1269,7 +1268,7 @@ goog.exportProperty(shaka.Player.prototype,"isInProgress",shaka.Player.prototype
|
|
|
1269
1268
|
goog.exportProperty(shaka.Player.prototype,"getMediaElement",shaka.Player.prototype.getMediaElement);goog.exportProperty(shaka.Player.prototype,"getManifestType",shaka.Player.prototype.getManifestType);goog.exportProperty(shaka.Player.prototype,"getLoadMode",shaka.Player.prototype.getLoadMode);goog.exportProperty(shaka.Player.prototype,"resetConfiguration",shaka.Player.prototype.resetConfiguration);goog.exportProperty(shaka.Player.prototype,"getBufferFullness",shaka.Player.prototype.getBufferFullness);
|
|
1270
1269
|
goog.exportProperty(shaka.Player.prototype,"getConfiguration",shaka.Player.prototype.getConfiguration);goog.exportProperty(shaka.Player.prototype,"configure",shaka.Player.prototype.configure);goog.exportProperty(shaka.Player.prototype,"releaseAllMutexes",shaka.Player.prototype.releaseAllMutexes);goog.exportProperty(shaka.Player.prototype,"load",shaka.Player.prototype.load);goog.exportProperty(shaka.Player.prototype,"updateStartTime",shaka.Player.prototype.updateStartTime);
|
|
1271
1270
|
goog.exportProperty(shaka.Player.prototype,"unload",shaka.Player.prototype.unload);goog.exportProperty(shaka.Player.prototype,"detach",shaka.Player.prototype.detach);goog.exportProperty(shaka.Player.prototype,"attachCanvas",shaka.Player.prototype.attachCanvas);goog.exportProperty(shaka.Player.prototype,"attach",shaka.Player.prototype.attach);goog.exportProperty(shaka.Player,"probeSupport",shaka.Player.probeSupport);goog.exportProperty(shaka.Player,"isBrowserSupported",shaka.Player.isBrowserSupported);
|
|
1272
|
-
goog.exportProperty(shaka.Player,"setAdManagerFactory",shaka.Player.setAdManagerFactory);goog.exportProperty(shaka.Player,"registerSupportPlugin",shaka.Player.registerSupportPlugin);goog.exportProperty(shaka.Player.prototype,"destroy",shaka.Player.prototype.destroy);shaka.Player.LoadMode={DESTROYED:0,NOT_LOADED:1,MEDIA_SOURCE:2,SRC_EQUALS:3};goog.exportProperty(shaka.Player,"LoadMode",shaka.Player.LoadMode);shaka.Player.TYPICAL_BUFFERING_THRESHOLD_=.5;shaka.Player.version="v4.6.
|
|
1271
|
+
goog.exportProperty(shaka.Player,"setAdManagerFactory",shaka.Player.setAdManagerFactory);goog.exportProperty(shaka.Player,"registerSupportPlugin",shaka.Player.registerSupportPlugin);goog.exportProperty(shaka.Player.prototype,"destroy",shaka.Player.prototype.destroy);shaka.Player.LoadMode={DESTROYED:0,NOT_LOADED:1,MEDIA_SOURCE:2,SRC_EQUALS:3};goog.exportProperty(shaka.Player,"LoadMode",shaka.Player.LoadMode);shaka.Player.TYPICAL_BUFFERING_THRESHOLD_=.5;shaka.Player.version="v4.6.6-debug";
|
|
1273
1272
|
goog.exportProperty(shaka.Player,"version",shaka.Player.version);shaka.Deprecate.init(shaka.Player.version);shaka.Player.restrictedStatuses_=["output-restricted","internal-error"];shaka.Player.supportPlugins_={};shaka.Player.adManagerFactory_=null;shaka.Player.TextTrackLabel="Shaka Player TextTrack";shaka.ads={};shaka.ads.AdsStats=function(){this.loadTimes_=[];this.skipped_=this.playedCompletely_=this.started_=0};shaka.ads.AdsStats.prototype.addLoadTime=function(a){this.loadTimes_.push(a)};shaka.ads.AdsStats.prototype.incrementStarted=function(){this.started_++};shaka.ads.AdsStats.prototype.incrementPlayedCompletely=function(){this.playedCompletely_++};shaka.ads.AdsStats.prototype.incrementSkipped=function(){this.skipped_++};
|
|
1274
1273
|
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()};
|
|
1275
1274
|
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()};
|
|
@@ -1343,7 +1342,7 @@ shaka.ads.MediaTailorAdManager.prototype.checkLinearAds_=function(a){for(var b=s
|
|
|
1343
1342
|
new shaka.ads.MediaTailorAd(f,e+1,d.ads.length,!0,this.video_);this.mediaTailorAd_=f;0===e&&this.sendTrackingEvent_(b.BREAKSTART_);this.setupCurrentAdListeners_();break}}}};
|
|
1344
1343
|
shaka.ads.MediaTailorAdManager.prototype.checkNonLinearAds_=function(a){for(var b=shaka.ads.MediaTailorAdManager,c=$jscomp.makeIterator(this.adBreaks_),d=c.next();!d.done;d=c.next()){d=d.value;if(this.ad_)break;for(var e=0;e<d.nonLinearAdsList.length;e++){var f=d.nonLinearAdsList[e];if(f.nonLinearAdList.length){var g=d.startTimeInSeconds,h=this.getCacheKeyForNonLinear_(f.nonLinearAdList[0]);h=this.staticResources_.get(h);if(g<=a&&h&&h.length){this.onEnded_();this.displayNonLinearAd_(h);this.mediaTailorAdBreak_=
|
|
1345
1344
|
d;this.ad_=new shaka.ads.MediaTailorAd(f,e+1,d.ads.length,!1,this.video_);this.mediaTailorAd_=f;0===e&&this.sendTrackingEvent_(b.BREAKSTART_);this.setupCurrentAdListeners_();break}}}}};
|
|
1346
|
-
shaka.ads.MediaTailorAdManager.prototype.displayNonLinearAd_=function(a){a=$jscomp.makeIterator(a);for(var b=a.next();!b.done;b=a.next())if(b=b.value,b.data.source.length){var c=document.createElement("img");c.
|
|
1345
|
+
shaka.ads.MediaTailorAdManager.prototype.displayNonLinearAd_=function(a){a=$jscomp.makeIterator(a);for(var b=a.next();!b.done;b=a.next())if(b=b.value,b.data.source.length){var c=document.createElement("img");c.src=b.data.source[0].url;c.style.top=(b.placeholder.top||0)+"%";c.style.height=100-(b.placeholder.top||0)+"%";c.style.left=(b.placeholder.left||0)+"%";c.style.maxWidth=100-(b.placeholder.left||0)+"%";c.style.objectFit="contain";c.style.position="absolute";this.adContainer_.appendChild(c)}};
|
|
1347
1346
|
shaka.ads.MediaTailorAdManager.prototype.onEnded_=function(){if(this.ad_){for(;this.adContainer_.lastChild;)this.adContainer_.removeChild(this.adContainer_.firstChild);this.isLive_||this.playedAds_.push(this.mediaTailorAd_.adId);this.removeCurrentAdListeners_();var a=this.ad_.getPositionInSequence(),b=this.ad_.getSequenceLength();a===b&&this.sendTrackingEvent_(shaka.ads.MediaTailorAdManager.BREAKEND_);this.mediaTailorAdBreak_=this.mediaTailorAd_=this.ad_=null}};
|
|
1348
1347
|
shaka.ads.MediaTailorAdManager.prototype.setupCurrentAdListeners_=function(){var a=this,b=shaka.ads.MediaTailorAdManager,c=!1;this.video_.paused?c=!0:(this.sendTrackingEvent_(b.IMPRESSION_),this.sendTrackingEvent_(b.START_));this.adListeners_.push({target:this.video_,type:"volumechange",listener:function(){a.video_.muted&&a.sendTrackingEvent_(b.MUTE_)}});this.adListeners_.push({target:this.video_,type:"volumechange",listener:function(){a.video_.muted||a.sendTrackingEvent_(b.UNMUTE_)}});this.adListeners_.push({target:this.video_,
|
|
1349
1348
|
type:"play",listener:function(){c?(a.sendTrackingEvent_(b.IMPRESSION_),a.sendTrackingEvent_(b.START_),c=!1):a.sendTrackingEvent_(b.RESUME_)}});this.adListeners_.push({target:this.video_,type:"pause",listener:function(){a.sendTrackingEvent_(b.PAUSE_)}});for(var d=$jscomp.makeIterator(this.adListeners_),e=d.next();!e.done;e=d.next())e=e.value,this.eventManager_.listen(e.target,e.type,e.listener)};
|
|
@@ -1866,10 +1865,10 @@ new Set;this.uriToStreamInfosMap_=new Map;this.presentationTimeline_=null;this.m
|
|
|
1866
1865
|
this.presentationDelay_=this.partialTargetDuration_=0;this.operationManager_=new shaka.util.OperationManager;this.groupIdToClosedCaptionsMap_=new Map;this.groupIdToCodecsMap_=new Map;this.mapTagToInitSegmentRefMap_=new Map;this.lowLatencyByterangeOptimization_=this.lowLatencyMode_=!1;this.averageUpdateDuration_=new shaka.abr.Ewma(5);this.contentSteeringManager_=null};shaka.hls.HlsParser.prototype.configure=function(a){this.config_=a;this.contentSteeringManager_&&this.contentSteeringManager_.configure(this.config_)};
|
|
1867
1866
|
shaka.hls.HlsParser.prototype.start=function(a,b){var c=this,d;return $jscomp.asyncExecutePromiseGeneratorProgram(function(e){if(1==e.nextAddress)return goog.asserts.assert(c.config_,"Must call configure() before start()!"),c.playerInterface_=b,c.lowLatencyMode_=b.isLowLatencyMode(),e.yield(c.requestManifest_([a]),2);if(3!=e.nextAddress)return d=e.yieldResult,c.masterPlaylistUri_=d.uri,goog.asserts.assert(d.data,"Response data should be non-null!"),e.yield(c.parseManifest_(d.data,a),3);goog.asserts.assert(c.manifest_,
|
|
1868
1867
|
"Manifest should be non-null");return e.return(c.manifest_)})};
|
|
1869
|
-
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();this.
|
|
1870
|
-
return Promise.all(a)};
|
|
1871
|
-
shaka.hls.HlsParser.prototype.update=function(){var a=this,b,c,d,e,f,g,h,k,l;return $jscomp.asyncExecutePromiseGeneratorProgram(function(m){if(1==m.nextAddress){if(!a.isLive_())return m.return();b=[];c=Array.from(a.uriToStreamInfosMap_.values());a.lastTargetDuration_=Infinity;d=c.filter(function(n){return n.stream.segmentIndex});e=$jscomp.makeIterator(d);for(f=e.next();!f.done;f=e.next())g=f.value,b.push(a.updateStream_(g));return m.yield(Promise.all(b),2)}a.notifySegmentsForStreams_(d.map(function(n){return n.stream}));
|
|
1872
|
-
d.some(function(n){return 0==n.hasEndList});d.length&&!h&&(k=shaka.hls.HlsParser.PresentationType_,a.setPresentationType_(k.VOD),l=d.map(function(n){return n.maxTimestamp}),a.presentationTimeline_.setDuration(Math.min.apply(Math,$jscomp.arrayFromIterable(l))),a.playerInterface_.updateDuration());h&&a.determineDuration_();m.jumpToEnd()})};shaka.hls.HlsParser.prototype.getMediaSequenceToStartTimeFor_=function(a){return this.isLive_()?this.mediaSequenceToStartTimeByType_.get(a.type):a.mediaSequenceToStartTime};
|
|
1868
|
+
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();this.mapTagToInitSegmentRefMap_.clear();
|
|
1869
|
+
this.contentSteeringManager_&&this.contentSteeringManager_.destroy();return Promise.all(a)};
|
|
1870
|
+
shaka.hls.HlsParser.prototype.update=function(){var a=this,b,c,d,e,f,g,h,k,l;return $jscomp.asyncExecutePromiseGeneratorProgram(function(m){if(1==m.nextAddress){if(!a.isLive_())return m.return();b=[];c=Array.from(a.uriToStreamInfosMap_.values());a.lastTargetDuration_=Infinity;d=c.filter(function(n){return n.stream.segmentIndex});e=$jscomp.makeIterator(d);for(f=e.next();!f.done;f=e.next())g=f.value,b.push(a.updateStream_(g));return m.yield(Promise.all(b),2)}a.notifySegmentsForStreams_(d.map(function(n){return n.stream}));
|
|
1871
|
+
h=d.some(function(n){return 0==n.hasEndList});d.length&&!h&&(k=shaka.hls.HlsParser.PresentationType_,a.setPresentationType_(k.VOD),l=d.map(function(n){return n.maxTimestamp}),a.presentationTimeline_.setDuration(Math.min.apply(Math,$jscomp.arrayFromIterable(l))),a.playerInterface_.updateDuration());h&&a.determineDuration_();m.jumpToEnd()})};shaka.hls.HlsParser.prototype.getMediaSequenceToStartTimeFor_=function(a){return this.isLive_()?this.mediaSequenceToStartTimeByType_.get(a.type):a.mediaSequenceToStartTime};
|
|
1873
1872
|
shaka.hls.HlsParser.prototype.updateStream_=function(a){var b=this,c,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,y,z,A,B,E,I,C,G,D,F,H,J;return $jscomp.asyncExecutePromiseGeneratorProgram(function(K){if(1==K.nextAddress){c=[];d=$jscomp.makeIterator(a.getUris());for(e=d.next();!e.done;e=d.next())f=e.value,g=new goog.Uri(f),h=g.getQueryData(),a.canBlockReload&&(0<=a.nextMediaSequence&&h.add("_HLS_msn",String(a.nextMediaSequence)),0<=a.nextPart&&h.add("_HLS_part",String(a.nextPart))),a.canSkipSegments&&h.add("_HLS_skip",
|
|
1874
1873
|
"YES"),h.getCount()&&g.setQueryData(h),c.push(g.toString());return K.yield(b.requestManifest_(c,!0),2)}k=K.yieldResult;if(!a.stream.segmentIndex)return K.return();l=b.manifestTextParser_.parsePlaylist(k.data);if(l.type!=shaka.hls.PlaylistType.MEDIA)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MANIFEST,shaka.util.Error.Code.HLS_INVALID_PLAYLIST_HIERARCHY);m=k.uri;m==k.originalUri||a.getUris().includes(m)||a.redirectUris.push(m);n=shaka.hls.Utils.filterTagsByName(l.tags,
|
|
1875
1874
|
"EXT-X-DEFINE");p=b.parseMediaVariables_(n,m);q=a.stream;r=b.getMediaSequenceToStartTimeFor_(a);u=b.parseDrmInfo_(l,q.mimeType);w=u.keyIds;t=u.drmInfos;v=function(M,L){return M.size===L.size&&[].concat($jscomp.arrayFromIterable(M)).every(function(O){return L.has(O)})};v(q.keyIds,w)||(q.keyIds=w,q.drmInfos=t,b.playerInterface_.newDrmInfo(q));x=b.createSegments_(l,q,r,p,a.getUris);y=x.segments;z=x.bandwidth;q.bandwidth=z;q.segmentIndex.mergeAndEvict(y,b.presentationTimeline_.getSegmentAvailabilityStart());
|
|
@@ -1889,11 +1888,11 @@ c.presentationTimeline_=new shaka.media.PresentationTimeline(null,0);c.presentat
|
|
|
1889
1888
|
ignoreManifestTimestampsInSegmentsMode:c.config_.hls.ignoreManifestTimestampsInSegmentsMode,type:shaka.media.ManifestParser.HLS,serviceDescription:null};if(c.codecInfoInManifest_||!c.config_.hls.disableCodecGuessing){L.jumpTo(8);break}H=[];J=$jscomp.makeIterator(c.manifest_.variants);for(K=J.next();!K.done;K=J.next())M=K.value,M.audio&&""===M.audio.codecs&&H.push(M.audio.createSegmentIndex()),M.video&&""===M.video.codecs&&H.push(M.video.createSegmentIndex());return L.yield(Promise.all(H),8);case 8:c.playerInterface_.makeTextStreamsForClosedCaptions(c.manifest_),
|
|
1890
1889
|
L.jumpToEnd()}})};
|
|
1891
1890
|
shaka.hls.HlsParser.prototype.getMediaPlaylistBasicInfo_=function(a,b){var c=this,d,e,f,g,h,k,l,m,n,p,q,r,u,w,t,v,x,y,z,A,B;return $jscomp.asyncExecutePromiseGeneratorProgram(function(E){switch(E.nextAddress){case 1:d=shaka.hls.HlsParser;e=shaka.media.SegmentUtils.getBasicInfoFromMimeType(c.config_.hls.mediaPlaylistFullMimeType);if(!a.segments.length)return E.return(e);f=Math.trunc((a.segments.length-1)/2);g=a.segments[f];h=shaka.hls.Utils.constructSegmentUris(b(),a.segments[0].verbatimSegmentUri);k=
|
|
1892
|
-
h[0];l=new goog.Uri(k);m=l.getPath().split(".").pop();if(n=d.RAW_FORMATS_TO_MIME_TYPES_[m])return E.return(shaka.media.SegmentUtils.getBasicInfoFromMimeType(n));p=shaka.net.NetworkingEngine.RequestType.SEGMENT;q=null;r=c.getInitSegmentReference_(a,g.tags,b);if(!r){E.jumpTo(2);break}u=shaka.net.NetworkingEngine.makeRequest(r.getUris(),c.config_.retryParameters);w=shaka.net.NetworkingEngine.AdvancedRequestType.INIT_SEGMENT;return E.yield(c.makeNetworkRequest_(u,
|
|
1893
|
-
q=t.data;case 2:return v=shaka.net.NetworkingEngine.makeRequest(h,c.config_.retryParameters),x=shaka.net.NetworkingEngine.AdvancedRequestType.MEDIA_SEGMENT,E.yield(c.makeNetworkRequest_(v,p,{type:x}),4);case 4:y=E.yieldResult;(z=y.headers["content-type"])&&(z=z.split(";")[0].toLowerCase());if("ts"==m||"video/mp2t"==z){if(A=shaka.media.SegmentUtils.getBasicInfoFromTs(y.data))return E.return(A)}else if("mp4"==m||"cmfv"==m||"m4s"==m||"video/mp4"==z||"audio/mp4"==
|
|
1894
|
-
y.data))return E.return(B);return E.return(e)}})};
|
|
1895
|
-
shaka.hls.HlsParser.prototype.determineDuration_=function(){goog.asserts.assert(this.presentationTimeline_,"Presentation timeline not created!");if(this.isLive_()){if(this.presentationType_==shaka.hls.HlsParser.PresentationType_.LIVE){var a=this.getLiveDuration_();this.config_.hls.useSafariBehaviorForLive&&(a=this.presentationTimeline_.getDelay());isNaN(this.config_.availabilityWindowOverride)||(a=this.config_.availabilityWindowOverride);this.presentationTimeline_.setSegmentAvailabilityDuration(a)}}else this.presentationTimeline_.setDuration(this.getMinDuration_());
|
|
1896
|
-
goog.asserts.assert(!this.presentationTimeline_.usingPresentationStartTime(),"We should not be using the presentation start time in HLS!")};
|
|
1891
|
+
h[0];l=new goog.Uri(k);m=l.getPath().split(".").pop();if(n=d.RAW_FORMATS_TO_MIME_TYPES_[m])return E.return(shaka.media.SegmentUtils.getBasicInfoFromMimeType(n));p=shaka.net.NetworkingEngine.RequestType.SEGMENT;q=null;r=c.getInitSegmentReference_(a,g.tags,b);c.mapTagToInitSegmentRefMap_.clear();if(!r){E.jumpTo(2);break}u=shaka.net.NetworkingEngine.makeRequest(r.getUris(),c.config_.retryParameters);w=shaka.net.NetworkingEngine.AdvancedRequestType.INIT_SEGMENT;return E.yield(c.makeNetworkRequest_(u,
|
|
1892
|
+
p,{type:w}),3);case 3:t=E.yieldResult,q=t.data;case 2:return v=shaka.net.NetworkingEngine.makeRequest(h,c.config_.retryParameters),x=shaka.net.NetworkingEngine.AdvancedRequestType.MEDIA_SEGMENT,E.yield(c.makeNetworkRequest_(v,p,{type:x}),4);case 4:y=E.yieldResult;(z=y.headers["content-type"])&&(z=z.split(";")[0].toLowerCase());if("ts"==m||"video/mp2t"==z){if(A=shaka.media.SegmentUtils.getBasicInfoFromTs(y.data))return E.return(A)}else if("mp4"==m||"cmfv"==m||"m4s"==m||"video/mp4"==z||"audio/mp4"==
|
|
1893
|
+
z||"video/iso.segment"==z)if(B=shaka.media.SegmentUtils.getBasicInfoFromMp4(q,y.data))return E.return(B);return E.return(e)}})};
|
|
1894
|
+
shaka.hls.HlsParser.prototype.determineDuration_=function(){goog.asserts.assert(this.presentationTimeline_,"Presentation timeline not created!");if(this.isLive_()){if(this.presentationType_==shaka.hls.HlsParser.PresentationType_.LIVE){var a=this.getLiveDuration_();this.config_.hls.useSafariBehaviorForLive&&(a=this.presentationTimeline_.getDelay());isNaN(this.config_.availabilityWindowOverride)||(a=this.config_.availabilityWindowOverride);this.presentationTimeline_.setSegmentAvailabilityDuration(a)}}else this.presentationTimeline_.setDuration(this.getMinDuration_());
|
|
1895
|
+
this.presentationTimeline_.lockStartTime();goog.asserts.assert(!this.presentationTimeline_.usingPresentationStartTime(),"We should not be using the presentation start time in HLS!")};
|
|
1897
1896
|
shaka.hls.HlsParser.prototype.parseMasterVariables_=function(a){var b=(new goog.Uri(this.masterPlaylistUri_)).getQueryData();a=$jscomp.makeIterator(a);for(var c=a.next();!c.done;c=a.next()){var d=c.value;c=d.getAttributeValue("NAME");var e=d.getAttributeValue("VALUE");d=d.getAttributeValue("QUERYPARAM");c&&e&&(this.globalVariables_.has(c)||this.globalVariables_.set(c,e));d&&(c=b.get(d)[0])&&!this.globalVariables_.has(c)&&this.globalVariables_.set(d,c)}};
|
|
1898
1897
|
shaka.hls.HlsParser.prototype.parseMediaVariables_=function(a,b){b=(new goog.Uri(b)).getQueryData();var c=new Map;a=$jscomp.makeIterator(a);for(var d=a.next();!d.done;d=a.next()){var e=d.value,f=e.getAttributeValue("NAME"),g=e.getAttributeValue("VALUE");d=e.getAttributeValue("QUERYPARAM");e=e.getAttributeValue("IMPORT");f&&g&&(c.has(f)||c.set(f,g));d&&(f=b.get(d)[0])&&!c.has(f)&&c.set(d,f);e&&(d=this.globalVariables_.get(e))&&c.set(e,d)}return c};
|
|
1899
1898
|
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,
|
|
@@ -2014,7 +2013,7 @@ shaka.mss.ContentProtection.getPlayReadyHeaderObject_=function(a){var b=shaka.ms
|
|
|
2014
2013
|
shaka.mss.ContentProtection.getInitDataFromPro_=function(a,b,c){var d=shaka.util.Uint8ArrayUtils;a=d.fromBase64(a.textContent);b=d.fromHex(b.replace(/-/g,""));d=new Set;return[{initData:shaka.util.Pssh.createPssh(a,b,d,0),initDataType:"cenc",keyId:c}]};
|
|
2015
2014
|
shaka.mss.ContentProtection.convertElements_=function(a,b){for(var c=shaka.mss.ContentProtection,d=shaka.util.ManifestParserUtils,e=c.licenseUrlParsers_,f=[],g=0;g<a.length;g++){var h=a[g],k=h.getAttribute("SystemID").toLowerCase(),l=b[k];if(l){var m=c.getPlayReadyKID_(h);k=c.getInitDataFromPro_(h,k,m);k=d.createDrmInfo(l,k);m&&k.keyIds.add(m);if(l=e.get(l))k.licenseServerUri=l(h);f.push(k)}}return f};shaka.mss.ContentProtection.PLAYREADY_RECORD_TYPES={RIGHTS_MANAGEMENT:1,RESERVED:2,EMBEDDED_LICENSE:3};
|
|
2016
2015
|
shaka.mss.ContentProtection.licenseUrlParsers_=(new Map).set("com.microsoft.playready",shaka.mss.ContentProtection.getPlayReadyLicenseUrl).set("com.microsoft.playready.recommendation",shaka.mss.ContentProtection.getPlayReadyLicenseUrl).set("com.microsoft.playready.software",shaka.mss.ContentProtection.getPlayReadyLicenseUrl).set("com.microsoft.playready.hardware",shaka.mss.ContentProtection.getPlayReadyLicenseUrl);shaka.util.Mp4Generator=function(a){shaka.util.Mp4Generator.initStaticProperties_();this.streamInfos_=a};shaka.util.Mp4Generator.prototype.initSegment=function(){var a=shaka.util.Mp4Generator,b=this.moov_(),c=new Uint8Array(a.FTYP_.byteLength+b.byteLength);c.set(a.FTYP_);c.set(b,a.FTYP_.byteLength);return c};
|
|
2017
|
-
shaka.util.Mp4Generator.prototype.moov_=function(){goog.asserts.assert(0<this.streamInfos_.length,"StreamInfos must have elements");for(var a=shaka.util.Mp4Generator,b=
|
|
2016
|
+
shaka.util.Mp4Generator.prototype.moov_=function(){goog.asserts.assert(0<this.streamInfos_.length,"StreamInfos must have elements");for(var a=shaka.util.Mp4Generator,b=[],c=$jscomp.makeIterator(this.streamInfos_),d=c.next();!d.done;d=c.next())b.push(this.trak_(d.value));b=shaka.util.Uint8ArrayUtils.concat.apply(shaka.util.Uint8ArrayUtils,$jscomp.arrayFromIterable(b));c=this.streamInfos_[0];return a.box("moov",this.mvhd_(c),b,this.mvex_(),this.pssh_(c))};
|
|
2018
2017
|
shaka.util.Mp4Generator.prototype.mvhd_=function(a){var b=shaka.util.Mp4Generator,c=a.duration*a.timescale,d=Math.floor(c/(b.UINT32_MAX_+1));c=Math.floor(c%(b.UINT32_MAX_+1));a=new Uint8Array([1,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,3].concat($jscomp.arrayFromIterable(this.breakNumberIntoBytes_(a.timescale,4)),$jscomp.arrayFromIterable(this.breakNumberIntoBytes_(d,4)),$jscomp.arrayFromIterable(this.breakNumberIntoBytes_(c,4)),[0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,
|
|
2019
2018
|
0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255]));return b.box("mvhd",a)};shaka.util.Mp4Generator.prototype.trak_=function(a){return shaka.util.Mp4Generator.box("trak",this.tkhd_(a),this.mdia_(a))};
|
|
2020
2019
|
shaka.util.Mp4Generator.prototype.tkhd_=function(a){var b=shaka.util.Mp4Generator,c=a.id+1,d=a.stream.width||0,e=a.stream.height||0;a.type==shaka.util.ManifestParserUtils.ContentType.AUDIO&&(e=d=0);var f=a.duration*a.timescale;a=Math.floor(f/(b.UINT32_MAX_+1));f=Math.floor(f%(b.UINT32_MAX_+1));c=new Uint8Array([1,0,0,7,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,3].concat($jscomp.arrayFromIterable(this.breakNumberIntoBytes_(c,4)),[0,0,0,0],$jscomp.arrayFromIterable(this.breakNumberIntoBytes_(a,4)),$jscomp.arrayFromIterable(this.breakNumberIntoBytes_(f,
|
|
@@ -2033,13 +2032,13 @@ shaka.util.Mp4Generator.prototype.hvc1_=function(a){var b=shaka.util.Mp4Generato
|
|
|
2033
2032
|
shaka.util.Mp4Generator.prototype.ac3_=function(a){var b=shaka.util.Mp4Generator,c=b.box("dac3",a.audioConfig),d="ac-3",e=new Uint8Array([]);a.encrypted&&(e=this.sinf_(a),d="enca");return b.box(d,this.audioStsd_(a),c,e)};shaka.util.Mp4Generator.prototype.ec3_=function(a){var b=shaka.util.Mp4Generator,c=b.box("dec3",a.audioConfig),d="ec-3",e=new Uint8Array([]);a.encrypted&&(e=this.sinf_(a),d="enca");return b.box(d,this.audioStsd_(a),c,e)};
|
|
2034
2033
|
shaka.util.Mp4Generator.prototype.mp4a_=function(a){var b=shaka.util.Mp4Generator;var c=0<a.audioConfig.byteLength?b.box("esds",a.audioConfig):b.box("esds",this.esds_(a));var d="mp4a",e=new Uint8Array([]);a.encrypted&&(e=this.sinf_(a),d="enca");return b.box(d,this.audioStsd_(a),c,e)};
|
|
2035
2034
|
shaka.util.Mp4Generator.prototype.esds_=function(a){var b=a.id+1,c=a.stream.channelsCount||2,d=a.stream.audioSamplingRate||44100,e=shaka.util.ManifestParserUtils.guessCodecs(shaka.util.ManifestParserUtils.ContentType.AUDIO,a.codecs.split(",")),f={96E3:0,88200:1,64E3:2,48E3:3,44100:4,32E3:5,24E3:6,22050:7,16E3:8,12E3:9,11025:10,8E3:11,7350:12};a=f[d];if("mp4a.40.5"===e||"mp4a.40.29"===e)a=f[2*d];d=parseInt(e.split(".").pop(),10);return new Uint8Array([0,0,0,0,3,25].concat($jscomp.arrayFromIterable(this.breakNumberIntoBytes_(b,
|
|
2036
|
-
2)),[0,4,17,64,21,0,0,0,0,0,0,0,0,0,0,0,5,2,d<<3|a>>>1,a<<7|c<<3,6,1,2]))};shaka.util.Mp4Generator.prototype.mvex_=function(){for(var a=shaka.util.Mp4Generator,b=
|
|
2035
|
+
2)),[0,4,17,64,21,0,0,0,0,0,0,0,0,0,0,0,5,2,d<<3|a>>>1,a<<7|c<<3,6,1,2]))};shaka.util.Mp4Generator.prototype.mvex_=function(){for(var a=shaka.util.Mp4Generator,b=[],c=$jscomp.makeIterator(this.streamInfos_),d=c.next();!d.done;d=c.next())b.push(this.trex_(d.value));b=shaka.util.Uint8ArrayUtils.concat.apply(shaka.util.Uint8ArrayUtils,$jscomp.arrayFromIterable(b));return a.box("mvex",b)};
|
|
2037
2036
|
shaka.util.Mp4Generator.prototype.trex_=function(a){var b=shaka.util.Mp4Generator;a=new Uint8Array([0,0,0,0].concat($jscomp.arrayFromIterable(this.breakNumberIntoBytes_(a.id+1,4)),[0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,1]));return b.box("trex",a)};
|
|
2038
|
-
shaka.util.Mp4Generator.prototype.pssh_=function(a){var b=
|
|
2039
|
-
shaka.util.Mp4Generator.prototype.frma_=function(a){var b=a.codecs.substring(0,a.codecs.indexOf("."));a=shaka.util.Mp4Generator;b=this.stringToCharCode_(b);b=new Uint8Array([].concat($jscomp.arrayFromIterable(this.breakNumberIntoBytes_(b,4))));return a.box("frma",b)};
|
|
2040
|
-
shaka.util.Mp4Generator.prototype.schi_=function(a){return shaka.util.Mp4Generator.box("schi",this.tenc_(a))};
|
|
2037
|
+
shaka.util.Mp4Generator.prototype.pssh_=function(a){var b=[];if(!a.encrypted)return new Uint8Array([]);a=$jscomp.makeIterator(a.stream.drmInfos);for(var c=a.next();!c.done;c=a.next())if(c=c.value,c.initData){c=$jscomp.makeIterator(c.initData);for(var d=c.next();!d.done;d=c.next())b.push(d.value.initData)}return shaka.util.Uint8ArrayUtils.concat.apply(shaka.util.Uint8ArrayUtils,$jscomp.arrayFromIterable(b))};
|
|
2038
|
+
shaka.util.Mp4Generator.prototype.sinf_=function(a){return shaka.util.Mp4Generator.box("sinf",this.frma_(a),this.schm_(),this.schi_(a))};shaka.util.Mp4Generator.prototype.frma_=function(a){var b=a.codecs.substring(0,a.codecs.indexOf("."));a=shaka.util.Mp4Generator;b=this.stringToCharCode_(b);b=new Uint8Array([].concat($jscomp.arrayFromIterable(this.breakNumberIntoBytes_(b,4))));return a.box("frma",b)};
|
|
2039
|
+
shaka.util.Mp4Generator.prototype.schm_=function(){var a=shaka.util.Mp4Generator,b=new Uint8Array([0,0,0,0,99,101,110,99,0,1,0,0]);return a.box("schm",b)};shaka.util.Mp4Generator.prototype.schi_=function(a){return shaka.util.Mp4Generator.box("schi",this.tenc_(a))};
|
|
2041
2040
|
shaka.util.Mp4Generator.prototype.tenc_=function(a){var b=new Uint8Array([0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]);a=$jscomp.makeIterator(a.stream.drmInfos);for(var c=a.next();!c.done;c=a.next())if((c=c.value)&&c.keyIds&&c.keyIds.size){c=$jscomp.makeIterator(c.keyIds);for(var d=c.next();!d.done;d=c.next())b=this.hexStringToBuffer_(d.value)}a=shaka.util.Mp4Generator;c=new Uint8Array([0,0,0,0,0,0,1,8]);goog.asserts.assert(b,"Default KID should be non-null");return a.box("tenc",c,b)};
|
|
2042
|
-
shaka.util.Mp4Generator.prototype.segmentData=function(){for(var a=
|
|
2041
|
+
shaka.util.Mp4Generator.prototype.segmentData=function(){for(var a=[],b=$jscomp.makeIterator(this.streamInfos_),c=b.next();!c.done;c=b.next())c=c.value,a.push.apply(a,[this.moof_(c),this.mdat_(c)]);return shaka.util.Uint8ArrayUtils.concat.apply(shaka.util.Uint8ArrayUtils,$jscomp.arrayFromIterable(a))};shaka.util.Mp4Generator.prototype.moof_=function(a){return shaka.util.Mp4Generator.box("moof",this.mfhd_(a),this.traf_(a))};
|
|
2043
2042
|
shaka.util.Mp4Generator.prototype.mfhd_=function(a){var b=shaka.util.Mp4Generator;a=new Uint8Array([0,0,0,0].concat($jscomp.arrayFromIterable(this.breakNumberIntoBytes_(a.data?a.data.sequenceNumber:0,4))));return b.box("mfhd",a)};shaka.util.Mp4Generator.prototype.traf_=function(a){var b=shaka.util.Mp4Generator,c=this.sdtp_(a),d=c.length+32+20+8+16+8+8;return b.box("traf",this.tfhd_(a),this.tfdt_(a),this.trun_(a,d),c)};
|
|
2044
2043
|
shaka.util.Mp4Generator.prototype.sdtp_=function(a){var b=shaka.util.Mp4Generator;a=a.data?a.data.samples:[];for(var c=new Uint8Array(4+a.length),d=0;d<a.length;d++){var e=a[d].flags;c[d+4]=e.dependsOn<<4|e.isDependedOn<<2|e.hasRedundancy}return b.box("sdtp",c)};shaka.util.Mp4Generator.prototype.tfhd_=function(a){var b=shaka.util.Mp4Generator;a=new Uint8Array([0,0,0,58].concat($jscomp.arrayFromIterable(this.breakNumberIntoBytes_(a.id+1,4)),[0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0]));return b.box("tfhd",a)};
|
|
2045
2044
|
shaka.util.Mp4Generator.prototype.tfdt_=function(a){var b=shaka.util.Mp4Generator;a=a.data?a.data.baseMediaDecodeTime:0;var c=Math.floor(a%(b.UINT32_MAX_+1));a=new Uint8Array([1,0,0,0].concat($jscomp.arrayFromIterable(this.breakNumberIntoBytes_(Math.floor(a/(b.UINT32_MAX_+1)),4)),$jscomp.arrayFromIterable(this.breakNumberIntoBytes_(c,4))));return b.box("tfdt",a)};
|
|
@@ -2595,11 +2594,11 @@ videoNalus:[],audioConfig:h,videoConfig:new Uint8Array([]),data:{sequenceNumber:
|
|
|
2595
2594
|
shaka.transmuxer.TsTransmuxer.prototype.getMp3StreamInfo_=function(a,b,c){var d=shaka.transmuxer.MpegAudio,e=shaka.util.TsParser.Timescale,f=[],g,h=null;a=$jscomp.makeIterator(a.getAudioData());for(var k=a.next();!k.done;k=a.next()){var l=k.value;if(k=l.data)for(null==h&&null!==l.pts&&(h=l.pts),l=0;l<k.length;){var m=d.parseHeader(k,l);m?(g||(g=m),l+m.frameLength<=k.length&&f.push({data:k.subarray(l,l+m.frameLength),size:m.frameLength,duration:d.MPEG_AUDIO_SAMPLE_PER_FRAME,cts:0,flags:{isLeading:0,
|
|
2596
2595
|
isDependedOn:0,hasRedundancy:0,degradPrio:0,dependsOn:2,isNonSync:0}}),l+=m.frameLength):l++}}if(!g||null==h)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MEDIA,shaka.util.Error.Code.TRANSMUXING_FAILED);d=g.sampleRate;e=h/e*d;return{id:b.id,type:shaka.util.ManifestParserUtils.ContentType.AUDIO,codecs:"mp3",encrypted:b.encrypted&&0<b.drmInfos.length,timescale:d,duration:c,videoNalus:[],audioConfig:new Uint8Array([]),videoConfig:new Uint8Array([]),data:{sequenceNumber:this.frameIndex_,
|
|
2597
2596
|
baseMediaDecodeTime:e,samples:f},stream:b}};
|
|
2598
|
-
shaka.transmuxer.TsTransmuxer.prototype.getAvcStreamInfo_=function(a,b,c,d){var e=shaka.transmuxer.H264,f=shaka.util.TsParser.Timescale,g=[],h=null,k=[];a=a.getVideoData();if(!a.length)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MEDIA,shaka.util.Error.Code.TRANSMUXING_NO_VIDEO_DATA);for(var l=0;l<a.length;l++){var m=a[l],n=m.nalus;k
|
|
2599
|
-
1].dts||0)-(m.dts||0):1<a.length?(m.dts||0)-(a[l-1].dts||0):(d.endTime-d.startTime)*f,cts:Math.round((m.pts||0)-(m.dts||0)),flags:{isLeading:0,isDependedOn:0,hasRedundancy:0,degradPrio:0,dependsOn:n.isKeyframe?2:1,isNonSync:n.isKeyframe?0:1}})}d=e.parseInfo(k);if(!d||null==h)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MEDIA,shaka.util.Error.Code.TRANSMUXING_FAILED);b.height=d.height;b.width=d.width;return{id:b.id,type:shaka.util.ManifestParserUtils.ContentType.VIDEO,
|
|
2597
|
+
shaka.transmuxer.TsTransmuxer.prototype.getAvcStreamInfo_=function(a,b,c,d){var e=shaka.transmuxer.H264,f=shaka.util.TsParser.Timescale,g=[],h=null,k=[];a=a.getVideoData();if(!a.length)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MEDIA,shaka.util.Error.Code.TRANSMUXING_NO_VIDEO_DATA);for(var l=0;l<a.length;l++){var m=a[l],n=m.nalus;k.push.apply(k,$jscomp.arrayFromIterable(n));if(n=e.parseFrame(n))null==h&&(h=m.dts),g.push({data:n.data,size:n.data.byteLength,
|
|
2598
|
+
duration:l+1<a.length?(a[l+1].dts||0)-(m.dts||0):1<a.length?(m.dts||0)-(a[l-1].dts||0):(d.endTime-d.startTime)*f,cts:Math.round((m.pts||0)-(m.dts||0)),flags:{isLeading:0,isDependedOn:0,hasRedundancy:0,degradPrio:0,dependsOn:n.isKeyframe?2:1,isNonSync:n.isKeyframe?0:1}})}d=e.parseInfo(k);if(!d||null==h)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MEDIA,shaka.util.Error.Code.TRANSMUXING_FAILED);b.height=d.height;b.width=d.width;return{id:b.id,type:shaka.util.ManifestParserUtils.ContentType.VIDEO,
|
|
2600
2599
|
codecs:"avc1",encrypted:b.encrypted&&0<b.drmInfos.length,timescale:f,duration:c,videoNalus:[],audioConfig:new Uint8Array([]),videoConfig:d.videoConfig,data:{sequenceNumber:this.frameIndex_,baseMediaDecodeTime:h,samples:g},stream:b}};
|
|
2601
|
-
shaka.transmuxer.TsTransmuxer.prototype.getHvcStreamInfo_=function(a,b,c,d){var e=shaka.transmuxer.H265,f=shaka.util.TsParser.Timescale,g=[],h=null,k=[];a=a.getVideoData();if(!a.length)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MEDIA,shaka.util.Error.Code.TRANSMUXING_NO_VIDEO_DATA);for(var l=0;l<a.length;l++){var m=a[l],n=m.nalus;k
|
|
2602
|
-
(a[l+1].dts||0)-(m.dts||0):1<a.length?(m.dts||0)-(a[l-1].dts||0):(d.endTime-d.startTime)*f,cts:Math.round((m.pts||0)-(m.dts||0)),flags:{isLeading:0,isDependedOn:0,hasRedundancy:0,degradPrio:0,dependsOn:n.isKeyframe?2:1,isNonSync:n.isKeyframe?0:1}})}d=e.parseInfo(k);if(!d||null==h)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MEDIA,shaka.util.Error.Code.TRANSMUXING_FAILED);b.height=d.height;b.width=d.width;return{id:b.id,type:shaka.util.ManifestParserUtils.ContentType.VIDEO,
|
|
2600
|
+
shaka.transmuxer.TsTransmuxer.prototype.getHvcStreamInfo_=function(a,b,c,d){var e=shaka.transmuxer.H265,f=shaka.util.TsParser.Timescale,g=[],h=null,k=[];a=a.getVideoData();if(!a.length)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MEDIA,shaka.util.Error.Code.TRANSMUXING_NO_VIDEO_DATA);for(var l=0;l<a.length;l++){var m=a[l],n=m.nalus;k.push.apply(k,$jscomp.arrayFromIterable(n));if(n=e.parseFrame(n))null==h&&null!=m.dts&&(h=m.dts),g.push({data:n.data,size:n.data.byteLength,
|
|
2601
|
+
duration:l+1<a.length?(a[l+1].dts||0)-(m.dts||0):1<a.length?(m.dts||0)-(a[l-1].dts||0):(d.endTime-d.startTime)*f,cts:Math.round((m.pts||0)-(m.dts||0)),flags:{isLeading:0,isDependedOn:0,hasRedundancy:0,degradPrio:0,dependsOn:n.isKeyframe?2:1,isNonSync:n.isKeyframe?0:1}})}d=e.parseInfo(k);if(!d||null==h)throw new shaka.util.Error(shaka.util.Error.Severity.CRITICAL,shaka.util.Error.Category.MEDIA,shaka.util.Error.Code.TRANSMUXING_FAILED);b.height=d.height;b.width=d.width;return{id:b.id,type:shaka.util.ManifestParserUtils.ContentType.VIDEO,
|
|
2603
2602
|
codecs:"hvc1",encrypted:b.encrypted&&0<b.drmInfos.length,timescale:f,duration:c,videoNalus:[],audioConfig:new Uint8Array([]),videoConfig:d.videoConfig,data:{sequenceNumber:this.frameIndex_,baseMediaDecodeTime:h,samples:g},stream:b}};goog.exportSymbol("shaka.transmuxer.TsTransmuxer",shaka.transmuxer.TsTransmuxer);goog.exportProperty(shaka.transmuxer.TsTransmuxer.prototype,"transmux",shaka.transmuxer.TsTransmuxer.prototype.transmux);
|
|
2604
2603
|
goog.exportProperty(shaka.transmuxer.TsTransmuxer.prototype,"getOriginalMimeType",shaka.transmuxer.TsTransmuxer.prototype.getOriginalMimeType);goog.exportProperty(shaka.transmuxer.TsTransmuxer.prototype,"convertCodecs",shaka.transmuxer.TsTransmuxer.prototype.convertCodecs);goog.exportProperty(shaka.transmuxer.TsTransmuxer.prototype,"isSupported",shaka.transmuxer.TsTransmuxer.prototype.isSupported);goog.exportProperty(shaka.transmuxer.TsTransmuxer.prototype,"destroy",shaka.transmuxer.TsTransmuxer.prototype.destroy);
|
|
2605
2604
|
shaka.transmuxer.TsTransmuxer.SUPPORTED_AUDIO_CODECS_=["aac","ac-3","ec-3","mp3"];shaka.transmuxer.TsTransmuxer.SUPPORTED_VIDEO_CODECS_=["avc","hevc"];shaka.transmuxer.TransmuxerEngine.registerTransmuxer("video/mp2t",function(){return new shaka.transmuxer.TsTransmuxer("video/mp2t")},shaka.transmuxer.TransmuxerEngine.PluginPriority.PREFERRED);/*
|