stream.hls: also compare parsed language selection #6469
Merged
Conversation
This file contains hidden or 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
Parse the language of `EXT-X-MEDIA` tags and parse the languages of the user's `hls-audio-select` values. Compare both plain language codes and the parsed languages when selecting the audio streams, so users are able to select audio streams 1. without having to know the specific ISO 639-2 language codes: Languages are looked up by the `alpha_2`, `alpha_3`, `name` and `bibliographic` attributes on the HLS playlist and user input. This means that for example `--hls-audio-select=German` will match German audio streams with `LANGUAGE="deu"`. 2. with language codes that are invalid or reserved for private use: Valid language codes are not guaranteed, so plain string comparisons are still needed, just like before. `pycountry` also rejects codes reserved for private use, so we need to handle this case as well.
Use the cached value of the parsed language of the media playlist when comparing it with the user's locale configuration.
92713e2 to
d32af02
Compare
gravyboat
approved these changes
Mar 13, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
See #6467 (comment)
This allows selecting HLS audio streams without having to know the exact value of the
LANGUAGEattribute of the respectiveEXT-X-MEDIAtag. Previously, this was even case-sensitive, which language codes definitely are not.Instead of only comparing plain values, parse the user's input (test all language attributes:
alpha_2,alpha_3,nameandbibliographic) and also parse the language data of the media playlists in the HLS multivariant playlist (test all language attributes as well), and then do the comparisons on the resultingLanguageobjects when selecting audio streams. Keep plain value language code comparision, to support selecting audio streams with invalid language codes or languages with reserved codes (qaa-qtz).The last two commits are simple performance improvements.
So for example,
--hls-audio-select=gernow allows users to select audio streams which are annotated with the alpha_3 codedeu(regardless of case), asgeris the bilbiographic attribute of German/Deutsch. Likewise,--hls-audio-select=Germanwould also work, as the language'snameattribute is also taken into consideration.pycountrydoes not have any data for localized language names,--hls-audio-select=Deutschwon't work.Since the implementation of the external audio stream selection is still pretty bad (#4902), we should at least improve the logging of the available substreams, as there's no indication of what is available unless low logging levels are set. This is for a future PR though...