From 356153077695ecc89fcc4955264a32cda2e5f177 Mon Sep 17 00:00:00 2001 From: Damiano Amatruda Date: Mon, 15 Mar 2021 18:17:29 +0100 Subject: [PATCH] Parse resolution in info dictionary (#173) --- yt_dlp/YoutubeDL.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py index 6c2b9eb57..8681a18e9 100644 --- a/yt_dlp/YoutubeDL.py +++ b/yt_dlp/YoutubeDL.py @@ -1644,7 +1644,7 @@ def _merge(formats_pair): new_dict.update({ 'width': the_only_video.get('width'), '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'), 'vcodec': the_only_video.get('vcodec'), 'vbr': the_only_video.get('vbr'), @@ -2651,12 +2651,11 @@ def format_resolution(format, default='unknown'): return 'audio only' if format.get('resolution') is not None: return format['resolution'] - if format.get('height') is not None: - if format.get('width') is not None: - res = '%sx%s' % (format['width'], format['height']) - else: - res = '%sp' % format['height'] - elif format.get('width') is not None: + if format.get('width') and format.get('height'): + res = '%dx%d' % (format['width'], format['height']) + elif format.get('height'): + res = '%sp' % format['height'] + elif format.get('width'): res = '%dx?' % format['width'] else: res = default