projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
905eef2
)
[extractor/common] add support for DASH and MSS formats extraction in SMIL manifests
author
Remita Amine
<remitamine@gmail.com>
Wed, 18 Jul 2018 17:29:18 +0000
(18:29 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Wed, 18 Jul 2018 17:34:04 +0000
(18:34 +0100)
youtube_dl/extractor/common.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index 5d4db54d5235989bd9bbe02a1d49884140a9878c..b8bbaf81a22aab883b1740f25edd91b78473916c 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-1859,9
+1859,7
@@
class InfoExtractor(object):
'height': height,
})
formats.extend(m3u8_formats)
'height': height,
})
formats.extend(m3u8_formats)
- continue
-
- if src_ext == 'f4m':
+ elif src_ext == 'f4m':
f4m_url = src_url
if not f4m_params:
f4m_params = {
f4m_url = src_url
if not f4m_params:
f4m_params = {
@@
-1871,9
+1869,13
@@
class InfoExtractor(object):
f4m_url += '&' if '?' in f4m_url else '?'
f4m_url += compat_urllib_parse_urlencode(f4m_params)
formats.extend(self._extract_f4m_formats(f4m_url, video_id, f4m_id='hds', fatal=False))
f4m_url += '&' if '?' in f4m_url else '?'
f4m_url += compat_urllib_parse_urlencode(f4m_params)
formats.extend(self._extract_f4m_formats(f4m_url, video_id, f4m_id='hds', fatal=False))
- continue
-
- if src_url.startswith('http') and self._is_valid_url(src, video_id):
+ elif src_ext == 'mpd':
+ formats.extend(self._extract_mpd_formats(
+ src_url, video_id, mpd_id='dash', fatal=False))
+ elif re.search(r'\.ism/[Mm]anifest', src_url):
+ formats.extend(self._extract_ism_formats(
+ src_url, video_id, ism_id='mss', fatal=False))
+ elif src_url.startswith('http') and self._is_valid_url(src, video_id):
http_count += 1
formats.append({
'url': src_url,
http_count += 1
formats.append({
'url': src_url,
@@
-1884,7
+1886,6
@@
class InfoExtractor(object):
'width': width,
'height': height,
})
'width': width,
'height': height,
})
- continue
return formats
return formats