Rapsys Git
/
youtubedl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New upstream version 2017.02.07
[youtubedl]
/
youtube_dl
/
downloader
/
__init__.py
diff --git
a/youtube_dl/downloader/__init__.py
b/youtube_dl/downloader/__init__.py
index 9fb66e2f7f680a71c05fdd866c72b0db2dd91a77..16952e359bc19337dc4f8682061d169ff956e264 100644
(file)
--- a/
youtube_dl/downloader/__init__.py
+++ b/
youtube_dl/downloader/__init__.py
@@
-1,13
+1,17
@@
from __future__ import unicode_literals
from .common import FileDownloader
from __future__ import unicode_literals
from .common import FileDownloader
-from .external import get_external_downloader
from .f4m import F4mFD
from .hls import HlsFD
from .f4m import F4mFD
from .hls import HlsFD
-from .hls import NativeHlsFD
from .http import HttpFD
from .http import HttpFD
-from .mplayer import MplayerFD
from .rtmp import RtmpFD
from .rtmp import RtmpFD
+from .dash import DashSegmentsFD
+from .rtsp import RtspFD
+from .ism import IsmFD
+from .external import (
+ get_external_downloader,
+ FFmpegFD,
+)
from ..utils import (
determine_protocol,
from ..utils import (
determine_protocol,
@@
-15,11
+19,13
@@
from ..utils import (
PROTOCOL_MAP = {
'rtmp': RtmpFD,
PROTOCOL_MAP = {
'rtmp': RtmpFD,
- 'm3u8_native':
Native
HlsFD,
- 'm3u8':
Hls
FD,
- 'mms':
Mplayer
FD,
- 'rtsp':
Mplayer
FD,
+ 'm3u8_native': HlsFD,
+ 'm3u8':
FFmpeg
FD,
+ 'mms':
Rtsp
FD,
+ 'rtsp':
Rtsp
FD,
'f4m': F4mFD,
'f4m': F4mFD,
+ 'http_dash_segments': DashSegmentsFD,
+ 'ism': IsmFD,
}
}
@@
-28,14
+34,20
@@
def get_suitable_downloader(info_dict, params={}):
protocol = determine_protocol(info_dict)
info_dict['protocol'] = protocol
protocol = determine_protocol(info_dict)
info_dict['protocol'] = protocol
+ # if (info_dict.get('start_time') or info_dict.get('end_time')) and not info_dict.get('requested_formats') and FFmpegFD.can_download(info_dict):
+ # return FFmpegFD
+
external_downloader = params.get('external_downloader')
if external_downloader is not None:
ed = get_external_downloader(external_downloader)
external_downloader = params.get('external_downloader')
if external_downloader is not None:
ed = get_external_downloader(external_downloader)
- if ed.
supports
(info_dict):
+ if ed.
can_download
(info_dict):
return ed
return ed
- if protocol == 'm3u8' and params.get('hls_prefer_native'):
- return NativeHlsFD
+ if protocol == 'm3u8' and params.get('hls_prefer_native') is True:
+ return HlsFD
+
+ if protocol == 'm3u8_native' and params.get('hls_prefer_native') is False:
+ return FFmpegFD
return PROTOCOL_MAP.get(protocol, HttpFD)
return PROTOCOL_MAP.get(protocol, HttpFD)