]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[jwplatform] Support DASH streams
authorYen Chi Hsuan <yan12125@gmail.com>
Sun, 2 Oct 2016 06:07:49 +0000 (14:07 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sun, 2 Oct 2016 06:07:49 +0000 (14:07 +0800)
ChangeLog
youtube_dl/extractor/jwplatform.py
youtube_dl/extractor/rudo.py

index d48a09122c04d320ff581e4175ba98f7512b16dc..f5172a8648c1e59e6e2d2df64bb3fd045a4a3f04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ Core
   --xattr-set-filesize (#9054)
 
 Extractors
++ [jwplatform] Support DASH streams in JWPlayer
 * [jwplatform] Improve JWPlayer handling
 * [dctp] Fix extraction (#10734)
 + [leeco] Recognize more Le Sports URLs (#10794)
index e10f7e9f94ce69f6740c4bc89d8e4c5ad8651734..5d56e0a28bd55b93153a92446834ba440ad59572 100644 (file)
@@ -32,7 +32,8 @@ class JWPlatformBaseIE(InfoExtractor):
         return self._parse_jwplayer_data(
             jwplayer_data, video_id, *args, **kwargs)
 
-    def _parse_jwplayer_data(self, jwplayer_data, video_id=None, require_title=True, m3u8_id=None, rtmp_params=None, base_url=None):
+    def _parse_jwplayer_data(self, jwplayer_data, video_id=None, require_title=True,
+                             m3u8_id=None, mpd_id=None, rtmp_params=None, base_url=None):
         # JWPlayer backward compatibility: flattened playlists
         # https://github.com/jwplayer/jwplayer/blob/v7.4.3/src/js/api/config.js#L81-L96
         if 'playlist' not in jwplayer_data:
@@ -63,6 +64,9 @@ class JWPlatformBaseIE(InfoExtractor):
                 if source_type == 'hls' or ext == 'm3u8':
                     formats.extend(self._extract_m3u8_formats(
                         source_url, this_video_id, 'mp4', 'm3u8_native', m3u8_id=m3u8_id, fatal=False))
+                elif ext == 'mpd':
+                    formats.extend(self._extract_mpd_formats(
+                        source_url, this_video_id, mpd_id=mpd_id, fatal=False))
                 # https://github.com/jwplayer/jwplayer/blob/master/src/js/providers/default.js#L67
                 elif source_type.startswith('audio') or ext in ('oga', 'aac', 'mp3', 'mpeg', 'vorbis'):
                     formats.append({
index 38366b784e7fbedce2b2d7de3669db752a6528d0..9a330c1961b75f662caa457fabe231e6aa4bcb8a 100644 (file)
@@ -43,7 +43,7 @@ class RudoIE(JWPlatformBaseIE):
             transform_source=lambda s: js_to_json(re.sub(r'encodeURI\([^)]+\)', '""', s)))
 
         info_dict = self._parse_jwplayer_data(
-            jwplayer_data, video_id, require_title=False, m3u8_id='hls')
+            jwplayer_data, video_id, require_title=False, m3u8_id='hls', mpd_id='dash')
 
         info_dict.update({
             'title': self._og_search_title(webpage),