rx-player 3.26.1 → 3.26.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/workflows/checks.yml +99 -0
- package/.github/workflows/sonarcloud_analysis.yml +20 -0
- package/CHANGELOG.md +99 -71
- package/README.md +19 -18
- package/VERSION +1 -1
- package/dist/_esm5.processed/compat/clear_element_src.js +8 -6
- package/dist/_esm5.processed/compat/eme/close_session.js +1 -2
- package/dist/_esm5.processed/compat/eme/custom_media_keys/ie11_media_keys.js +1 -2
- package/dist/_esm5.processed/compat/eme/custom_media_keys/index.d.ts +3 -1
- package/dist/_esm5.processed/compat/eme/custom_media_keys/old_webkit_media_keys.js +6 -4
- package/dist/_esm5.processed/compat/eme/custom_media_keys/webkit_media_keys.js +1 -2
- package/dist/_esm5.processed/compat/eme/generate_key_request.js +1 -2
- package/dist/_esm5.processed/compat/eme/load_session.js +2 -3
- package/dist/_esm5.processed/compat/event_listeners.d.ts +3 -2
- package/dist/_esm5.processed/compat/event_listeners.js +8 -14
- package/dist/_esm5.processed/compat/make_vtt_cue.js +1 -1
- package/dist/_esm5.processed/compat/on_height_width_change.js +1 -2
- package/dist/_esm5.processed/compat/set_element_src.js +1 -1
- package/dist/_esm5.processed/compat/when_loaded_metadata.js +1 -2
- package/dist/_esm5.processed/compat/when_media_source_open.js +1 -2
- package/dist/_esm5.processed/config.d.ts +3 -8
- package/dist/_esm5.processed/config.js +4 -9
- package/dist/_esm5.processed/core/abr/abr_manager.d.ts +11 -10
- package/dist/_esm5.processed/core/abr/abr_manager.js +47 -8
- package/dist/_esm5.processed/core/abr/bandwidth_estimator.js +1 -1
- package/dist/_esm5.processed/core/abr/buffer_based_chooser.d.ts +2 -2
- package/dist/_esm5.processed/core/abr/buffer_based_chooser.js +3 -3
- package/dist/_esm5.processed/core/abr/get_buffer_levels.js +3 -0
- package/dist/_esm5.processed/core/abr/get_estimate_from_buffer_levels.d.ts +3 -3
- package/dist/_esm5.processed/core/abr/get_estimate_from_buffer_levels.js +3 -3
- package/dist/_esm5.processed/core/abr/guess_based_chooser.d.ts +95 -0
- package/dist/_esm5.processed/core/abr/guess_based_chooser.js +242 -0
- package/dist/_esm5.processed/core/abr/index.d.ts +3 -3
- package/dist/_esm5.processed/core/abr/last_estimate_storage.d.ts +61 -0
- package/dist/_esm5.processed/core/abr/last_estimate_storage.js +37 -0
- package/dist/_esm5.processed/core/abr/network_analyzer.d.ts +25 -7
- package/dist/_esm5.processed/core/abr/network_analyzer.js +68 -31
- package/dist/_esm5.processed/core/abr/pending_requests_store.d.ts +56 -28
- package/dist/_esm5.processed/core/abr/pending_requests_store.js +9 -7
- package/dist/_esm5.processed/core/abr/representation_estimator.d.ts +34 -51
- package/dist/_esm5.processed/core/abr/representation_estimator.js +111 -52
- package/dist/_esm5.processed/core/abr/representation_score_calculator.d.ts +5 -8
- package/dist/_esm5.processed/core/abr/representation_score_calculator.js +20 -23
- package/dist/_esm5.processed/core/abr/{ewma.d.ts → utils/ewma.d.ts} +0 -0
- package/dist/_esm5.processed/core/abr/{ewma.js → utils/ewma.js} +0 -0
- package/dist/_esm5.processed/core/abr/{filter_by_bitrate.d.ts → utils/filter_by_bitrate.d.ts} +1 -1
- package/dist/_esm5.processed/core/abr/{filter_by_bitrate.js → utils/filter_by_bitrate.js} +1 -1
- package/dist/_esm5.processed/core/abr/{filter_by_width.d.ts → utils/filter_by_width.d.ts} +1 -1
- package/dist/_esm5.processed/core/abr/{filter_by_width.js → utils/filter_by_width.js} +2 -2
- package/dist/_esm5.processed/core/abr/{select_optimal_representation.d.ts → utils/select_optimal_representation.d.ts} +1 -1
- package/dist/_esm5.processed/core/abr/{select_optimal_representation.js → utils/select_optimal_representation.js} +1 -1
- package/dist/_esm5.processed/core/api/emit_seek_events.d.ts +4 -4
- package/dist/_esm5.processed/core/api/emit_seek_events.js +12 -10
- package/dist/_esm5.processed/core/api/index.d.ts +3 -1
- package/dist/_esm5.processed/core/api/index.js +2 -0
- package/dist/_esm5.processed/core/api/option_utils.js +4 -4
- package/dist/_esm5.processed/core/api/playback_observer.d.ts +280 -0
- package/dist/_esm5.processed/core/api/playback_observer.js +461 -0
- package/dist/_esm5.processed/core/api/public_api.d.ts +8 -7
- package/dist/_esm5.processed/core/api/public_api.js +98 -94
- package/dist/_esm5.processed/core/api/track_choice_manager.js +3 -3
- package/dist/_esm5.processed/core/eme/__tests__/__global__/utils.js +1 -0
- package/dist/_esm5.processed/core/eme/attach_media_keys.js +1 -2
- package/dist/_esm5.processed/core/eme/check_key_statuses.js +4 -5
- package/dist/_esm5.processed/core/eme/clean_old_loaded_sessions.js +1 -2
- package/dist/_esm5.processed/core/eme/clear_eme_session.js +6 -2
- package/dist/_esm5.processed/core/eme/create_session.js +1 -2
- package/dist/_esm5.processed/core/eme/dispose_media_keys.js +2 -3
- package/dist/_esm5.processed/core/eme/eme_manager.js +4 -5
- package/dist/_esm5.processed/core/eme/find_key_system.js +4 -5
- package/dist/_esm5.processed/core/eme/get_media_keys.js +2 -3
- package/dist/_esm5.processed/core/eme/get_session.js +1 -2
- package/dist/_esm5.processed/core/eme/init_media_keys.js +5 -5
- package/dist/_esm5.processed/core/eme/session_events_listener.js +6 -7
- package/dist/_esm5.processed/core/eme/set_server_certificate.js +8 -3
- package/dist/_esm5.processed/core/eme/types.d.ts +12 -4
- package/dist/_esm5.processed/core/eme/utils/close_session.js +2 -3
- package/dist/_esm5.processed/core/eme/utils/is_session_usable.js +1 -1
- package/dist/_esm5.processed/core/eme/utils/loaded_sessions_store.js +3 -4
- package/dist/_esm5.processed/core/eme/utils/persistent_sessions_store.js +3 -3
- package/dist/_esm5.processed/core/fetchers/index.d.ts +2 -2
- package/dist/_esm5.processed/core/fetchers/manifest/manifest_fetcher.js +2 -2
- package/dist/_esm5.processed/core/fetchers/segment/index.d.ts +2 -2
- package/dist/_esm5.processed/core/fetchers/segment/prioritized_segment_fetcher.d.ts +12 -29
- package/dist/_esm5.processed/core/fetchers/segment/prioritized_segment_fetcher.js +3 -7
- package/dist/_esm5.processed/core/fetchers/segment/prioritizer.d.ts +53 -53
- package/dist/_esm5.processed/core/fetchers/segment/segment_fetcher.d.ts +42 -11
- package/dist/_esm5.processed/core/fetchers/segment/segment_fetcher.js +118 -46
- package/dist/_esm5.processed/core/fetchers/segment/segment_fetcher_creator.d.ts +21 -20
- package/dist/_esm5.processed/core/fetchers/segment/segment_fetcher_creator.js +9 -8
- package/dist/_esm5.processed/core/init/create_eme_manager.js +1 -2
- package/dist/_esm5.processed/core/init/create_media_source.js +3 -4
- package/dist/_esm5.processed/core/init/create_stream_playback_observer.d.ts +39 -0
- package/dist/_esm5.processed/core/init/create_stream_playback_observer.js +50 -0
- package/dist/_esm5.processed/core/init/duration_updater.js +16 -7
- package/dist/_esm5.processed/core/init/emit_loaded_event.d.ts +4 -3
- package/dist/_esm5.processed/core/init/emit_loaded_event.js +8 -8
- package/dist/_esm5.processed/core/init/end_of_stream.js +1 -2
- package/dist/_esm5.processed/core/init/get_initial_time.js +2 -3
- package/dist/_esm5.processed/core/init/initial_seek_and_play.d.ts +32 -31
- package/dist/_esm5.processed/core/init/initial_seek_and_play.js +25 -32
- package/dist/_esm5.processed/core/init/initialize_directfile.d.ts +6 -5
- package/dist/_esm5.processed/core/init/initialize_directfile.js +16 -12
- package/dist/_esm5.processed/core/init/initialize_media_source.d.ts +10 -10
- package/dist/_esm5.processed/core/init/initialize_media_source.js +18 -12
- package/dist/_esm5.processed/core/init/load_on_media_source.d.ts +8 -11
- package/dist/_esm5.processed/core/init/load_on_media_source.js +16 -19
- package/dist/_esm5.processed/core/init/manifest_update_scheduler.js +8 -7
- package/dist/_esm5.processed/core/init/stall_avoider.d.ts +4 -6
- package/dist/_esm5.processed/core/init/stall_avoider.js +56 -42
- package/dist/_esm5.processed/core/init/stream_events_emitter/stream_events_emitter.d.ts +2 -2
- package/dist/_esm5.processed/core/init/stream_events_emitter/stream_events_emitter.js +20 -15
- package/dist/_esm5.processed/core/init/throw_on_media_error.js +1 -2
- package/dist/_esm5.processed/core/init/types.d.ts +0 -20
- package/dist/_esm5.processed/core/init/update_playback_rate.d.ts +5 -4
- package/dist/_esm5.processed/core/init/update_playback_rate.js +10 -11
- package/dist/_esm5.processed/core/segment_buffers/garbage_collector.d.ts +4 -4
- package/dist/_esm5.processed/core/segment_buffers/garbage_collector.js +12 -7
- package/dist/_esm5.processed/core/segment_buffers/implementations/audio_video/audio_video_segment_buffer.js +8 -7
- package/dist/_esm5.processed/core/segment_buffers/implementations/text/html/html_text_segment_buffer.js +9 -10
- package/dist/_esm5.processed/core/segment_buffers/implementations/text/html/text_track_cues_store.js +1 -1
- package/dist/_esm5.processed/core/segment_buffers/implementations/text/native/native_text_segment_buffer.js +4 -4
- package/dist/_esm5.processed/core/segment_buffers/implementations/utils/manual_time_ranges.js +2 -2
- package/dist/_esm5.processed/core/segment_buffers/inventory/buffered_history.js +2 -2
- package/dist/_esm5.processed/core/segment_buffers/inventory/segment_inventory.d.ts +1 -12
- package/dist/_esm5.processed/core/segment_buffers/inventory/segment_inventory.js +10 -10
- package/dist/_esm5.processed/core/segment_buffers/segment_buffers_store.js +1 -1
- package/dist/_esm5.processed/core/stream/adaptation/adaptation_stream.d.ts +15 -13
- package/dist/_esm5.processed/core/stream/adaptation/adaptation_stream.js +36 -23
- package/dist/_esm5.processed/core/stream/adaptation/create_representation_estimator.d.ts +9 -17
- package/dist/_esm5.processed/core/stream/adaptation/create_representation_estimator.js +11 -20
- package/dist/_esm5.processed/core/stream/adaptation/index.d.ts +2 -2
- package/dist/_esm5.processed/core/stream/index.d.ts +2 -2
- package/dist/_esm5.processed/core/stream/orchestrator/active_period_emitter.js +5 -6
- package/dist/_esm5.processed/core/stream/orchestrator/are_streams_complete.js +1 -2
- package/dist/_esm5.processed/core/stream/orchestrator/index.d.ts +2 -2
- package/dist/_esm5.processed/core/stream/orchestrator/stream_orchestrator.d.ts +10 -8
- package/dist/_esm5.processed/core/stream/orchestrator/stream_orchestrator.js +22 -21
- package/dist/_esm5.processed/core/stream/period/create_empty_adaptation_stream.d.ts +6 -4
- package/dist/_esm5.processed/core/stream/period/create_empty_adaptation_stream.js +11 -10
- package/dist/_esm5.processed/core/stream/period/index.d.ts +2 -2
- package/dist/_esm5.processed/core/stream/period/period_stream.d.ts +23 -7
- package/dist/_esm5.processed/core/stream/period/period_stream.js +38 -24
- package/dist/_esm5.processed/core/stream/reload_after_switch.d.ts +5 -4
- package/dist/_esm5.processed/core/stream/reload_after_switch.js +8 -7
- package/dist/_esm5.processed/core/stream/representation/append_segment_to_buffer.d.ts +4 -2
- package/dist/_esm5.processed/core/stream/representation/append_segment_to_buffer.js +10 -8
- package/dist/_esm5.processed/core/stream/representation/downloading_queue.d.ts +9 -9
- package/dist/_esm5.processed/core/stream/representation/downloading_queue.js +10 -12
- package/dist/_esm5.processed/core/stream/representation/force_garbage_collection.d.ts +1 -3
- package/dist/_esm5.processed/core/stream/representation/force_garbage_collection.js +6 -8
- package/dist/_esm5.processed/core/stream/representation/get_buffer_status.d.ts +3 -7
- package/dist/_esm5.processed/core/stream/representation/get_buffer_status.js +7 -8
- package/dist/_esm5.processed/core/stream/representation/get_needed_segments.js +1 -1
- package/dist/_esm5.processed/core/stream/representation/get_segment_priority.d.ts +6 -9
- package/dist/_esm5.processed/core/stream/representation/get_segment_priority.js +7 -8
- package/dist/_esm5.processed/core/stream/representation/index.d.ts +2 -2
- package/dist/_esm5.processed/core/stream/representation/push_init_segment.d.ts +4 -2
- package/dist/_esm5.processed/core/stream/representation/push_init_segment.js +3 -5
- package/dist/_esm5.processed/core/stream/representation/push_media_segment.d.ts +6 -4
- package/dist/_esm5.processed/core/stream/representation/push_media_segment.js +3 -5
- package/dist/_esm5.processed/core/stream/representation/representation_stream.d.ts +9 -12
- package/dist/_esm5.processed/core/stream/representation/representation_stream.js +30 -21
- package/dist/_esm5.processed/errors/error_message.js +1 -1
- package/dist/_esm5.processed/experimental/tools/VideoThumbnailLoader/create_request.d.ts +5 -3
- package/dist/_esm5.processed/experimental/tools/VideoThumbnailLoader/create_request.js +21 -8
- package/dist/_esm5.processed/experimental/tools/VideoThumbnailLoader/get_initialized_source_buffer.js +2 -3
- package/dist/_esm5.processed/experimental/tools/VideoThumbnailLoader/load_segments.d.ts +2 -2
- package/dist/_esm5.processed/experimental/tools/VideoThumbnailLoader/load_segments.js +4 -0
- package/dist/_esm5.processed/experimental/tools/VideoThumbnailLoader/prepare_source_buffer.js +1 -1
- package/dist/_esm5.processed/experimental/tools/VideoThumbnailLoader/push_data.d.ts +2 -2
- package/dist/_esm5.processed/experimental/tools/VideoThumbnailLoader/thumbnail_loader.js +17 -6
- package/dist/_esm5.processed/experimental/tools/createMetaplaylist/get_duration_from_manifest.js +1 -2
- package/dist/_esm5.processed/experimental/tools/createMetaplaylist/index.js +1 -2
- package/dist/_esm5.processed/experimental/tools/mediaCapabilitiesProber/probers/mediaDisplayInfos.js +1 -1
- package/dist/_esm5.processed/features/initialize_features.js +47 -44
- package/dist/_esm5.processed/index.js +2 -2
- package/dist/_esm5.processed/manifest/index.d.ts +2 -2
- package/dist/_esm5.processed/manifest/index.js +2 -2
- package/dist/_esm5.processed/manifest/representation.js +1 -1
- package/dist/_esm5.processed/manifest/representation_index/static.js +1 -0
- package/dist/_esm5.processed/manifest/representation_index/types.d.ts +24 -3
- package/dist/_esm5.processed/manifest/update_period_in_place.js +1 -1
- package/dist/_esm5.processed/manifest/{are_same_content.d.ts → utils.d.ts} +9 -7
- package/dist/_esm5.processed/manifest/{are_same_content.js → utils.js} +18 -1
- package/dist/_esm5.processed/minimal.js +2 -2
- package/dist/_esm5.processed/parsers/containers/isobmff/get_box.d.ts +18 -9
- package/dist/_esm5.processed/parsers/containers/isobmff/get_box.js +32 -9
- package/dist/_esm5.processed/parsers/containers/isobmff/read.d.ts +18 -5
- package/dist/_esm5.processed/parsers/containers/isobmff/read.js +28 -6
- package/dist/_esm5.processed/parsers/containers/isobmff/utils.js +52 -47
- package/dist/_esm5.processed/parsers/images/bif.js +1 -1
- package/dist/_esm5.processed/parsers/manifest/dash/common/flatten_overlapping_periods.js +2 -2
- package/dist/_esm5.processed/parsers/manifest/dash/common/get_http_utc-timing_url.js +2 -2
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/base.d.ts +2 -1
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/base.js +3 -2
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/get_init_segment.js +2 -1
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/get_segments_from_timeline.d.ts +1 -0
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/get_segments_from_timeline.js +7 -9
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/list.d.ts +2 -1
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/list.js +4 -2
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/template.d.ts +2 -1
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/template.js +11 -5
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/timeline/convert_element_to_index_segment.js +10 -9
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/timeline/parse_s_element.js +3 -3
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/timeline/timeline_representation_index.d.ts +6 -1
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/timeline/timeline_representation_index.js +5 -4
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/tokens.d.ts +1 -1
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/tokens.js +4 -4
- package/dist/_esm5.processed/parsers/manifest/dash/common/parse_adaptation_sets.d.ts +3 -1
- package/dist/_esm5.processed/parsers/manifest/dash/common/parse_adaptation_sets.js +19 -18
- package/dist/_esm5.processed/parsers/manifest/dash/common/parse_mpd.d.ts +2 -1
- package/dist/_esm5.processed/parsers/manifest/dash/common/parse_mpd.js +14 -8
- package/dist/_esm5.processed/parsers/manifest/dash/common/parse_periods.d.ts +2 -2
- package/dist/_esm5.processed/parsers/manifest/dash/common/parse_periods.js +7 -8
- package/dist/_esm5.processed/parsers/manifest/dash/common/parse_representation_index.d.ts +3 -1
- package/dist/_esm5.processed/parsers/manifest/dash/common/parse_representation_index.js +5 -10
- package/dist/_esm5.processed/parsers/manifest/dash/common/parse_representations.d.ts +3 -1
- package/dist/_esm5.processed/parsers/manifest/dash/common/parse_representations.js +17 -8
- package/dist/_esm5.processed/parsers/manifest/dash/common/resolve_base_urls.d.ts +7 -2
- package/dist/_esm5.processed/parsers/manifest/dash/common/resolve_base_urls.js +22 -21
- package/dist/_esm5.processed/parsers/manifest/dash/js-parser/node_parsers/AdaptationSet.js +10 -0
- package/dist/_esm5.processed/parsers/manifest/dash/js-parser/node_parsers/BaseURL.js +9 -9
- package/dist/_esm5.processed/parsers/manifest/dash/js-parser/node_parsers/Representation.js +24 -0
- package/dist/_esm5.processed/parsers/manifest/dash/js-parser/node_parsers/SegmentTemplate.js +7 -5
- package/dist/_esm5.processed/parsers/manifest/dash/js-parser/node_parsers/utils.js +12 -9
- package/dist/_esm5.processed/parsers/manifest/dash/js-parser/parse_from_document.js +5 -2
- package/dist/_esm5.processed/parsers/manifest/dash/node_parser_types.d.ts +8 -0
- package/dist/_esm5.processed/parsers/manifest/dash/parsers_types.d.ts +11 -2
- package/dist/_esm5.processed/parsers/manifest/dash/wasm-parser/ts/dash-wasm-parser.js +7 -4
- package/dist/_esm5.processed/parsers/manifest/dash/wasm-parser/ts/generators/AdaptationSet.js +11 -0
- package/dist/_esm5.processed/parsers/manifest/dash/wasm-parser/ts/generators/BaseURL.js +7 -1
- package/dist/_esm5.processed/parsers/manifest/dash/wasm-parser/ts/generators/EventStream.js +5 -0
- package/dist/_esm5.processed/parsers/manifest/dash/wasm-parser/ts/generators/MPD.js +5 -0
- package/dist/_esm5.processed/parsers/manifest/dash/wasm-parser/ts/generators/Period.js +13 -0
- package/dist/_esm5.processed/parsers/manifest/dash/wasm-parser/ts/generators/Representation.js +23 -0
- package/dist/_esm5.processed/parsers/manifest/dash/wasm-parser/ts/generators/SegmentList.js +5 -0
- package/dist/_esm5.processed/parsers/manifest/dash/wasm-parser/ts/generators/XLink.js +6 -0
- package/dist/_esm5.processed/parsers/manifest/dash/wasm-parser/ts/generators/root.js +6 -0
- package/dist/_esm5.processed/parsers/manifest/local/parse_local_manifest.js +1 -1
- package/dist/_esm5.processed/parsers/manifest/local/representation_index.js +4 -2
- package/dist/_esm5.processed/parsers/manifest/smooth/create_parser.js +1 -1
- package/dist/_esm5.processed/parsers/manifest/smooth/get_codecs.js +1 -1
- package/dist/_esm5.processed/parsers/manifest/smooth/representation_index.js +3 -1
- package/dist/_esm5.processed/parsers/manifest/utils/check_manifest_ids.js +1 -1
- package/dist/_esm5.processed/parsers/manifest/utils/clear_timeline_from_position.js +1 -1
- package/dist/_esm5.processed/parsers/manifest/utils/index_helpers.d.ts +11 -3
- package/dist/_esm5.processed/parsers/manifest/utils/index_helpers.js +5 -5
- package/dist/_esm5.processed/parsers/manifest/utils/is_segment_still_available.js +3 -6
- package/dist/_esm5.processed/parsers/texttracks/sami/html.js +2 -2
- package/dist/_esm5.processed/parsers/texttracks/sami/native.js +2 -2
- package/dist/_esm5.processed/parsers/texttracks/ttml/html/apply_font_size.js +13 -1
- package/dist/_esm5.processed/parsers/texttracks/ttml/html/generate_css_test_outline.js +4 -4
- package/dist/_esm5.processed/parsers/texttracks/webvtt/html/create_default_style_elements.js +2 -2
- package/dist/_esm5.processed/parsers/texttracks/webvtt/html/create_style_attribute.js +5 -5
- package/dist/_esm5.processed/transports/dash/image_pipelines.d.ts +2 -2
- package/dist/_esm5.processed/transports/dash/init_segment_loader.js +1 -1
- package/dist/_esm5.processed/transports/dash/manifest_parser.js +89 -20
- package/dist/_esm5.processed/transports/dash/segment_loader.js +1 -1
- package/dist/_esm5.processed/transports/local/segment_loader.js +2 -2
- package/dist/_esm5.processed/transports/local/segment_parser.d.ts +2 -2
- package/dist/_esm5.processed/transports/local/text_parser.d.ts +2 -2
- package/dist/_esm5.processed/transports/metaplaylist/pipelines.js +1 -1
- package/dist/_esm5.processed/transports/smooth/extract_timings_infos.js +1 -1
- package/dist/_esm5.processed/transports/smooth/pipelines.js +2 -2
- package/dist/_esm5.processed/transports/smooth/segment_loader.js +3 -3
- package/dist/_esm5.processed/transports/types.d.ts +29 -15
- package/dist/_esm5.processed/transports/utils/byte_range.js +2 -2
- package/dist/_esm5.processed/transports/utils/call_custom_manifest_loader.js +1 -1
- package/dist/_esm5.processed/transports/utils/get_isobmff_timing_infos.js +6 -1
- package/dist/_esm5.processed/transports/utils/parse_text_track.js +6 -4
- package/dist/_esm5.processed/utils/assert.js +3 -3
- package/dist/_esm5.processed/utils/concat_map_latest.js +1 -2
- package/dist/_esm5.processed/utils/defer_subscriptions.js +1 -2
- package/dist/_esm5.processed/utils/filter_map.js +1 -2
- package/dist/_esm5.processed/utils/reference.d.ts +108 -0
- package/dist/_esm5.processed/utils/reference.js +137 -0
- package/dist/_esm5.processed/utils/request/fetch.d.ts +1 -1
- package/dist/_esm5.processed/utils/request/fetch.js +3 -3
- package/dist/_esm5.processed/utils/request/xhr.d.ts +1 -1
- package/dist/_esm5.processed/utils/request/xhr.js +1 -1
- package/dist/_esm5.processed/utils/rx-retry_with_backoff.js +1 -2
- package/dist/mpd-parser.wasm +0 -0
- package/dist/rx-player.d.ts +1 -15
- package/dist/rx-player.js +3666 -2470
- package/dist/rx-player.min.d.ts +1 -15
- package/dist/rx-player.min.js +1 -1
- package/jest.config.js +28 -1
- package/package.json +43 -43
- package/scripts/build/constants.d.ts +50 -0
- package/scripts/build/generate_build.js +1 -189
- package/scripts/doc-generator/construct_table_of_contents.js +31 -24
- package/scripts/doc-generator/convert_MD_to_HMTL.js +4 -8
- package/scripts/doc-generator/create_documentation.js +331 -0
- package/scripts/doc-generator/create_documentation_page.js +209 -0
- package/scripts/doc-generator/create_page.js +117 -35
- package/scripts/doc-generator/generate_header_html.js +148 -0
- package/scripts/doc-generator/generate_page_html.js +116 -0
- package/scripts/doc-generator/generate_page_list_html.js +93 -0
- package/scripts/doc-generator/generate_sidebar_html.js +88 -0
- package/scripts/doc-generator/get_search_data_for_content.js +137 -0
- package/scripts/doc-generator/index.js +14 -15
- package/scripts/doc-generator/parse_doc_configs.js +327 -0
- package/scripts/doc-generator/scripts/lunr.js +10 -0
- package/scripts/doc-generator/scripts/script.js +451 -0
- package/scripts/doc-generator/styles/style.css +712 -144
- package/scripts/doc-generator/utils.js +85 -0
- package/scripts/fast_demo_build.js +143 -0
- package/scripts/generate_documentation_list.js +6 -2
- package/scripts/generate_full_demo.js +26 -49
- package/scripts/start_demo_web_server.js +14 -4
- package/scripts/update-version +1 -1
- package/sonar-project.properties +2 -1
- package/src/compat/__tests__/add_text_track.test.ts +1 -0
- package/src/compat/__tests__/clear_element_src.test.ts +55 -28
- package/src/compat/__tests__/set_element_src.test.ts +2 -2
- package/src/compat/__tests__/when_loaded_metadata.test.ts +4 -5
- package/src/compat/__tests__/when_media_source_open.test.ts +4 -5
- package/src/compat/clear_element_src.ts +8 -6
- package/src/compat/eme/close_session.ts +3 -5
- package/src/compat/eme/custom_media_keys/ie11_media_keys.ts +1 -1
- package/src/compat/eme/custom_media_keys/index.ts +6 -6
- package/src/compat/eme/custom_media_keys/old_webkit_media_keys.ts +6 -3
- package/src/compat/eme/custom_media_keys/webkit_media_keys.ts +1 -1
- package/src/compat/eme/generate_key_request.ts +1 -1
- package/src/compat/eme/load_session.ts +4 -6
- package/src/compat/event_listeners.ts +12 -21
- package/src/compat/on_height_width_change.ts +3 -5
- package/src/compat/set_element_src.ts +1 -1
- package/src/compat/when_loaded_metadata.ts +1 -1
- package/src/compat/when_media_source_open.ts +1 -1
- package/src/config.ts +4 -9
- package/src/core/abr/README.md +7 -7
- package/src/core/abr/abr_manager.ts +62 -21
- package/src/core/abr/bandwidth_estimator.ts +1 -1
- package/src/core/abr/buffer_based_chooser.ts +8 -6
- package/src/core/abr/get_buffer_levels.ts +3 -0
- package/src/core/abr/get_estimate_from_buffer_levels.ts +4 -4
- package/src/core/abr/guess_based_chooser.ts +308 -0
- package/src/core/abr/index.ts +7 -3
- package/src/core/abr/last_estimate_storage.ts +79 -0
- package/src/core/abr/network_analyzer.ts +74 -31
- package/src/core/abr/pending_requests_store.ts +76 -42
- package/src/core/abr/representation_estimator.ts +200 -125
- package/src/core/abr/representation_score_calculator.ts +33 -26
- package/src/core/abr/{__tests__ → utils/__tests__}/ewma.test.ts +0 -0
- package/src/core/abr/{__tests__ → utils/__tests__}/filter_by_bitrate.test.ts +1 -1
- package/src/core/abr/{__tests__ → utils/__tests__}/filter_by_width.test.ts +1 -1
- package/src/core/abr/{__tests__ → utils/__tests__}/select_optimal_representation.test.ts +1 -1
- package/src/core/abr/{ewma.ts → utils/ewma.ts} +0 -0
- package/src/core/abr/{filter_by_bitrate.ts → utils/filter_by_bitrate.ts} +2 -2
- package/src/core/abr/{filter_by_width.ts → utils/filter_by_width.ts} +3 -3
- package/src/core/abr/{select_optimal_representation.ts → utils/select_optimal_representation.ts} +2 -2
- package/src/core/api/README.md +4 -3
- package/src/core/api/__tests__/option_utils.test.ts +1 -0
- package/src/core/api/emit_seek_events.ts +21 -20
- package/src/core/api/index.ts +6 -2
- package/src/core/api/playback_observer.ts +768 -0
- package/src/core/api/public_api.ts +111 -111
- package/src/core/api/track_choice_manager.ts +6 -3
- package/src/core/eme/__tests__/__global__/get_license.test.ts +5 -3
- package/src/core/eme/__tests__/__global__/init_data.test.ts +11 -12
- package/src/core/eme/__tests__/__global__/media_key_system_access.test.ts +2 -1
- package/src/core/eme/__tests__/__global__/media_keys.test.ts +5 -8
- package/src/core/eme/__tests__/__global__/server_certificate.test.ts +8 -6
- package/src/core/eme/__tests__/__global__/utils.ts +1 -0
- package/src/core/eme/__tests__/init_media_keys.test.ts +6 -65
- package/src/core/eme/attach_media_keys.ts +2 -1
- package/src/core/eme/check_key_statuses.ts +10 -8
- package/src/core/eme/clean_old_loaded_sessions.ts +2 -4
- package/src/core/eme/clear_eme_session.ts +6 -1
- package/src/core/eme/create_session.ts +3 -5
- package/src/core/eme/dispose_media_keys.ts +2 -2
- package/src/core/eme/eme_manager.ts +10 -12
- package/src/core/eme/find_key_system.ts +3 -5
- package/src/core/eme/get_media_keys.ts +4 -6
- package/src/core/eme/get_session.ts +2 -4
- package/src/core/eme/init_media_keys.ts +9 -9
- package/src/core/eme/session_events_listener.ts +14 -15
- package/src/core/eme/set_server_certificate.ts +9 -5
- package/src/core/eme/types.ts +15 -4
- package/src/core/eme/utils/close_session.ts +7 -7
- package/src/core/eme/utils/is_session_usable.ts +1 -1
- package/src/core/eme/utils/loaded_sessions_store.ts +2 -2
- package/src/core/eme/utils/persistent_sessions_store.ts +2 -2
- package/src/core/fetchers/index.ts +2 -2
- package/src/core/fetchers/manifest/manifest_fetcher.ts +1 -1
- package/src/core/fetchers/segment/__tests__/prioritizer.test.ts +3 -4
- package/src/core/fetchers/segment/index.ts +2 -2
- package/src/core/fetchers/segment/prioritized_segment_fetcher.ts +37 -45
- package/src/core/fetchers/segment/prioritizer.ts +82 -82
- package/src/core/fetchers/segment/segment_fetcher.ts +178 -80
- package/src/core/fetchers/segment/segment_fetcher_creator.ts +23 -31
- package/src/core/init/create_eme_manager.ts +1 -1
- package/src/core/init/create_media_source.ts +5 -7
- package/src/core/init/create_stream_playback_observer.ts +88 -0
- package/src/core/init/duration_updater.ts +20 -17
- package/src/core/init/emit_loaded_event.ts +11 -15
- package/src/core/init/end_of_stream.ts +2 -4
- package/src/core/init/get_initial_time.ts +0 -1
- package/src/core/init/initial_seek_and_play.ts +67 -51
- package/src/core/init/initialize_directfile.ts +26 -35
- package/src/core/init/initialize_media_source.ts +28 -28
- package/src/core/init/load_on_media_source.ts +51 -58
- package/src/core/init/manifest_update_scheduler.ts +11 -12
- package/src/core/init/stall_avoider.ts +64 -47
- package/src/core/init/stream_events_emitter/stream_events_emitter.ts +24 -21
- package/src/core/init/throw_on_media_error.ts +1 -1
- package/src/core/init/types.ts +0 -24
- package/src/core/init/update_playback_rate.ts +15 -16
- package/src/core/segment_buffers/README.md +3 -3
- package/src/core/segment_buffers/garbage_collector.ts +15 -11
- package/src/core/segment_buffers/implementations/audio_video/audio_video_segment_buffer.ts +10 -7
- package/src/core/segment_buffers/implementations/text/html/html_text_segment_buffer.ts +14 -16
- package/src/core/segment_buffers/implementations/text/html/text_track_cues_store.ts +1 -1
- package/src/core/segment_buffers/implementations/text/native/native_text_segment_buffer.ts +4 -4
- package/src/core/segment_buffers/implementations/utils/manual_time_ranges.ts +2 -2
- package/src/core/segment_buffers/inventory/buffered_history.ts +2 -2
- package/src/core/segment_buffers/inventory/segment_inventory.ts +1 -13
- package/src/core/stream/adaptation/adaptation_stream.ts +78 -56
- package/src/core/stream/adaptation/create_representation_estimator.ts +19 -45
- package/src/core/stream/adaptation/index.ts +2 -2
- package/src/core/stream/index.ts +2 -2
- package/src/core/stream/orchestrator/active_period_emitter.ts +6 -8
- package/src/core/stream/orchestrator/are_streams_complete.ts +2 -4
- package/src/core/stream/orchestrator/index.ts +2 -2
- package/src/core/stream/orchestrator/stream_orchestrator.ts +58 -49
- package/src/core/stream/period/create_empty_adaptation_stream.ts +14 -10
- package/src/core/stream/period/index.ts +2 -2
- package/src/core/stream/period/period_stream.ts +118 -75
- package/src/core/stream/reload_after_switch.ts +13 -10
- package/src/core/stream/representation/append_segment_to_buffer.ts +20 -16
- package/src/core/stream/representation/downloading_queue.ts +21 -24
- package/src/core/stream/representation/force_garbage_collection.ts +16 -23
- package/src/core/stream/representation/get_buffer_status.ts +9 -11
- package/src/core/stream/representation/get_needed_segments.ts +1 -1
- package/src/core/stream/representation/get_segment_priority.ts +8 -10
- package/src/core/stream/representation/index.ts +2 -2
- package/src/core/stream/representation/push_init_segment.ts +19 -16
- package/src/core/stream/representation/push_media_segment.ts +21 -17
- package/src/core/stream/representation/representation_stream.ts +50 -47
- package/src/experimental/features/__tests__/dash_wasm.test.ts +1 -0
- package/src/experimental/tools/VideoThumbnailLoader/create_request.ts +32 -17
- package/src/experimental/tools/VideoThumbnailLoader/get_initialized_source_buffer.ts +6 -9
- package/src/experimental/tools/VideoThumbnailLoader/load_segments.ts +12 -6
- package/src/experimental/tools/VideoThumbnailLoader/prepare_source_buffer.ts +4 -2
- package/src/experimental/tools/VideoThumbnailLoader/push_data.ts +2 -2
- package/src/experimental/tools/VideoThumbnailLoader/thumbnail_loader.ts +21 -12
- package/src/experimental/tools/createMetaplaylist/get_duration_from_manifest.ts +1 -1
- package/src/experimental/tools/createMetaplaylist/index.ts +1 -1
- package/src/experimental/tools/mediaCapabilitiesProber/__tests__/probers/DRMInfos.test.ts +4 -2
- package/src/features/__tests__/initialize_features.test.ts +191 -101
- package/src/features/initialize_features.ts +40 -37
- package/src/features/list/__tests__/bif_parser.test.ts +1 -0
- package/src/features/list/__tests__/dash.test.ts +1 -0
- package/src/features/list/__tests__/directfile.test.ts +1 -0
- package/src/features/list/__tests__/eme.test.ts +1 -0
- package/src/features/list/__tests__/html_sami_parser.test.ts +1 -0
- package/src/features/list/__tests__/html_srt_parser.test.ts +1 -0
- package/src/features/list/__tests__/html_text_buffer.test.ts +1 -0
- package/src/features/list/__tests__/html_ttml_parser.test.ts +1 -0
- package/src/features/list/__tests__/html_vtt_parser.test.ts +1 -0
- package/src/features/list/__tests__/image_buffer.test.ts +1 -0
- package/src/features/list/__tests__/native_sami_parser.test.ts +1 -0
- package/src/features/list/__tests__/native_srt_parser.test.ts +1 -0
- package/src/features/list/__tests__/native_text_buffer.test.ts +1 -0
- package/src/features/list/__tests__/native_ttml_parser.test.ts +1 -0
- package/src/features/list/__tests__/native_vtt_parser.test.ts +1 -0
- package/src/features/list/__tests__/smooth.test.ts +1 -0
- package/src/index.ts +2 -2
- package/src/manifest/__tests__/manifest.test.ts +1 -0
- package/src/manifest/index.ts +7 -1
- package/src/manifest/representation_index/__tests__/static.test.ts +1 -0
- package/src/manifest/representation_index/static.ts +1 -0
- package/src/manifest/representation_index/types.ts +25 -3
- package/src/manifest/{are_same_content.ts → utils.ts} +26 -9
- package/src/minimal.ts +3 -2
- package/src/parsers/containers/isobmff/get_box.ts +35 -8
- package/src/parsers/containers/isobmff/read.ts +32 -5
- package/src/parsers/containers/isobmff/utils.ts +52 -47
- package/src/parsers/manifest/dash/common/__tests__/flatten_overlapping_period.test.ts +4 -4
- package/src/parsers/manifest/dash/common/flatten_overlapping_periods.ts +4 -2
- package/src/parsers/manifest/dash/common/get_clock_offset.ts +3 -3
- package/src/parsers/manifest/dash/common/get_http_utc-timing_url.ts +15 -6
- package/src/parsers/manifest/dash/common/indexes/base.ts +5 -3
- package/src/parsers/manifest/dash/common/indexes/get_init_segment.ts +1 -0
- package/src/parsers/manifest/dash/common/indexes/get_segments_from_timeline.ts +9 -9
- package/src/parsers/manifest/dash/common/indexes/list.ts +6 -3
- package/src/parsers/manifest/dash/common/indexes/template.ts +13 -6
- package/src/parsers/manifest/dash/common/indexes/timeline/convert_element_to_index_segment.ts +10 -9
- package/src/parsers/manifest/dash/common/indexes/timeline/timeline_representation_index.ts +13 -5
- package/src/parsers/manifest/dash/common/indexes/tokens.ts +4 -4
- package/src/parsers/manifest/dash/common/parse_adaptation_sets.ts +10 -4
- package/src/parsers/manifest/dash/common/parse_mpd.ts +21 -13
- package/src/parsers/manifest/dash/common/parse_periods.ts +7 -8
- package/src/parsers/manifest/dash/common/parse_representation_index.ts +12 -12
- package/src/parsers/manifest/dash/common/parse_representations.ts +23 -4
- package/src/parsers/manifest/dash/common/resolve_base_urls.ts +33 -24
- package/src/parsers/manifest/dash/js-parser/node_parsers/AdaptationSet.ts +12 -0
- package/src/parsers/manifest/dash/js-parser/node_parsers/BaseURL.ts +13 -9
- package/src/parsers/manifest/dash/js-parser/node_parsers/Representation.ts +28 -0
- package/src/parsers/manifest/dash/js-parser/node_parsers/SegmentTemplate.ts +8 -5
- package/src/parsers/manifest/dash/js-parser/node_parsers/utils.ts +3 -0
- package/src/parsers/manifest/dash/js-parser/parse_from_document.ts +5 -2
- package/src/parsers/manifest/dash/node_parser_types.ts +8 -0
- package/src/parsers/manifest/dash/parsers_types.ts +8 -2
- package/src/parsers/manifest/dash/wasm-parser/rs/lib.rs +1 -8
- package/src/parsers/manifest/dash/wasm-parser/rs/processor/attributes.rs +26 -5
- package/src/parsers/manifest/dash/wasm-parser/rs/processor/mod.rs +75 -521
- package/src/parsers/manifest/dash/wasm-parser/ts/dash-wasm-parser.ts +7 -4
- package/src/parsers/manifest/dash/wasm-parser/ts/generators/AdaptationSet.ts +13 -0
- package/src/parsers/manifest/dash/wasm-parser/ts/generators/BaseURL.ts +8 -1
- package/src/parsers/manifest/dash/wasm-parser/ts/generators/EventStream.ts +6 -0
- package/src/parsers/manifest/dash/wasm-parser/ts/generators/MPD.ts +6 -0
- package/src/parsers/manifest/dash/wasm-parser/ts/generators/Period.ts +14 -0
- package/src/parsers/manifest/dash/wasm-parser/ts/generators/Representation.ts +26 -0
- package/src/parsers/manifest/dash/wasm-parser/ts/generators/SegmentList.ts +6 -0
- package/src/parsers/manifest/dash/wasm-parser/ts/generators/XLink.ts +7 -0
- package/src/parsers/manifest/dash/wasm-parser/ts/generators/root.ts +7 -0
- package/src/parsers/manifest/dash/wasm-parser/ts/types.ts +1 -1
- package/src/parsers/manifest/local/representation_index.ts +2 -0
- package/src/parsers/manifest/smooth/create_parser.ts +1 -1
- package/src/parsers/manifest/smooth/representation_index.ts +3 -1
- package/src/parsers/manifest/utils/clear_timeline_from_position.ts +1 -1
- package/src/parsers/manifest/utils/index_helpers.ts +21 -11
- package/src/parsers/manifest/utils/is_segment_still_available.ts +4 -6
- package/src/parsers/texttracks/sami/html.ts +1 -1
- package/src/parsers/texttracks/sami/native.ts +1 -1
- package/src/parsers/texttracks/ttml/html/apply_font_size.ts +11 -1
- package/src/transports/dash/image_pipelines.ts +4 -4
- package/src/transports/dash/init_segment_loader.ts +1 -1
- package/src/transports/dash/manifest_parser.ts +99 -25
- package/src/transports/dash/segment_loader.ts +1 -1
- package/src/transports/dash/segment_parser.ts +4 -4
- package/src/transports/dash/text_parser.ts +8 -8
- package/src/transports/local/segment_loader.ts +2 -2
- package/src/transports/local/segment_parser.ts +4 -4
- package/src/transports/local/text_parser.ts +8 -8
- package/src/transports/metaplaylist/pipelines.ts +11 -11
- package/src/transports/smooth/extract_timings_infos.ts +1 -1
- package/src/transports/smooth/pipelines.ts +8 -8
- package/src/transports/smooth/segment_loader.ts +3 -3
- package/src/transports/types.ts +31 -17
- package/src/transports/utils/call_custom_manifest_loader.ts +1 -1
- package/src/transports/utils/get_isobmff_timing_infos.ts +6 -1
- package/src/transports/utils/parse_text_track.ts +4 -2
- package/src/typings/globals.d.ts +57 -40
- package/src/utils/__tests__/concat_map_latest.test.ts +7 -9
- package/src/utils/__tests__/defer_subscriptions.test.ts +4 -4
- package/src/utils/__tests__/event_emitter.test.ts +1 -1
- package/src/utils/__tests__/initialization_segment_cache.test.ts +7 -0
- package/src/utils/assert.ts +1 -1
- package/src/utils/concat_map_latest.ts +2 -4
- package/src/utils/defer_subscriptions.ts +1 -1
- package/src/utils/filter_map.ts +2 -4
- package/src/utils/reference.ts +234 -0
- package/src/utils/request/fetch.ts +3 -3
- package/src/utils/request/xhr.ts +2 -2
- package/src/utils/rx-retry_with_backoff.ts +2 -4
- package/tsconfig.json +4 -1
- package/tsconfig.modules.json +8 -3
- package/dist/_esm5.processed/core/abr/create_filters.d.ts +0 -27
- package/dist/_esm5.processed/core/abr/create_filters.js +0 -56
- package/dist/_esm5.processed/core/api/clock.d.ts +0 -157
- package/dist/_esm5.processed/core/api/clock.js +0 -363
- package/dist/_esm5.processed/core/init/create_stream_clock.d.ts +0 -34
- package/dist/_esm5.processed/core/init/create_stream_clock.js +0 -55
- package/dist/_esm5.processed/parsers/manifest/dash/common/extract_minimum_availability_time_offset.d.ts +0 -31
- package/dist/_esm5.processed/parsers/manifest/dash/common/extract_minimum_availability_time_offset.js +0 -37
- package/scripts/doc-generator/construct_html.js +0 -135
- package/scripts/doc-generator/construct_page_list.js +0 -120
- package/scripts/doc-generator/create_for_dir.js +0 -151
- package/scripts/doc-generator/get_files_to_convert.js +0 -71
- package/scripts/doc-generator/mkdir_parent.js +0 -21
- package/scripts/doc-generator/read_title_from_md.js +0 -22
- package/scripts/doc-generator/remove_toc_from_md.js +0 -20
- package/src/core/abr/create_filters.ts +0 -59
- package/src/core/api/clock.ts +0 -573
- package/src/core/init/create_stream_clock.ts +0 -93
- package/src/parsers/manifest/dash/common/extract_minimum_availability_time_offset.ts +0 -41
|
@@ -20,16 +20,15 @@
|
|
|
20
20
|
/* eslint-disable @typescript-eslint/no-unsafe-call */
|
|
21
21
|
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
|
|
22
22
|
/* eslint-disable @typescript-eslint/no-unsafe-return */
|
|
23
|
+
/* eslint-disable @typescript-eslint/no-unsafe-argument */
|
|
23
24
|
/* eslint-disable @typescript-eslint/restrict-template-expressions */
|
|
24
25
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
25
26
|
|
|
26
27
|
import {
|
|
27
28
|
EMPTY,
|
|
28
|
-
// of as observableOf,
|
|
29
29
|
Subject,
|
|
30
|
-
|
|
30
|
+
takeUntil,
|
|
31
31
|
} from "rxjs";
|
|
32
|
-
import { takeUntil } from "rxjs/operators";
|
|
33
32
|
import { IEncryptedEventData } from "../../../../compat/eme";
|
|
34
33
|
import { IContentProtection } from "../../types";
|
|
35
34
|
import {
|
|
@@ -83,7 +82,7 @@ describe("core - eme - global tests - init data", () => {
|
|
|
83
82
|
switch (++eventsReceived) {
|
|
84
83
|
case 1:
|
|
85
84
|
expect(evt.type).toEqual("created-media-keys");
|
|
86
|
-
evt.value.
|
|
85
|
+
evt.value.canAttachMediaKeys.setValue(true);
|
|
87
86
|
break;
|
|
88
87
|
case 2:
|
|
89
88
|
expect(evt.type).toEqual("attached-media-keys");
|
|
@@ -135,7 +134,7 @@ describe("core - eme - global tests - init data", () => {
|
|
|
135
134
|
switch (++eventsReceived) {
|
|
136
135
|
case 1:
|
|
137
136
|
expect(evt.type).toEqual("created-media-keys");
|
|
138
|
-
evt.value.
|
|
137
|
+
evt.value.canAttachMediaKeys.setValue(true);
|
|
139
138
|
break;
|
|
140
139
|
case 2:
|
|
141
140
|
expect(evt.type).toEqual("attached-media-keys");
|
|
@@ -209,7 +208,7 @@ describe("core - eme - global tests - init data", () => {
|
|
|
209
208
|
switch (++eventsReceived) {
|
|
210
209
|
case 1:
|
|
211
210
|
expect(evt.type).toEqual("created-media-keys");
|
|
212
|
-
evt.value.
|
|
211
|
+
evt.value.canAttachMediaKeys.setValue(true);
|
|
213
212
|
break;
|
|
214
213
|
case 2:
|
|
215
214
|
expect(evt.type).toEqual("attached-media-keys");
|
|
@@ -303,7 +302,7 @@ describe("core - eme - global tests - init data", () => {
|
|
|
303
302
|
switch (++eventsReceived) {
|
|
304
303
|
case 1:
|
|
305
304
|
expect(evt.type).toEqual("created-media-keys");
|
|
306
|
-
evt.value.
|
|
305
|
+
evt.value.canAttachMediaKeys.setValue(true);
|
|
307
306
|
break;
|
|
308
307
|
case 2:
|
|
309
308
|
expect(evt.type).toEqual("attached-media-keys");
|
|
@@ -396,7 +395,7 @@ describe("core - eme - global tests - init data", () => {
|
|
|
396
395
|
break;
|
|
397
396
|
case 2:
|
|
398
397
|
expect(evt.type).toEqual("created-media-keys");
|
|
399
|
-
evt.value.
|
|
398
|
+
evt.value.canAttachMediaKeys.setValue(true);
|
|
400
399
|
break;
|
|
401
400
|
case 3:
|
|
402
401
|
expect(evt.type).toEqual("attached-media-keys");
|
|
@@ -458,7 +457,7 @@ describe("core - eme - global tests - init data", () => {
|
|
|
458
457
|
break;
|
|
459
458
|
case 5:
|
|
460
459
|
expect(evt.type).toEqual("created-media-keys");
|
|
461
|
-
evt.value.
|
|
460
|
+
evt.value.canAttachMediaKeys.setValue(true);
|
|
462
461
|
break;
|
|
463
462
|
case 6:
|
|
464
463
|
expect(evt.type).toEqual("attached-media-keys");
|
|
@@ -553,7 +552,7 @@ describe("core - eme - global tests - init data", () => {
|
|
|
553
552
|
case 5: checkEncryptedEventReceived(evt, initDataEvent2, 5); break;
|
|
554
553
|
case 6:
|
|
555
554
|
expect(evt.type).toEqual("created-media-keys");
|
|
556
|
-
evt.value.
|
|
555
|
+
evt.value.canAttachMediaKeys.setValue(true);
|
|
557
556
|
break;
|
|
558
557
|
case 7: expect(evt.type).toEqual("attached-media-keys"); break;
|
|
559
558
|
case 8:
|
|
@@ -668,7 +667,7 @@ describe("core - eme - global tests - init data", () => {
|
|
|
668
667
|
case 4: checkEncryptedEventReceived(evt, initDataEvent4, 4); break;
|
|
669
668
|
case 5:
|
|
670
669
|
expect(evt.type).toEqual("created-media-keys");
|
|
671
|
-
evt.value.
|
|
670
|
+
evt.value.canAttachMediaKeys.setValue(true);
|
|
672
671
|
break;
|
|
673
672
|
case 6: expect(evt.type).toEqual("attached-media-keys"); break;
|
|
674
673
|
case 7:
|
|
@@ -778,7 +777,7 @@ describe("core - eme - global tests - init data", () => {
|
|
|
778
777
|
case 1: checkEncryptedEventReceived(evt, initDataEvent1, 1); break;
|
|
779
778
|
case 2:
|
|
780
779
|
expect(evt.type).toEqual("created-media-keys");
|
|
781
|
-
evt.value.
|
|
780
|
+
evt.value.canAttachMediaKeys.setValue(true);
|
|
782
781
|
break;
|
|
783
782
|
case 3:
|
|
784
783
|
expect(evt.type).toEqual("attached-media-keys");
|
|
@@ -20,6 +20,7 @@
|
|
|
20
20
|
/* eslint-disable @typescript-eslint/no-unsafe-call */
|
|
21
21
|
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
|
|
22
22
|
/* eslint-disable @typescript-eslint/no-unsafe-return */
|
|
23
|
+
/* eslint-disable @typescript-eslint/no-unsafe-argument */
|
|
23
24
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
24
25
|
|
|
25
26
|
import {
|
|
@@ -27,9 +28,9 @@ import {
|
|
|
27
28
|
Observable,
|
|
28
29
|
of as observableOf,
|
|
29
30
|
Subject,
|
|
31
|
+
takeUntil,
|
|
30
32
|
throwError as observableThrow,
|
|
31
33
|
} from "rxjs";
|
|
32
|
-
import { takeUntil } from "rxjs/operators";
|
|
33
34
|
import { ICustomMediaKeySystemAccess } from "../../../../compat";
|
|
34
35
|
import {
|
|
35
36
|
defaultKSConfig,
|
|
@@ -27,12 +27,9 @@ import {
|
|
|
27
27
|
EMPTY,
|
|
28
28
|
of as observableOf,
|
|
29
29
|
Subject,
|
|
30
|
-
// throwError as observableThrow,
|
|
31
|
-
} from "rxjs";
|
|
32
|
-
import {
|
|
33
30
|
take,
|
|
34
31
|
takeUntil,
|
|
35
|
-
} from "rxjs
|
|
32
|
+
} from "rxjs";
|
|
36
33
|
import {
|
|
37
34
|
MediaKeysImpl,
|
|
38
35
|
MediaKeySystemAccessImpl,
|
|
@@ -144,7 +141,7 @@ describe("core - eme - global tests - media key system access", () => {
|
|
|
144
141
|
.subscribe((evt : any) => {
|
|
145
142
|
eventsReceived++;
|
|
146
143
|
expect(evt.type).toEqual("created-media-keys");
|
|
147
|
-
evt.value.
|
|
144
|
+
evt.value.canAttachMediaKeys.setValue(true);
|
|
148
145
|
setTimeout(() => {
|
|
149
146
|
expect(eventsReceived).toEqual(1);
|
|
150
147
|
expect(setMediaKeysSpy).toHaveBeenCalledTimes(1);
|
|
@@ -173,7 +170,7 @@ describe("core - eme - global tests - media key system access", () => {
|
|
|
173
170
|
switch (++eventsReceived) {
|
|
174
171
|
case 1:
|
|
175
172
|
expect(evt.type).toEqual("created-media-keys");
|
|
176
|
-
evt.value.
|
|
173
|
+
evt.value.canAttachMediaKeys.setValue(true);
|
|
177
174
|
break;
|
|
178
175
|
case 2:
|
|
179
176
|
expect(evt.type).toEqual("attached-media-keys");
|
|
@@ -207,7 +204,7 @@ describe("core - eme - global tests - media key system access", () => {
|
|
|
207
204
|
switch (++eventsReceived) {
|
|
208
205
|
case 1:
|
|
209
206
|
expect(evt.type).toEqual("created-media-keys");
|
|
210
|
-
evt.value.
|
|
207
|
+
evt.value.canAttachMediaKeys.setValue(true);
|
|
211
208
|
break;
|
|
212
209
|
case 2:
|
|
213
210
|
expect(evt.type).toEqual("attached-media-keys");
|
|
@@ -250,7 +247,7 @@ describe("core - eme - global tests - media key system access", () => {
|
|
|
250
247
|
switch (++eventsReceived) {
|
|
251
248
|
case 1:
|
|
252
249
|
expect(evt.type).toEqual("created-media-keys");
|
|
253
|
-
evt.value.
|
|
250
|
+
evt.value.canAttachMediaKeys.setValue(true);
|
|
254
251
|
break;
|
|
255
252
|
case 2:
|
|
256
253
|
expect(evt.type).toEqual("attached-media-keys");
|
|
@@ -23,8 +23,10 @@
|
|
|
23
23
|
/* eslint-disable no-restricted-properties */
|
|
24
24
|
/* eslint-disable @typescript-eslint/restrict-template-expressions */
|
|
25
25
|
|
|
26
|
-
import {
|
|
27
|
-
|
|
26
|
+
import {
|
|
27
|
+
Subject,
|
|
28
|
+
takeUntil,
|
|
29
|
+
} from "rxjs";
|
|
28
30
|
import { IContentProtection } from "../../types";
|
|
29
31
|
import {
|
|
30
32
|
expectLicenseRequestMessage,
|
|
@@ -84,7 +86,7 @@ describe("core - eme - global tests - server certificate", () => {
|
|
|
84
86
|
switch (++eventsReceived) {
|
|
85
87
|
case 1:
|
|
86
88
|
expect(evt.type).toEqual("created-media-keys");
|
|
87
|
-
evt.value.
|
|
89
|
+
evt.value.canAttachMediaKeys.setValue(true);
|
|
88
90
|
break;
|
|
89
91
|
case 2:
|
|
90
92
|
expect(evt.type).toEqual("attached-media-keys");
|
|
@@ -153,7 +155,7 @@ describe("core - eme - global tests - server certificate", () => {
|
|
|
153
155
|
switch (++eventsReceived) {
|
|
154
156
|
case 1:
|
|
155
157
|
expect(evt.type).toEqual("created-media-keys");
|
|
156
|
-
evt.value.
|
|
158
|
+
evt.value.canAttachMediaKeys.setValue(true);
|
|
157
159
|
break;
|
|
158
160
|
case 2:
|
|
159
161
|
expect(evt.type).toEqual("warning");
|
|
@@ -234,7 +236,7 @@ describe("core - eme - global tests - server certificate", () => {
|
|
|
234
236
|
switch (++eventsReceived) {
|
|
235
237
|
case 1:
|
|
236
238
|
expect(evt.type).toEqual("created-media-keys");
|
|
237
|
-
evt.value.
|
|
239
|
+
evt.value.canAttachMediaKeys.setValue(true);
|
|
238
240
|
break;
|
|
239
241
|
case 2:
|
|
240
242
|
expect(evt.type).toEqual("warning");
|
|
@@ -321,7 +323,7 @@ describe("core - eme - global tests - server certificate", () => {
|
|
|
321
323
|
switch (++eventsReceived) {
|
|
322
324
|
case 1:
|
|
323
325
|
expect(evt.type).toEqual("created-media-keys");
|
|
324
|
-
evt.value.
|
|
326
|
+
evt.value.canAttachMediaKeys.setValue(true);
|
|
325
327
|
break;
|
|
326
328
|
case 2:
|
|
327
329
|
expect(evt.type).toEqual("attached-media-keys");
|
|
@@ -20,6 +20,7 @@
|
|
|
20
20
|
/* eslint-disable @typescript-eslint/no-unsafe-call */
|
|
21
21
|
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
|
|
22
22
|
/* eslint-disable @typescript-eslint/no-unsafe-return */
|
|
23
|
+
/* eslint-disable @typescript-eslint/no-unsafe-argument */
|
|
23
24
|
/* eslint-disable no-restricted-properties */
|
|
24
25
|
|
|
25
26
|
import {
|
|
@@ -22,11 +22,12 @@
|
|
|
22
22
|
/* eslint-disable @typescript-eslint/no-unsafe-return */
|
|
23
23
|
|
|
24
24
|
import {
|
|
25
|
-
isObservable,
|
|
26
25
|
of as observableOf,
|
|
26
|
+
skip,
|
|
27
|
+
take,
|
|
28
|
+
tap,
|
|
27
29
|
throwError,
|
|
28
30
|
} from "rxjs";
|
|
29
|
-
import { skip, take, tap } from "rxjs/operators";
|
|
30
31
|
|
|
31
32
|
describe("core - eme - initMediaKeys", () => {
|
|
32
33
|
beforeEach(() => {
|
|
@@ -71,8 +72,8 @@ describe("core - eme - initMediaKeys", () => {
|
|
|
71
72
|
.toEqual(fakeResult.mediaKeySystemAccess);
|
|
72
73
|
expect(result.value.stores).toEqual(fakeResult.stores);
|
|
73
74
|
expect(result.value.options).toEqual(fakeResult.options);
|
|
74
|
-
expect(
|
|
75
|
-
|
|
75
|
+
expect(typeof result.value.canAttachMediaKeys.setValue === "function")
|
|
76
|
+
.toBeTruthy();
|
|
76
77
|
|
|
77
78
|
expect(spyGetMediaKeysInfos).toHaveBeenCalledTimes(1);
|
|
78
79
|
expect(spyGetMediaKeysInfos)
|
|
@@ -116,7 +117,7 @@ describe("core - eme - initMediaKeys", () => {
|
|
|
116
117
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
117
118
|
tap((evt: { type : string; value : any }) => {
|
|
118
119
|
if (evt.type === "created-media-keys") {
|
|
119
|
-
evt.value.
|
|
120
|
+
evt.value.canAttachMediaKeys.setValue(true);
|
|
120
121
|
}
|
|
121
122
|
}),
|
|
122
123
|
skip(1)
|
|
@@ -178,64 +179,4 @@ describe("core - eme - initMediaKeys", () => {
|
|
|
178
179
|
});
|
|
179
180
|
});
|
|
180
181
|
|
|
181
|
-
it("Should throw if attachMediaKeys throws", (done) => {
|
|
182
|
-
const fakeResult = { mediaKeySystemAccess: { a: 5, keySystem: "toto" },
|
|
183
|
-
mediaKeys: { b: 4 },
|
|
184
|
-
stores: { loadedSessionsStore: { c: 3 },
|
|
185
|
-
persistentSessionsStore: { d: 2 } },
|
|
186
|
-
options: { e: 1 } };
|
|
187
|
-
const spyGetMediaKeysInfos = jest.fn(() => {
|
|
188
|
-
return observableOf(fakeResult);
|
|
189
|
-
});
|
|
190
|
-
jest.mock("../get_media_keys", () => ({
|
|
191
|
-
__esModule: true as const,
|
|
192
|
-
default: spyGetMediaKeysInfos,
|
|
193
|
-
}));
|
|
194
|
-
const err = new Error("a");
|
|
195
|
-
const spyAttachMediaKeys = jest.fn(() => throwError(() => err));
|
|
196
|
-
const spyDisableOldMediaKeys = jest.fn(() => {
|
|
197
|
-
return observableOf(undefined);
|
|
198
|
-
});
|
|
199
|
-
jest.mock("../attach_media_keys", () => ({
|
|
200
|
-
__esModule: true as const,
|
|
201
|
-
default: spyAttachMediaKeys,
|
|
202
|
-
disableOldMediaKeys: spyDisableOldMediaKeys,
|
|
203
|
-
}));
|
|
204
|
-
const initMediaKeys = require("../init_media_keys").default;
|
|
205
|
-
|
|
206
|
-
const mediaElement = document.createElement("video");
|
|
207
|
-
const keySystemsConfigs = [{ l: 4 }, { d: 12 }];
|
|
208
|
-
|
|
209
|
-
let eventReceived = false;
|
|
210
|
-
initMediaKeys(mediaElement, keySystemsConfigs)
|
|
211
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
212
|
-
.subscribe((evt : { type : string; value : any }) => {
|
|
213
|
-
expect(evt.type).toEqual("created-media-keys");
|
|
214
|
-
expect(evt.value.mediaKeys).toEqual(fakeResult.mediaKeys);
|
|
215
|
-
expect(evt.value.mediaKeySystemAccess).toEqual(fakeResult.mediaKeySystemAccess);
|
|
216
|
-
expect(evt.value.stores).toEqual(fakeResult.stores);
|
|
217
|
-
expect(evt.value.options).toEqual(fakeResult.options);
|
|
218
|
-
expect(isObservable(evt.value.attachMediaKeys$) &&
|
|
219
|
-
typeof evt.value.attachMediaKeys$.next === "function").toBeTruthy();
|
|
220
|
-
evt.value.attachMediaKeys$.next();
|
|
221
|
-
eventReceived = true;
|
|
222
|
-
}, (e : Error) => {
|
|
223
|
-
expect(eventReceived).toEqual(true);
|
|
224
|
-
expect(e).toBe(err);
|
|
225
|
-
|
|
226
|
-
expect(spyGetMediaKeysInfos).toHaveBeenCalledTimes(1);
|
|
227
|
-
expect(spyGetMediaKeysInfos)
|
|
228
|
-
.toHaveBeenCalledWith(mediaElement, keySystemsConfigs);
|
|
229
|
-
|
|
230
|
-
expect(spyAttachMediaKeys).toHaveBeenCalledTimes(1);
|
|
231
|
-
expect(spyAttachMediaKeys)
|
|
232
|
-
.toHaveBeenCalledWith(
|
|
233
|
-
mediaElement,
|
|
234
|
-
{ mediaKeySystemAccess: fakeResult.mediaKeySystemAccess,
|
|
235
|
-
mediaKeys: fakeResult.mediaKeys,
|
|
236
|
-
loadedSessionsStore: fakeResult.stores.loadedSessionsStore,
|
|
237
|
-
keySystemOptions: fakeResult.options });
|
|
238
|
-
done();
|
|
239
|
-
});
|
|
240
|
-
});
|
|
241
182
|
});
|
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
import { ICustomMediaKeySession } from "../../compat";
|
|
18
18
|
import getUUIDKidFromKeyStatusKID from "../../compat/eme/get_uuid_kid_from_keystatus_kid";
|
|
19
19
|
import { EncryptedMediaError } from "../../errors";
|
|
20
|
+
import { bytesToHex } from "../../utils/string_parsing";
|
|
20
21
|
import { IEMEWarningEvent } from "./types";
|
|
21
22
|
|
|
22
23
|
const KEY_STATUSES = { EXPIRED: "expired",
|
|
@@ -96,8 +97,9 @@ export default function checkKeyStatuses(
|
|
|
96
97
|
new Uint8Array(keyStatusKeyId));
|
|
97
98
|
switch (keyStatus) {
|
|
98
99
|
case KEY_STATUSES.EXPIRED: {
|
|
99
|
-
const error = new EncryptedMediaError(
|
|
100
|
-
|
|
100
|
+
const error = new EncryptedMediaError(
|
|
101
|
+
"KEY_STATUS_CHANGE_ERROR",
|
|
102
|
+
`A decryption key expired (${bytesToHex(keyId)})`);
|
|
101
103
|
|
|
102
104
|
if (throwOnLicenseExpiration !== false) {
|
|
103
105
|
throw error;
|
|
@@ -108,9 +110,9 @@ export default function checkKeyStatuses(
|
|
|
108
110
|
}
|
|
109
111
|
|
|
110
112
|
case KEY_STATUSES.INTERNAL_ERROR: {
|
|
111
|
-
const error = new EncryptedMediaError(
|
|
112
|
-
|
|
113
|
-
|
|
113
|
+
const error = new EncryptedMediaError(
|
|
114
|
+
"KEY_STATUS_CHANGE_ERROR",
|
|
115
|
+
`A "${keyStatus}" status has been encountered (${bytesToHex(keyId)})`);
|
|
114
116
|
if (fallbackOn.keyInternalError !== true) {
|
|
115
117
|
throw error;
|
|
116
118
|
}
|
|
@@ -120,9 +122,9 @@ export default function checkKeyStatuses(
|
|
|
120
122
|
}
|
|
121
123
|
|
|
122
124
|
case KEY_STATUSES.OUTPUT_RESTRICTED: {
|
|
123
|
-
const error = new EncryptedMediaError(
|
|
124
|
-
|
|
125
|
-
|
|
125
|
+
const error = new EncryptedMediaError(
|
|
126
|
+
"KEY_STATUS_CHANGE_ERROR",
|
|
127
|
+
`A "${keyStatus}" status has been encountered (${bytesToHex(keyId)})`);
|
|
126
128
|
if (fallbackOn.keyOutputRestricted !== true) {
|
|
127
129
|
throw error;
|
|
128
130
|
}
|
|
@@ -16,13 +16,11 @@
|
|
|
16
16
|
|
|
17
17
|
import {
|
|
18
18
|
EMPTY,
|
|
19
|
+
mapTo,
|
|
19
20
|
merge as observableMerge,
|
|
20
21
|
Observable,
|
|
21
|
-
} from "rxjs";
|
|
22
|
-
import {
|
|
23
|
-
mapTo,
|
|
24
22
|
startWith,
|
|
25
|
-
} from "rxjs
|
|
23
|
+
} from "rxjs";
|
|
26
24
|
import { ICustomMediaKeySession } from "../../compat";
|
|
27
25
|
import { IInitializationDataInfo } from "./types";
|
|
28
26
|
import LoadedSessionsStore from "./utils/loaded_sessions_store";
|
|
@@ -17,9 +17,9 @@
|
|
|
17
17
|
import {
|
|
18
18
|
defer as observableDefer,
|
|
19
19
|
EMPTY,
|
|
20
|
+
ignoreElements ,
|
|
20
21
|
Observable,
|
|
21
22
|
} from "rxjs";
|
|
22
|
-
import { ignoreElements } from "rxjs/operators";
|
|
23
23
|
import { shouldUnsetMediaKeys } from "../../compat/";
|
|
24
24
|
import log from "../../log";
|
|
25
25
|
import disposeMediaKeys from "./dispose_media_keys";
|
|
@@ -48,6 +48,11 @@ export default function clearEMESession(
|
|
|
48
48
|
{
|
|
49
49
|
log.info("EME: closing all current sessions.");
|
|
50
50
|
return currentState.loadedSessionsStore.closeAllSessions()
|
|
51
|
+
// NOTE As of now (RxJS 7.4.0), RxJS defines `ignoreElements` default
|
|
52
|
+
// first type parameter as `any` instead of the perfectly fine `unknown`,
|
|
53
|
+
// leading to linter issues, as it forbids the usage of `any`.
|
|
54
|
+
// This is why we're disabling the eslint rule.
|
|
55
|
+
/* eslint-disable-next-line @typescript-eslint/no-unsafe-argument */
|
|
51
56
|
.pipe(ignoreElements());
|
|
52
57
|
}
|
|
53
58
|
log.info("EME: Nothing to clear. Returning right away. No state =",
|
|
@@ -15,15 +15,13 @@
|
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
17
|
import {
|
|
18
|
+
catchError,
|
|
18
19
|
defer as observableDefer,
|
|
20
|
+
map,
|
|
21
|
+
mergeMap,
|
|
19
22
|
Observable,
|
|
20
23
|
of as observableOf,
|
|
21
24
|
} from "rxjs";
|
|
22
|
-
import {
|
|
23
|
-
catchError,
|
|
24
|
-
map,
|
|
25
|
-
mergeMap,
|
|
26
|
-
} from "rxjs/operators";
|
|
27
25
|
import {
|
|
28
26
|
ICustomMediaKeySession,
|
|
29
27
|
loadSession,
|
|
@@ -16,10 +16,10 @@
|
|
|
16
16
|
|
|
17
17
|
import {
|
|
18
18
|
defer as observableDefer,
|
|
19
|
+
mergeMap,
|
|
19
20
|
Observable,
|
|
20
21
|
of as observableOf,
|
|
21
22
|
} from "rxjs";
|
|
22
|
-
import { mergeMapTo } from "rxjs/operators";
|
|
23
23
|
import { setMediaKeys } from "../../compat";
|
|
24
24
|
import log from "../../log";
|
|
25
25
|
import MediaKeysInfosStore from "./media_keys_infos_store";
|
|
@@ -41,6 +41,6 @@ export default function disposeMediaKeys(
|
|
|
41
41
|
const { loadedSessionsStore } = currentState;
|
|
42
42
|
MediaKeysInfosStore.clearState(mediaElement);
|
|
43
43
|
return loadedSessionsStore.closeAllSessions()
|
|
44
|
-
.pipe(
|
|
44
|
+
.pipe(mergeMap(() => setMediaKeys(mediaElement, null)));
|
|
45
45
|
});
|
|
46
46
|
}
|
|
@@ -15,24 +15,22 @@
|
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
17
|
import {
|
|
18
|
+
catchError,
|
|
18
19
|
concat as observableConcat,
|
|
19
20
|
EMPTY,
|
|
20
|
-
merge as observableMerge,
|
|
21
|
-
Observable,
|
|
22
|
-
of as observableOf,
|
|
23
|
-
ReplaySubject,
|
|
24
|
-
throwError,
|
|
25
|
-
} from "rxjs";
|
|
26
|
-
import {
|
|
27
|
-
catchError,
|
|
28
21
|
filter,
|
|
29
22
|
ignoreElements,
|
|
30
23
|
map,
|
|
24
|
+
merge as observableMerge,
|
|
31
25
|
mergeMap,
|
|
26
|
+
Observable,
|
|
27
|
+
of as observableOf,
|
|
28
|
+
ReplaySubject,
|
|
32
29
|
shareReplay,
|
|
33
30
|
take,
|
|
34
31
|
tap,
|
|
35
|
-
|
|
32
|
+
throwError,
|
|
33
|
+
} from "rxjs";
|
|
36
34
|
import {
|
|
37
35
|
events,
|
|
38
36
|
generateKeyRequest,
|
|
@@ -136,8 +134,8 @@ export default function EMEManager(
|
|
|
136
134
|
|
|
137
135
|
/** Parsed `encrypted` events coming from the HTMLMediaElement. */
|
|
138
136
|
const mediaEncryptedEvents$ = onEncrypted$(mediaElement).pipe(
|
|
139
|
-
tap((
|
|
140
|
-
log.debug("EME: Encrypted event received from media element."
|
|
137
|
+
tap(() => {
|
|
138
|
+
log.debug("EME: Encrypted event received from media element.");
|
|
141
139
|
}),
|
|
142
140
|
filterMap<MediaEncryptedEvent, IInitializationDataInfo, null>(
|
|
143
141
|
(evt) => getInitData(evt), null),
|
|
@@ -146,7 +144,7 @@ export default function EMEManager(
|
|
|
146
144
|
|
|
147
145
|
/** Encryption events coming from the `contentProtections$` argument. */
|
|
148
146
|
const externalEvents$ = contentProtections$.pipe(
|
|
149
|
-
tap((
|
|
147
|
+
tap(() => { log.debug("EME: Encrypted event received from Player"); }));
|
|
150
148
|
|
|
151
149
|
/** Emit events signaling that an encryption initialization data is encountered. */
|
|
152
150
|
const initializationData$ = observableMerge(externalEvents$, mediaEncryptedEvents$);
|
|
@@ -15,15 +15,13 @@
|
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
17
|
import {
|
|
18
|
+
catchError,
|
|
18
19
|
defer as observableDefer,
|
|
20
|
+
map,
|
|
19
21
|
Observable,
|
|
20
22
|
of as observableOf,
|
|
21
23
|
throwError as observableThrow,
|
|
22
24
|
} from "rxjs";
|
|
23
|
-
import {
|
|
24
|
-
catchError,
|
|
25
|
-
map,
|
|
26
|
-
} from "rxjs/operators";
|
|
27
25
|
import {
|
|
28
26
|
ICustomMediaKeySystemAccess,
|
|
29
27
|
requestMediaKeySystemAccess,
|
|
@@ -266,7 +264,7 @@ export default function getMediaKeySystemAccess(
|
|
|
266
264
|
currentState.mediaKeySystemAccess,
|
|
267
265
|
currentState.keySystemOptions);
|
|
268
266
|
if (cachedKeySystemAccess !== null) {
|
|
269
|
-
log.info("EME: Found cached compatible keySystem"
|
|
267
|
+
log.info("EME: Found cached compatible keySystem");
|
|
270
268
|
return observableOf({
|
|
271
269
|
type: "reuse-media-key-system-access" as const,
|
|
272
270
|
value: { mediaKeySystemAccess: cachedKeySystemAccess.keySystemAccess,
|
|
@@ -14,15 +14,13 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
|
-
import {
|
|
18
|
-
Observable,
|
|
19
|
-
of as observableOf,
|
|
20
|
-
} from "rxjs";
|
|
21
17
|
import {
|
|
22
18
|
catchError,
|
|
23
19
|
map,
|
|
24
20
|
mergeMap,
|
|
25
|
-
|
|
21
|
+
Observable,
|
|
22
|
+
of as observableOf,
|
|
23
|
+
} from "rxjs";
|
|
26
24
|
import {
|
|
27
25
|
ICustomMediaKeys,
|
|
28
26
|
ICustomMediaKeySystemAccess,
|
|
@@ -112,7 +110,7 @@ export default function getMediaKeysInfos(
|
|
|
112
110
|
}
|
|
113
111
|
|
|
114
112
|
return createMediaKeys(mediaKeySystemAccess).pipe(map((mediaKeys) => {
|
|
115
|
-
log.info("EME: MediaKeys created with success"
|
|
113
|
+
log.info("EME: MediaKeys created with success");
|
|
116
114
|
const loadedSessionsStore = new LoadedSessionsStore(mediaKeys);
|
|
117
115
|
return { mediaKeys,
|
|
118
116
|
mediaKeySystemAccess,
|
|
@@ -17,13 +17,11 @@
|
|
|
17
17
|
import {
|
|
18
18
|
concat as observableConcat,
|
|
19
19
|
defer as observableDefer,
|
|
20
|
+
map,
|
|
21
|
+
mergeMap,
|
|
20
22
|
Observable,
|
|
21
23
|
of as observableOf,
|
|
22
24
|
} from "rxjs";
|
|
23
|
-
import {
|
|
24
|
-
map,
|
|
25
|
-
mergeMap,
|
|
26
|
-
} from "rxjs/operators";
|
|
27
25
|
import { ICustomMediaKeySession } from "../../compat";
|
|
28
26
|
import log from "../../log";
|
|
29
27
|
import cleanOldLoadedSessions, {
|
|
@@ -15,18 +15,17 @@
|
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
17
|
import {
|
|
18
|
-
|
|
19
|
-
of as observableOf,
|
|
20
|
-
ReplaySubject,
|
|
21
|
-
} from "rxjs";
|
|
22
|
-
import {
|
|
18
|
+
filter,
|
|
23
19
|
mapTo,
|
|
24
20
|
mergeMap,
|
|
21
|
+
Observable,
|
|
22
|
+
of as observableOf,
|
|
25
23
|
startWith,
|
|
26
24
|
take,
|
|
27
|
-
} from "rxjs
|
|
25
|
+
} from "rxjs";
|
|
28
26
|
import log from "../../log";
|
|
29
27
|
import isNullOrUndefined from "../../utils/is_null_or_undefined";
|
|
28
|
+
import createSharedReference from "../../utils/reference";
|
|
30
29
|
import attachMediaKeys, {
|
|
31
30
|
disableMediaKeys,
|
|
32
31
|
} from "./attach_media_keys";
|
|
@@ -67,7 +66,7 @@ export default function initMediaKeys(
|
|
|
67
66
|
initializationDataSystemId = getDrmSystemId(mediaKeySystemAccess.keySystem);
|
|
68
67
|
}
|
|
69
68
|
|
|
70
|
-
const
|
|
69
|
+
const canAttachMediaKeys = createSharedReference(false);
|
|
71
70
|
const shouldDisableOldMediaKeys =
|
|
72
71
|
mediaElement.mediaKeys !== null &&
|
|
73
72
|
mediaElement.mediaKeys !== undefined &&
|
|
@@ -81,7 +80,8 @@ export default function initMediaKeys(
|
|
|
81
80
|
return disableOldMediaKeys$.pipe(
|
|
82
81
|
mergeMap(() => {
|
|
83
82
|
log.debug("EME: Attaching current MediaKeys");
|
|
84
|
-
return
|
|
83
|
+
return canAttachMediaKeys.asObservable().pipe(
|
|
84
|
+
filter(canAttach => canAttach),
|
|
85
85
|
mergeMap(() => {
|
|
86
86
|
const stateToAttatch = { loadedSessionsStore: stores.loadedSessionsStore,
|
|
87
87
|
mediaKeySystemAccess,
|
|
@@ -98,7 +98,7 @@ export default function initMediaKeys(
|
|
|
98
98
|
mediaKeys,
|
|
99
99
|
stores,
|
|
100
100
|
options,
|
|
101
|
-
|
|
101
|
+
canAttachMediaKeys } })
|
|
102
102
|
);
|
|
103
103
|
})
|
|
104
104
|
);
|