rx-player 4.0.0-dev.2023111400 → 4.0.0-dev.2023121900
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/CHANGELOG.md +20 -60
- package/FILES.md +1 -1
- package/README.md +2 -33
- package/VERSION +1 -1
- package/dist/_esm5.processed/core/api/debug/buffer_graph.js +2 -6
- package/dist/_esm5.processed/core/api/debug/modules/general_info.js +20 -10
- package/dist/_esm5.processed/core/api/option_utils.d.ts +0 -2
- package/dist/_esm5.processed/core/api/option_utils.js +0 -6
- package/dist/_esm5.processed/core/api/public_api.d.ts +1 -2
- package/dist/_esm5.processed/core/api/public_api.js +9 -17
- package/dist/_esm5.processed/core/init/directfile_content_initializer.js +1 -1
- package/dist/_esm5.processed/core/init/media_source_content_initializer.js +3 -14
- package/dist/_esm5.processed/core/init/utils/rebuffering_controller.d.ts +2 -36
- package/dist/_esm5.processed/core/init/utils/rebuffering_controller.js +2 -82
- package/dist/_esm5.processed/core/segment_buffers/implementations/audio_video/audio_video_segment_buffer.js +9 -2
- package/dist/_esm5.processed/core/segment_buffers/implementations/image/image_segment_buffer.js +1 -1
- package/dist/_esm5.processed/core/segment_buffers/implementations/text/html/html_text_segment_buffer.js +1 -1
- package/dist/_esm5.processed/core/segment_buffers/implementations/text/native/native_text_segment_buffer.js +1 -1
- package/dist/_esm5.processed/core/segment_buffers/index.d.ts +2 -2
- package/dist/_esm5.processed/core/segment_buffers/inventory/index.d.ts +2 -2
- package/dist/_esm5.processed/core/segment_buffers/inventory/segment_inventory.d.ts +25 -8
- package/dist/_esm5.processed/core/segment_buffers/inventory/segment_inventory.js +19 -10
- package/dist/_esm5.processed/core/stream/representation/utils/get_buffer_status.js +1 -1
- package/dist/_esm5.processed/core/stream/representation/utils/get_needed_segments.js +1 -1
- package/dist/_esm5.processed/parsers/texttracks/ttml/html/apply_extent.js +1 -8
- package/dist/_esm5.processed/parsers/texttracks/ttml/html/apply_line_height.js +2 -1
- package/dist/_esm5.processed/parsers/texttracks/ttml/html/apply_origin.js +1 -9
- package/dist/_esm5.processed/public_types.d.ts +2 -0
- package/dist/commonjs/compat/is_codec_supported.js +22 -1
- package/dist/commonjs/config.d.ts +2 -1
- package/dist/commonjs/core/adaptive/adaptive_representation_selector.d.ts +2 -19
- package/dist/commonjs/core/adaptive/adaptive_representation_selector.js +2 -2
- package/dist/commonjs/core/adaptive/network_analyzer.js +3 -3
- package/dist/commonjs/core/api/debug/buffer_graph.js +2 -6
- package/dist/commonjs/core/api/debug/modules/general_info.js +17 -10
- package/dist/commonjs/core/api/index.d.ts +1 -1
- package/dist/commonjs/core/api/option_utils.d.ts +2 -0
- package/dist/commonjs/core/api/option_utils.js +2 -3
- package/dist/commonjs/core/api/playback_observer.d.ts +128 -8
- package/dist/commonjs/core/api/playback_observer.js +217 -64
- package/dist/commonjs/core/api/public_api.d.ts +9 -0
- package/dist/commonjs/core/api/public_api.js +41 -16
- package/dist/commonjs/core/api/utils.js +1 -1
- package/dist/commonjs/core/decrypt/get_media_keys.js +2 -6
- package/dist/commonjs/core/fetchers/manifest/manifest_fetcher.d.ts +6 -0
- package/dist/commonjs/core/fetchers/manifest/manifest_fetcher.js +11 -3
- package/dist/commonjs/core/fetchers/segment/segment_fetcher.d.ts +8 -1
- package/dist/commonjs/core/fetchers/segment/segment_fetcher.js +8 -4
- package/dist/commonjs/core/fetchers/segment/segment_fetcher_creator.d.ts +1 -0
- package/dist/commonjs/core/fetchers/utils/schedule_request.js +1 -1
- package/dist/commonjs/core/init/directfile_content_initializer.js +29 -8
- package/dist/commonjs/core/init/media_source_content_initializer.d.ts +6 -0
- package/dist/commonjs/core/init/media_source_content_initializer.js +32 -20
- package/dist/commonjs/core/init/utils/content_time_boundaries_observer.d.ts +13 -12
- package/dist/commonjs/core/init/utils/content_time_boundaries_observer.js +17 -19
- package/dist/commonjs/core/init/utils/create_stream_playback_observer.d.ts +1 -5
- package/dist/commonjs/core/init/utils/create_stream_playback_observer.js +16 -14
- package/dist/commonjs/core/init/utils/get_initial_time.d.ts +17 -3
- package/dist/commonjs/core/init/utils/get_initial_time.js +9 -7
- package/dist/commonjs/core/init/utils/initial_seek_and_play.d.ts +9 -11
- package/dist/commonjs/core/init/utils/initial_seek_and_play.js +121 -91
- package/dist/commonjs/core/init/utils/rebuffering_controller.js +27 -70
- package/dist/commonjs/core/init/utils/stream_events_emitter/stream_events_emitter.js +4 -2
- package/dist/commonjs/core/segment_buffers/garbage_collector.js +1 -2
- package/dist/commonjs/core/segment_buffers/implementations/audio_video/audio_video_segment_buffer.js +9 -2
- package/dist/commonjs/core/segment_buffers/implementations/text/html/html_text_segment_buffer.js +1 -1
- package/dist/commonjs/core/segment_buffers/implementations/text/native/native_text_segment_buffer.js +1 -1
- package/dist/commonjs/core/segment_buffers/index.d.ts +2 -2
- package/dist/commonjs/core/segment_buffers/inventory/index.d.ts +2 -2
- package/dist/commonjs/core/segment_buffers/inventory/segment_inventory.d.ts +25 -8
- package/dist/commonjs/core/segment_buffers/inventory/segment_inventory.js +19 -10
- package/dist/commonjs/core/stream/adaptation/get_representations_switch_strategy.d.ts +2 -2
- package/dist/commonjs/core/stream/adaptation/get_representations_switch_strategy.js +16 -9
- package/dist/commonjs/core/stream/orchestrator/stream_orchestrator.js +14 -18
- package/dist/commonjs/core/stream/period/period_stream.js +5 -8
- package/dist/commonjs/core/stream/period/types.d.ts +2 -3
- package/dist/commonjs/core/stream/period/utils/get_adaptation_switch_strategy.d.ts +4 -5
- package/dist/commonjs/core/stream/period/utils/get_adaptation_switch_strategy.js +17 -13
- package/dist/commonjs/core/stream/representation/representation_stream.js +3 -4
- package/dist/commonjs/core/stream/representation/types.d.ts +2 -2
- package/dist/commonjs/core/stream/representation/utils/append_segment_to_buffer.js +11 -12
- package/dist/commonjs/core/stream/representation/utils/get_buffer_status.js +4 -4
- package/dist/commonjs/core/stream/representation/utils/get_needed_segments.js +1 -1
- package/dist/commonjs/default_config.d.ts +12 -16
- package/dist/commonjs/default_config.js +21 -16
- package/dist/commonjs/experimental/tools/VideoThumbnailLoader/video_thumbnail_loader.js +3 -1
- package/dist/commonjs/experimental/tools/createMetaplaylist/get_duration_from_manifest.js +2 -0
- package/dist/commonjs/manifest/adaptation.js +2 -1
- package/dist/commonjs/manifest/representation_index/static.d.ts +1 -1
- package/dist/commonjs/manifest/representation_index/static.js +2 -2
- package/dist/commonjs/manifest/representation_index/types.d.ts +4 -4
- package/dist/commonjs/parsers/manifest/dash/common/indexes/base.d.ts +6 -1
- package/dist/commonjs/parsers/manifest/dash/common/indexes/base.js +4 -3
- package/dist/commonjs/parsers/manifest/dash/common/indexes/get_segments_from_timeline.d.ts +5 -2
- package/dist/commonjs/parsers/manifest/dash/common/indexes/get_segments_from_timeline.js +15 -4
- package/dist/commonjs/parsers/manifest/dash/common/indexes/index.d.ts +5 -5
- package/dist/commonjs/parsers/manifest/dash/common/indexes/list.d.ts +1 -1
- package/dist/commonjs/parsers/manifest/dash/common/indexes/list.js +2 -2
- package/dist/commonjs/parsers/manifest/dash/common/indexes/template.d.ts +12 -5
- package/dist/commonjs/parsers/manifest/dash/common/indexes/template.js +42 -29
- package/dist/commonjs/parsers/manifest/dash/common/indexes/timeline/index.d.ts +2 -1
- package/dist/commonjs/parsers/manifest/dash/common/indexes/timeline/timeline_representation_index.d.ts +99 -6
- package/dist/commonjs/parsers/manifest/dash/common/indexes/timeline/timeline_representation_index.js +250 -51
- package/dist/commonjs/parsers/manifest/dash/common/manifest_bounds_calculator.d.ts +40 -17
- package/dist/commonjs/parsers/manifest/dash/common/manifest_bounds_calculator.js +38 -18
- package/dist/commonjs/parsers/manifest/dash/common/parse_adaptation_sets.js +13 -10
- package/dist/commonjs/parsers/manifest/dash/common/parse_mpd.js +27 -14
- package/dist/commonjs/parsers/manifest/dash/common/parse_periods.d.ts +1 -1
- package/dist/commonjs/parsers/manifest/dash/common/parse_periods.js +17 -18
- package/dist/commonjs/parsers/manifest/dash/common/parse_representation_index.d.ts +19 -6
- package/dist/commonjs/parsers/manifest/dash/common/parse_representation_index.js +21 -8
- package/dist/commonjs/parsers/manifest/dash/common/parse_representations.js +7 -3
- package/dist/commonjs/parsers/manifest/local/representation_index.d.ts +1 -1
- package/dist/commonjs/parsers/manifest/local/representation_index.js +3 -3
- package/dist/commonjs/parsers/manifest/metaplaylist/representation_index.d.ts +1 -1
- package/dist/commonjs/parsers/manifest/metaplaylist/representation_index.js +2 -2
- package/dist/commonjs/parsers/manifest/smooth/representation_index.d.ts +5 -5
- package/dist/commonjs/parsers/manifest/smooth/representation_index.js +25 -9
- package/dist/commonjs/parsers/manifest/utils/index_helpers.js +1 -1
- package/dist/commonjs/parsers/texttracks/ttml/html/apply_line_height.js +2 -1
- package/dist/commonjs/public_types.d.ts +107 -36
- package/dist/commonjs/transports/dash/init_segment_loader.js +10 -5
- package/dist/commonjs/transports/dash/manifest_parser.js +5 -2
- package/dist/commonjs/transports/dash/segment_loader.js +2 -1
- package/dist/commonjs/transports/dash/text_loader.js +2 -0
- package/dist/commonjs/transports/metaplaylist/manifest_loader.js +2 -1
- package/dist/commonjs/transports/metaplaylist/pipelines.js +4 -1
- package/dist/commonjs/transports/smooth/pipelines.js +4 -2
- package/dist/commonjs/transports/smooth/segment_loader.js +2 -1
- package/dist/commonjs/transports/types.d.ts +12 -0
- package/dist/commonjs/transports/utils/generate_manifest_loader.js +6 -3
- package/dist/commonjs/utils/request/fetch.d.ts +6 -0
- package/dist/commonjs/utils/request/fetch.js +29 -8
- package/dist/commonjs/utils/request/xhr.d.ts +11 -5
- package/dist/commonjs/utils/request/xhr.js +29 -8
- package/dist/es2017/compat/is_codec_supported.js +22 -1
- package/dist/es2017/config.d.ts +2 -1
- package/dist/es2017/core/adaptive/adaptive_representation_selector.d.ts +2 -19
- package/dist/es2017/core/adaptive/adaptive_representation_selector.js +2 -2
- package/dist/es2017/core/adaptive/network_analyzer.js +3 -3
- package/dist/es2017/core/api/debug/buffer_graph.js +2 -6
- package/dist/es2017/core/api/debug/modules/general_info.js +17 -10
- package/dist/es2017/core/api/index.d.ts +1 -1
- package/dist/es2017/core/api/option_utils.d.ts +2 -0
- package/dist/es2017/core/api/option_utils.js +2 -3
- package/dist/es2017/core/api/playback_observer.d.ts +128 -8
- package/dist/es2017/core/api/playback_observer.js +217 -66
- package/dist/es2017/core/api/public_api.d.ts +9 -0
- package/dist/es2017/core/api/public_api.js +40 -15
- package/dist/es2017/core/api/utils.js +1 -1
- package/dist/es2017/core/decrypt/get_media_keys.js +2 -6
- package/dist/es2017/core/fetchers/manifest/manifest_fetcher.d.ts +6 -0
- package/dist/es2017/core/fetchers/manifest/manifest_fetcher.js +11 -3
- package/dist/es2017/core/fetchers/segment/segment_fetcher.d.ts +8 -1
- package/dist/es2017/core/fetchers/segment/segment_fetcher.js +8 -4
- package/dist/es2017/core/fetchers/segment/segment_fetcher_creator.d.ts +1 -0
- package/dist/es2017/core/fetchers/utils/schedule_request.js +1 -1
- package/dist/es2017/core/init/directfile_content_initializer.js +31 -8
- package/dist/es2017/core/init/media_source_content_initializer.d.ts +6 -0
- package/dist/es2017/core/init/media_source_content_initializer.js +34 -22
- package/dist/es2017/core/init/utils/content_time_boundaries_observer.d.ts +13 -12
- package/dist/es2017/core/init/utils/content_time_boundaries_observer.js +17 -17
- package/dist/es2017/core/init/utils/create_stream_playback_observer.d.ts +1 -5
- package/dist/es2017/core/init/utils/create_stream_playback_observer.js +16 -14
- package/dist/es2017/core/init/utils/get_initial_time.d.ts +17 -3
- package/dist/es2017/core/init/utils/get_initial_time.js +9 -7
- package/dist/es2017/core/init/utils/initial_seek_and_play.d.ts +9 -11
- package/dist/es2017/core/init/utils/initial_seek_and_play.js +120 -91
- package/dist/es2017/core/init/utils/rebuffering_controller.js +27 -70
- package/dist/es2017/core/init/utils/stream_events_emitter/stream_events_emitter.js +4 -2
- package/dist/es2017/core/segment_buffers/garbage_collector.js +1 -2
- package/dist/es2017/core/segment_buffers/implementations/audio_video/audio_video_segment_buffer.js +9 -2
- package/dist/es2017/core/segment_buffers/implementations/text/html/html_text_segment_buffer.js +1 -1
- package/dist/es2017/core/segment_buffers/implementations/text/native/native_text_segment_buffer.js +1 -1
- package/dist/es2017/core/segment_buffers/index.d.ts +2 -2
- package/dist/es2017/core/segment_buffers/inventory/index.d.ts +2 -2
- package/dist/es2017/core/segment_buffers/inventory/segment_inventory.d.ts +25 -8
- package/dist/es2017/core/segment_buffers/inventory/segment_inventory.js +19 -10
- package/dist/es2017/core/stream/adaptation/get_representations_switch_strategy.d.ts +2 -2
- package/dist/es2017/core/stream/adaptation/get_representations_switch_strategy.js +16 -9
- package/dist/es2017/core/stream/orchestrator/stream_orchestrator.js +16 -18
- package/dist/es2017/core/stream/period/period_stream.js +4 -7
- package/dist/es2017/core/stream/period/types.d.ts +2 -3
- package/dist/es2017/core/stream/period/utils/get_adaptation_switch_strategy.d.ts +4 -5
- package/dist/es2017/core/stream/period/utils/get_adaptation_switch_strategy.js +17 -13
- package/dist/es2017/core/stream/representation/representation_stream.js +3 -4
- package/dist/es2017/core/stream/representation/types.d.ts +2 -2
- package/dist/es2017/core/stream/representation/utils/append_segment_to_buffer.js +1 -2
- package/dist/es2017/core/stream/representation/utils/get_buffer_status.js +4 -4
- package/dist/es2017/core/stream/representation/utils/get_needed_segments.js +1 -1
- package/dist/es2017/default_config.d.ts +12 -16
- package/dist/es2017/default_config.js +21 -16
- package/dist/es2017/experimental/tools/VideoThumbnailLoader/video_thumbnail_loader.js +3 -1
- package/dist/es2017/experimental/tools/createMetaplaylist/get_duration_from_manifest.js +2 -0
- package/dist/es2017/manifest/adaptation.js +2 -1
- package/dist/es2017/manifest/representation_index/static.d.ts +1 -1
- package/dist/es2017/manifest/representation_index/static.js +2 -2
- package/dist/es2017/manifest/representation_index/types.d.ts +4 -4
- package/dist/es2017/parsers/manifest/dash/common/indexes/base.d.ts +6 -1
- package/dist/es2017/parsers/manifest/dash/common/indexes/base.js +4 -3
- package/dist/es2017/parsers/manifest/dash/common/indexes/get_segments_from_timeline.d.ts +5 -2
- package/dist/es2017/parsers/manifest/dash/common/indexes/get_segments_from_timeline.js +15 -4
- package/dist/es2017/parsers/manifest/dash/common/indexes/index.d.ts +5 -5
- package/dist/es2017/parsers/manifest/dash/common/indexes/list.d.ts +1 -1
- package/dist/es2017/parsers/manifest/dash/common/indexes/list.js +2 -2
- package/dist/es2017/parsers/manifest/dash/common/indexes/template.d.ts +12 -5
- package/dist/es2017/parsers/manifest/dash/common/indexes/template.js +40 -27
- package/dist/es2017/parsers/manifest/dash/common/indexes/timeline/index.d.ts +2 -1
- package/dist/es2017/parsers/manifest/dash/common/indexes/timeline/timeline_representation_index.d.ts +99 -6
- package/dist/es2017/parsers/manifest/dash/common/indexes/timeline/timeline_representation_index.js +246 -51
- package/dist/es2017/parsers/manifest/dash/common/manifest_bounds_calculator.d.ts +40 -17
- package/dist/es2017/parsers/manifest/dash/common/manifest_bounds_calculator.js +38 -18
- package/dist/es2017/parsers/manifest/dash/common/parse_adaptation_sets.js +11 -8
- package/dist/es2017/parsers/manifest/dash/common/parse_mpd.js +27 -13
- package/dist/es2017/parsers/manifest/dash/common/parse_periods.d.ts +1 -1
- package/dist/es2017/parsers/manifest/dash/common/parse_periods.js +13 -16
- package/dist/es2017/parsers/manifest/dash/common/parse_representation_index.d.ts +19 -6
- package/dist/es2017/parsers/manifest/dash/common/parse_representation_index.js +10 -8
- package/dist/es2017/parsers/manifest/dash/common/parse_representations.js +7 -3
- package/dist/es2017/parsers/manifest/local/representation_index.d.ts +1 -1
- package/dist/es2017/parsers/manifest/local/representation_index.js +3 -3
- package/dist/es2017/parsers/manifest/metaplaylist/representation_index.d.ts +1 -1
- package/dist/es2017/parsers/manifest/metaplaylist/representation_index.js +2 -2
- package/dist/es2017/parsers/manifest/smooth/representation_index.d.ts +5 -5
- package/dist/es2017/parsers/manifest/smooth/representation_index.js +25 -9
- package/dist/es2017/parsers/manifest/utils/index_helpers.js +1 -1
- package/dist/es2017/parsers/texttracks/ttml/html/apply_line_height.js +2 -1
- package/dist/es2017/public_types.d.ts +107 -36
- package/dist/es2017/transports/dash/init_segment_loader.js +5 -0
- package/dist/es2017/transports/dash/manifest_parser.js +3 -0
- package/dist/es2017/transports/dash/segment_loader.js +1 -0
- package/dist/es2017/transports/dash/text_loader.js +2 -0
- package/dist/es2017/transports/metaplaylist/manifest_loader.js +1 -0
- package/dist/es2017/transports/metaplaylist/pipelines.js +4 -1
- package/dist/es2017/transports/smooth/pipelines.js +2 -0
- package/dist/es2017/transports/smooth/segment_loader.js +1 -0
- package/dist/es2017/transports/types.d.ts +12 -0
- package/dist/es2017/transports/utils/generate_manifest_loader.js +3 -0
- package/dist/es2017/utils/request/fetch.d.ts +6 -0
- package/dist/es2017/utils/request/fetch.js +29 -8
- package/dist/es2017/utils/request/xhr.d.ts +11 -5
- package/dist/es2017/utils/request/xhr.js +30 -9
- package/dist/mpd-parser.wasm +0 -0
- package/dist/rx-player.js +1335 -812
- package/dist/rx-player.min.js +1 -1
- package/package.json +7 -4
- package/scripts/canal-release.patch +78 -0
- package/scripts/make-dev-releases +65 -0
- package/scripts/update-version +7 -0
- package/sonar-project.properties +1 -1
- package/src/compat/is_codec_supported.ts +23 -1
- package/src/core/adaptive/adaptive_representation_selector.ts +4 -21
- package/src/core/adaptive/network_analyzer.ts +3 -3
- package/src/core/api/debug/buffer_graph.ts +2 -5
- package/src/core/api/debug/modules/general_info.ts +15 -10
- package/src/core/api/index.ts +1 -0
- package/src/core/api/option_utils.ts +3 -3
- package/src/core/api/playback_observer.ts +327 -107
- package/src/core/api/public_api.ts +42 -14
- package/src/core/api/utils.ts +3 -1
- package/src/core/decrypt/get_media_keys.ts +2 -8
- package/src/core/fetchers/manifest/manifest_fetcher.ts +21 -3
- package/src/core/fetchers/segment/segment_fetcher.ts +19 -5
- package/src/core/fetchers/segment/segment_fetcher_creator.ts +1 -0
- package/src/core/fetchers/utils/schedule_request.ts +1 -1
- package/src/core/init/directfile_content_initializer.ts +31 -15
- package/src/core/init/media_source_content_initializer.ts +40 -27
- package/src/core/init/utils/content_time_boundaries_observer.ts +24 -23
- package/src/core/init/utils/create_stream_playback_observer.ts +19 -20
- package/src/core/init/utils/get_initial_time.ts +25 -12
- package/src/core/init/utils/initial_seek_and_play.ts +140 -108
- package/src/core/init/utils/rebuffering_controller.ts +32 -77
- package/src/core/init/utils/stream_events_emitter/stream_events_emitter.ts +5 -2
- package/src/core/segment_buffers/garbage_collector.ts +1 -1
- package/src/core/segment_buffers/implementations/audio_video/audio_video_segment_buffer.ts +10 -2
- package/src/core/segment_buffers/implementations/text/html/html_text_segment_buffer.ts +1 -1
- package/src/core/segment_buffers/implementations/text/native/native_text_segment_buffer.ts +1 -1
- package/src/core/segment_buffers/index.ts +2 -0
- package/src/core/segment_buffers/inventory/index.ts +2 -0
- package/src/core/segment_buffers/inventory/segment_inventory.ts +49 -17
- package/src/core/stream/adaptation/get_representations_switch_strategy.ts +21 -12
- package/src/core/stream/orchestrator/stream_orchestrator.ts +14 -19
- package/src/core/stream/period/period_stream.ts +7 -8
- package/src/core/stream/period/types.ts +2 -3
- package/src/core/stream/period/utils/get_adaptation_switch_strategy.ts +21 -15
- package/src/core/stream/representation/representation_stream.ts +3 -5
- package/src/core/stream/representation/types.ts +2 -2
- package/src/core/stream/representation/utils/append_segment_to_buffer.ts +1 -1
- package/src/core/stream/representation/utils/get_buffer_status.ts +5 -4
- package/src/core/stream/representation/utils/get_needed_segments.ts +2 -2
- package/src/default_config.ts +22 -17
- package/src/experimental/tools/VideoThumbnailLoader/video_thumbnail_loader.ts +3 -1
- package/src/experimental/tools/createMetaplaylist/get_duration_from_manifest.ts +2 -0
- package/src/manifest/adaptation.ts +2 -1
- package/src/manifest/representation_index/static.ts +2 -2
- package/src/manifest/representation_index/types.ts +4 -4
- package/src/parsers/manifest/dash/common/__tests__/manifest_bounds_calculator.test.ts +182 -36
- package/src/parsers/manifest/dash/common/indexes/base.ts +12 -4
- package/src/parsers/manifest/dash/common/indexes/get_segments_from_timeline.ts +19 -5
- package/src/parsers/manifest/dash/common/indexes/index.ts +16 -4
- package/src/parsers/manifest/dash/common/indexes/list.ts +2 -2
- package/src/parsers/manifest/dash/common/indexes/template.ts +52 -31
- package/src/parsers/manifest/dash/common/indexes/timeline/index.ts +4 -1
- package/src/parsers/manifest/dash/common/indexes/timeline/timeline_representation_index.ts +366 -60
- package/src/parsers/manifest/dash/common/manifest_bounds_calculator.ts +63 -25
- package/src/parsers/manifest/dash/common/parse_adaptation_sets.ts +10 -4
- package/src/parsers/manifest/dash/common/parse_mpd.ts +28 -15
- package/src/parsers/manifest/dash/common/parse_periods.ts +12 -17
- package/src/parsers/manifest/dash/common/parse_representation_index.ts +50 -26
- package/src/parsers/manifest/dash/common/parse_representations.ts +9 -3
- package/src/parsers/manifest/local/representation_index.ts +3 -3
- package/src/parsers/manifest/metaplaylist/representation_index.ts +2 -2
- package/src/parsers/manifest/smooth/representation_index.ts +23 -9
- package/src/parsers/manifest/utils/__tests__/get_first_time_from_adaptations.test.ts +1 -1
- package/src/parsers/manifest/utils/__tests__/get_last_time_from_adaptation.test.ts +1 -1
- package/src/parsers/manifest/utils/index_helpers.ts +1 -1
- package/src/parsers/texttracks/ttml/html/apply_line_height.ts +3 -1
- package/src/public_types.ts +108 -36
- package/src/transports/dash/init_segment_loader.ts +5 -0
- package/src/transports/dash/manifest_parser.ts +6 -0
- package/src/transports/dash/segment_loader.ts +1 -0
- package/src/transports/dash/text_loader.ts +2 -0
- package/src/transports/metaplaylist/manifest_loader.ts +1 -0
- package/src/transports/metaplaylist/pipelines.ts +4 -1
- package/src/transports/smooth/pipelines.ts +2 -0
- package/src/transports/smooth/segment_loader.ts +1 -0
- package/src/transports/types.ts +12 -0
- package/src/transports/utils/generate_manifest_loader.ts +3 -0
- package/src/utils/request/fetch.ts +35 -8
- package/src/utils/request/xhr.ts +45 -14
- package/dist/commonjs/parsers/manifest/utils/is_segment_still_available.d.ts +0 -29
- package/dist/commonjs/parsers/manifest/utils/is_segment_still_available.js +0 -54
- package/dist/es2017/parsers/manifest/utils/is_segment_still_available.d.ts +0 -29
- package/dist/es2017/parsers/manifest/utils/is_segment_still_available.js +0 -51
- package/src/parsers/manifest/utils/is_segment_still_available.ts +0 -58
- package/src/typings/object-assign.d.ts +0 -48
|
@@ -208,7 +208,7 @@ function getAdaptationSetSwitchingIDs(adaptation) {
|
|
|
208
208
|
*/
|
|
209
209
|
function parseAdaptationSets(adaptationsIR, context) {
|
|
210
210
|
var e_2, _a;
|
|
211
|
-
var _b, _c, _d, _e, _f, _g;
|
|
211
|
+
var _b, _c, _d, _e, _f, _g, _h;
|
|
212
212
|
var parsedAdaptations = { video: [],
|
|
213
213
|
audio: [],
|
|
214
214
|
text: [] };
|
|
@@ -224,8 +224,12 @@ function parseAdaptationSets(adaptationsIR, context) {
|
|
|
224
224
|
roles.some(function (role) { return role.schemeIdUri === "urn:mpeg:dash:role:2011"; });
|
|
225
225
|
var representationsIR = adaptation.children.representations;
|
|
226
226
|
var availabilityTimeComplete = (_b = adaptation.attributes.availabilityTimeComplete) !== null && _b !== void 0 ? _b : context.availabilityTimeComplete;
|
|
227
|
-
var availabilityTimeOffset =
|
|
228
|
-
|
|
227
|
+
var availabilityTimeOffset = void 0;
|
|
228
|
+
if (adaptation.attributes.availabilityTimeOffset !== undefined ||
|
|
229
|
+
context.availabilityTimeOffset !== undefined) {
|
|
230
|
+
availabilityTimeOffset = ((_c = adaptation.attributes.availabilityTimeOffset) !== null && _c !== void 0 ? _c : 0) +
|
|
231
|
+
((_d = context.availabilityTimeOffset) !== null && _d !== void 0 ? _d : 0);
|
|
232
|
+
}
|
|
229
233
|
var adaptationMimeType = adaptation.attributes.mimeType;
|
|
230
234
|
var adaptationCodecs = adaptation.attributes.codecs;
|
|
231
235
|
var type = (0, infer_adaptation_type_1.default)(representationsIR, (0, is_non_empty_string_1.default)(adaptationMimeType) ?
|
|
@@ -238,7 +242,7 @@ function parseAdaptationSets(adaptationsIR, context) {
|
|
|
238
242
|
if (type === undefined) {
|
|
239
243
|
continue;
|
|
240
244
|
}
|
|
241
|
-
var priority = (
|
|
245
|
+
var priority = (_e = adaptation.attributes.selectionPriority) !== null && _e !== void 0 ? _e : 1;
|
|
242
246
|
var originalID = adaptation.attributes.id;
|
|
243
247
|
var adaptationSetSwitchingIDs = getAdaptationSetSwitchingIDs(adaptation);
|
|
244
248
|
var parentSegmentTemplates = [];
|
|
@@ -260,14 +264,13 @@ function parseAdaptationSets(adaptationsIR, context) {
|
|
|
260
264
|
parentSegmentTemplates: parentSegmentTemplates,
|
|
261
265
|
receivedTime: context.receivedTime,
|
|
262
266
|
start: context.start,
|
|
263
|
-
timeShiftBufferDepth: context.timeShiftBufferDepth,
|
|
264
267
|
unsafelyBaseOnPreviousAdaptation: null,
|
|
265
268
|
};
|
|
266
269
|
var trickModeProperty = Array.isArray(essentialProperties) ?
|
|
267
270
|
(0, array_find_1.default)(essentialProperties, function (scheme) {
|
|
268
271
|
return scheme.schemeIdUri === "http://dashif.org/guidelines/trickmode";
|
|
269
272
|
}) : undefined;
|
|
270
|
-
var trickModeAttachedAdaptationIds = (
|
|
273
|
+
var trickModeAttachedAdaptationIds = (_f = trickModeProperty === null || trickModeProperty === void 0 ? void 0 : trickModeProperty.value) === null || _f === void 0 ? void 0 : _f.split(" ");
|
|
271
274
|
var isTrickModeTrack = trickModeAttachedAdaptationIds !== undefined;
|
|
272
275
|
var accessibilities = adaptationChildren.accessibilities;
|
|
273
276
|
var isDub = void 0;
|
|
@@ -310,8 +313,8 @@ function parseAdaptationSets(adaptationsIR, context) {
|
|
|
310
313
|
}
|
|
311
314
|
var newID = adaptationID;
|
|
312
315
|
parsedAdaptationsIDs.push(adaptationID);
|
|
313
|
-
reprCtxt.unsafelyBaseOnPreviousAdaptation = (
|
|
314
|
-
.unsafelyBaseOnPreviousPeriod) === null ||
|
|
316
|
+
reprCtxt.unsafelyBaseOnPreviousAdaptation = (_h = (_g = context
|
|
317
|
+
.unsafelyBaseOnPreviousPeriod) === null || _g === void 0 ? void 0 : _g.getAdaptation(adaptationID)) !== null && _h !== void 0 ? _h : null;
|
|
315
318
|
var representations = (0, parse_representations_1.default)(representationsIR, adaptation, reprCtxt);
|
|
316
319
|
var parsedAdaptationSet = { id: adaptationID, representations: representations, type: type, isTrickModeTrack: isTrickModeTrack };
|
|
317
320
|
if (adaptation.attributes.language != null) {
|
|
@@ -342,7 +345,7 @@ function parseAdaptationSets(adaptationsIR, context) {
|
|
|
342
345
|
// look if we have to merge this into another Adaptation
|
|
343
346
|
var mergedIntoIdx = -1;
|
|
344
347
|
var _loop_1 = function (id) {
|
|
345
|
-
var
|
|
348
|
+
var _j;
|
|
346
349
|
var switchingInfos = adaptationSwitchingInfos[id];
|
|
347
350
|
if (switchingInfos !== undefined &&
|
|
348
351
|
switchingInfos.newID !== newID &&
|
|
@@ -356,7 +359,7 @@ function parseAdaptationSets(adaptationsIR, context) {
|
|
|
356
359
|
parsedAdaptationSet.closedCaption &&
|
|
357
360
|
mergedInto[0].language === parsedAdaptationSet.language) {
|
|
358
361
|
log_1.default.info("DASH Parser: merging \"switchable\" AdaptationSets", originalID, id);
|
|
359
|
-
(
|
|
362
|
+
(_j = mergedInto[0].representations).push.apply(_j, __spreadArray([], __read(parsedAdaptationSet.representations), false));
|
|
360
363
|
mergedInto[1] = {
|
|
361
364
|
priority: Math.max(priority, mergedInto[1].priority),
|
|
362
365
|
isMainAdaptation: isMainAdaptation ||
|
|
@@ -60,6 +60,7 @@ var resolve_url_1 = require("../../../../utils/resolve_url");
|
|
|
60
60
|
var get_clock_offset_1 = require("./get_clock_offset");
|
|
61
61
|
var get_http_utc_timing_url_1 = require("./get_http_utc-timing_url");
|
|
62
62
|
var get_minimum_and_maximum_positions_1 = require("./get_minimum_and_maximum_positions");
|
|
63
|
+
var manifest_bounds_calculator_1 = require("./manifest_bounds_calculator");
|
|
63
64
|
var parse_availability_start_time_1 = require("./parse_availability_start_time");
|
|
64
65
|
var parse_periods_1 = require("./parse_periods");
|
|
65
66
|
var resolve_base_urls_1 = require("./resolve_base_urls");
|
|
@@ -183,7 +184,14 @@ function parseCompleteIntermediateRepresentation(mpdIR, args, warnings, xlinkInf
|
|
|
183
184
|
var availabilityStartTime = (0, parse_availability_start_time_1.default)(rootAttributes, args.referenceDateTime);
|
|
184
185
|
var timeShiftBufferDepth = rootAttributes.timeShiftBufferDepth;
|
|
185
186
|
var clockOffset = args.externalClockOffset, unsafelyBaseOnPreviousManifest = args.unsafelyBaseOnPreviousManifest;
|
|
186
|
-
var
|
|
187
|
+
var externalClockOffset = args.externalClockOffset;
|
|
188
|
+
var manifestBoundsCalculator = new manifest_bounds_calculator_1.default({
|
|
189
|
+
availabilityStartTime: availabilityStartTime,
|
|
190
|
+
isDynamic: isDynamic,
|
|
191
|
+
timeShiftBufferDepth: timeShiftBufferDepth,
|
|
192
|
+
serverTimestampOffset: externalClockOffset,
|
|
193
|
+
});
|
|
194
|
+
var manifestInfos = { availabilityStartTime: availabilityStartTime, baseURLs: mpdBaseUrls, clockOffset: clockOffset, duration: rootAttributes.duration, isDynamic: isDynamic, manifestBoundsCalculator: manifestBoundsCalculator, manifestProfiles: mpdIR.attributes.profiles,
|
|
187
195
|
receivedTime: args.manifestReceivedTime, timeShiftBufferDepth: timeShiftBufferDepth, unsafelyBaseOnPreviousManifest: unsafelyBaseOnPreviousManifest, xlinkInfos: xlinkInfos, xmlNamespaces: mpdIR.attributes.namespaces };
|
|
188
196
|
var parsedPeriods = (0, parse_periods_1.default)(rootChildren.periods, manifestInfos);
|
|
189
197
|
var mediaPresentationDuration = rootAttributes.duration;
|
|
@@ -223,38 +231,43 @@ function parseCompleteIntermediateRepresentation(mpdIR, args, warnings, xlinkInf
|
|
|
223
231
|
time: now };
|
|
224
232
|
}
|
|
225
233
|
else {
|
|
226
|
-
|
|
227
|
-
timeshiftDepth = timeShiftBufferDepth !== null && timeShiftBufferDepth !== void 0 ? timeShiftBufferDepth : null;
|
|
234
|
+
// Determine the maximum seekable position
|
|
228
235
|
var finalMaximumSafePosition = void 0;
|
|
229
|
-
var livePosition = void 0;
|
|
230
|
-
if (maximumUnsafePosition !== undefined) {
|
|
231
|
-
livePosition = maximumUnsafePosition;
|
|
232
|
-
}
|
|
233
236
|
if (maximumSafePosition !== undefined) {
|
|
234
237
|
finalMaximumSafePosition = maximumSafePosition;
|
|
235
238
|
}
|
|
236
239
|
else {
|
|
237
|
-
var ast = availabilityStartTime !== null && availabilityStartTime !== void 0 ? availabilityStartTime : 0;
|
|
238
|
-
var externalClockOffset = args.externalClockOffset;
|
|
239
240
|
if (externalClockOffset === undefined) {
|
|
240
241
|
log_1.default.warn("DASH Parser: use system clock to define maximum position");
|
|
241
|
-
finalMaximumSafePosition = (Date.now() / 1000) -
|
|
242
|
+
finalMaximumSafePosition = (Date.now() / 1000) - availabilityStartTime;
|
|
242
243
|
}
|
|
243
244
|
else {
|
|
244
245
|
var serverTime = (0, monotonic_timestamp_1.default)() + externalClockOffset;
|
|
245
|
-
finalMaximumSafePosition = (serverTime / 1000) -
|
|
246
|
+
finalMaximumSafePosition = (serverTime / 1000) - availabilityStartTime;
|
|
246
247
|
}
|
|
247
248
|
}
|
|
249
|
+
// Determine live edge (what position corresponds to live content, can be
|
|
250
|
+
// inferior or superior to the maximum anounced position in some specific
|
|
251
|
+
// scenarios). However, the `timeShiftBufferDepth` should be based on it.
|
|
252
|
+
var livePosition = manifestBoundsCalculator.getEstimatedLiveEdge();
|
|
248
253
|
if (livePosition === undefined) {
|
|
249
|
-
|
|
254
|
+
if (maximumUnsafePosition !== undefined) {
|
|
255
|
+
livePosition = maximumUnsafePosition;
|
|
256
|
+
}
|
|
257
|
+
else {
|
|
258
|
+
livePosition = finalMaximumSafePosition;
|
|
259
|
+
}
|
|
260
|
+
// manifestBoundsCalculator.forceLiveEdge(livePosition);
|
|
250
261
|
}
|
|
251
262
|
maximumTimeData = { isLinear: true,
|
|
252
263
|
maximumSafePosition: finalMaximumSafePosition, livePosition: livePosition, time: now };
|
|
253
264
|
// if the minimum calculated time is even below the buffer depth, perhaps we
|
|
254
265
|
// can go even lower in terms of depth
|
|
266
|
+
minimumTime = minimumSafePosition;
|
|
267
|
+
timeshiftDepth = timeShiftBufferDepth !== null && timeShiftBufferDepth !== void 0 ? timeShiftBufferDepth : null;
|
|
255
268
|
if (timeshiftDepth !== null && minimumTime !== undefined &&
|
|
256
|
-
|
|
257
|
-
timeshiftDepth =
|
|
269
|
+
livePosition - minimumTime > timeshiftDepth) {
|
|
270
|
+
timeshiftDepth = livePosition - minimumTime;
|
|
258
271
|
}
|
|
259
272
|
}
|
|
260
273
|
// `isLastPeriodKnown` should be `true` in two cases for DASH contents:
|
|
@@ -63,5 +63,5 @@ export interface IPeriodContext extends IInheritedAdaptationContext {
|
|
|
63
63
|
value: string;
|
|
64
64
|
}> | undefined;
|
|
65
65
|
}
|
|
66
|
-
type IInheritedAdaptationContext = Omit<IAdaptationSetContext, "availabilityTimeComplete" | "availabilityTimeOffset" | "duration" | "isLastPeriod" | "
|
|
66
|
+
type IInheritedAdaptationContext = Omit<IAdaptationSetContext, "availabilityTimeComplete" | "availabilityTimeOffset" | "duration" | "isLastPeriod" | "start" | "unsafelyBaseOnPreviousPeriod">;
|
|
67
67
|
export {};
|
|
@@ -45,13 +45,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
45
45
|
var log_1 = require("../../../../log");
|
|
46
46
|
var flat_map_1 = require("../../../../utils/flat_map");
|
|
47
47
|
var id_generator_1 = require("../../../../utils/id_generator");
|
|
48
|
+
var is_null_or_undefined_1 = require("../../../../utils/is_null_or_undefined");
|
|
48
49
|
var monotonic_timestamp_1 = require("../../../../utils/monotonic_timestamp");
|
|
49
50
|
var object_values_1 = require("../../../../utils/object_values");
|
|
50
51
|
var string_parsing_1 = require("../../../../utils/string_parsing");
|
|
51
52
|
// eslint-disable-next-line max-len
|
|
52
53
|
var flatten_overlapping_periods_1 = require("./flatten_overlapping_periods");
|
|
53
54
|
var get_periods_time_infos_1 = require("./get_periods_time_infos");
|
|
54
|
-
var manifest_bounds_calculator_1 = require("./manifest_bounds_calculator");
|
|
55
55
|
var parse_adaptation_sets_1 = require("./parse_adaptation_sets");
|
|
56
56
|
var resolve_base_urls_1 = require("./resolve_base_urls");
|
|
57
57
|
var generatePeriodID = (0, id_generator_1.default)();
|
|
@@ -62,15 +62,14 @@ var generatePeriodID = (0, id_generator_1.default)();
|
|
|
62
62
|
* @returns {Array.<Object>}
|
|
63
63
|
*/
|
|
64
64
|
function parsePeriods(periodsIR, context) {
|
|
65
|
-
var _a, _b, _c, _d
|
|
65
|
+
var _a, _b, _c, _d;
|
|
66
66
|
var parsedPeriods = [];
|
|
67
67
|
var periodsTimeInformation = (0, get_periods_time_infos_1.default)(periodsIR, context);
|
|
68
68
|
if (periodsTimeInformation.length !== periodsIR.length) {
|
|
69
69
|
throw new Error("MPD parsing error: the time information are incoherent.");
|
|
70
70
|
}
|
|
71
|
-
var isDynamic = context.isDynamic,
|
|
72
|
-
|
|
73
|
-
if (!isDynamic && context.duration != null) {
|
|
71
|
+
var isDynamic = context.isDynamic, manifestBoundsCalculator = context.manifestBoundsCalculator;
|
|
72
|
+
if (!isDynamic && !(0, is_null_or_undefined_1.default)(context.duration)) {
|
|
74
73
|
manifestBoundsCalculator.setLastPosition(context.duration);
|
|
75
74
|
}
|
|
76
75
|
var _loop_1 = function (i) {
|
|
@@ -78,9 +77,9 @@ function parsePeriods(periodsIR, context) {
|
|
|
78
77
|
var periodIR = periodsIR[i];
|
|
79
78
|
var xlinkInfos = context.xlinkInfos.get(periodIR);
|
|
80
79
|
var periodBaseURLs = (0, resolve_base_urls_1.default)(context.baseURLs, periodIR.children.baseURLs);
|
|
81
|
-
var
|
|
80
|
+
var _f = periodsTimeInformation[i], periodStart = _f.periodStart, periodDuration = _f.periodDuration, periodEnd = _f.periodEnd;
|
|
82
81
|
var periodID;
|
|
83
|
-
if (periodIR.attributes.id
|
|
82
|
+
if ((0, is_null_or_undefined_1.default)(periodIR.attributes.id)) {
|
|
84
83
|
log_1.default.warn("DASH: No usable id found in the Period. Generating one.");
|
|
85
84
|
periodID = "gen-dash-period-" + generatePeriodID();
|
|
86
85
|
}
|
|
@@ -95,14 +94,14 @@ function parsePeriods(periodsIR, context) {
|
|
|
95
94
|
context.receivedTime;
|
|
96
95
|
var unsafelyBaseOnPreviousPeriod = (_b = (_a = context
|
|
97
96
|
.unsafelyBaseOnPreviousManifest) === null || _a === void 0 ? void 0 : _a.getPeriod(periodID)) !== null && _b !== void 0 ? _b : null;
|
|
98
|
-
var availabilityTimeComplete =
|
|
99
|
-
var availabilityTimeOffset =
|
|
97
|
+
var availabilityTimeComplete = periodIR.attributes.availabilityTimeComplete;
|
|
98
|
+
var availabilityTimeOffset = periodIR.attributes.availabilityTimeOffset;
|
|
100
99
|
var manifestProfiles = context.manifestProfiles;
|
|
101
100
|
var segmentTemplate = periodIR.children.segmentTemplate;
|
|
102
|
-
var adapCtxt = { availabilityTimeComplete: availabilityTimeComplete, availabilityTimeOffset: availabilityTimeOffset, baseURLs: periodBaseURLs, manifestBoundsCalculator: manifestBoundsCalculator, end: periodEnd, isDynamic: isDynamic, isLastPeriod: isLastPeriod, manifestProfiles: manifestProfiles, receivedTime: receivedTime, segmentTemplate: segmentTemplate, start: periodStart,
|
|
101
|
+
var adapCtxt = { availabilityTimeComplete: availabilityTimeComplete, availabilityTimeOffset: availabilityTimeOffset, baseURLs: periodBaseURLs, manifestBoundsCalculator: manifestBoundsCalculator, end: periodEnd, isDynamic: isDynamic, isLastPeriod: isLastPeriod, manifestProfiles: manifestProfiles, receivedTime: receivedTime, segmentTemplate: segmentTemplate, start: periodStart, unsafelyBaseOnPreviousPeriod: unsafelyBaseOnPreviousPeriod };
|
|
103
102
|
var adaptations = (0, parse_adaptation_sets_1.default)(periodIR.children.adaptations, adapCtxt);
|
|
104
|
-
var namespaces = ((
|
|
105
|
-
.concat((
|
|
103
|
+
var namespaces = ((_c = context.xmlNamespaces) !== null && _c !== void 0 ? _c : [])
|
|
104
|
+
.concat((_d = periodIR.attributes.namespaces) !== null && _d !== void 0 ? _d : []);
|
|
106
105
|
var streamEvents = generateStreamEvents(periodIR.children.eventStreams, periodStart, namespaces);
|
|
107
106
|
var parsedPeriod = { id: periodID,
|
|
108
107
|
start: periodStart,
|
|
@@ -124,7 +123,7 @@ function parsePeriods(periodsIR, context) {
|
|
|
124
123
|
else {
|
|
125
124
|
var guessedLastPositionFromClock = guessLastPositionFromClock(context, periodStart);
|
|
126
125
|
if (guessedLastPositionFromClock !== undefined) {
|
|
127
|
-
var
|
|
126
|
+
var _g = __read(guessedLastPositionFromClock, 2), guessedLastPosition = _g[0], guessedPositionTime = _g[1];
|
|
128
127
|
manifestBoundsCalculator.setLastPosition(guessedLastPosition, guessedPositionTime);
|
|
129
128
|
}
|
|
130
129
|
}
|
|
@@ -140,7 +139,7 @@ function parsePeriods(periodsIR, context) {
|
|
|
140
139
|
// Guess a last time the last position
|
|
141
140
|
var guessedLastPositionFromClock = guessLastPositionFromClock(context, 0);
|
|
142
141
|
if (guessedLastPositionFromClock !== undefined) {
|
|
143
|
-
var
|
|
142
|
+
var _e = __read(guessedLastPositionFromClock, 2), lastPosition = _e[0], positionTime = _e[1];
|
|
144
143
|
manifestBoundsCalculator.setLastPosition(lastPosition, positionTime);
|
|
145
144
|
}
|
|
146
145
|
}
|
|
@@ -176,7 +175,7 @@ exports.default = parsePeriods;
|
|
|
176
175
|
* @returns {Array.<number|undefined>}
|
|
177
176
|
*/
|
|
178
177
|
function guessLastPositionFromClock(context, minimumTime) {
|
|
179
|
-
if (context.clockOffset
|
|
178
|
+
if (!(0, is_null_or_undefined_1.default)(context.clockOffset)) {
|
|
180
179
|
var lastPosition = context.clockOffset / 1000 -
|
|
181
180
|
context.availabilityStartTime;
|
|
182
181
|
var positionTime = (0, monotonic_timestamp_1.default)() / 1000;
|
|
@@ -212,7 +211,7 @@ function getMaximumLastPosition(adaptationsPerType) {
|
|
|
212
211
|
var maxEncounteredPosition = null;
|
|
213
212
|
var allIndexAreEmpty = true;
|
|
214
213
|
var adaptationsVal = (0, object_values_1.default)(adaptationsPerType)
|
|
215
|
-
.filter(function (ada) { return ada
|
|
214
|
+
.filter(function (ada) { return !(0, is_null_or_undefined_1.default)(ada); });
|
|
216
215
|
var allAdaptations = (0, flat_map_1.default)(adaptationsVal, function (adaptationsForType) { return adaptationsForType; });
|
|
217
216
|
try {
|
|
218
217
|
for (var allAdaptations_1 = __values(allAdaptations), allAdaptations_1_1 = allAdaptations_1.next(); !allAdaptations_1_1.done; allAdaptations_1_1 = allAdaptations_1.next()) {
|
|
@@ -226,7 +225,7 @@ function getMaximumLastPosition(adaptationsPerType) {
|
|
|
226
225
|
allIndexAreEmpty = false;
|
|
227
226
|
if (typeof position === "number") {
|
|
228
227
|
maxEncounteredPosition =
|
|
229
|
-
maxEncounteredPosition
|
|
228
|
+
(0, is_null_or_undefined_1.default)(maxEncounteredPosition) ? position :
|
|
230
229
|
Math.max(maxEncounteredPosition, position);
|
|
231
230
|
}
|
|
232
231
|
}
|
|
@@ -248,7 +247,7 @@ function getMaximumLastPosition(adaptationsPerType) {
|
|
|
248
247
|
}
|
|
249
248
|
finally { if (e_1) throw e_1.error; }
|
|
250
249
|
}
|
|
251
|
-
if (
|
|
250
|
+
if (!(0, is_null_or_undefined_1.default)(maxEncounteredPosition)) {
|
|
252
251
|
return maxEncounteredPosition;
|
|
253
252
|
}
|
|
254
253
|
else if (allIndexAreEmpty) {
|
|
@@ -29,10 +29,25 @@ export default function parseRepresentationIndex(representation: IRepresentation
|
|
|
29
29
|
export interface IRepresentationIndexContext {
|
|
30
30
|
/** Parsed AdaptationSet which contains the Representation. */
|
|
31
31
|
adaptation: IAdaptationSetIntermediateRepresentation;
|
|
32
|
-
/**
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
32
|
+
/**
|
|
33
|
+
* If `false`, declared segments in the MPD might still be not completely generated.
|
|
34
|
+
* If `true`, they are completely generated.
|
|
35
|
+
*
|
|
36
|
+
* If `undefined`, the corresponding property was not set in the MPD and it is
|
|
37
|
+
* thus assumed that they are all generated.
|
|
38
|
+
* It might however be semantically different than `true` in the RxPlayer as it
|
|
39
|
+
* means that the packager didn't include that information in the MPD.
|
|
40
|
+
*/
|
|
41
|
+
availabilityTimeComplete: boolean | undefined;
|
|
42
|
+
/**
|
|
43
|
+
* availability time offset of the concerned Adaptation.
|
|
44
|
+
*
|
|
45
|
+
* If `undefined`, the corresponding property was not set in the MPD and it is
|
|
46
|
+
* thus assumed to be equal to `0`.
|
|
47
|
+
* It might however be semantically different than `0` in the RxPlayer as it
|
|
48
|
+
* means that the packager didn't include that information in the MPD.
|
|
49
|
+
*/
|
|
50
|
+
availabilityTimeOffset: number | undefined;
|
|
36
51
|
/** Eventual URLs from which every relative URL will be based on. */
|
|
37
52
|
baseURLs: IResolvedBaseUrl[];
|
|
38
53
|
/** End time of the current Period, in seconds. */
|
|
@@ -61,8 +76,6 @@ export interface IRepresentationIndexContext {
|
|
|
61
76
|
receivedTime?: number | undefined;
|
|
62
77
|
/** Start time of the current period, in seconds. */
|
|
63
78
|
start: number;
|
|
64
|
-
/** Depth of the buffer for the whole content, in seconds. */
|
|
65
|
-
timeShiftBufferDepth?: number | undefined;
|
|
66
79
|
/**
|
|
67
80
|
* The parser should take this Representation - which is the same as this one
|
|
68
81
|
* parsed at an earlier time - as a base to speed-up the parsing process.
|
|
@@ -51,7 +51,7 @@ var indexes_1 = require("./indexes");
|
|
|
51
51
|
*/
|
|
52
52
|
function parseRepresentationIndex(representation, context) {
|
|
53
53
|
var _a, _b;
|
|
54
|
-
var availabilityTimeOffset = context.availabilityTimeOffset, manifestBoundsCalculator = context.manifestBoundsCalculator, isDynamic = context.isDynamic, periodEnd = context.end, periodStart = context.start, receivedTime = context.receivedTime,
|
|
54
|
+
var availabilityTimeOffset = context.availabilityTimeOffset, manifestBoundsCalculator = context.manifestBoundsCalculator, isDynamic = context.isDynamic, periodEnd = context.end, periodStart = context.start, receivedTime = context.receivedTime, unsafelyBaseOnPreviousRepresentation = context.unsafelyBaseOnPreviousRepresentation, inbandEventStreams = context.inbandEventStreams, isLastPeriod = context.isLastPeriod;
|
|
55
55
|
var isEMSGWhitelisted = function (inbandEvent) {
|
|
56
56
|
if (inbandEventStreams === undefined) {
|
|
57
57
|
return false;
|
|
@@ -62,8 +62,20 @@ function parseRepresentationIndex(representation, context) {
|
|
|
62
62
|
return schemeIdUri === inbandEvent.schemeIdUri;
|
|
63
63
|
});
|
|
64
64
|
};
|
|
65
|
-
var reprIndexCtxt = {
|
|
66
|
-
|
|
65
|
+
var reprIndexCtxt = {
|
|
66
|
+
availabilityTimeComplete: undefined,
|
|
67
|
+
availabilityTimeOffset: availabilityTimeOffset,
|
|
68
|
+
unsafelyBaseOnPreviousRepresentation: unsafelyBaseOnPreviousRepresentation,
|
|
69
|
+
isEMSGWhitelisted: isEMSGWhitelisted,
|
|
70
|
+
isLastPeriod: isLastPeriod,
|
|
71
|
+
manifestBoundsCalculator: manifestBoundsCalculator,
|
|
72
|
+
isDynamic: isDynamic,
|
|
73
|
+
periodEnd: periodEnd,
|
|
74
|
+
periodStart: periodStart,
|
|
75
|
+
receivedTime: receivedTime,
|
|
76
|
+
representationBitrate: representation.attributes.bitrate,
|
|
77
|
+
representationId: representation.attributes.id,
|
|
78
|
+
};
|
|
67
79
|
var representationIndex;
|
|
68
80
|
if (representation.children.segmentBase !== undefined) {
|
|
69
81
|
var segmentBase = representation.children.segmentBase;
|
|
@@ -81,11 +93,12 @@ function parseRepresentationIndex(representation, context) {
|
|
|
81
93
|
segmentTemplates.push(childSegmentTemplate);
|
|
82
94
|
}
|
|
83
95
|
var segmentTemplate = object_assign_1.default.apply(void 0, __spreadArray([{}], __read(segmentTemplates /* Ugly TS Hack */), false));
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
96
|
+
if (segmentTemplate.availabilityTimeOffset !== undefined ||
|
|
97
|
+
context.availabilityTimeOffset !== undefined) {
|
|
98
|
+
reprIndexCtxt.availabilityTimeOffset =
|
|
99
|
+
((_a = segmentTemplate.availabilityTimeOffset) !== null && _a !== void 0 ? _a : 0) +
|
|
100
|
+
((_b = context.availabilityTimeOffset) !== null && _b !== void 0 ? _b : 0);
|
|
101
|
+
}
|
|
89
102
|
representationIndex = indexes_1.TimelineRepresentationIndex
|
|
90
103
|
.isTimelineIndexArgument(segmentTemplate) ?
|
|
91
104
|
new indexes_1.TimelineRepresentationIndex(segmentTemplate, reprIndexCtxt) :
|
|
@@ -117,7 +117,7 @@ function getHDRInformation(_a) {
|
|
|
117
117
|
*/
|
|
118
118
|
function parseRepresentations(representationsIR, adaptation, context) {
|
|
119
119
|
var e_1, _a;
|
|
120
|
-
var _b, _c, _d, _e;
|
|
120
|
+
var _b, _c, _d, _e, _f;
|
|
121
121
|
var parsedRepresentations = [];
|
|
122
122
|
var _loop_1 = function (representation) {
|
|
123
123
|
// Compute Representation ID
|
|
@@ -145,8 +145,12 @@ function parseRepresentations(representationsIR, adaptation, context) {
|
|
|
145
145
|
.unsafelyBaseOnPreviousAdaptation) === null || _b === void 0 ? void 0 : _b.getRepresentation(representationID)) !== null && _c !== void 0 ? _c : null;
|
|
146
146
|
var inbandEventStreams = combineInbandEventStreams(representation, adaptation);
|
|
147
147
|
var availabilityTimeComplete = (_d = representation.attributes.availabilityTimeComplete) !== null && _d !== void 0 ? _d : context.availabilityTimeComplete;
|
|
148
|
-
var availabilityTimeOffset =
|
|
149
|
-
|
|
148
|
+
var availabilityTimeOffset = void 0;
|
|
149
|
+
if (representation.attributes.availabilityTimeOffset !== undefined ||
|
|
150
|
+
context.availabilityTimeOffset !== undefined) {
|
|
151
|
+
availabilityTimeOffset = ((_e = representation.attributes.availabilityTimeOffset) !== null && _e !== void 0 ? _e : 0) +
|
|
152
|
+
((_f = context.availabilityTimeOffset) !== null && _f !== void 0 ? _f : 0);
|
|
153
|
+
}
|
|
150
154
|
var reprIndexCtxt = (0, object_assign_1.default)({}, context, { availabilityTimeOffset: availabilityTimeOffset, availabilityTimeComplete: availabilityTimeComplete, unsafelyBaseOnPreviousRepresentation: unsafelyBaseOnPreviousRepresentation, adaptation: adaptation, inbandEventStreams: inbandEventStreams });
|
|
151
155
|
var representationIndex = (0, parse_representation_index_1.default)(representation, reprIndexCtxt);
|
|
152
156
|
// Find bitrate
|
|
@@ -158,7 +158,7 @@ var LocalRepresentationIndex = /** @class */ (function () {
|
|
|
158
158
|
* @returns {boolean|undefined}
|
|
159
159
|
*/
|
|
160
160
|
LocalRepresentationIndex.prototype.awaitSegmentBetween = function (start, end) {
|
|
161
|
-
if (this.
|
|
161
|
+
if (this.isStillAwaitingFutureSegments()) {
|
|
162
162
|
return false;
|
|
163
163
|
}
|
|
164
164
|
if (this._index.incomingRanges === undefined) {
|
|
@@ -180,8 +180,8 @@ var LocalRepresentationIndex = /** @class */ (function () {
|
|
|
180
180
|
LocalRepresentationIndex.prototype.isSegmentStillAvailable = function () {
|
|
181
181
|
return true;
|
|
182
182
|
};
|
|
183
|
-
LocalRepresentationIndex.prototype.
|
|
184
|
-
return this._index.isFinished;
|
|
183
|
+
LocalRepresentationIndex.prototype.isStillAwaitingFutureSegments = function () {
|
|
184
|
+
return !this._index.isFinished;
|
|
185
185
|
};
|
|
186
186
|
/**
|
|
187
187
|
* @returns {Boolean}
|
|
@@ -165,8 +165,8 @@ var MetaRepresentationIndex = /** @class */ (function () {
|
|
|
165
165
|
/**
|
|
166
166
|
* @returns {Boolean}
|
|
167
167
|
*/
|
|
168
|
-
MetaRepresentationIndex.prototype.
|
|
169
|
-
return this._wrappedIndex.
|
|
168
|
+
MetaRepresentationIndex.prototype.isStillAwaitingFutureSegments = function () {
|
|
169
|
+
return this._wrappedIndex.isStillAwaitingFutureSegments();
|
|
170
170
|
};
|
|
171
171
|
/**
|
|
172
172
|
* @returns {Boolean}
|
|
@@ -189,9 +189,9 @@ export default class SmoothRepresentationIndex implements IRepresentationIndex {
|
|
|
189
189
|
*/
|
|
190
190
|
_update(newIndex: SmoothRepresentationIndex): void;
|
|
191
191
|
/**
|
|
192
|
-
* Returns `
|
|
192
|
+
* Returns `false` if the last segments in this index have already been
|
|
193
193
|
* generated.
|
|
194
|
-
* Returns `
|
|
194
|
+
* Returns `true` if the index is still waiting on future segments to be
|
|
195
195
|
* generated.
|
|
196
196
|
*
|
|
197
197
|
* For Smooth, it should only depend on whether the content is a live content
|
|
@@ -199,7 +199,7 @@ export default class SmoothRepresentationIndex implements IRepresentationIndex {
|
|
|
199
199
|
* TODO What about Smooth live content that finishes at some point?
|
|
200
200
|
* @returns {boolean}
|
|
201
201
|
*/
|
|
202
|
-
|
|
202
|
+
isStillAwaitingFutureSegments(): boolean;
|
|
203
203
|
/**
|
|
204
204
|
* @returns {Boolean}
|
|
205
205
|
*/
|
|
@@ -209,8 +209,8 @@ export default class SmoothRepresentationIndex implements IRepresentationIndex {
|
|
|
209
209
|
* Add segments to a `SharedSmoothSegmentTimeline` that were predicted to come
|
|
210
210
|
* after `currentSegment`.
|
|
211
211
|
* @param {Array.<Object>} nextSegments - The segment information parsed.
|
|
212
|
-
* @param {Object}
|
|
213
|
-
* new segment information.
|
|
212
|
+
* @param {Object} currentSegment - Information on the segment which contained
|
|
213
|
+
* that new segment information.
|
|
214
214
|
*/
|
|
215
215
|
addPredictedSegments(nextSegments: Array<{
|
|
216
216
|
duration: number;
|
|
@@ -20,7 +20,6 @@ var log_1 = require("../../../log");
|
|
|
20
20
|
var assert_1 = require("../../../utils/assert");
|
|
21
21
|
var monotonic_timestamp_1 = require("../../../utils/monotonic_timestamp");
|
|
22
22
|
var index_helpers_1 = require("../utils/index_helpers");
|
|
23
|
-
var is_segment_still_available_1 = require("../utils/is_segment_still_available");
|
|
24
23
|
var tokens_1 = require("./utils/tokens");
|
|
25
24
|
/**
|
|
26
25
|
* @param {Number} start
|
|
@@ -270,7 +269,7 @@ var SmoothRepresentationIndex = /** @class */ (function () {
|
|
|
270
269
|
SmoothRepresentationIndex.prototype.awaitSegmentBetween = function (start, end) {
|
|
271
270
|
var _a;
|
|
272
271
|
(0, assert_1.default)(start <= end);
|
|
273
|
-
if (this.
|
|
272
|
+
if (this.isStillAwaitingFutureSegments()) {
|
|
274
273
|
return false;
|
|
275
274
|
}
|
|
276
275
|
var lastAvailablePosition = this.getLastAvailablePosition();
|
|
@@ -307,7 +306,24 @@ var SmoothRepresentationIndex = /** @class */ (function () {
|
|
|
307
306
|
}
|
|
308
307
|
this._refreshTimeline();
|
|
309
308
|
var _a = this._sharedSmoothTimeline, timeline = _a.timeline, timescale = _a.timescale;
|
|
310
|
-
|
|
309
|
+
for (var i = 0; i < timeline.length; i++) {
|
|
310
|
+
var tSegment = timeline[i];
|
|
311
|
+
var tSegmentTime = tSegment.start / timescale;
|
|
312
|
+
if (tSegmentTime > segment.time) {
|
|
313
|
+
return false; // We went over it without finding it
|
|
314
|
+
}
|
|
315
|
+
else if (tSegmentTime === segment.time) {
|
|
316
|
+
return true;
|
|
317
|
+
}
|
|
318
|
+
else { // tSegment.start < segment.time
|
|
319
|
+
if (tSegment.repeatCount >= 0 && tSegment.duration !== undefined) {
|
|
320
|
+
var timeDiff = tSegmentTime - tSegment.start;
|
|
321
|
+
var repeat = (timeDiff / tSegment.duration) - 1;
|
|
322
|
+
return repeat % 1 === 0 && repeat <= tSegment.repeatCount;
|
|
323
|
+
}
|
|
324
|
+
}
|
|
325
|
+
}
|
|
326
|
+
return false;
|
|
311
327
|
};
|
|
312
328
|
/**
|
|
313
329
|
* @param {Error} error
|
|
@@ -341,9 +357,9 @@ var SmoothRepresentationIndex = /** @class */ (function () {
|
|
|
341
357
|
this._sharedSmoothTimeline.update(newIndex._sharedSmoothTimeline);
|
|
342
358
|
};
|
|
343
359
|
/**
|
|
344
|
-
* Returns `
|
|
360
|
+
* Returns `false` if the last segments in this index have already been
|
|
345
361
|
* generated.
|
|
346
|
-
* Returns `
|
|
362
|
+
* Returns `true` if the index is still waiting on future segments to be
|
|
347
363
|
* generated.
|
|
348
364
|
*
|
|
349
365
|
* For Smooth, it should only depend on whether the content is a live content
|
|
@@ -351,8 +367,8 @@ var SmoothRepresentationIndex = /** @class */ (function () {
|
|
|
351
367
|
* TODO What about Smooth live content that finishes at some point?
|
|
352
368
|
* @returns {boolean}
|
|
353
369
|
*/
|
|
354
|
-
SmoothRepresentationIndex.prototype.
|
|
355
|
-
return
|
|
370
|
+
SmoothRepresentationIndex.prototype.isStillAwaitingFutureSegments = function () {
|
|
371
|
+
return this._isLive;
|
|
356
372
|
};
|
|
357
373
|
/**
|
|
358
374
|
* @returns {Boolean}
|
|
@@ -367,8 +383,8 @@ var SmoothRepresentationIndex = /** @class */ (function () {
|
|
|
367
383
|
* Add segments to a `SharedSmoothSegmentTimeline` that were predicted to come
|
|
368
384
|
* after `currentSegment`.
|
|
369
385
|
* @param {Array.<Object>} nextSegments - The segment information parsed.
|
|
370
|
-
* @param {Object}
|
|
371
|
-
* new segment information.
|
|
386
|
+
* @param {Object} currentSegment - Information on the segment which contained
|
|
387
|
+
* that new segment information.
|
|
372
388
|
*/
|
|
373
389
|
SmoothRepresentationIndex.prototype.addPredictedSegments = function (nextSegments, currentSegment) {
|
|
374
390
|
this._sharedSmoothTimeline.addPredictedSegments(nextSegments, currentSegment);
|
|
@@ -105,7 +105,7 @@ exports.getTimescaledRange = getTimescaledRange;
|
|
|
105
105
|
* timescaled time.
|
|
106
106
|
* Returns -1 if the given time is lower than the start of the first available
|
|
107
107
|
* segment.
|
|
108
|
-
* @param {Object}
|
|
108
|
+
* @param {Object} timeline
|
|
109
109
|
* @param {Number} timeTScaled
|
|
110
110
|
* @returns {Number}
|
|
111
111
|
*/
|
|
@@ -24,10 +24,11 @@ var regexps_1 = require("../regexps");
|
|
|
24
24
|
*/
|
|
25
25
|
function applyLineHeight(element, lineHeight) {
|
|
26
26
|
var trimmedLineHeight = lineHeight.trim();
|
|
27
|
+
var splittedLineHeight = trimmedLineHeight.split(" ");
|
|
27
28
|
if (trimmedLineHeight === "auto") {
|
|
28
29
|
return;
|
|
29
30
|
}
|
|
30
|
-
var firstLineHeight = regexps_1.REGXP_LENGTH.exec(
|
|
31
|
+
var firstLineHeight = regexps_1.REGXP_LENGTH.exec(splittedLineHeight[0]);
|
|
31
32
|
if (firstLineHeight === null) {
|
|
32
33
|
return;
|
|
33
34
|
}
|