diff options
| author | Sergey M. <dstftw@gmail.com> | 2015-10-11 02:15:01 +0600 |
|---|---|---|
| committer | Sergey M. <dstftw@gmail.com> | 2015-10-11 02:15:01 +0600 |
| commit | 08fd433f3ee90646ccbbb1076109327b764b9d73 (patch) | |
| tree | 31e1ba27b13706ffddf4a6d4f68162538e9a17e6 | |
| parent | 75f105d455bd0a2226ce4fa78b56c7a344ad6bd8 (diff) | |
| parent | 35a3ff1d337edd527c73db133d87ed23ca4469f5 (diff) | |
Merge pull request #7126 from remitamine/vimeo
[vimeo] extract m3u8 manifest and bitrate
| -rw-r--r-- | youtube_dl/extractor/vimeo.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dl/extractor/vimeo.py index 7dd52627d..97590d220 100644 --- a/youtube_dl/extractor/vimeo.py +++ b/youtube_dl/extractor/vimeo.py @@ -395,14 +395,17 @@ class VimeoIE(VimeoBaseInfoExtractor): 'ext': codec_extension, 'url': video_url, 'format_id': format_id, - 'width': file_info.get('width'), - 'height': file_info.get('height'), + 'width': int_or_none(file_info.get('width')), + 'height': int_or_none(file_info.get('height')), + 'tbr': int_or_none(file_info.get('bitrate')), }) 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'): formats += files[key] - if len(formats) == 0: - raise ExtractorError('No known codec found') + self._sort_formats(formats) subtitles = {} text_tracks = config['request'].get('text_tracks') |