projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0857baa
)
[rtlxl] Use m3u8 streams instead of f4m (#4115, #4118)
author
Naglis Jonaitis
<njonaitis@gmail.com>
Tue, 18 Nov 2014 22:26:44 +0000
(
00:26
+0200)
committer
Naglis Jonaitis
<njonaitis@gmail.com>
Tue, 18 Nov 2014 22:26:44 +0000
(
00:26
+0200)
youtube_dl/extractor/rtlnl.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/rtlnl.py
b/youtube_dl/extractor/rtlnl.py
index 0ab1eb69c8c82ae0bc04ec135971cd919b17a155..599952512ff2367b0854b19d6c9750c383489fdb 100644
(file)
--- a/
youtube_dl/extractor/rtlnl.py
+++ b/
youtube_dl/extractor/rtlnl.py
@@
-28,8
+28,9
@@
class RtlXlIE(InfoExtractor):
mobj = re.match(self._VALID_URL, url)
uuid = mobj.group('uuid')
mobj = re.match(self._VALID_URL, url)
uuid = mobj.group('uuid')
+ # Use m3u8 streams (see https://github.com/rg3/youtube-dl/issues/4118)
info = self._download_json(
info = self._download_json(
- 'http://www.rtl.nl/system/s4m/vfd/version=2/uuid=%s/
fmt=flash
/' % uuid,
+ 'http://www.rtl.nl/system/s4m/vfd/version=2/uuid=%s/
d=pc/fmt=adaptive
/' % uuid,
uuid)
material = info['material'][0]
uuid)
material = info['material'][0]
@@
-39,11
+40,11
@@
class RtlXlIE(InfoExtractor):
subtitle = material['title'] or info['episodes'][0]['name']
videopath = material['videopath']
subtitle = material['title'] or info['episodes'][0]['name']
videopath = material['videopath']
-
f4m
_url = 'http://manifest.us.rtl.nl' + videopath
+
m3u8
_url = 'http://manifest.us.rtl.nl' + videopath
- formats = self._extract_
f4m_formats(f4m_url, uuid
)
+ formats = self._extract_
m3u8_formats(m3u8_url, uuid, ext='mp4'
)
- video_urlpart = videopath.split('/
flash
/')[1][:-4]
+ video_urlpart = videopath.split('/
adaptive
/')[1][:-4]
PG_URL_TEMPLATE = 'http://pg.us.rtl.nl/rtlxl/network/%s/progressive/%s.mp4'
formats.extend([
PG_URL_TEMPLATE = 'http://pg.us.rtl.nl/rtlxl/network/%s/progressive/%s.mp4'
formats.extend([
@@
-57,6
+58,8
@@
class RtlXlIE(InfoExtractor):
}
])
}
])
+ self._sort_formats(formats)
+
return {
'id': uuid,
'title': '%s - %s' % (progname, subtitle),
return {
'id': uuid,
'title': '%s - %s' % (progname, subtitle),