rx-player 4.0.0-dev.2023111400 → 4.0.0-dev.2023120600
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 +11 -227
- package/FILES.md +1 -1
- package/VERSION +1 -1
- package/dist/_esm5.processed/compat/add_text_track.d.ts +1 -3
- package/dist/_esm5.processed/compat/add_text_track.js +4 -7
- package/dist/_esm5.processed/compat/browser_compatibility_types.d.ts +0 -7
- package/dist/_esm5.processed/compat/event_listeners.d.ts +2 -15
- package/dist/_esm5.processed/compat/event_listeners.js +2 -37
- package/dist/_esm5.processed/compat/index.d.ts +1 -3
- package/dist/_esm5.processed/compat/index.js +1 -3
- package/dist/_esm5.processed/config.d.ts +9 -21
- package/dist/_esm5.processed/core/adaptive/adaptive_representation_selector.d.ts +0 -58
- package/dist/_esm5.processed/core/adaptive/adaptive_representation_selector.js +14 -54
- package/dist/_esm5.processed/core/adaptive/utils/select_optimal_representation.d.ts +2 -8
- package/dist/_esm5.processed/core/adaptive/utils/select_optimal_representation.js +2 -11
- package/dist/_esm5.processed/core/api/debug/buffer_graph.js +2 -6
- package/dist/_esm5.processed/core/api/debug/modules/general_info.js +13 -32
- package/dist/_esm5.processed/core/api/debug/modules/segment_buffer_content.js +3 -3
- package/dist/_esm5.processed/core/api/debug/modules/segment_buffer_size.js +1 -1
- package/dist/_esm5.processed/core/api/option_utils.d.ts +12 -35
- package/dist/_esm5.processed/core/api/option_utils.js +41 -230
- package/dist/_esm5.processed/core/api/public_api.d.ts +91 -266
- package/dist/_esm5.processed/core/api/public_api.js +439 -805
- package/dist/_esm5.processed/core/{segment_buffers/implementations/image → api/track_management}/index.d.ts +3 -2
- package/dist/_esm5.processed/core/{segment_buffers/implementations/image → api/track_management}/index.js +3 -2
- package/dist/_esm5.processed/core/api/{tracks_management/media_element_track_choice_manager.d.ts → track_management/media_element_tracks_store.d.ts} +15 -75
- package/dist/_esm5.processed/core/api/{tracks_management/media_element_track_choice_manager.js → track_management/media_element_tracks_store.js} +74 -193
- package/dist/_esm5.processed/core/api/track_management/track_dispatcher.d.ts +84 -0
- package/dist/_esm5.processed/core/api/track_management/track_dispatcher.js +158 -0
- package/dist/_esm5.processed/core/api/track_management/tracks_store.d.ts +406 -0
- package/dist/_esm5.processed/core/api/track_management/tracks_store.js +932 -0
- package/dist/_esm5.processed/core/api/utils.d.ts +1 -0
- package/dist/_esm5.processed/core/api/utils.js +28 -11
- package/dist/_esm5.processed/core/decrypt/content_decryptor.js +3 -3
- package/dist/_esm5.processed/core/decrypt/find_key_system.js +83 -71
- package/dist/_esm5.processed/core/decrypt/get_media_keys.js +6 -5
- package/dist/_esm5.processed/core/decrypt/session_events_listener.js +10 -72
- package/dist/_esm5.processed/core/decrypt/utils/persistent_sessions_store.d.ts +4 -4
- package/dist/_esm5.processed/core/decrypt/utils/persistent_sessions_store.js +6 -4
- package/dist/_esm5.processed/core/fetchers/manifest/manifest_fetcher.d.ts +1 -3
- package/dist/_esm5.processed/core/fetchers/manifest/manifest_fetcher.js +7 -26
- package/dist/_esm5.processed/core/fetchers/segment/segment_fetcher.d.ts +3 -9
- package/dist/_esm5.processed/core/fetchers/segment/segment_fetcher.js +16 -9
- package/dist/_esm5.processed/core/fetchers/segment/segment_fetcher_creator.d.ts +1 -3
- package/dist/_esm5.processed/core/fetchers/segment/segment_fetcher_creator.js +1 -1
- package/dist/_esm5.processed/core/fetchers/utils/schedule_request.d.ts +1 -6
- package/dist/_esm5.processed/core/fetchers/utils/schedule_request.js +4 -41
- package/dist/_esm5.processed/core/init/directfile_content_initializer.js +1 -1
- package/dist/_esm5.processed/core/init/media_source_content_initializer.d.ts +1 -8
- package/dist/_esm5.processed/core/init/media_source_content_initializer.js +5 -19
- package/dist/_esm5.processed/core/init/types.d.ts +5 -15
- 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/text/native/native_text_segment_buffer.d.ts +1 -2
- package/dist/_esm5.processed/core/segment_buffers/implementations/text/native/native_text_segment_buffer.js +2 -3
- package/dist/_esm5.processed/core/segment_buffers/implementations/types.d.ts +2 -2
- package/dist/_esm5.processed/core/segment_buffers/index.d.ts +2 -2
- package/dist/_esm5.processed/core/segment_buffers/index.js +2 -1
- package/dist/_esm5.processed/core/segment_buffers/inventory/index.d.ts +1 -0
- package/dist/_esm5.processed/core/segment_buffers/inventory/index.js +1 -0
- package/dist/_esm5.processed/core/segment_buffers/inventory/utils.d.ts +33 -0
- package/dist/_esm5.processed/core/segment_buffers/inventory/utils.js +49 -0
- package/dist/_esm5.processed/core/segment_buffers/segment_buffers_store.d.ts +0 -1
- package/dist/_esm5.processed/core/segment_buffers/segment_buffers_store.js +2 -16
- package/dist/_esm5.processed/core/stream/adaptation/adaptation_stream.d.ts +0 -15
- package/dist/_esm5.processed/core/stream/adaptation/adaptation_stream.js +183 -93
- package/dist/_esm5.processed/core/stream/adaptation/get_representations_switch_strategy.d.ts +39 -0
- package/dist/_esm5.processed/core/stream/adaptation/get_representations_switch_strategy.js +133 -0
- package/dist/_esm5.processed/core/stream/adaptation/types.d.ts +27 -13
- package/dist/_esm5.processed/core/stream/index.d.ts +2 -3
- package/dist/_esm5.processed/core/stream/orchestrator/stream_orchestrator.d.ts +2 -0
- package/dist/_esm5.processed/core/stream/orchestrator/stream_orchestrator.js +5 -7
- package/dist/_esm5.processed/core/stream/period/period_stream.js +13 -12
- package/dist/_esm5.processed/core/stream/period/types.d.ts +5 -14
- package/dist/_esm5.processed/core/stream/period/utils/get_adaptation_switch_strategy.d.ts +2 -4
- package/dist/_esm5.processed/core/stream/period/utils/get_adaptation_switch_strategy.js +10 -46
- package/dist/_esm5.processed/core/stream/representation/representation_stream.js +29 -23
- package/dist/_esm5.processed/core/stream/representation/types.d.ts +11 -1
- package/dist/_esm5.processed/default_config.d.ts +35 -98
- package/dist/_esm5.processed/default_config.js +36 -113
- package/dist/_esm5.processed/errors/custom_loader_error.d.ts +1 -3
- package/dist/_esm5.processed/errors/custom_loader_error.js +1 -3
- package/dist/_esm5.processed/errors/media_error.js +2 -2
- package/dist/_esm5.processed/errors/network_error.d.ts +0 -1
- package/dist/_esm5.processed/errors/network_error.js +0 -1
- package/dist/_esm5.processed/errors/request_error.d.ts +2 -3
- package/dist/_esm5.processed/errors/request_error.js +2 -5
- package/dist/_esm5.processed/experimental/tools/VideoThumbnailLoader/video_thumbnail_loader.js +3 -3
- package/dist/_esm5.processed/features/features_object.js +0 -2
- package/dist/_esm5.processed/features/list/directfile.js +2 -5
- package/dist/_esm5.processed/features/list/index.d.ts +0 -2
- package/dist/_esm5.processed/features/list/index.js +0 -2
- package/dist/_esm5.processed/features/types.d.ts +3 -27
- package/dist/_esm5.processed/manifest/adaptation.d.ts +9 -11
- package/dist/_esm5.processed/manifest/adaptation.js +41 -30
- package/dist/_esm5.processed/manifest/index.d.ts +3 -4
- package/dist/_esm5.processed/manifest/manifest.d.ts +5 -54
- package/dist/_esm5.processed/manifest/manifest.js +5 -110
- package/dist/_esm5.processed/manifest/period.d.ts +4 -5
- package/dist/_esm5.processed/manifest/representation.d.ts +10 -5
- package/dist/_esm5.processed/manifest/representation.js +15 -5
- package/dist/_esm5.processed/manifest/representation_index/index.d.ts +2 -2
- package/dist/_esm5.processed/manifest/representation_index/static.d.ts +2 -0
- package/dist/_esm5.processed/manifest/representation_index/static.js +6 -0
- package/dist/_esm5.processed/manifest/representation_index/types.d.ts +42 -21
- package/dist/_esm5.processed/manifest/types.d.ts +0 -2
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/base.d.ts +17 -31
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/base.js +26 -19
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/list.d.ts +2 -0
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/list.js +7 -1
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/template.d.ts +2 -6
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/template.js +11 -8
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/timeline/timeline_representation_index.d.ts +2 -0
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/timeline/timeline_representation_index.js +6 -0
- package/dist/_esm5.processed/parsers/manifest/dash/common/infer_adaptation_type.d.ts +2 -2
- package/dist/_esm5.processed/parsers/manifest/dash/common/infer_adaptation_type.js +1 -6
- package/dist/_esm5.processed/parsers/manifest/dash/common/parse_adaptation_sets.js +3 -5
- package/dist/_esm5.processed/parsers/manifest/dash/common/parse_mpd.d.ts +0 -2
- package/dist/_esm5.processed/parsers/manifest/dash/common/parse_mpd.js +1 -1
- package/dist/_esm5.processed/parsers/manifest/dash/common/parse_periods.js +2 -2
- package/dist/_esm5.processed/parsers/manifest/dash/common/parse_representation_index.d.ts +0 -2
- package/dist/_esm5.processed/parsers/manifest/dash/common/parse_representation_index.js +2 -2
- package/dist/_esm5.processed/parsers/manifest/dash/js-parser/node_parsers/AdaptationSet.js +10 -6
- package/dist/_esm5.processed/parsers/manifest/dash/js-parser/node_parsers/Representation.js +4 -2
- package/dist/_esm5.processed/parsers/manifest/dash/js-parser/node_parsers/utils.d.ts +10 -1
- package/dist/_esm5.processed/parsers/manifest/dash/js-parser/node_parsers/utils.js +18 -2
- package/dist/_esm5.processed/parsers/manifest/dash/node_parser_types.d.ts +4 -4
- package/dist/_esm5.processed/parsers/manifest/dash/wasm-parser/ts/generators/AdaptationSet.js +3 -6
- package/dist/_esm5.processed/parsers/manifest/dash/wasm-parser/ts/generators/Representation.js +1 -2
- package/dist/_esm5.processed/parsers/manifest/local/representation_index.d.ts +2 -0
- package/dist/_esm5.processed/parsers/manifest/local/representation_index.js +6 -0
- package/dist/_esm5.processed/parsers/manifest/metaplaylist/metaplaylist_parser.js +6 -6
- package/dist/_esm5.processed/parsers/manifest/metaplaylist/representation_index.d.ts +12 -3
- package/dist/_esm5.processed/parsers/manifest/metaplaylist/representation_index.js +11 -2
- package/dist/_esm5.processed/parsers/manifest/smooth/create_parser.d.ts +0 -1
- package/dist/_esm5.processed/parsers/manifest/smooth/create_parser.js +11 -17
- package/dist/_esm5.processed/parsers/manifest/smooth/representation_index.d.ts +21 -83
- package/dist/_esm5.processed/parsers/manifest/smooth/representation_index.js +53 -125
- package/dist/_esm5.processed/parsers/manifest/smooth/shared_smooth_segment_timeline.d.ts +119 -0
- package/dist/_esm5.processed/parsers/manifest/smooth/shared_smooth_segment_timeline.js +159 -0
- package/dist/_esm5.processed/parsers/manifest/smooth/utils/add_segment_infos.d.ts +3 -6
- package/dist/_esm5.processed/parsers/manifest/smooth/utils/add_segment_infos.js +4 -4
- package/dist/_esm5.processed/parsers/manifest/types.d.ts +3 -3
- package/dist/_esm5.processed/parsers/texttracks/ttml/html/apply_extent.js +1 -8
- package/dist/_esm5.processed/parsers/texttracks/ttml/html/apply_origin.js +1 -9
- package/dist/_esm5.processed/public_types.d.ts +396 -308
- package/dist/_esm5.processed/tools/TextTrackRenderer/text_track_renderer.d.ts +5 -4
- package/dist/_esm5.processed/tools/TextTrackRenderer/text_track_renderer.js +5 -4
- package/dist/_esm5.processed/transports/dash/add_segment_integrity_checks_to_loader.js +4 -4
- package/dist/_esm5.processed/transports/dash/manifest_parser.js +2 -3
- package/dist/_esm5.processed/transports/dash/pipelines.js +1 -4
- package/dist/_esm5.processed/transports/dash/segment_loader.d.ts +2 -2
- package/dist/_esm5.processed/transports/dash/segment_loader.js +26 -20
- package/dist/_esm5.processed/transports/dash/segment_parser.js +19 -24
- package/dist/_esm5.processed/transports/dash/text_loader.js +5 -5
- package/dist/_esm5.processed/transports/dash/text_parser.js +28 -33
- package/dist/_esm5.processed/transports/local/pipelines.js +1 -10
- package/dist/_esm5.processed/transports/local/segment_loader.js +2 -2
- package/dist/_esm5.processed/transports/local/segment_parser.d.ts +1 -1
- package/dist/_esm5.processed/transports/local/segment_parser.js +10 -10
- package/dist/_esm5.processed/transports/local/text_parser.d.ts +2 -2
- package/dist/_esm5.processed/transports/local/text_parser.js +23 -23
- package/dist/_esm5.processed/transports/metaplaylist/pipelines.js +34 -52
- package/dist/_esm5.processed/{utils/list_to_map.d.ts → transports/smooth/is_mp4_embedded_track.d.ts} +5 -5
- package/dist/_esm5.processed/{features/list/image_buffer.d.ts → transports/smooth/is_mp4_embedded_track.js} +7 -6
- package/dist/_esm5.processed/transports/smooth/pipelines.js +33 -190
- package/dist/_esm5.processed/transports/smooth/segment_loader.d.ts +1 -1
- package/dist/_esm5.processed/transports/smooth/segment_loader.js +28 -22
- package/dist/_esm5.processed/transports/smooth/utils.d.ts +1 -26
- package/dist/_esm5.processed/transports/smooth/utils.js +1 -55
- package/dist/_esm5.processed/transports/types.d.ts +94 -89
- package/dist/_esm5.processed/transports/utils/call_custom_manifest_loader.js +3 -3
- package/dist/_esm5.processed/transports/utils/infer_segment_container.d.ts +3 -3
- package/dist/_esm5.processed/transports/utils/infer_segment_container.js +5 -7
- package/dist/_esm5.processed/transports/utils/parse_text_track.d.ts +8 -12
- package/dist/_esm5.processed/transports/utils/parse_text_track.js +19 -21
- package/dist/_esm5.processed/utils/array_includes.d.ts +2 -1
- package/dist/_esm5.processed/utils/array_includes.js +30 -28
- package/dist/_esm5.processed/utils/request/xhr.js +5 -5
- package/dist/commonjs/compat/is_codec_supported.js +22 -1
- package/dist/commonjs/config.d.ts +1 -0
- 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/option_utils.d.ts +2 -0
- package/dist/commonjs/core/api/option_utils.js +2 -3
- package/dist/commonjs/core/api/public_api.d.ts +9 -0
- package/dist/commonjs/core/api/public_api.js +34 -9
- 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 +24 -7
- package/dist/commonjs/core/init/media_source_content_initializer.d.ts +6 -0
- package/dist/commonjs/core/init/media_source_content_initializer.js +4 -6
- 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 +16 -17
- 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/stream/representation/utils/get_buffer_status.js +3 -3
- package/dist/commonjs/core/stream/representation/utils/get_needed_segments.js +1 -1
- package/dist/commonjs/default_config.d.ts +5 -0
- package/dist/commonjs/default_config.js +5 -0
- 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/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/public_types.d.ts +78 -34
- 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 +1 -0
- 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/option_utils.d.ts +2 -0
- package/dist/es2017/core/api/option_utils.js +2 -3
- package/dist/es2017/core/api/public_api.d.ts +9 -0
- package/dist/es2017/core/api/public_api.js +33 -8
- 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 +24 -7
- package/dist/es2017/core/init/media_source_content_initializer.d.ts +6 -0
- package/dist/es2017/core/init/media_source_content_initializer.js +4 -6
- 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 +16 -15
- 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/stream/representation/utils/get_buffer_status.js +3 -3
- package/dist/es2017/core/stream/representation/utils/get_needed_segments.js +1 -1
- package/dist/es2017/default_config.d.ts +5 -0
- package/dist/es2017/default_config.js +5 -0
- 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/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/public_types.d.ts +78 -34
- 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/rx-player.js +723 -376
- package/dist/rx-player.min.js +1 -1
- package/package.json +3 -4
- package/scripts/update-version +2 -0
- package/sonar-project.properties +1 -1
- package/src/compat/is_codec_supported.ts +23 -1
- 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/option_utils.ts +3 -3
- package/src/core/api/public_api.ts +35 -7
- 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 +23 -7
- package/src/core/init/media_source_content_initializer.ts +13 -7
- package/src/core/init/utils/content_time_boundaries_observer.ts +23 -22
- package/src/core/init/utils/get_initial_time.ts +25 -12
- package/src/core/stream/representation/utils/get_buffer_status.ts +3 -3
- package/src/core/stream/representation/utils/get_needed_segments.ts +2 -2
- package/src/default_config.ts +5 -0
- 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/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/public_types.ts +79 -34
- 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/_esm5.processed/compat/fullscreen.d.ts +0 -32
- package/dist/_esm5.processed/compat/fullscreen.js +0 -78
- package/dist/_esm5.processed/compat/is_offline.d.ts +0 -39
- package/dist/_esm5.processed/compat/is_offline.js +0 -43
- package/dist/_esm5.processed/core/api/tracks_management/track_choice_manager.d.ts +0 -258
- package/dist/_esm5.processed/core/api/tracks_management/track_choice_manager.js +0 -989
- package/dist/_esm5.processed/core/segment_buffers/implementations/image/image_segment_buffer.d.ts +0 -75
- package/dist/_esm5.processed/core/segment_buffers/implementations/image/image_segment_buffer.js +0 -133
- package/dist/_esm5.processed/features/list/bif_parser.d.ts +0 -23
- package/dist/_esm5.processed/features/list/bif_parser.js +0 -27
- package/dist/_esm5.processed/features/list/image_buffer.js +0 -25
- package/dist/_esm5.processed/transports/dash/image_pipelines.d.ts +0 -38
- package/dist/_esm5.processed/transports/dash/image_pipelines.js +0 -129
- package/dist/_esm5.processed/utils/list_to_map.js +0 -28
- package/dist/_esm5.processed/utils/simple_set.d.ts +0 -51
- package/dist/_esm5.processed/utils/simple_set.js +0 -57
- package/dist/_esm5.processed/utils/uniq.d.ts +0 -36
- package/dist/_esm5.processed/utils/uniq.js +0 -43
- 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
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright 2015 CANAL+ Group
|
|
3
|
+
*
|
|
4
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
|
+
* you may not use this file except in compliance with the License.
|
|
6
|
+
* You may obtain a copy of the License at
|
|
7
|
+
*
|
|
8
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
9
|
+
*
|
|
10
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
11
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
12
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
13
|
+
* See the License for the specific language governing permissions and
|
|
14
|
+
* limitations under the License.
|
|
15
|
+
*/
|
|
16
|
+
import config from "../../../config";
|
|
17
|
+
import { convertToRanges, excludeFromRanges, isTimeInRange, isTimeInRanges, keepRangeIntersection, } from "../../../utils/ranges";
|
|
18
|
+
import { getFirstSegmentAfterPeriod, getLastSegmentBeforePeriod, } from "../../segment_buffers";
|
|
19
|
+
export default function getRepresentationsSwitchingStrategy(period, adaptation, settings, segmentBuffer, playbackObserver) {
|
|
20
|
+
if (settings.switchingMode === "lazy") {
|
|
21
|
+
return { type: "continue", value: undefined };
|
|
22
|
+
}
|
|
23
|
+
var buffered = segmentBuffer.getBufferedRanges();
|
|
24
|
+
if (buffered.length === 0) {
|
|
25
|
+
return { type: "continue", value: undefined };
|
|
26
|
+
}
|
|
27
|
+
var bufferedRanges = convertToRanges(buffered);
|
|
28
|
+
var start = period.start;
|
|
29
|
+
var end = period.end == null ? Infinity :
|
|
30
|
+
period.end;
|
|
31
|
+
var intersection = keepRangeIntersection(bufferedRanges, [{ start: start, end: end }]);
|
|
32
|
+
if (intersection.length === 0) {
|
|
33
|
+
return { type: "continue", value: undefined };
|
|
34
|
+
}
|
|
35
|
+
segmentBuffer.synchronizeInventory();
|
|
36
|
+
var inventory = segmentBuffer.getInventory();
|
|
37
|
+
/** Data already in the right Adaptation */
|
|
38
|
+
var rangesWithReps = getBufferedRangesFromRepresentations(inventory, period, adaptation, settings.representations);
|
|
39
|
+
/**
|
|
40
|
+
* Data different from the wanted Adaptation in the Period's range.
|
|
41
|
+
* /!\ Could contain some data at the end of the previous Period or at the
|
|
42
|
+
* beginning of the next one.
|
|
43
|
+
*/
|
|
44
|
+
var unwantedRange = excludeFromRanges(intersection, rangesWithReps);
|
|
45
|
+
if (unwantedRange.length === 0) {
|
|
46
|
+
return { type: "continue", value: undefined };
|
|
47
|
+
}
|
|
48
|
+
var currentTime = playbackObserver.getCurrentTime();
|
|
49
|
+
var readyState = playbackObserver.getReadyState();
|
|
50
|
+
if (settings.switchingMode === "reload" &&
|
|
51
|
+
// We're playing the current Period
|
|
52
|
+
isTimeInRange({ start: start, end: end }, currentTime) &&
|
|
53
|
+
// There is data for the current position
|
|
54
|
+
readyState > 1 &&
|
|
55
|
+
// We're not playing the current wanted video Adaptation
|
|
56
|
+
!isTimeInRanges(rangesWithReps, currentTime)) {
|
|
57
|
+
return { type: "needs-reload", value: undefined };
|
|
58
|
+
}
|
|
59
|
+
// From here, clean-up data from the previous Adaptation, if one
|
|
60
|
+
var shouldFlush = settings.switchingMode === "direct";
|
|
61
|
+
var rangesToExclude = [];
|
|
62
|
+
// First, we don't want to accidentally remove some segments from the previous
|
|
63
|
+
// Period (which overlap a little with this one)
|
|
64
|
+
/** Last segment before one for the current period. */
|
|
65
|
+
var lastSegmentBefore = getLastSegmentBeforePeriod(inventory, period);
|
|
66
|
+
if (lastSegmentBefore !== null &&
|
|
67
|
+
(lastSegmentBefore.bufferedEnd === undefined ||
|
|
68
|
+
period.start - lastSegmentBefore.bufferedEnd < 1)) // Close to Period's start
|
|
69
|
+
{
|
|
70
|
+
// Exclude data close to the period's start to avoid cleaning
|
|
71
|
+
// to much
|
|
72
|
+
rangesToExclude.push({ start: 0,
|
|
73
|
+
end: period.start + 1 });
|
|
74
|
+
}
|
|
75
|
+
if (!shouldFlush) {
|
|
76
|
+
// exclude data around current position to avoid decoding issues
|
|
77
|
+
var ADAP_REP_SWITCH_BUFFER_PADDINGS = config.getCurrent().ADAP_REP_SWITCH_BUFFER_PADDINGS;
|
|
78
|
+
var bufferType = adaptation.type;
|
|
79
|
+
/** Ranges that won't be cleaned from the current buffer. */
|
|
80
|
+
var paddingBefore = ADAP_REP_SWITCH_BUFFER_PADDINGS[bufferType].before;
|
|
81
|
+
if (paddingBefore == null) {
|
|
82
|
+
paddingBefore = 0;
|
|
83
|
+
}
|
|
84
|
+
var paddingAfter = ADAP_REP_SWITCH_BUFFER_PADDINGS[bufferType].after;
|
|
85
|
+
if (paddingAfter == null) {
|
|
86
|
+
paddingAfter = 0;
|
|
87
|
+
}
|
|
88
|
+
rangesToExclude.push({ start: currentTime - paddingBefore,
|
|
89
|
+
end: currentTime + paddingAfter });
|
|
90
|
+
}
|
|
91
|
+
// Now remove possible small range from the end if there is a segment from the
|
|
92
|
+
// next Period
|
|
93
|
+
if (period.end !== undefined) {
|
|
94
|
+
/** first segment after for the current period. */
|
|
95
|
+
var firstSegmentAfter = getFirstSegmentAfterPeriod(inventory, period);
|
|
96
|
+
if (firstSegmentAfter !== null &&
|
|
97
|
+
(firstSegmentAfter.bufferedStart === undefined ||
|
|
98
|
+
// Close to Period's end
|
|
99
|
+
(firstSegmentAfter.bufferedStart - period.end) < 1)) {
|
|
100
|
+
rangesToExclude.push({ start: period.end - 1,
|
|
101
|
+
end: Number.MAX_VALUE });
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
var toRemove = excludeFromRanges(unwantedRange, rangesToExclude);
|
|
105
|
+
if (toRemove.length === 0) {
|
|
106
|
+
return { type: "continue", value: undefined };
|
|
107
|
+
}
|
|
108
|
+
return shouldFlush ? { type: "flush-buffer", value: toRemove } :
|
|
109
|
+
{ type: "clean-buffer", value: toRemove };
|
|
110
|
+
}
|
|
111
|
+
/**
|
|
112
|
+
* Returns buffered ranges of what we know correspond to the given `adaptation`
|
|
113
|
+
* in the SegmentBuffer.
|
|
114
|
+
* @param {Array.<Object>} inventory
|
|
115
|
+
* @param {Object} period
|
|
116
|
+
* @param {Object} adaptation
|
|
117
|
+
* @returns {Array.<Object>}
|
|
118
|
+
*/
|
|
119
|
+
function getBufferedRangesFromRepresentations(inventory, period, adaptation, representations) {
|
|
120
|
+
return inventory.reduce(function (acc, chunk) {
|
|
121
|
+
if (chunk.infos.period.id !== period.id ||
|
|
122
|
+
chunk.infos.adaptation.id !== adaptation.id ||
|
|
123
|
+
!representations.some(function (rep) { return rep.id === chunk.infos.representation.id; })) {
|
|
124
|
+
return acc;
|
|
125
|
+
}
|
|
126
|
+
var bufferedStart = chunk.bufferedStart, bufferedEnd = chunk.bufferedEnd;
|
|
127
|
+
if (bufferedStart === undefined || bufferedEnd === undefined) {
|
|
128
|
+
return acc;
|
|
129
|
+
}
|
|
130
|
+
acc.push({ start: bufferedStart, end: bufferedEnd });
|
|
131
|
+
return acc;
|
|
132
|
+
}, []);
|
|
133
|
+
}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
import Manifest, { Adaptation, Period, Representation } from "../../../manifest";
|
|
2
|
+
import { IAudioTrackSwitchingMode, IVideoTrackSwitchingMode } from "../../../public_types";
|
|
2
3
|
import { IReadOnlySharedReference } from "../../../utils/reference";
|
|
3
4
|
import { IRepresentationEstimator } from "../../adaptive";
|
|
4
5
|
import { IReadOnlyPlaybackObserver } from "../../api";
|
|
5
6
|
import { SegmentFetcherCreator } from "../../fetchers";
|
|
6
7
|
import { IBufferType, SegmentBuffer } from "../../segment_buffers";
|
|
7
|
-
import { IRepresentationStreamCallbacks, IRepresentationStreamPlaybackObservation } from "../representation";
|
|
8
|
+
import { IRepresentationsChoice, IRepresentationStreamCallbacks, IRepresentationStreamPlaybackObservation } from "../representation";
|
|
8
9
|
/** Callbacks called by the `AdaptationStream` on various events. */
|
|
9
10
|
export interface IAdaptationStreamCallbacks<T> extends Omit<IRepresentationStreamCallbacks<T>, "terminating"> {
|
|
10
11
|
/** Called as new bitrate estimates are done. */
|
|
11
|
-
|
|
12
|
+
bitrateEstimateChange(payload: IBitrateEstimateChangePayload): void;
|
|
12
13
|
/**
|
|
13
14
|
* Called when a new `RepresentationStream` is created to load segments from a
|
|
14
15
|
* `Representation`.
|
|
@@ -19,9 +20,17 @@ export interface IAdaptationStreamCallbacks<T> extends Omit<IRepresentationStrea
|
|
|
19
20
|
* needs the `MediaSource` to be reloaded first.
|
|
20
21
|
*/
|
|
21
22
|
waitingMediaSourceReload(payload: IWaitingMediaSourceReloadPayload): void;
|
|
23
|
+
/**
|
|
24
|
+
* Some situations might require the browser's buffers to be refreshed.
|
|
25
|
+
* This callback is called when such situation arised.
|
|
26
|
+
*
|
|
27
|
+
* Generally flushing/refreshing low-level buffers can be performed simply by
|
|
28
|
+
* performing a very small seek.
|
|
29
|
+
*/
|
|
30
|
+
needsBufferFlush(): void;
|
|
22
31
|
}
|
|
23
|
-
/** Payload for the `
|
|
24
|
-
export interface
|
|
32
|
+
/** Payload for the `bitrateEstimateChange` callback. */
|
|
33
|
+
export interface IBitrateEstimateChangePayload {
|
|
25
34
|
/** The type of buffer for which the estimation is done. */
|
|
26
35
|
type: IBufferType;
|
|
27
36
|
/**
|
|
@@ -113,6 +122,7 @@ export interface IAdaptationStreamArguments {
|
|
|
113
122
|
manifest: Manifest;
|
|
114
123
|
period: Period;
|
|
115
124
|
adaptation: Adaptation;
|
|
125
|
+
representations: IReadOnlySharedReference<IRepresentationsChoice>;
|
|
116
126
|
};
|
|
117
127
|
options: IAdaptationStreamOptions;
|
|
118
128
|
/** Estimate the right Representation to play. */
|
|
@@ -152,15 +162,6 @@ export interface IAdaptationStreamOptions {
|
|
|
152
162
|
* - We don't know which DRM system is currently used.
|
|
153
163
|
*/
|
|
154
164
|
drmSystemId: string | undefined;
|
|
155
|
-
/**
|
|
156
|
-
* Strategy taken when the user switch manually the current Representation:
|
|
157
|
-
* - "seamless": the switch will happen smoothly, with the Representation
|
|
158
|
-
* with the new bitrate progressively being pushed alongside the old
|
|
159
|
-
* Representation.
|
|
160
|
-
* - "direct": hard switch. The Representation switch will be directly
|
|
161
|
-
* visible but may necessitate the current MediaSource to be reloaded.
|
|
162
|
-
*/
|
|
163
|
-
manualBitrateSwitchingMode: "seamless" | "direct";
|
|
164
165
|
/**
|
|
165
166
|
* If `true`, the AdaptationStream might replace segments of a lower-quality
|
|
166
167
|
* (with a lower bitrate) with segments of a higher quality (with a higher
|
|
@@ -176,3 +177,16 @@ export interface IAdaptationStreamOptions {
|
|
|
176
177
|
*/
|
|
177
178
|
enableFastSwitching: boolean;
|
|
178
179
|
}
|
|
180
|
+
/** Object indicating a choice of Adaptation made by the user. */
|
|
181
|
+
export interface IAdaptationChoice {
|
|
182
|
+
/** The Adaptation choosen. */
|
|
183
|
+
adaptation: Adaptation;
|
|
184
|
+
/** "Switching mode" in which the track switch should happen. */
|
|
185
|
+
switchingMode: ITrackSwitchingMode;
|
|
186
|
+
/**
|
|
187
|
+
* Shared reference allowing to indicate which Representations from
|
|
188
|
+
* that Adaptation are allowed.
|
|
189
|
+
*/
|
|
190
|
+
representations: IReadOnlySharedReference<IRepresentationsChoice>;
|
|
191
|
+
}
|
|
192
|
+
export type ITrackSwitchingMode = IAudioTrackSwitchingMode | IVideoTrackSwitchingMode;
|
|
@@ -14,8 +14,7 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import StreamOrchestrator, { INeedsMediaSourceReloadPayload, IStreamOrchestratorOptions, IStreamOrchestratorPlaybackObservation, IStreamOrchestratorCallbacks } from "./orchestrator";
|
|
17
|
-
export {
|
|
18
|
-
export {
|
|
19
|
-
export { IWaitingMediaSourceReloadPayload, } from "./adaptation";
|
|
17
|
+
export { IRepresentationsChoice, IInbandEvent, IStreamStatusPayload, } from "./representation";
|
|
18
|
+
export { IAdaptationChoice, ITrackSwitchingMode, IWaitingMediaSourceReloadPayload, } from "./adaptation";
|
|
20
19
|
export default StreamOrchestrator;
|
|
21
20
|
export { INeedsMediaSourceReloadPayload, IStreamOrchestratorPlaybackObservation, IStreamOrchestratorOptions, IStreamOrchestratorCallbacks, };
|
|
@@ -134,6 +134,8 @@ export interface IPeriodStreamClearedPayload {
|
|
|
134
134
|
* about which `PeriodStream` has been removed.
|
|
135
135
|
*/
|
|
136
136
|
type: IBufferType;
|
|
137
|
+
/** The `Manifest` linked to the `PeriodStream` we just cleared. */
|
|
138
|
+
manifest: Manifest;
|
|
137
139
|
/**
|
|
138
140
|
* The `Period` linked to the `PeriodStream` we just removed.
|
|
139
141
|
*
|
|
@@ -187,7 +187,7 @@ export default function StreamOrchestrator(content, playbackObserver, representa
|
|
|
187
187
|
while (periodList.length() > 0) {
|
|
188
188
|
var period = periodList.get(periodList.length() - 1);
|
|
189
189
|
periodList.removeElement(period);
|
|
190
|
-
callbacks.periodStreamCleared({ type: bufferType, period: period });
|
|
190
|
+
callbacks.periodStreamCleared({ type: bufferType, manifest: manifest, period: period });
|
|
191
191
|
}
|
|
192
192
|
currentCanceller.cancel();
|
|
193
193
|
currentCanceller = new TaskCanceller();
|
|
@@ -296,7 +296,7 @@ export default function StreamOrchestrator(content, playbackObserver, representa
|
|
|
296
296
|
while (periodList.length() > 0) {
|
|
297
297
|
period = periodList.get(periodList.length() - 1);
|
|
298
298
|
periodList.removeElement(period);
|
|
299
|
-
callbacks.periodStreamCleared({ type: bufferType, period: period });
|
|
299
|
+
callbacks.periodStreamCleared({ type: bufferType, manifest: manifest, period: period });
|
|
300
300
|
}
|
|
301
301
|
currentCanceller.cancel();
|
|
302
302
|
currentCanceller = new TaskCanceller();
|
|
@@ -404,8 +404,7 @@ export default function StreamOrchestrator(content, playbackObserver, representa
|
|
|
404
404
|
((_b = position.pending) !== null && _b !== void 0 ? _b : position.last) >= basePeriod.end) {
|
|
405
405
|
log.info("Stream: Destroying PeriodStream as the current playhead moved above it", bufferType, basePeriod.start, (_c = position.pending) !== null && _c !== void 0 ? _c : position.last, basePeriod.end);
|
|
406
406
|
stopListeningObservations();
|
|
407
|
-
consecutivePeriodStreamCb.periodStreamCleared({ type: bufferType,
|
|
408
|
-
period: basePeriod });
|
|
407
|
+
consecutivePeriodStreamCb.periodStreamCleared({ type: bufferType, manifest: manifest, period: basePeriod });
|
|
409
408
|
currentStreamCanceller.cancel();
|
|
410
409
|
}
|
|
411
410
|
}, { clearSignal: cancelSignal, includeLastObservation: true });
|
|
@@ -422,7 +421,7 @@ export default function StreamOrchestrator(content, playbackObserver, representa
|
|
|
422
421
|
// current Stream is active, destroy next Stream if created
|
|
423
422
|
log.info("Stream: Destroying next PeriodStream due to current one being active", bufferType, nextStreamInfo.period.start);
|
|
424
423
|
consecutivePeriodStreamCb
|
|
425
|
-
.periodStreamCleared({ type: bufferType, period: nextStreamInfo.period });
|
|
424
|
+
.periodStreamCleared({ type: bufferType, manifest: manifest, period: nextStreamInfo.period });
|
|
426
425
|
nextStreamInfo.canceller.cancel();
|
|
427
426
|
nextStreamInfo = null;
|
|
428
427
|
}
|
|
@@ -446,8 +445,7 @@ export default function StreamOrchestrator(content, playbackObserver, representa
|
|
|
446
445
|
return;
|
|
447
446
|
}
|
|
448
447
|
log.warn("Stream: Creating next `PeriodStream` while one was already created.", bufferType, nextPeriod.id, nextStreamInfo.period.id);
|
|
449
|
-
consecutivePeriodStreamCb.periodStreamCleared({ type: bufferType,
|
|
450
|
-
period: nextStreamInfo.period });
|
|
448
|
+
consecutivePeriodStreamCb.periodStreamCleared({ type: bufferType, manifest: manifest, period: nextStreamInfo.period });
|
|
451
449
|
nextStreamInfo.canceller.cancel();
|
|
452
450
|
}
|
|
453
451
|
var nextStreamCanceller = new TaskCanceller();
|
|
@@ -105,35 +105,35 @@ import getAdaptationSwitchStrategy from "./utils/get_adaptation_switch_strategy"
|
|
|
105
105
|
export default function PeriodStream(_a, callbacks, parentCancelSignal) {
|
|
106
106
|
var _this = this;
|
|
107
107
|
var bufferType = _a.bufferType, content = _a.content, garbageCollectors = _a.garbageCollectors, playbackObserver = _a.playbackObserver, representationEstimator = _a.representationEstimator, segmentFetcherCreator = _a.segmentFetcherCreator, segmentBuffersStore = _a.segmentBuffersStore, options = _a.options, wantedBufferAhead = _a.wantedBufferAhead, maxVideoBufferSize = _a.maxVideoBufferSize;
|
|
108
|
-
var period = content.period;
|
|
108
|
+
var manifest = content.manifest, period = content.period;
|
|
109
109
|
/**
|
|
110
|
-
* Emits the chosen Adaptation for the current type.
|
|
110
|
+
* Emits the chosen Adaptation and Representations for the current type.
|
|
111
111
|
* `null` when no Adaptation is chosen (e.g. no subtitles)
|
|
112
112
|
* `undefined` at the beginning (it can be ignored.).
|
|
113
113
|
*/
|
|
114
114
|
var adaptationRef = new SharedReference(undefined, parentCancelSignal);
|
|
115
|
-
callbacks.periodStreamReady({ type: bufferType, period: period, adaptationRef: adaptationRef });
|
|
115
|
+
callbacks.periodStreamReady({ type: bufferType, manifest: manifest, period: period, adaptationRef: adaptationRef });
|
|
116
116
|
if (parentCancelSignal.isCancelled()) {
|
|
117
117
|
return;
|
|
118
118
|
}
|
|
119
119
|
var currentStreamCanceller;
|
|
120
120
|
var isFirstAdaptationSwitch = true;
|
|
121
|
-
adaptationRef.onUpdate(function (
|
|
121
|
+
adaptationRef.onUpdate(function (choice) {
|
|
122
122
|
// As an IIFE to profit from async/await while respecting onUpdate's signature
|
|
123
123
|
(function () { return __awaiter(_this, void 0, void 0, function () {
|
|
124
|
-
var streamCanceller, segmentBufferStatus, periodEnd, DELTA_POSITION_AFTER_RELOAD, relativePosAfterSwitch, readyState, segmentBuffer, playbackInfos, strategy, _i, _a, _b, start, end;
|
|
124
|
+
var streamCanceller, segmentBufferStatus, periodEnd, DELTA_POSITION_AFTER_RELOAD, relativePosAfterSwitch, adaptation, representations, readyState, segmentBuffer, playbackInfos, strategy, _i, _a, _b, start, end;
|
|
125
125
|
var _c;
|
|
126
126
|
return __generator(this, function (_d) {
|
|
127
127
|
switch (_d.label) {
|
|
128
128
|
case 0:
|
|
129
|
-
if (
|
|
129
|
+
if (choice === undefined) {
|
|
130
130
|
return [2 /*return*/];
|
|
131
131
|
}
|
|
132
132
|
streamCanceller = new TaskCanceller();
|
|
133
133
|
streamCanceller.linkToSignal(parentCancelSignal);
|
|
134
134
|
currentStreamCanceller === null || currentStreamCanceller === void 0 ? void 0 : currentStreamCanceller.cancel(); // Cancel oreviously created stream if one
|
|
135
135
|
currentStreamCanceller = streamCanceller;
|
|
136
|
-
if (!(
|
|
136
|
+
if (!(choice === null)) return [3 /*break*/, 7];
|
|
137
137
|
log.info("Stream: Set no ".concat(bufferType, " Adaptation. P:"), period.start);
|
|
138
138
|
segmentBufferStatus = segmentBuffersStore.getStatus(bufferType);
|
|
139
139
|
if (!(segmentBufferStatus.type === "initialized")) return [3 /*break*/, 5];
|
|
@@ -178,6 +178,7 @@ export default function PeriodStream(_a, callbacks, parentCancelSignal) {
|
|
|
178
178
|
segmentBuffersStore.getStatus(bufferType).type === "disabled") {
|
|
179
179
|
return [2 /*return*/, askForMediaSourceReload(relativePosAfterSwitch, true, streamCanceller.signal)];
|
|
180
180
|
}
|
|
181
|
+
adaptation = choice.adaptation, representations = choice.representations;
|
|
181
182
|
log.info("Stream: Updating ".concat(bufferType, " adaptation"), "A: ".concat(adaptation.id), "P: ".concat(period.start));
|
|
182
183
|
callbacks.adaptationChange({ type: bufferType, adaptation: adaptation, period: period });
|
|
183
184
|
if (streamCanceller.isUsed()) {
|
|
@@ -186,7 +187,7 @@ export default function PeriodStream(_a, callbacks, parentCancelSignal) {
|
|
|
186
187
|
readyState = playbackObserver.getReadyState();
|
|
187
188
|
segmentBuffer = createOrReuseSegmentBuffer(segmentBuffersStore, bufferType, adaptation, options);
|
|
188
189
|
playbackInfos = { currentTime: playbackObserver.getCurrentTime(), readyState: readyState };
|
|
189
|
-
strategy = getAdaptationSwitchStrategy(segmentBuffer, period, adaptation, playbackInfos, options);
|
|
190
|
+
strategy = getAdaptationSwitchStrategy(segmentBuffer, period, adaptation, choice.switchingMode, playbackInfos, options);
|
|
190
191
|
if (strategy.type === "needs-reload") {
|
|
191
192
|
return [2 /*return*/, askForMediaSourceReload(relativePosAfterSwitch, true, streamCanceller.signal)];
|
|
192
193
|
}
|
|
@@ -222,7 +223,7 @@ export default function PeriodStream(_a, callbacks, parentCancelSignal) {
|
|
|
222
223
|
_d.label = 13;
|
|
223
224
|
case 13:
|
|
224
225
|
garbageCollectors.get(segmentBuffer)(streamCanceller.signal);
|
|
225
|
-
createAdaptationStream(adaptation, segmentBuffer, streamCanceller.signal);
|
|
226
|
+
createAdaptationStream(adaptation, representations, segmentBuffer, streamCanceller.signal);
|
|
226
227
|
return [2 /*return*/];
|
|
227
228
|
}
|
|
228
229
|
});
|
|
@@ -236,13 +237,13 @@ export default function PeriodStream(_a, callbacks, parentCancelSignal) {
|
|
|
236
237
|
}, { clearSignal: parentCancelSignal, emitCurrentValue: true });
|
|
237
238
|
/**
|
|
238
239
|
* @param {Object} adaptation
|
|
240
|
+
* @param {Object} representations
|
|
239
241
|
* @param {Object} segmentBuffer
|
|
240
242
|
* @param {Object} cancelSignal
|
|
241
243
|
*/
|
|
242
|
-
function createAdaptationStream(adaptation, segmentBuffer, cancelSignal) {
|
|
243
|
-
var manifest = content.manifest;
|
|
244
|
+
function createAdaptationStream(adaptation, representations, segmentBuffer, cancelSignal) {
|
|
244
245
|
var adaptationPlaybackObserver = createAdaptationStreamPlaybackObserver(playbackObserver, segmentBuffer);
|
|
245
|
-
AdaptationStream({ content: { manifest: manifest, period: period, adaptation: adaptation }, options: options, playbackObserver: adaptationPlaybackObserver, representationEstimator: representationEstimator, segmentBuffer: segmentBuffer, segmentFetcherCreator: segmentFetcherCreator, wantedBufferAhead: wantedBufferAhead, maxVideoBufferSize: maxVideoBufferSize }, __assign(__assign({}, callbacks), { error: onAdaptationStreamError }), cancelSignal);
|
|
246
|
+
AdaptationStream({ content: { manifest: manifest, period: period, adaptation: adaptation, representations: representations }, options: options, playbackObserver: adaptationPlaybackObserver, representationEstimator: representationEstimator, segmentBuffer: segmentBuffer, segmentFetcherCreator: segmentFetcherCreator, wantedBufferAhead: wantedBufferAhead, maxVideoBufferSize: maxVideoBufferSize }, __assign(__assign({}, callbacks), { error: onAdaptationStreamError }), cancelSignal);
|
|
246
247
|
function onAdaptationStreamError(error) {
|
|
247
248
|
// Stream linked to a non-native media buffer should not impact the
|
|
248
249
|
// stability of the player. ie: if a text buffer sends an error, we want
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import Manifest, { Adaptation, Period } from "../../../manifest";
|
|
2
|
-
import { IAudioTrackSwitchingMode } from "../../../public_types";
|
|
3
2
|
import SharedReference, { IReadOnlySharedReference } from "../../../utils/reference";
|
|
4
3
|
import { CancellationSignal } from "../../../utils/task_canceller";
|
|
5
4
|
import WeakMapMemory from "../../../utils/weak_map_memory";
|
|
@@ -7,7 +6,7 @@ import { IRepresentationEstimator } from "../../adaptive";
|
|
|
7
6
|
import { IReadOnlyPlaybackObserver } from "../../api";
|
|
8
7
|
import { SegmentFetcherCreator } from "../../fetchers";
|
|
9
8
|
import SegmentBuffersStore, { IBufferType, ITextTrackSegmentBufferOptions, SegmentBuffer } from "../../segment_buffers";
|
|
10
|
-
import { IAdaptationStreamCallbacks, IAdaptationStreamOptions, IPausedPlaybackObservation } from "../adaptation";
|
|
9
|
+
import { IAdaptationChoice, IAdaptationStreamCallbacks, IAdaptationStreamOptions, IPausedPlaybackObservation } from "../adaptation";
|
|
11
10
|
import { IPositionPlaybackObservation } from "../representation";
|
|
12
11
|
/** Callbacks called by the `AdaptationStream` on various events. */
|
|
13
12
|
export interface IPeriodStreamCallbacks extends IAdaptationStreamCallbacks<unknown> {
|
|
@@ -21,14 +20,6 @@ export interface IPeriodStreamCallbacks extends IAdaptationStreamCallbacks<unkno
|
|
|
21
20
|
* `Adaptation`.
|
|
22
21
|
*/
|
|
23
22
|
adaptationChange(payload: IAdaptationChangePayload): void;
|
|
24
|
-
/**
|
|
25
|
-
* Some situations might require the browser's buffers to be refreshed.
|
|
26
|
-
* This callback is called when such situation arised.
|
|
27
|
-
*
|
|
28
|
-
* Generally flushing/refreshing low-level buffers can be performed simply by
|
|
29
|
-
* performing a very small seek.
|
|
30
|
-
*/
|
|
31
|
-
needsBufferFlush(): void;
|
|
32
23
|
}
|
|
33
24
|
/** Payload for the `adaptationChange` callback. */
|
|
34
25
|
export interface IAdaptationChangePayload {
|
|
@@ -46,6 +37,8 @@ export interface IAdaptationChangePayload {
|
|
|
46
37
|
export interface IPeriodStreamReadyPayload {
|
|
47
38
|
/** The type of buffer linked to the `PeriodStream` we want to create. */
|
|
48
39
|
type: IBufferType;
|
|
40
|
+
/** The `Manifest` linked to the `PeriodStream` we have created. */
|
|
41
|
+
manifest: Manifest;
|
|
49
42
|
/** The `Period` linked to the `PeriodStream` we have created. */
|
|
50
43
|
period: Period;
|
|
51
44
|
/**
|
|
@@ -55,11 +48,11 @@ export interface IPeriodStreamReadyPayload {
|
|
|
55
48
|
* The `PeriodStream` will not do anything until this Reference has emitted
|
|
56
49
|
* at least one to give its initial choice.
|
|
57
50
|
* You can send `null` through it to tell this `PeriodStream` that you don't
|
|
58
|
-
* want any `Adaptation
|
|
51
|
+
* want any `Adaptation` for now.
|
|
59
52
|
* It is set to `undefined` by default, you SHOULD NOT set it to `undefined`
|
|
60
53
|
* yourself.
|
|
61
54
|
*/
|
|
62
|
-
adaptationRef: SharedReference<
|
|
55
|
+
adaptationRef: SharedReference<IAdaptationChoice | null | undefined>;
|
|
63
56
|
}
|
|
64
57
|
/** Playback observation required by the `PeriodStream`. */
|
|
65
58
|
export interface IPeriodStreamPlaybackObservation {
|
|
@@ -100,8 +93,6 @@ export interface IPeriodStreamArguments {
|
|
|
100
93
|
}
|
|
101
94
|
/** Options tweaking the behavior of the PeriodStream. */
|
|
102
95
|
export type IPeriodStreamOptions = IAdaptationStreamOptions & {
|
|
103
|
-
/** RxPlayer's behavior when switching the audio track. */
|
|
104
|
-
audioTrackSwitchingMode: IAudioTrackSwitchingMode;
|
|
105
96
|
/** Behavior when a new video and/or audio codec is encountered. */
|
|
106
97
|
onCodecSwitch: "continue" | "reload";
|
|
107
98
|
/** Options specific to the text SegmentBuffer. */
|
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import { Adaptation, Period } from "../../../../manifest";
|
|
17
|
-
import { IAudioTrackSwitchingMode } from "../../../../public_types";
|
|
18
17
|
import { SegmentBuffer } from "../../../segment_buffers";
|
|
18
|
+
import { ITrackSwitchingMode } from "../../adaptation";
|
|
19
19
|
export type IAdaptationSwitchStrategy =
|
|
20
20
|
/** Do nothing special. */
|
|
21
21
|
{
|
|
@@ -50,8 +50,6 @@ export type IAdaptationSwitchStrategy =
|
|
|
50
50
|
value: undefined;
|
|
51
51
|
};
|
|
52
52
|
export interface IAdaptationSwitchOptions {
|
|
53
|
-
/** RxPlayer's behavior when switching the audio track. */
|
|
54
|
-
audioTrackSwitchingMode: IAudioTrackSwitchingMode;
|
|
55
53
|
/** Behavior when a new video and/or audio codec is encountered. */
|
|
56
54
|
onCodecSwitch: "continue" | "reload";
|
|
57
55
|
}
|
|
@@ -64,7 +62,7 @@ export interface IAdaptationSwitchOptions {
|
|
|
64
62
|
* @param {Object} playbackInfo
|
|
65
63
|
* @returns {Object}
|
|
66
64
|
*/
|
|
67
|
-
export default function getAdaptationSwitchStrategy(segmentBuffer: SegmentBuffer, period: Period, adaptation: Adaptation, playbackInfo: {
|
|
65
|
+
export default function getAdaptationSwitchStrategy(segmentBuffer: SegmentBuffer, period: Period, adaptation: Adaptation, switchingMode: ITrackSwitchingMode, playbackInfo: {
|
|
68
66
|
currentTime: number;
|
|
69
67
|
readyState: number;
|
|
70
68
|
}, options: IAdaptationSwitchOptions): IAdaptationSwitchStrategy;
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
import config from "../../../../config";
|
|
17
17
|
import areCodecsCompatible from "../../../../utils/are_codecs_compatible";
|
|
18
18
|
import { convertToRanges, excludeFromRanges, isTimeInRange, isTimeInRanges, keepRangeIntersection, } from "../../../../utils/ranges";
|
|
19
|
+
import { getFirstSegmentAfterPeriod, getLastSegmentBeforePeriod, } from "../../../segment_buffers";
|
|
19
20
|
/**
|
|
20
21
|
* Find out what to do when switching Adaptation, based on the current
|
|
21
22
|
* situation.
|
|
@@ -25,7 +26,7 @@ import { convertToRanges, excludeFromRanges, isTimeInRange, isTimeInRanges, keep
|
|
|
25
26
|
* @param {Object} playbackInfo
|
|
26
27
|
* @returns {Object}
|
|
27
28
|
*/
|
|
28
|
-
export default function getAdaptationSwitchStrategy(segmentBuffer, period, adaptation, playbackInfo, options) {
|
|
29
|
+
export default function getAdaptationSwitchStrategy(segmentBuffer, period, adaptation, switchingMode, playbackInfo, options) {
|
|
29
30
|
if (segmentBuffer.codec !== undefined &&
|
|
30
31
|
options.onCodecSwitch === "reload" &&
|
|
31
32
|
!hasCompatibleCodec(adaptation, segmentBuffer.codec)) {
|
|
@@ -62,10 +63,7 @@ export default function getAdaptationSwitchStrategy(segmentBuffer, period, adapt
|
|
|
62
63
|
return { type: "continue", value: undefined };
|
|
63
64
|
}
|
|
64
65
|
var currentTime = playbackInfo.currentTime;
|
|
65
|
-
|
|
66
|
-
var hasReloadSwitchingMode = adaptation.type === "video" ||
|
|
67
|
-
(adaptation.type === "audio" && audioTrackSwitchingMode === "reload");
|
|
68
|
-
if (hasReloadSwitchingMode &&
|
|
66
|
+
if (switchingMode === "reload" &&
|
|
69
67
|
// We're playing the current Period
|
|
70
68
|
isTimeInRange({ start: start, end: end }, currentTime) &&
|
|
71
69
|
// There is data for the current position or the codecs are differents
|
|
@@ -76,8 +74,7 @@ export default function getAdaptationSwitchStrategy(segmentBuffer, period, adapt
|
|
|
76
74
|
return { type: "needs-reload", value: undefined };
|
|
77
75
|
}
|
|
78
76
|
// From here, clean-up data from the previous Adaptation, if one
|
|
79
|
-
var
|
|
80
|
-
audioTrackSwitchingMode === "direct";
|
|
77
|
+
var shouldCleanAll = switchingMode === "direct";
|
|
81
78
|
var rangesToExclude = [];
|
|
82
79
|
// First, we don't want to accidentally remove some segments from the previous
|
|
83
80
|
// Period (which overlap a little with this one)
|
|
@@ -94,17 +91,17 @@ export default function getAdaptationSwitchStrategy(segmentBuffer, period, adapt
|
|
|
94
91
|
}
|
|
95
92
|
// Next, exclude data around current position to avoid decoding issues
|
|
96
93
|
var bufferType = adaptation.type;
|
|
97
|
-
var
|
|
94
|
+
var ADAP_REP_SWITCH_BUFFER_PADDINGS = config.getCurrent().ADAP_REP_SWITCH_BUFFER_PADDINGS;
|
|
98
95
|
/** Ranges that won't be cleaned from the current buffer. */
|
|
99
|
-
var paddingBefore =
|
|
96
|
+
var paddingBefore = ADAP_REP_SWITCH_BUFFER_PADDINGS[bufferType].before;
|
|
100
97
|
if (paddingBefore == null) {
|
|
101
98
|
paddingBefore = 0;
|
|
102
99
|
}
|
|
103
|
-
var paddingAfter =
|
|
100
|
+
var paddingAfter = ADAP_REP_SWITCH_BUFFER_PADDINGS[bufferType].after;
|
|
104
101
|
if (paddingAfter == null) {
|
|
105
102
|
paddingAfter = 0;
|
|
106
103
|
}
|
|
107
|
-
if (!
|
|
104
|
+
if (!shouldCleanAll) {
|
|
108
105
|
rangesToExclude.push({ start: currentTime - paddingBefore,
|
|
109
106
|
end: currentTime + paddingAfter });
|
|
110
107
|
}
|
|
@@ -125,7 +122,8 @@ export default function getAdaptationSwitchStrategy(segmentBuffer, period, adapt
|
|
|
125
122
|
if (toRemove.length === 0) {
|
|
126
123
|
return { type: "continue", value: undefined };
|
|
127
124
|
}
|
|
128
|
-
return
|
|
125
|
+
return shouldCleanAll && adaptation.type !== "text" ?
|
|
126
|
+
{ type: "flush-buffer", value: toRemove } :
|
|
129
127
|
{ type: "clean-buffer", value: toRemove };
|
|
130
128
|
}
|
|
131
129
|
/**
|
|
@@ -162,37 +160,3 @@ function getBufferedRangesFromAdaptation(inventory, period, adaptation) {
|
|
|
162
160
|
return acc;
|
|
163
161
|
}, []);
|
|
164
162
|
}
|
|
165
|
-
/**
|
|
166
|
-
* Returns the last segment in the `inventory` which is linked to a Period
|
|
167
|
-
* before `period`.
|
|
168
|
-
* @param {Array.<Object>} inventory
|
|
169
|
-
* @param {Object} period
|
|
170
|
-
* @returns {Object|null}
|
|
171
|
-
*/
|
|
172
|
-
function getLastSegmentBeforePeriod(inventory, period) {
|
|
173
|
-
for (var i = 0; i < inventory.length; i++) {
|
|
174
|
-
if (inventory[i].infos.period.start >= period.start) {
|
|
175
|
-
if (i > 0) {
|
|
176
|
-
return inventory[i - 1];
|
|
177
|
-
}
|
|
178
|
-
return null;
|
|
179
|
-
}
|
|
180
|
-
}
|
|
181
|
-
return inventory.length > 0 ? inventory[inventory.length - 1] :
|
|
182
|
-
null;
|
|
183
|
-
}
|
|
184
|
-
/**
|
|
185
|
-
* Returns the first segment in the `inventory` which is linked to a Period
|
|
186
|
-
* after `period`.
|
|
187
|
-
* @param {Array.<Object>} inventory
|
|
188
|
-
* @param {Object} period
|
|
189
|
-
* @returns {Object|null}
|
|
190
|
-
*/
|
|
191
|
-
function getFirstSegmentAfterPeriod(inventory, period) {
|
|
192
|
-
for (var i = 0; i < inventory.length; i++) {
|
|
193
|
-
if (inventory[i].infos.period.start > period.start) {
|
|
194
|
-
return inventory[i];
|
|
195
|
-
}
|
|
196
|
-
}
|
|
197
|
-
return null;
|
|
198
|
-
}
|
|
@@ -283,20 +283,33 @@ export default function RepresentationStream(_a, callbacks, parentCancelSignal)
|
|
|
283
283
|
// is not running anymore.
|
|
284
284
|
return;
|
|
285
285
|
}
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
//
|
|
290
|
-
//
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
286
|
+
// Supplementary encryption information might have been parsed.
|
|
287
|
+
for (var _i = 0, _a = evt.protectionData; _i < _a.length; _i++) {
|
|
288
|
+
var protInfo = _a[_i];
|
|
289
|
+
// TODO better handle use cases like key rotation by not always grouping
|
|
290
|
+
// every protection data together? To check.
|
|
291
|
+
representation.addProtectionData(protInfo.initDataType, protInfo.keyId, protInfo.initData);
|
|
292
|
+
}
|
|
293
|
+
// Now that the initialization segment has been parsed - which may have
|
|
294
|
+
// included encryption information - take care of the encryption event
|
|
295
|
+
// if not already done.
|
|
296
|
+
if (!hasSentEncryptionData) {
|
|
297
|
+
var allEncryptionData = representation.getAllEncryptionData();
|
|
298
|
+
if (allEncryptionData.length > 0) {
|
|
299
|
+
callbacks.encryptionDataEncountered(allEncryptionData.map(function (p) { return objectAssign({ content: content }, p); }));
|
|
300
|
+
hasSentEncryptionData = true;
|
|
301
|
+
// previous callback could have lead to cancellation
|
|
302
|
+
if (globalCanceller.isUsed()) {
|
|
303
|
+
return;
|
|
298
304
|
}
|
|
299
305
|
}
|
|
306
|
+
}
|
|
307
|
+
if (evt.segmentType === "init") {
|
|
308
|
+
if (!representation.index.isInitialized() &&
|
|
309
|
+
evt.segmentList !== undefined) {
|
|
310
|
+
representation.index.initialize(evt.segmentList);
|
|
311
|
+
}
|
|
312
|
+
initSegmentState.isLoaded = true;
|
|
300
313
|
if (evt.initializationData !== null) {
|
|
301
314
|
var initSegmentUniqueId = representation.uniqueId;
|
|
302
315
|
initSegmentState.uniqueId = initSegmentUniqueId;
|
|
@@ -313,19 +326,12 @@ export default function RepresentationStream(_a, callbacks, parentCancelSignal)
|
|
|
313
326
|
// Sometimes the segment list is only known once the initialization segment
|
|
314
327
|
// is parsed. Thus we immediately re-check if there's new segments to load.
|
|
315
328
|
checkStatus();
|
|
329
|
+
return;
|
|
316
330
|
}
|
|
317
331
|
else {
|
|
318
|
-
var inbandEvents = evt.inbandEvents,
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
if (!hasSentEncryptionData && protectionDataUpdate) {
|
|
322
|
-
var allEncryptionData = representation.getAllEncryptionData();
|
|
323
|
-
if (allEncryptionData.length > 0) {
|
|
324
|
-
callbacks.encryptionDataEncountered(allEncryptionData.map(function (p) { return objectAssign({ content: content }, p); }));
|
|
325
|
-
if (globalCanceller.isUsed()) {
|
|
326
|
-
return; // previous callback has stopped everything by side-effect
|
|
327
|
-
}
|
|
328
|
-
}
|
|
332
|
+
var inbandEvents = evt.inbandEvents, predictedSegments = evt.predictedSegments, needsManifestRefresh = evt.needsManifestRefresh;
|
|
333
|
+
if (predictedSegments !== undefined) {
|
|
334
|
+
representation.index.addPredictedSegments(predictedSegments, evt.segment);
|
|
329
335
|
}
|
|
330
336
|
if (needsManifestRefresh === true) {
|
|
331
337
|
callbacks.needsManifestRefresh();
|