projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Skip unsupported adaptive stream type (#18804)
[youtube-dl]
/
youtube_dl
/
extractor
/
ruutu.py
diff --git
a/youtube_dl/extractor/ruutu.py
b/youtube_dl/extractor/ruutu.py
index f12bc56141c7512f0f5af750b43ff383e729b637..f530f0083faf5ccc60c1f24a9a0b731157271199 100644
(file)
--- a/
youtube_dl/extractor/ruutu.py
+++ b/
youtube_dl/extractor/ruutu.py
@@
-53,13
+53,20
@@
class RuutuIE(InfoExtractor):
'age_limit': 0,
},
},
'age_limit': 0,
},
},
+ # Episode where <SourceFile> is "NOT-USED", but has other
+ # downloadable sources available.
+ {
+ 'url': 'http://www.ruutu.fi/video/3193728',
+ 'only_matching': True,
+ },
]
def _real_extract(self, url):
video_id = self._match_id(url)
video_xml = self._download_xml(
]
def _real_extract(self, url):
video_id = self._match_id(url)
video_xml = self._download_xml(
- 'http://gatling.ruutu.fi/media-xml-cache?id=%s' % video_id, video_id)
+ 'https://gatling.nelonenmedia.fi/media-xml-cache', video_id,
+ query={'id': video_id})
formats = []
processed_urls = []
formats = []
processed_urls = []
@@
-72,7
+79,7
@@
class RuutuIE(InfoExtractor):
video_url = child.text
if (not video_url or video_url in processed_urls or
any(p in video_url for p in ('NOT_USED', 'NOT-USED'))):
video_url = child.text
if (not video_url or video_url in processed_urls or
any(p in video_url for p in ('NOT_USED', 'NOT-USED'))):
- return
+ continue
processed_urls.append(video_url)
ext = determine_ext(video_url)
if ext == 'm3u8':
processed_urls.append(video_url)
ext = determine_ext(video_url)
if ext == 'm3u8':
@@
-81,6
+88,12
@@
class RuutuIE(InfoExtractor):
elif ext == 'f4m':
formats.extend(self._extract_f4m_formats(
video_url, video_id, f4m_id='hds', fatal=False))
elif ext == 'f4m':
formats.extend(self._extract_f4m_formats(
video_url, video_id, f4m_id='hds', fatal=False))
+ elif ext == 'mpd':
+ # video-only and audio-only streams are of different
+ # duration resulting in out of sync issue
+ continue
+ formats.extend(self._extract_mpd_formats(
+ video_url, video_id, mpd_id='dash', fatal=False))
else:
proto = compat_urllib_parse_urlparse(video_url).scheme
if not child.tag.startswith('HTTP') and proto != 'rtmp':
else:
proto = compat_urllib_parse_urlparse(video_url).scheme
if not child.tag.startswith('HTTP') and proto != 'rtmp':