mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-21 20:46:36 -05:00
[YoutubeDL] Generalize best/worst format match behavior
This commit is contained in:
parent
4d72df4031
commit
e01c56f9e1
1 changed files with 5 additions and 11 deletions
|
@ -914,22 +914,16 @@ def select_format(self, format_spec, available_formats):
|
|||
if not available_formats:
|
||||
return None
|
||||
|
||||
if format_spec == 'best' or format_spec is None:
|
||||
if format_spec in ['best', 'worst', None]:
|
||||
format_idx = 0 if format_spec == 'worst' else -1
|
||||
audiovideo_formats = [
|
||||
f for f in available_formats
|
||||
if f.get('vcodec') != 'none' and f.get('acodec') != 'none']
|
||||
if audiovideo_formats:
|
||||
return audiovideo_formats[-1]
|
||||
# for audio only urls, 'best' selects the best audio format
|
||||
return audiovideo_formats[format_idx]
|
||||
# for audio only urls, select the best/worst audio format
|
||||
elif all(f.get('acodec') != 'none' for f in available_formats):
|
||||
return available_formats[-1]
|
||||
elif format_spec == 'worst':
|
||||
audiovideo_formats = [
|
||||
f for f in available_formats
|
||||
if f.get('vcodec') != 'none' and f.get('acodec') != 'none']
|
||||
if audiovideo_formats:
|
||||
return audiovideo_formats[0]
|
||||
return available_formats[0]
|
||||
return available_formats[format_idx]
|
||||
elif format_spec == 'bestaudio':
|
||||
audio_formats = [
|
||||
f for f in available_formats
|
||||
|
|
Loading…
Reference in a new issue