]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[common] Extract audio formats in SMIL
authorYen Chi Hsuan <yan12125@gmail.com>
Fri, 20 May 2016 11:02:53 +0000 (19:02 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Fri, 20 May 2016 11:02:53 +0000 (19:02 +0800)
Found in http://www.cbc.ca/player/play/2657631896

Closes #5156

youtube_dl/extractor/common.py

index 8a8c07226868abb79fb5fa51666507d7da5a81e8..9f22ee930b38c85977cdca54f04f3a0763c1e345 100644 (file)
@@ -1278,21 +1278,21 @@ class InfoExtractor(object):
         m3u8_count = 0
 
         srcs = []
-        videos = smil.findall(self._xpath_ns('.//video', namespace))
-        for video in videos:
-            src = video.get('src')
+        media = smil.findall(self._xpath_ns('.//video', namespace)) + smil.findall(self._xpath_ns('.//audio', namespace))
+        for medium in media:
+            src = medium.get('src')
             if not src or src in srcs:
                 continue
             srcs.append(src)
 
-            bitrate = float_or_none(video.get('system-bitrate') or video.get('systemBitrate'), 1000)
-            filesize = int_or_none(video.get('size') or video.get('fileSize'))
-            width = int_or_none(video.get('width'))
-            height = int_or_none(video.get('height'))
-            proto = video.get('proto')
-            ext = video.get('ext')
+            bitrate = float_or_none(medium.get('system-bitrate') or medium.get('systemBitrate'), 1000)
+            filesize = int_or_none(medium.get('size') or medium.get('fileSize'))
+            width = int_or_none(medium.get('width'))
+            height = int_or_none(medium.get('height'))
+            proto = medium.get('proto')
+            ext = medium.get('ext')
             src_ext = determine_ext(src)
-            streamer = video.get('streamer') or base
+            streamer = medium.get('streamer') or base
 
             if proto == 'rtmp' or streamer.startswith('rtmp'):
                 rtmp_count += 1