mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-30 12:01:28 +00:00
[ie/youtube] Avoid false DRM detection (#7396)
Some master manifests contain a mix of DRM and non-DRM formats
This commit is contained in:
parent
bc344cd456
commit
94ed638a43
|
@ -3927,9 +3927,12 @@ def process_manifest_format(f, proto, client_name, itag):
|
|||
elif itag:
|
||||
f['format_id'] = itag
|
||||
|
||||
if f.get('source_preference') is None:
|
||||
f['source_preference'] = -1
|
||||
|
||||
if itag in ('616', '235'):
|
||||
f['format_note'] = join_nonempty(f.get('format_note'), 'Premium', delim=' ')
|
||||
f['source_preference'] = (f.get('source_preference') or -1) + 100
|
||||
f['source_preference'] += 100
|
||||
|
||||
f['quality'] = q(itag_qualities.get(try_get(f, lambda f: f['format_id'].split('-')[0]), -1))
|
||||
if f['quality'] == -1 and f.get('height'):
|
||||
|
@ -3938,6 +3941,10 @@ def process_manifest_format(f, proto, client_name, itag):
|
|||
f['format_note'] = join_nonempty(f.get('format_note'), client_name, delim=', ')
|
||||
if f.get('fps') and f['fps'] <= 1:
|
||||
del f['fps']
|
||||
|
||||
if proto == 'hls' and f.get('has_drm'):
|
||||
f['has_drm'] = 'maybe'
|
||||
f['source_preference'] -= 5
|
||||
return True
|
||||
|
||||
subtitles = {}
|
||||
|
@ -4037,6 +4044,10 @@ def _list_formats(self, video_id, microformats, video_details, player_responses,
|
|||
else None)
|
||||
streaming_data = traverse_obj(player_responses, (..., 'streamingData'))
|
||||
*formats, subtitles = self._extract_formats_and_subtitles(streaming_data, video_id, player_url, live_status, duration)
|
||||
if all(f.get('has_drm') for f in formats):
|
||||
# If there are no formats that definitely don't have DRM, all have DRM
|
||||
for f in formats:
|
||||
f['has_drm'] = True
|
||||
|
||||
return live_broadcast_details, live_status, streaming_data, formats, subtitles
|
||||
|
||||
|
|
Loading…
Reference in a new issue