From: Sergey M․ <dstftw@gmail.com>
Date: Tue, 22 Sep 2015 15:47:56 +0000 (+0600)
Subject: [viewster] Extract height from bitrate and prefer mp4 videos
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=8e97596b7b62fb35ccfeb37c0ce5cb008b217d99;p=youtube-dl.git

[viewster] Extract height from bitrate and prefer mp4 videos
---

diff --git a/youtube_dl/extractor/viewster.py b/youtube_dl/extractor/viewster.py
index c68a38167..c6aa73c0e 100644
--- a/youtube_dl/extractor/viewster.py
+++ b/youtube_dl/extractor/viewster.py
@@ -120,11 +120,18 @@ class ViewsterIE(InfoExtractor):
                     fatal=False  # m3u8 sometimes fail
                 ))
             else:
-                formats.append({
+                format_id = media.get('Bitrate')
+                f = {
                     'url': video_url,
+                    'format_id': 'mp4-%s' % format_id,
                     'height': int_or_none(media.get('Height')),
                     '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)
 
         synopsis = info.get('Synopsis', {})