Upstream/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-12-12 14:26:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Parse resolution in info dictionary (#173)

Browse Source
This commit is contained in:
Damiano Amatruda 2021-03-15 18:17:29 +01:00 committed by pukkandan
parent 4690688658
commit 3561530776
No known key found for this signature in database
GPG Key ID: 0F00D95A001F4698
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
yt_dlp/YoutubeDL.py
View File

@ -1644,7 +1644,7 @@ def _merge(formats_pair):
new_dict.update({ new_dict.update({
'width': the_only_video.get('width'), 'width': the_only_video.get('width'),
'height': the_only_video.get('height'), 'height': the_only_video.get('height'),
'resolution': the_only_video.get('resolution'), 'resolution': the_only_video.get('resolution') or self.format_resolution(the_only_video),
'fps': the_only_video.get('fps'), 'fps': the_only_video.get('fps'),
'vcodec': the_only_video.get('vcodec'), 'vcodec': the_only_video.get('vcodec'),
'vbr': the_only_video.get('vbr'), 'vbr': the_only_video.get('vbr'),
@ -2651,12 +2651,11 @@ def format_resolution(format, default='unknown'):
return 'audio only' return 'audio only'
if format.get('resolution') is not None: if format.get('resolution') is not None:
return format['resolution'] return format['resolution']
if format.get('height') is not None: if format.get('width') and format.get('height'):
if format.get('width') is not None: res = '%dx%d' % (format['width'], format['height'])
res = '%sx%s' % (format['width'], format['height']) elif format.get('height'):
else: res = '%sp' % format['height']
res = '%sp' % format['height'] elif format.get('width'):
elif format.get('width') is not None:
res = '%dx?' % format['width'] res = '%dx?' % format['width']
else: else:
res = default res = default