about summary refs log tree commit diff
path: root/youtube_dl/extractor/internetvideoarchive.py
diff options
context:
space:
mode:
authorRemita Amine <remitamine@gmail.com>2016-09-04 11:42:15 +0100
committerRemita Amine <remitamine@gmail.com>2016-09-04 11:45:29 +0100
commit0def758782c273e0a1c9984f895638845796715b (patch)
tree8dee67238657c1204da108d1db6e208f2ff948aa /youtube_dl/extractor/internetvideoarchive.py
parent919cf1a62f022c61cfa65498e8c1b1cc0d21046e (diff)
downloadyoutube-dl-0def758782c273e0a1c9984f895638845796715b.tar.gz
youtube-dl-0def758782c273e0a1c9984f895638845796715b.tar.xz
youtube-dl-0def758782c273e0a1c9984f895638845796715b.zip
[internetvideoarchive] extract all formats
Diffstat (limited to 'youtube_dl/extractor/internetvideoarchive.py')
-rw-r--r--youtube_dl/extractor/internetvideoarchive.py15
1 files changed, 12 insertions, 3 deletions
diff --git a/youtube_dl/extractor/internetvideoarchive.py b/youtube_dl/extractor/internetvideoarchive.py
index 45add007f..76cc5ec3e 100644
--- a/youtube_dl/extractor/internetvideoarchive.py
+++ b/youtube_dl/extractor/internetvideoarchive.py
@@ -48,13 +48,23 @@ class InternetVideoArchiveIE(InfoExtractor):
             # There are multiple videos in the playlist whlie only the first one
             # matches the video played in browsers
             video_info = configuration['playlist'][0]
+            title = video_info['title']
 
             formats = []
             for source in video_info['sources']:
                 file_url = source['file']
                 if determine_ext(file_url) == 'm3u8':
-                    formats.extend(self._extract_m3u8_formats(
-                        file_url, video_id, ext='mp4', m3u8_id='hls'))
+                    m3u8_formats = self._extract_m3u8_formats(
+                        file_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False)
+                    if m3u8_formats:
+                        formats.extend(m3u8_formats)
+                        file_url = m3u8_formats[0]['url']
+                        formats.extend(self._extract_f4m_formats(
+                            file_url.replace('.m3u8', '.f4m'),
+                            video_id, f4m_id='hds', fatal=False))
+                        formats.extend(self._extract_mpd_formats(
+                            file_url.replace('.m3u8', '.mpd'),
+                            video_id, mpd_id='dash', fatal=False))
                 else:
                     a_format = {
                         'url': file_url,
@@ -70,7 +80,6 @@ class InternetVideoArchiveIE(InfoExtractor):
 
             self._sort_formats(formats)
 
-            title = video_info['title']
             description = video_info.get('description')
             thumbnail = video_info.get('image')
         else: