about summary refs log tree commit diff
path: root/youtube_dl/extractor/instagram.py
diff options
context:
space:
mode:
authorDéstin Reed <trox1972@users.noreply.github.com>2016-09-28 17:28:16 +0200
committerSergey M․ <dstftw@gmail.com>2016-10-01 00:13:34 +0700
commit16097822582b839a3744b54af90f7b3fd7132d26 (patch)
tree284d6ac4afec26945e04c7201d9cbb943275f985 /youtube_dl/extractor/instagram.py
parentde6babf92252ea5828a9c17d76766357cff3e440 (diff)
downloadyoutube-dl-16097822582b839a3744b54af90f7b3fd7132d26.tar.gz
youtube-dl-16097822582b839a3744b54af90f7b3fd7132d26.tar.xz
youtube-dl-16097822582b839a3744b54af90f7b3fd7132d26.zip
[Instagram] Extract video dimensions
Diffstat (limited to 'youtube_dl/extractor/instagram.py')
-rw-r--r--youtube_dl/extractor/instagram.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/youtube_dl/extractor/instagram.py b/youtube_dl/extractor/instagram.py
index 5ebc30a10..dde435189 100644
--- a/youtube_dl/extractor/instagram.py
+++ b/youtube_dl/extractor/instagram.py
@@ -84,7 +84,7 @@ class InstagramIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id)
 
         (video_url, description, thumbnail, timestamp, uploader,
-         uploader_id, like_count, comment_count) = [None] * 8
+         uploader_id, like_count, comment_count, height, width) = [None] * 10
 
         shared_data = self._parse_json(
             self._search_regex(
@@ -96,6 +96,8 @@ class InstagramIE(InfoExtractor):
                 shared_data, lambda x: x['entry_data']['PostPage'][0]['media'], dict)
             if media:
                 video_url = media.get('video_url')
+                height = int_or_none(media.get('dimensions', {}).get('height'))
+                width = int_or_none(media.get('dimensions', {}).get('width'))
                 description = media.get('caption')
                 thumbnail = media.get('display_src')
                 timestamp = int_or_none(media.get('date'))
@@ -115,6 +117,12 @@ class InstagramIE(InfoExtractor):
         if not video_url:
             video_url = self._og_search_video_url(webpage, secure=False)
 
+        formats = [{
+            'url': video_url,
+            'width': width,
+            'height': height,
+        }]
+
         if not uploader_id:
             uploader_id = self._search_regex(
                 r'"owner"\s*:\s*{\s*"username"\s*:\s*"(.+?)"',
@@ -131,7 +139,7 @@ class InstagramIE(InfoExtractor):
 
         return {
             'id': video_id,
-            'url': video_url,
+            'formats': formats,
             'ext': 'mp4',
             'title': 'Video by %s' % uploader_id,
             'description': description,