fenix
/
ytdl-nightly
mirror of https://github.com/ytdl-org/ytdl-nightly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[youtube] improve width and height extraction from fmt_list

This commit is contained in:
remitamine 2016-03-02 17:52:13 +01:00
parent e7d2084568
commit 3318832e9d
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
youtube_dl/extractor/youtube.py
View File

@ -1399,16 +1399,19 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
encoded_url_map = video_info.get('url_encoded_fmt_stream_map', [''])[0] + ',' + video_info.get('adaptive_fmts', [''])[0] encoded_url_map = video_info.get('url_encoded_fmt_stream_map', [''])[0] + ',' + video_info.get('adaptive_fmts', [''])[0]
if 'rtmpe%3Dyes' in encoded_url_map: if 'rtmpe%3Dyes' in encoded_url_map:
raise ExtractorError('rtmpe downloads are not supported, see https://github.com/rg3/youtube-dl/issues/343 for more information.', expected=True) raise ExtractorError('rtmpe downloads are not supported, see https://github.com/rg3/youtube-dl/issues/343 for more information.', expected=True)
formats_spec = {}
fmt_list = video_info.get('fmt_list', [''])[0] fmt_list = video_info.get('fmt_list', [''])[0]
if fmt_list: if fmt_list:
for fmt in fmt_list.split(','): for fmt in fmt_list.split(','):
spec = fmt.split('/') spec = fmt.split('/')
width, height = spec[1].split('x') if len(spec) > 1:
self._formats[spec[0]].update({ width_height = spec[1].split('x')
'resolution': spec[1], if len(width_height) == 2:
'width': int_or_none(width), formats_spec[spec[0]] = {
'height': int_or_none(height), 'resolution': spec[1],
}) 'width': int_or_none(width_height[0]),
'height': int_or_none(width_height[1]),
}
formats = [] formats = []
for url_data_str in encoded_url_map.split(','): for url_data_str in encoded_url_map.split(','):
url_data = compat_parse_qs(url_data_str) url_data = compat_parse_qs(url_data_str)
@ -1477,6 +1480,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
} }
if format_id in self._formats: if format_id in self._formats:
dct.update(self._formats[format_id]) dct.update(self._formats[format_id])
if format_id in formats_spec:
dct.update(formats_spec[format_id])
# Some itags are not included in DASH manifest thus corresponding formats will # Some itags are not included in DASH manifest thus corresponding formats will
# lack metadata (see https://github.com/rg3/youtube-dl/pull/5993). # lack metadata (see https://github.com/rg3/youtube-dl/pull/5993).