Browse Source

[youtube] Add formats 298, 299 (Fixes #4056)

Philipp Hagemeister 11 years ago
parent
commit
fbb21cf528
3 changed files with 7 additions and 0 deletions
  1. 2 0
      youtube_dl/YoutubeDL.py
  2. 1 0
      youtube_dl/extractor/common.py
  3. 4 0
      youtube_dl/extractor/youtube.py

+ 2 - 0
youtube_dl/YoutubeDL.py

@@ -1211,6 +1211,8 @@ class YoutubeDL(object):
             res += 'video@'
             res += 'video@'
         if fdict.get('vbr') is not None:
         if fdict.get('vbr') is not None:
             res += '%4dk' % fdict['vbr']
             res += '%4dk' % fdict['vbr']
+        if fdict.get('fps') is not None:
+            res += ', %sfps' % fdict['fps']
         if fdict.get('acodec') is not None:
         if fdict.get('acodec') is not None:
             if res:
             if res:
                 res += ', '
                 res += ', '

+ 1 - 0
youtube_dl/extractor/common.py

@@ -72,6 +72,7 @@ class InfoExtractor(object):
                     * acodec     Name of the audio codec in use
                     * acodec     Name of the audio codec in use
                     * asr        Audio sampling rate in Hertz
                     * asr        Audio sampling rate in Hertz
                     * vbr        Average video bitrate in KBit/s
                     * vbr        Average video bitrate in KBit/s
+                    * fps        Frame rate
                     * vcodec     Name of the video codec in use
                     * vcodec     Name of the video codec in use
                     * container  Name of the container format
                     * container  Name of the container format
                     * filesize   The number of bytes, if known in advance
                     * filesize   The number of bytes, if known in advance

+ 4 - 0
youtube_dl/extractor/youtube.py

@@ -302,6 +302,10 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor):
         '171': {'ext': 'webm', 'vcodec': 'none', 'format_note': 'DASH audio', 'abr': 128, 'preference': -50},
         '171': {'ext': 'webm', 'vcodec': 'none', 'format_note': 'DASH audio', 'abr': 128, 'preference': -50},
         '172': {'ext': 'webm', 'vcodec': 'none', 'format_note': 'DASH audio', 'abr': 256, 'preference': -50},
         '172': {'ext': 'webm', 'vcodec': 'none', 'format_note': 'DASH audio', 'abr': 256, 'preference': -50},
 
 
+        # Dash mov
+        '298': {'ext': 'mov', 'height': 720, 'format_note': 'DASH video', 'acodec': 'none', 'preference': -40, 'fps': 60, 'vcodec': 'h264'},
+        '299': {'ext': 'mov', 'height': 1080, 'format_note': 'DASH video', 'acodec': 'none', 'preference': -40, 'fps': 60, 'vcodec': 'h264'},
+
         # RTMP (unnamed)
         # RTMP (unnamed)
         '_rtmp': {'protocol': 'rtmp'},
         '_rtmp': {'protocol': 'rtmp'},
     }
     }