shaka-player 4.4.3 → 4.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/ISSUE_TEMPLATE/bug_report.md +1 -1
- package/.github/workflows/release-please.yaml +2 -27
- package/AUTHORS +2 -0
- package/CHANGELOG.md +156 -39
- package/CODE_OF_CONDUCT.md +1 -1
- package/CONTRIBUTORS +2 -0
- package/README.md +54 -42
- package/demo/asset_card.js +18 -21
- package/demo/cast_receiver/index.html +0 -1
- package/demo/close_button.js +0 -3
- package/demo/common/asset.js +33 -22
- package/demo/common/assets.js +249 -60
- package/demo/config.js +219 -253
- package/demo/custom.js +88 -133
- package/demo/front.js +7 -10
- package/demo/index.html +19 -22
- package/demo/input.js +6 -11
- package/demo/input_container.js +8 -9
- package/demo/main.js +62 -126
- package/demo/search.js +29 -34
- package/demo/service_worker.js +0 -3
- package/demo/tooltip.js +3 -5
- package/demo/visualizer.js +3 -5
- package/demo/visualizer_button.js +1 -20
- package/dist/controls.css +1 -1
- package/dist/controls.css.map +1 -1
- package/dist/demo.compiled.debug.js +211 -228
- package/dist/demo.compiled.debug.map +4 -4
- package/dist/demo.compiled.js +211 -228
- package/dist/demo.compiled.map +4 -4
- package/dist/deps.js +42 -37
- package/dist/locales.js +34 -30
- package/dist/receiver.compiled.debug.js +64 -77
- package/dist/receiver.compiled.debug.map +4 -4
- package/dist/receiver.compiled.js +64 -77
- package/dist/receiver.compiled.map +4 -4
- package/dist/shaka-player.compiled.d.ts +343 -151
- package/dist/shaka-player.compiled.debug.d.ts +343 -151
- package/dist/shaka-player.compiled.debug.externs.js +356 -117
- package/dist/shaka-player.compiled.debug.js +952 -811
- package/dist/shaka-player.compiled.debug.map +4 -4
- package/dist/shaka-player.compiled.externs.js +356 -117
- package/dist/shaka-player.compiled.js +1165 -1078
- package/dist/shaka-player.compiled.map +4 -4
- package/dist/shaka-player.ui.d.ts +359 -153
- package/dist/shaka-player.ui.debug.d.ts +359 -153
- package/dist/shaka-player.ui.debug.externs.js +382 -117
- package/dist/shaka-player.ui.debug.js +1084 -918
- package/dist/shaka-player.ui.debug.map +4 -4
- package/dist/shaka-player.ui.externs.js +382 -117
- package/dist/shaka-player.ui.js +1377 -1274
- package/dist/shaka-player.ui.map +4 -4
- package/docs/design/lcevc-integration.md +14 -14
- package/docs/tutorials/ad_monetization.md +54 -0
- package/docs/tutorials/basic-usage.md +2 -1
- package/docs/tutorials/errors.md +2 -1
- package/docs/tutorials/faq.md +27 -55
- package/docs/tutorials/index.json +2 -1
- package/docs/tutorials/lcevc.md +118 -0
- package/docs/tutorials/offline.md +10 -8
- package/docs/tutorials/plugins.md +5 -0
- package/docs/tutorials/ui-customization.md +17 -0
- package/docs/tutorials/ui.md +2 -1
- package/docs/tutorials/upgrade.md +3 -0
- package/externs/css_style_declaration.js +19 -0
- package/externs/lcevc.js +37 -13
- package/externs/managedmediasource.js +24 -0
- package/externs/media_remote.js +68 -0
- package/externs/mediatailor.js +193 -0
- package/externs/pictureinpicture.js +11 -0
- package/externs/shaka/abr_manager.js +6 -2
- package/externs/shaka/ads.js +27 -0
- package/externs/shaka/cea.js +7 -0
- package/externs/shaka/codecs.js +5 -3
- package/externs/shaka/manifest.js +31 -10
- package/externs/shaka/manifest_parser.js +24 -1
- package/externs/shaka/net.js +2 -2
- package/externs/shaka/offline.js +13 -2
- package/externs/shaka/player.js +65 -8
- package/externs/shaka/text.js +3 -1
- package/externs/shaka/transmuxer.js +1 -1
- package/karma.conf.js +7 -3
- package/lib/abr/simple_abr_manager.js +66 -9
- package/lib/ads/ad_manager.js +104 -50
- package/lib/ads/media_tailor_ad.js +297 -0
- package/lib/ads/media_tailor_ad_manager.js +839 -0
- package/lib/cast/cast_receiver.js +1 -1
- package/lib/cea/cea_decoder.js +28 -0
- package/lib/cea/dummy_caption_decoder.js +5 -0
- package/lib/cea/ts_cea_parser.js +15 -2
- package/lib/config/codec_switching_strategy.js +24 -0
- package/lib/dash/content_protection.js +120 -2
- package/lib/dash/dash_parser.js +322 -93
- package/lib/dash/mpd_utils.js +62 -37
- package/lib/dash/segment_base.js +17 -10
- package/lib/dash/segment_list.js +18 -9
- package/lib/dash/segment_template.js +122 -107
- package/lib/dependencies/all.js +8 -7
- package/lib/hls/hls_classes.js +28 -43
- package/lib/hls/hls_parser.js +798 -658
- package/lib/hls/hls_utils.js +64 -5
- package/lib/hls/manifest_text_parser.js +7 -11
- package/lib/lcevc/lcevc_dec.js +220 -0
- package/lib/media/adaptation_set.js +32 -14
- package/lib/media/adaptation_set_criteria.js +86 -16
- package/lib/media/closed_caption_parser.js +13 -0
- package/lib/media/content_workarounds.js +6 -0
- package/lib/media/drm_engine.js +8 -13
- package/lib/media/manifest_parser.js +8 -113
- package/lib/media/media_source_capabilities.js +10 -3
- package/lib/media/media_source_engine.js +286 -44
- package/lib/media/play_rate_controller.js +8 -38
- package/lib/media/presentation_timeline.js +7 -1
- package/lib/media/quality_observer.js +1 -1
- package/lib/media/segment_index.js +6 -6
- package/lib/media/segment_prefetch.js +92 -24
- package/lib/media/segment_reference.js +73 -7
- package/lib/media/segment_utils.js +343 -0
- package/lib/media/stall_detector.js +0 -3
- package/lib/media/streaming_engine.js +73 -38
- package/lib/mss/mss_parser.js +19 -2
- package/lib/net/networking_engine.js +67 -12
- package/lib/net/networking_utils.js +95 -0
- package/lib/offline/indexeddb/v1_storage_cell.js +3 -0
- package/lib/offline/indexeddb/v2_storage_cell.js +3 -0
- package/lib/offline/manifest_converter.js +3 -0
- package/lib/offline/offline_manifest_parser.js +10 -0
- package/lib/offline/storage.js +14 -7
- package/lib/player.js +1098 -1537
- package/lib/polyfill/mediasource.js +22 -1
- package/lib/text/cue.js +15 -0
- package/lib/text/mp4_ttml_parser.js +2 -2
- package/lib/text/srt_text_parser.js +2 -2
- package/lib/text/stub_text_displayer.js +51 -0
- package/lib/text/text_engine.js +3 -2
- package/lib/text/ttml_text_parser.js +45 -5
- package/lib/text/ui_text_displayer.js +8 -0
- package/lib/text/vtt_text_parser.js +40 -22
- package/lib/transmuxer/aac_transmuxer.js +1 -1
- package/lib/transmuxer/ac3_transmuxer.js +1 -1
- package/lib/transmuxer/ec3_transmuxer.js +1 -1
- package/lib/transmuxer/h264.js +5 -4
- package/lib/transmuxer/h265.js +863 -0
- package/lib/transmuxer/mp3_transmuxer.js +1 -1
- package/lib/transmuxer/mpeg_ts_transmuxer.js +4 -3
- package/lib/transmuxer/mss_transmuxer.js +1 -1
- package/lib/transmuxer/ts_transmuxer.js +187 -22
- package/lib/util/buffer_utils.js +26 -4
- package/lib/util/content_steering_manager.js +358 -0
- package/lib/util/error.js +30 -15
- package/lib/util/exp_golomb.js +30 -2
- package/lib/util/fairplay_utils.js +1 -1
- package/lib/util/fake_event.js +8 -1
- package/lib/util/id3_utils.js +50 -1
- package/lib/util/manifest_parser_utils.js +12 -8
- package/lib/util/mp4_generator.js +6 -8
- package/lib/util/mutex.js +59 -0
- package/lib/util/object_utils.js +1 -1
- package/lib/util/periods.js +156 -179
- package/lib/util/platform.js +44 -3
- package/lib/util/player_configuration.js +43 -6
- package/lib/util/state_history.js +6 -2
- package/lib/util/stream_utils.js +206 -283
- package/lib/util/ts_parser.js +335 -98
- package/lib/util/uint8array_utils.js +5 -1
- package/lib/util/xml_utils.js +5 -0
- package/maintained-branches.md +3 -2
- package/package.json +4 -6
- package/roadmap.md +25 -5
- package/shaka-player.uncompiled.js +2 -2
- package/support.html +0 -1
- package/test/abr/simple_abr_manager_unit.js +33 -33
- package/test/ads/ad_manager_unit.js +3 -2
- package/test/cast/cast_receiver_integration.js +50 -4
- package/test/cast/cast_utils_unit.js +2 -0
- package/test/cea/cea_decoder_unit.js +7 -0
- package/test/codec_switching/codec_switching_integration.js +182 -0
- package/test/dash/dash_parser_content_protection_unit.js +2 -0
- package/test/dash/dash_parser_integration.js +74 -0
- package/test/dash/dash_parser_live_unit.js +2 -19
- package/test/dash/dash_parser_manifest_unit.js +536 -2
- package/test/dash/dash_parser_segment_base_unit.js +2 -0
- package/test/dash/dash_parser_segment_list_unit.js +2 -0
- package/test/dash/dash_parser_segment_template_unit.js +2 -0
- package/test/dash/mpd_utils_unit.js +61 -30
- package/test/demo/demo_unit.js +0 -16
- package/test/hls/hls_live_unit.js +14 -3
- package/test/hls/hls_parser_unit.js +385 -33
- package/test/hls/manifest_text_parser_unit.js +32 -99
- package/test/media/adaptation_set_criteria_unit.js +284 -15
- package/test/media/adaptation_set_unit.js +2 -0
- package/test/media/content_workarounds_unit.js +1 -1
- package/test/media/drm_engine_unit.js +3 -3
- package/test/media/media_source_engine_unit.js +166 -2
- package/test/media/play_rate_controller_unit.js +0 -48
- package/test/media/segment_index_unit.js +5 -4
- package/test/media/segment_prefetch_unit.js +1 -1
- package/test/media/streaming_engine_unit.js +17 -17
- package/test/mss/mss_parser_unit.js +2 -0
- package/test/mss/mss_player_integration.js +3 -2
- package/test/net/networking_engine_unit.js +3 -3
- package/test/{media/manifest_parser_unit.js → net/networking_utils_unit.js} +2 -2
- package/test/offline/manifest_convert_unit.js +14 -0
- package/test/offline/offline_integration.js +2 -1
- package/test/offline/storage_integration.js +22 -13
- package/test/player_external.js +4 -2
- package/test/player_integration.js +15 -4
- package/test/player_load_graph_integration.js +47 -151
- package/test/player_src_equals_external.js +1 -0
- package/test/player_src_equals_integration.js +71 -4
- package/test/player_unit.js +182 -158
- package/test/test/assets/dash-aes-128/Fragments(video=0,format=mpd-time-csf) +0 -0
- package/test/test/assets/dash-aes-128/Fragments(video=20000000,format=mpd-time-csf) +0 -0
- package/test/test/assets/dash-aes-128/Fragments(video=40000000,format=mpd-time-csf) +0 -0
- package/test/test/assets/dash-aes-128/Fragments(video=60000000,format=mpd-time-csf) +0 -0
- package/test/test/assets/dash-aes-128/Fragments(video=i,format=mpd-time-csf) +0 -0
- package/test/test/assets/dash-aes-128/dash.mpd +18 -0
- package/test/test/assets/dash-aes-128/license +1 -0
- package/test/test/assets/dash-multi-codec/audio_en_2c_128k_aac.mp4 +0 -0
- package/test/test/assets/dash-multi-codec/audio_es_2c_64k_opus.webm +0 -0
- package/test/test/assets/dash-multi-codec/dash.mpd +32 -0
- package/test/test/assets/dash-multi-codec/video_144p_108k_h264.mp4 +0 -0
- package/test/test/assets/hls-ts-h265/0.ts +0 -0
- package/test/test/assets/hls-ts-h265/hevc.m3u8 +6 -0
- package/test/test/assets/hls-ts-h265/index.m3u8 +7 -0
- package/test/test/assets/hls-ts-muxed-aac-h265/0.ts +0 -0
- package/test/test/assets/hls-ts-muxed-aac-h265/1.ts +0 -0
- package/test/test/assets/hls-ts-muxed-aac-h265/media.m3u8 +9 -0
- package/test/test/assets/hls-ts-muxed-ac3-h264/media.m3u8 +24 -0
- package/test/test/assets/hls-ts-muxed-ac3-h264/s_00000.ts +0 -0
- package/test/test/assets/hls-ts-muxed-ac3-h264/s_00001.ts +0 -0
- package/test/test/assets/hls-ts-muxed-ac3-h264/s_00002.ts +0 -0
- package/test/test/assets/hls-ts-muxed-ac3-h264/s_00003.ts +0 -0
- package/test/test/assets/hls-ts-muxed-ac3-h264/s_00004.ts +0 -0
- package/test/test/assets/hls-ts-muxed-ac3-h264/s_00005.ts +0 -0
- package/test/test/assets/hls-ts-muxed-ec3-h264/ChID_voices_1280x720p_25fps_h264_6ch_256kbps_ddp_sub_0000.ts +0 -0
- package/test/test/assets/hls-ts-muxed-ec3-h264/ChID_voices_1280x720p_25fps_h264_6ch_256kbps_ddp_sub_0001.ts +0 -0
- package/test/test/assets/hls-ts-muxed-ec3-h264/ChID_voices_1280x720p_25fps_h264_6ch_256kbps_ddp_sub_0002.ts +0 -0
- package/test/test/assets/hls-ts-muxed-ec3-h264/ChID_voices_1280x720p_25fps_h264_6ch_256kbps_ddp_sub_0003.ts +0 -0
- package/test/test/assets/hls-ts-muxed-ec3-h264/prog_index.m3u8 +14 -0
- package/test/test/assets/hls-ts-muxed-mp3-h264/index.m3u8 +23 -0
- package/test/test/assets/hls-ts-muxed-mp3-h264/seg-1-v1-a1.ts +0 -0
- package/test/test/assets/hls-ts-muxed-mp3-h264/seg-2-v1-a1.ts +0 -0
- package/test/test/assets/hls-ts-muxed-mp3-h264/seg-3-v1-a1.ts +0 -0
- package/test/test/assets/hls-ts-muxed-mp3-h264/seg-4-v1-a1.ts +0 -0
- package/test/test/assets/hls-ts-muxed-mp3-h264/seg-5-v1-a1.ts +0 -0
- package/test/test/assets/hls-ts-muxed-mp3-h264/seg-6-v1-a1.ts +0 -0
- package/test/test/assets/hls-ts-muxed-mp3-h264/seg-7-v1-a1.ts +0 -0
- package/test/test/assets/hls-ts-muxed-mp3-h264/seg-8-v1-a1.ts +0 -0
- package/test/test/util/dash_parser_util.js +4 -0
- package/test/test/util/fake_ad_manager.js +20 -0
- package/test/test/util/fake_media_source_engine.js +13 -2
- package/test/test/util/fake_networking_engine.js +9 -1
- package/test/test/util/fake_segment_prefetch.js +3 -0
- package/test/test/util/manifest_generator.js +11 -3
- package/test/test/util/manifest_parser_util.js +14 -2
- package/test/test/util/mss_parser_util.js +4 -0
- package/test/test/util/offline_utils.js +2 -0
- package/test/test/util/simple_fakes.js +2 -2
- package/test/test/util/streaming_engine_util.js +10 -4
- package/test/test/util/test_scheme.js +6 -0
- package/test/test/util/ui_utils.js +4 -3
- package/test/text/mp4_ttml_parser_unit.js +4 -4
- package/test/text/srt_text_parser_unit.js +1 -1
- package/test/text/text_displayer_layout_unit.js +1 -1
- package/test/text/text_engine_unit.js +6 -0
- package/test/text/ttml_text_parser_unit.js +85 -2
- package/test/text/vtt_text_parser_unit.js +103 -31
- package/test/transmuxer/transmuxer_engine_integration.js +9 -0
- package/test/transmuxer/transmuxer_integration.js +150 -3
- package/test/ui/ad_ui_unit.js +2 -2
- package/test/ui/ui_customization_unit.js +17 -16
- package/test/ui/ui_integration.js +30 -20
- package/test/ui/ui_unit.js +28 -29
- package/test/util/buffer_utils_unit.js +1 -1
- package/test/util/content_steering_manager_unit.js +427 -0
- package/test/util/id3_utils_unit.js +52 -0
- package/test/util/stream_utils_unit.js +207 -169
- package/test/util/ts_parser_unit.js +3 -3
- package/third_party/closure-uri/uri.js +13 -1
- package/ui/audio_language_selection.js +9 -2
- package/ui/controls.js +125 -0
- package/ui/externs/ui.js +24 -2
- package/ui/language_utils.js +43 -8
- package/ui/less/range_elements.less +33 -0
- package/ui/locales/en.json +1 -0
- package/ui/locales/es-419.json +1 -0
- package/ui/locales/es.json +1 -0
- package/ui/locales/source.json +4 -0
- package/ui/localization.js +10 -0
- package/ui/pip_button.js +22 -120
- package/ui/remote_button.js +203 -0
- package/ui/resolution_selection.js +47 -10
- package/ui/seek_bar.js +296 -3
- package/ui/text_selection.js +2 -1
- package/ui/ui.js +11 -4
- package/demo/common/message_ids.js +0 -309
- package/demo/locales/en.json +0 -288
- package/demo/locales/source.json +0 -1146
- package/externs/mux.js +0 -69
- package/lib/lcevc/lcevc_dil.js +0 -152
- package/lib/routing/node.js +0 -23
- package/lib/routing/payload.js +0 -43
- package/lib/routing/walker.js +0 -587
- package/lib/transmuxer/muxjs_transmuxer.js +0 -242
- package/test/routing/walker_unit.js +0 -504
- package/test/transmuxer/muxjs_transmuxer_integration.js +0 -177
|
@@ -9,6 +9,7 @@ goog.provide('shaka.util.PlayerConfiguration');
|
|
|
9
9
|
goog.require('goog.asserts');
|
|
10
10
|
goog.require('shaka.abr.SimpleAbrManager');
|
|
11
11
|
goog.require('shaka.config.AutoShowText');
|
|
12
|
+
goog.require('shaka.config.CodecSwitchingStrategy');
|
|
12
13
|
goog.require('shaka.log');
|
|
13
14
|
goog.require('shaka.net.NetworkingEngine');
|
|
14
15
|
goog.require('shaka.util.ConfigUtils');
|
|
@@ -90,6 +91,7 @@ shaka.util.PlayerConfiguration = class {
|
|
|
90
91
|
// segments to detect key changes.
|
|
91
92
|
parseInbandPsshEnabled: shaka.util.Platform.isXboxOne(),
|
|
92
93
|
minHdcpVersion: '',
|
|
94
|
+
ignoreDuplicateInitData: !shaka.util.Platform.isTizen2(),
|
|
93
95
|
};
|
|
94
96
|
|
|
95
97
|
const manifest = {
|
|
@@ -133,6 +135,7 @@ shaka.util.PlayerConfiguration = class {
|
|
|
133
135
|
element);
|
|
134
136
|
},
|
|
135
137
|
sequenceMode: false,
|
|
138
|
+
enableAudioGroups: false,
|
|
136
139
|
},
|
|
137
140
|
hls: {
|
|
138
141
|
ignoreTextStreamFailures: false,
|
|
@@ -146,6 +149,8 @@ shaka.util.PlayerConfiguration = class {
|
|
|
146
149
|
liveSegmentsDelay: 3,
|
|
147
150
|
sequenceMode: shaka.util.Platform.supportsSequenceMode(),
|
|
148
151
|
ignoreManifestTimestampsInSegmentsMode: false,
|
|
152
|
+
disableCodecGuessing: false,
|
|
153
|
+
allowLowLatencyByteRangeOptimization: true,
|
|
149
154
|
},
|
|
150
155
|
mss: {
|
|
151
156
|
manifestPreprocessor: (element) => {
|
|
@@ -213,15 +218,19 @@ shaka.util.PlayerConfiguration = class {
|
|
|
213
218
|
liveSync: false,
|
|
214
219
|
liveSyncMaxLatency: 1,
|
|
215
220
|
liveSyncPlaybackRate: 1.1,
|
|
221
|
+
liveSyncMinLatency: 0,
|
|
222
|
+
liveSyncMinPlaybackRate: 1,
|
|
216
223
|
};
|
|
217
224
|
|
|
218
|
-
// WebOS, Tizen, and
|
|
219
|
-
// slowly to seeking.
|
|
225
|
+
// WebOS, Tizen, Chromecast and Hisense have long hardware pipelines
|
|
226
|
+
// that respond slowly to seeking.
|
|
227
|
+
// Therefore we should not seek when we detect a stall
|
|
220
228
|
// on one of these platforms. Instead, default stallSkip to 0 to force the
|
|
221
229
|
// stall detector to pause and play instead.
|
|
222
230
|
if (shaka.util.Platform.isWebOS() ||
|
|
223
231
|
shaka.util.Platform.isTizen() ||
|
|
224
|
-
shaka.util.Platform.isChromecast()
|
|
232
|
+
shaka.util.Platform.isChromecast() ||
|
|
233
|
+
shaka.util.Platform.isHisense()) {
|
|
225
234
|
streaming.stallSkip = 0;
|
|
226
235
|
}
|
|
227
236
|
|
|
@@ -307,7 +316,13 @@ shaka.util.PlayerConfiguration = class {
|
|
|
307
316
|
drawLogo: false,
|
|
308
317
|
};
|
|
309
318
|
|
|
319
|
+
let codecSwitchingStrategy = shaka.config.CodecSwitchingStrategy.RELOAD;
|
|
320
|
+
if (shaka.util.Platform.supportsSmoothCodecSwitching()) {
|
|
321
|
+
codecSwitchingStrategy = shaka.config.CodecSwitchingStrategy.SMOOTH;
|
|
322
|
+
}
|
|
323
|
+
|
|
310
324
|
const mediaSource = {
|
|
325
|
+
codecSwitchingStrategy: codecSwitchingStrategy,
|
|
311
326
|
sourceBufferExtraFeatures: '',
|
|
312
327
|
forceTransmux: false,
|
|
313
328
|
insertFakeEncryptionInInit: true,
|
|
@@ -336,6 +351,7 @@ shaka.util.PlayerConfiguration = class {
|
|
|
336
351
|
preferredTextRole: '',
|
|
337
352
|
preferredAudioChannelCount: 2,
|
|
338
353
|
preferredVideoHdrLevel: 'AUTO',
|
|
354
|
+
preferredVideoLayout: '',
|
|
339
355
|
preferredVideoCodecs: [],
|
|
340
356
|
preferredAudioCodecs: [],
|
|
341
357
|
preferForcedSubs: false,
|
|
@@ -366,7 +382,8 @@ shaka.util.PlayerConfiguration = class {
|
|
|
366
382
|
// eslint-disable-next-line require-await
|
|
367
383
|
offline.trackSelectionCallback = async (tracks) => {
|
|
368
384
|
return shaka.util.PlayerConfiguration.defaultTrackSelect(
|
|
369
|
-
tracks, config.preferredAudioLanguage
|
|
385
|
+
tracks, config.preferredAudioLanguage,
|
|
386
|
+
config.preferredVideoHdrLevel);
|
|
370
387
|
};
|
|
371
388
|
|
|
372
389
|
return config;
|
|
@@ -407,14 +424,34 @@ shaka.util.PlayerConfiguration = class {
|
|
|
407
424
|
/**
|
|
408
425
|
* @param {!Array.<shaka.extern.Track>} tracks
|
|
409
426
|
* @param {string} preferredAudioLanguage
|
|
427
|
+
* @param {string} preferredVideoHdrLevel
|
|
410
428
|
* @return {!Array.<shaka.extern.Track>}
|
|
411
429
|
*/
|
|
412
|
-
static defaultTrackSelect(
|
|
430
|
+
static defaultTrackSelect(
|
|
431
|
+
tracks, preferredAudioLanguage, preferredVideoHdrLevel) {
|
|
413
432
|
const ContentType = shaka.util.ManifestParserUtils.ContentType;
|
|
414
433
|
const LanguageUtils = shaka.util.LanguageUtils;
|
|
415
434
|
|
|
435
|
+
let hdrLevel = preferredVideoHdrLevel;
|
|
436
|
+
if (hdrLevel == 'AUTO') {
|
|
437
|
+
// Auto detect the ideal HDR level.
|
|
438
|
+
if (window.matchMedia('(color-gamut: p3)').matches) {
|
|
439
|
+
hdrLevel = 'PQ';
|
|
440
|
+
} else {
|
|
441
|
+
hdrLevel = 'SDR';
|
|
442
|
+
}
|
|
443
|
+
}
|
|
444
|
+
|
|
416
445
|
/** @type {!Array.<shaka.extern.Track>} */
|
|
417
|
-
const allVariants = tracks.filter((track) =>
|
|
446
|
+
const allVariants = tracks.filter((track) => {
|
|
447
|
+
if (track.type != 'variant') {
|
|
448
|
+
return false;
|
|
449
|
+
}
|
|
450
|
+
if (track.hdr && track.hdr != hdrLevel) {
|
|
451
|
+
return false;
|
|
452
|
+
}
|
|
453
|
+
return true;
|
|
454
|
+
});
|
|
418
455
|
|
|
419
456
|
/** @type {!Array.<shaka.extern.Track>} */
|
|
420
457
|
let selectedVariants = [];
|
|
@@ -40,13 +40,15 @@ shaka.util.StateHistory = class {
|
|
|
40
40
|
|
|
41
41
|
/**
|
|
42
42
|
* @param {string} state
|
|
43
|
+
* @return {boolean} True if this changed the state
|
|
43
44
|
*/
|
|
44
45
|
update(state) {
|
|
45
46
|
// |open_| will only be |null| when we first call |update|.
|
|
46
47
|
if (this.open_ == null) {
|
|
47
48
|
this.start_(state);
|
|
49
|
+
return true;
|
|
48
50
|
} else {
|
|
49
|
-
this.update_(state);
|
|
51
|
+
return this.update_(state);
|
|
50
52
|
}
|
|
51
53
|
}
|
|
52
54
|
|
|
@@ -116,6 +118,7 @@ shaka.util.StateHistory = class {
|
|
|
116
118
|
|
|
117
119
|
/**
|
|
118
120
|
* @param {string} state
|
|
121
|
+
* @return {boolean} True if this changed the state
|
|
119
122
|
* @private
|
|
120
123
|
*/
|
|
121
124
|
update_(state) {
|
|
@@ -131,7 +134,7 @@ shaka.util.StateHistory = class {
|
|
|
131
134
|
|
|
132
135
|
// If the state has not changed, there is no need to add a new entry.
|
|
133
136
|
if (this.open_.state == state) {
|
|
134
|
-
return;
|
|
137
|
+
return false;
|
|
135
138
|
}
|
|
136
139
|
|
|
137
140
|
// We have changed states, so "close" the open state.
|
|
@@ -142,6 +145,7 @@ shaka.util.StateHistory = class {
|
|
|
142
145
|
state: state,
|
|
143
146
|
duration: 0,
|
|
144
147
|
};
|
|
148
|
+
return true;
|
|
145
149
|
}
|
|
146
150
|
|
|
147
151
|
/**
|