stream.hls: fix maps with and without keys #5861
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add the `key` attribute to the `Map` class, so segment maps can be encrypted independently or left as plain text, depending on the order of the `EXT-X-MAP` and `EXT-X-KEY` tags in the playlist. TODO: Rewrite the `HLSSegment`, `HLSStreamWriter` and `HLSStreamWorker` classes based on the logic of the DASH implementation, where init segments are queued by the worker separately.
Closed
4 tasks
gravyboat
approved these changes
Feb 25, 2024
bastimeyer
deleted the
stream/hls/fix-plaintext-maps-encrypted-segments
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add the
keyattribute to theMapclass, so segment maps can be encrypted independently or left as plain text, depending on the order of theEXT-X-MAPandEXT-X-KEYtags in the playlist.TODO:
Rewrite the
HLSSegment,HLSStreamWriterandHLSStreamWorkerclasses based on the logic of the DASH implementation, where init segments are queued by the worker separately.Fixes #5856
Let's fix this bug, even though the current implementation is terrible.
{ "streams": [ { "index": 0, "codec_name": "aac", "codec_long_name": "AAC (Advanced Audio Coding)", "profile": "LC", "codec_type": "audio", "codec_tag_string": "mp4a", "codec_tag": "0x6134706d", "sample_fmt": "fltp", "sample_rate": "48000", "channels": 2, "channel_layout": "stereo", "bits_per_sample": 0, "initial_padding": 0, "id": "0x1", "r_frame_rate": "0/0", "avg_frame_rate": "0/0", "time_base": "1/48000", "start_pts": 0, "start_time": "0.000000", "duration_ts": 289792, "duration": "6.037333", "bit_rate": "222535", "extradata_size": 2, "disposition": { "default": 1, "dub": 0, "original": 0, "comment": 0, "lyrics": 0, "karaoke": 0, "forced": 0, "hearing_impaired": 0, "visual_impaired": 0, "clean_effects": 0, "attached_pic": 0, "timed_thumbnails": 0, "non_diegetic": 0, "captions": 0, "descriptions": 0, "metadata": 0, "dependent": 0, "still_image": 0 }, "tags": { "creation_time": "2024-02-20T08:58:32.000000Z", "language": "eng", "handler_name": "ETI ISO Audio Media Handler", "vendor_id": "[0][0][0][0]" } } ] }