Merge pull request #7126 from remitamine/vimeo

[vimeo] extract m3u8 manifest and bitrate
This commit is contained in:
Sergey M. 2015-10-11 02:15:01 +06:00
commit 08fd433f3e

View File

@ -395,14 +395,17 @@ def _real_extract(self, url):
'ext': codec_extension, 'ext': codec_extension,
'url': video_url, 'url': video_url,
'format_id': format_id, 'format_id': format_id,
'width': file_info.get('width'), 'width': int_or_none(file_info.get('width')),
'height': file_info.get('height'), 'height': int_or_none(file_info.get('height')),
'tbr': int_or_none(file_info.get('bitrate')),
}) })
formats = [] formats = []
m3u8_url = config_files.get('hls', {}).get('all')
if m3u8_url:
formats = self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', 'm3u8_native', 0, 'hls', fatal=False)
for key in ('other', 'sd', 'hd'): for key in ('other', 'sd', 'hd'):
formats += files[key] formats += files[key]
if len(formats) == 0: self._sort_formats(formats)
raise ExtractorError('No known codec found')
subtitles = {} subtitles = {}
text_tracks = config['request'].get('text_tracks') text_tracks = config['request'].get('text_tracks')