浏览代码

[viewster] Extract height from bitrate and prefer mp4 videos

Sergey M․ 10 年之前
父节点
当前提交
8e97596b7b
共有 1 个文件被更改,包括 9 次插入2 次删除
  1. 9 2
      youtube_dl/extractor/viewster.py

+ 9 - 2
youtube_dl/extractor/viewster.py

@@ -120,11 +120,18 @@ class ViewsterIE(InfoExtractor):
                     fatal=False  # m3u8 sometimes fail
                     fatal=False  # m3u8 sometimes fail
                 ))
                 ))
             else:
             else:
-                formats.append({
+                format_id = media.get('Bitrate')
+                f = {
                     'url': video_url,
                     'url': video_url,
+                    'format_id': 'mp4-%s' % format_id,
                     'height': int_or_none(media.get('Height')),
                     'height': int_or_none(media.get('Height')),
                     'width': int_or_none(media.get('Width')),
                     'width': int_or_none(media.get('Width')),
-                })
+                    'preference': 1,
+                }
+                if format_id and not f['height']:
+                    f['height'] = int_or_none(self._search_regex(
+                        r'^(\d+)[pP]$', format_id, 'height', default=None))
+                formats.append(f)
         self._sort_formats(formats)
         self._sort_formats(formats)
 
 
         synopsis = info.get('Synopsis', {})
         synopsis = info.get('Synopsis', {})