projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
51ef491
)
[downloader/hls] immediately delegate downloading to ffmpeg in case live stream
author
Remita Amine
<remitamine@gmail.com>
Sat, 25 Mar 2017 18:37:54 +0000
(19:37 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Sat, 25 Mar 2017 18:38:23 +0000
(19:38 +0100)
youtube_dl/downloader/hls.py
patch
|
blob
|
history
youtube_dl/extractor/arkena.py
patch
|
blob
|
history
youtube_dl/extractor/ceskatelevize.py
patch
|
blob
|
history
youtube_dl/extractor/eyedotv.py
patch
|
blob
|
history
youtube_dl/extractor/freshlive.py
patch
|
blob
|
history
youtube_dl/extractor/livestream.py
patch
|
blob
|
history
youtube_dl/extractor/vk.py
patch
|
blob
|
history
diff --git
a/youtube_dl/downloader/hls.py
b/youtube_dl/downloader/hls.py
index 4989abce12ee236e5c528778e5b95f67d92e165e..7534e4da5e3dbea6d3a304b9abcaf62e223b4c30 100644
(file)
--- a/
youtube_dl/downloader/hls.py
+++ b/
youtube_dl/downloader/hls.py
@@
-30,6
+30,15
@@
class HlsFD(FragmentFD):
FD_NAME = 'hlsnative'
FD_NAME = 'hlsnative'
+ def _delegate_to_ffmpeg(self, filename, info_dict):
+ 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)
+
@staticmethod
def can_download(manifest, info_dict):
UNSUPPORTED_FEATURES = (
@staticmethod
def can_download(manifest, info_dict):
UNSUPPORTED_FEATURES = (
@@
-53,10
+62,12
@@
class HlsFD(FragmentFD):
)
check_results = [not re.search(feature, manifest) for feature in UNSUPPORTED_FEATURES]
check_results.append(can_decrypt_frag or '#EXT-X-KEY:METHOD=AES-128' not in manifest)
)
check_results = [not re.search(feature, manifest) for feature in UNSUPPORTED_FEATURES]
check_results.append(can_decrypt_frag or '#EXT-X-KEY:METHOD=AES-128' not in manifest)
- check_results.append(not info_dict.get('is_live'))
return all(check_results)
def real_download(self, filename, info_dict):
return all(check_results)
def real_download(self, filename, info_dict):
+ if info_dict.get('is_live'):
+ return self._delegate_to_ffmpeg(filename, info_dict)
+
man_url = info_dict['url']
self.to_screen('[%s] Downloading m3u8 manifest' % self.FD_NAME)
man_url = info_dict['url']
self.to_screen('[%s] Downloading m3u8 manifest' % self.FD_NAME)
@@
-68,13
+79,7
@@
class HlsFD(FragmentFD):
if info_dict.get('extra_param_to_segment_url'):
self.report_error('pycrypto not found. Please install it.')
return False
if info_dict.get('extra_param_to_segment_url'):
self.report_error('pycrypto not found. Please install it.')
return False
- 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)
+ return self._delegate_to_ffmpeg(filename, info_dict)
total_frags = 0
for line in s.splitlines():
total_frags = 0
for line in s.splitlines():
diff --git
a/youtube_dl/extractor/arkena.py
b/youtube_dl/extractor/arkena.py
index 50ffb442dd051be347e2c79c2d4a11dacb9f574b..4495ddbb079760bc3c35611b4126f6086a996a63 100644
(file)
--- a/
youtube_dl/extractor/arkena.py
+++ b/
youtube_dl/extractor/arkena.py
@@
-93,8
+93,7
@@
class ArkenaIE(InfoExtractor):
exts = (mimetype2ext(f.get('Type')), determine_ext(f_url, None))
if kind == 'm3u8' or 'm3u8' in exts:
formats.extend(self._extract_m3u8_formats(
exts = (mimetype2ext(f.get('Type')), determine_ext(f_url, None))
if kind == 'm3u8' or 'm3u8' in exts:
formats.extend(self._extract_m3u8_formats(
- f_url, video_id, 'mp4',
- entry_protocol='m3u8' if is_live else 'm3u8_native',
+ f_url, video_id, 'mp4', 'm3u8_native',
m3u8_id=kind, fatal=False, live=is_live))
elif kind == 'flash' or 'f4m' in exts:
formats.extend(self._extract_f4m_formats(
m3u8_id=kind, fatal=False, live=is_live))
elif kind == 'flash' or 'f4m' in exts:
formats.extend(self._extract_f4m_formats(
diff --git
a/youtube_dl/extractor/ceskatelevize.py
b/youtube_dl/extractor/ceskatelevize.py
index b1dfacf8094f92493ad6cc95b6fe758b3b81f4fc..dd2529a6dc7742f4a37ad2c37d2c0c20deb97788 100644
(file)
--- a/
youtube_dl/extractor/ceskatelevize.py
+++ b/
youtube_dl/extractor/ceskatelevize.py
@@
-160,8
+160,7
@@
class CeskaTelevizeIE(InfoExtractor):
for format_id, stream_url in item.get('streamUrls', {}).items():
if 'playerType=flash' in stream_url:
stream_formats = self._extract_m3u8_formats(
for format_id, stream_url in item.get('streamUrls', {}).items():
if 'playerType=flash' in stream_url:
stream_formats = self._extract_m3u8_formats(
- stream_url, playlist_id, 'mp4',
- entry_protocol='m3u8' if is_live else 'm3u8_native',
+ stream_url, playlist_id, 'mp4', 'm3u8_native',
m3u8_id='hls-%s' % format_id, fatal=False)
else:
stream_formats = self._extract_mpd_formats(
m3u8_id='hls-%s' % format_id, fatal=False)
else:
stream_formats = self._extract_mpd_formats(
diff --git
a/youtube_dl/extractor/eyedotv.py
b/youtube_dl/extractor/eyedotv.py
index 2f3035147777550aded9378d99dbd3fea2c5ba75..f62ddebaeee5426a8f8486edbdfff3bba881d0c3 100644
(file)
--- a/
youtube_dl/extractor/eyedotv.py
+++ b/
youtube_dl/extractor/eyedotv.py
@@
-54,7
+54,7
@@
class EyedoTVIE(InfoExtractor):
'id': video_id,
'title': title,
'formats': self._extract_m3u8_formats(
'id': video_id,
'title': title,
'formats': self._extract_m3u8_formats(
- m3u8_url, video_id, 'mp4', 'm3u8
' if is_live else 'm3u8
_native'),
+ m3u8_url, video_id, 'mp4', 'm3u8_native'),
'description': xpath_text(video_data, _add_ns('Description')),
'duration': parse_duration(xpath_text(video_data, _add_ns('Duration'))),
'uploader': xpath_text(video_data, _add_ns('Createur')),
'description': xpath_text(video_data, _add_ns('Description')),
'duration': parse_duration(xpath_text(video_data, _add_ns('Duration'))),
'uploader': xpath_text(video_data, _add_ns('Createur')),
diff --git
a/youtube_dl/extractor/freshlive.py
b/youtube_dl/extractor/freshlive.py
index a90f9156c694be3395dd505c6015f595fdb797b5..72a8459453bb2702df66664eec2ff16c0c78f1a9 100644
(file)
--- a/
youtube_dl/extractor/freshlive.py
+++ b/
youtube_dl/extractor/freshlive.py
@@
-56,9
+56,8
@@
class FreshLiveIE(InfoExtractor):
is_live = info.get('liveStreamUrl') is not None
formats = self._extract_m3u8_formats(
is_live = info.get('liveStreamUrl') is not None
formats = self._extract_m3u8_formats(
- stream_url, video_id, ext='mp4',
- entry_protocol='m3u8' if is_live else 'm3u8_native',
- m3u8_id='hls')
+ stream_url, video_id, 'mp4',
+ 'm3u8_native', m3u8_id='hls')
if is_live:
title = self._live_title(title)
if is_live:
title = self._live_title(title)
diff --git
a/youtube_dl/extractor/livestream.py
b/youtube_dl/extractor/livestream.py
index c863413bf008baa6baf0233b8185a10ea119d091..7f946c6ed9d64c54670d7fba68058144bcab494b 100644
(file)
--- a/
youtube_dl/extractor/livestream.py
+++ b/
youtube_dl/extractor/livestream.py
@@
-119,7
+119,8
@@
class LivestreamIE(InfoExtractor):
m3u8_url = video_data.get('m3u8_url')
if m3u8_url:
formats.extend(self._extract_m3u8_formats(
m3u8_url = video_data.get('m3u8_url')
if m3u8_url:
formats.extend(self._extract_m3u8_formats(
- m3u8_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False))
+ m3u8_url, video_id, 'mp4', 'm3u8_native',
+ m3u8_id='hls', fatal=False))
f4m_url = video_data.get('f4m_url')
if f4m_url:
f4m_url = video_data.get('f4m_url')
if f4m_url:
@@
-158,11
+159,11
@@
class LivestreamIE(InfoExtractor):
if smil_url:
formats.extend(self._extract_smil_formats(smil_url, broadcast_id))
if smil_url:
formats.extend(self._extract_smil_formats(smil_url, broadcast_id))
- entry_protocol = 'm3u8' if is_live else 'm3u8_native'
m3u8_url = stream_info.get('m3u8_url')
if m3u8_url:
formats.extend(self._extract_m3u8_formats(
m3u8_url = stream_info.get('m3u8_url')
if m3u8_url:
formats.extend(self._extract_m3u8_formats(
- m3u8_url, broadcast_id, 'mp4', entry_protocol, m3u8_id='hls', fatal=False))
+ m3u8_url, broadcast_id, 'mp4', 'm3u8_native',
+ m3u8_id='hls', fatal=False))
rtsp_url = stream_info.get('rtsp_url')
if rtsp_url:
rtsp_url = stream_info.get('rtsp_url')
if rtsp_url:
@@
-276,7
+277,7
@@
class LivestreamOriginalIE(InfoExtractor):
'view_count': view_count,
}
'view_count': view_count,
}
- def _extract_video_formats(self, video_data, video_id
, entry_protocol
):
+ def _extract_video_formats(self, video_data, video_id):
formats = []
progressive_url = video_data.get('progressiveUrl')
formats = []
progressive_url = video_data.get('progressiveUrl')
@@
-289,7
+290,8
@@
class LivestreamOriginalIE(InfoExtractor):
m3u8_url = video_data.get('httpUrl')
if m3u8_url:
formats.extend(self._extract_m3u8_formats(
m3u8_url = video_data.get('httpUrl')
if m3u8_url:
formats.extend(self._extract_m3u8_formats(
- m3u8_url, video_id, 'mp4', entry_protocol, m3u8_id='hls', fatal=False))
+ m3u8_url, video_id, 'mp4', 'm3u8_native',
+ m3u8_id='hls', fatal=False))
rtsp_url = video_data.get('rtspUrl')
if rtsp_url:
rtsp_url = video_data.get('rtspUrl')
if rtsp_url:
@@
-340,11
+342,10
@@
class LivestreamOriginalIE(InfoExtractor):
}
video_data = self._download_json(stream_url, content_id)
is_live = video_data.get('isLive')
}
video_data = self._download_json(stream_url, content_id)
is_live = video_data.get('isLive')
- entry_protocol = 'm3u8' if is_live else 'm3u8_native'
info.update({
'id': content_id,
'title': self._live_title(info['title']) if is_live else info['title'],
info.update({
'id': content_id,
'title': self._live_title(info['title']) if is_live else info['title'],
- 'formats': self._extract_video_formats(video_data, content_id
, entry_protocol
),
+ 'formats': self._extract_video_formats(video_data, content_id),
'is_live': is_live,
})
return info
'is_live': is_live,
})
return info
diff --git
a/youtube_dl/extractor/vk.py
b/youtube_dl/extractor/vk.py
index 7c42a4f54864eeb370c6a4583daae950262b45b8..dc2719cf987981999a31487966508e589c86f64b 100644
(file)
--- a/
youtube_dl/extractor/vk.py
+++ b/
youtube_dl/extractor/vk.py
@@
-432,8
+432,7
@@
class VKIE(VKBaseIE):
})
elif format_id == 'hls':
formats.extend(self._extract_m3u8_formats(
})
elif format_id == 'hls':
formats.extend(self._extract_m3u8_formats(
- format_url, video_id, 'mp4',
- entry_protocol='m3u8' if is_live else 'm3u8_native',
+ format_url, video_id, 'mp4', 'm3u8_native',
m3u8_id=format_id, fatal=False, live=is_live))
elif format_id == 'rtmp':
formats.append({
m3u8_id=format_id, fatal=False, live=is_live))
elif format_id == 'rtmp':
formats.append({