aboutsummaryrefslogtreecommitdiffhomepage
path: root/youtube_dl/downloader
diff options
context:
space:
mode:
authorSergey M․ <[email protected]>2016-05-01 13:56:51 +0600
committerSergey M․ <[email protected]>2016-05-01 13:56:51 +0600
commit0d66bd0eab436f7215f5da168b378127898ccd66 (patch)
tree3776667fbefb8de51ab6ac53d9c4dd2860e1abfc /youtube_dl/downloader
parent4bd143a3a06264fcda5fa254709d404ccab6601c (diff)
downloadyoutube-dl-0d66bd0eab436f7215f5da168b378127898ccd66.tar.gz
youtube-dl-0d66bd0eab436f7215f5da168b378127898ccd66.zip
[downloader/hls] Delegate extraction to ffmpeg when unsupported features detected
Diffstat (limited to 'youtube_dl/downloader')
-rw-r--r--youtube_dl/downloader/hls.py23
1 files changed, 23 insertions, 0 deletions
diff --git a/youtube_dl/downloader/hls.py b/youtube_dl/downloader/hls.py
index a01dac031..d7b34bde3 100644
--- a/youtube_dl/downloader/hls.py
+++ b/youtube_dl/downloader/hls.py
@@ -4,6 +4,7 @@ import os.path
import re
from .fragment import FragmentFD
+from .external import FFmpegFD
from ..compat import compat_urlparse
from ..utils import (
@@ -17,12 +18,34 @@ class HlsFD(FragmentFD):
FD_NAME = 'hlsnative'
+ @staticmethod
+ def can_download(manifest):
+ UNSUPPORTED_FEATURES = (
+ r'#EXT-X-KEY:METHOD=(?!NONE)', # encrypted streams [1]
+ r'#EXT-X-BYTERANGE', # playlists composed of byte ranges of media files [2]
+ r'#EXT-X-MEDIA-SEQUENCE:(?!0$)', # live streams [3]
+ # 1. https://tools.ietf.org/html/draft-pantos-http-live-streaming-17#section-4.3.2.4
+ # 2. https://tools.ietf.org/html/draft-pantos-http-live-streaming-17#section-4.3.2.2
+ # 3. https://tools.ietf.org/html/draft-pantos-http-live-streaming-17#section-4.3.3.2
+ )
+ return all(not re.search(feature, manifest) for feature in UNSUPPORTED_FEATURES)
+
def real_download(self, filename, info_dict):
man_url = info_dict['url']
self.to_screen('[%s] Downloading m3u8 manifest' % self.FD_NAME)
manifest = self.ydl.urlopen(man_url).read()
s = manifest.decode('utf-8', 'ignore')
+
+ if not self.can_download(s):
+ self.report_warning(
+ 'hlsnative has detected features it does not support, '
+ 'extraction will be delegated to ffmpeg')
+ fd = FFmpegFD(self.ydl, self.params)
+ for ph in self._progress_hooks:
+ fd.add_progress_hook(ph)
+ return fd.real_download(filename, info_dict)
+
fragment_urls = []
for line in s.splitlines():
line = line.strip()