projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[jwplatform] Parse video_id from JWPlayer data
[youtube-dl]
/
youtube_dl
/
extractor
/
limelight.py
diff --git
a/youtube_dl/extractor/limelight.py
b/youtube_dl/extractor/limelight.py
index 0d7abbaa8423ff5c44fdf1b21e8da5cbe4e57b24..a425bafe30ae5cffdbeb793ef27c4ffdb870dcc9 100644
(file)
--- a/
youtube_dl/extractor/limelight.py
+++ b/
youtube_dl/extractor/limelight.py
@@
-37,7
+37,7
@@
class LimelightBaseIE(InfoExtractor):
for stream in streams:
stream_url = stream.get('url')
for stream in streams:
stream_url = stream.get('url')
- if not stream_url or stream.get('
previewStream') or stream.get('
drmProtected'):
+ if not stream_url or stream.get('drmProtected'):
continue
ext = determine_ext(stream_url)
if ext == 'f4m':
continue
ext = determine_ext(stream_url)
if ext == 'f4m':
@@
-53,11
+53,17
@@
class LimelightBaseIE(InfoExtractor):
'height': int_or_none(stream.get('videoHeightInPixels')),
'ext': ext,
}
'height': int_or_none(stream.get('videoHeightInPixels')),
'ext': ext,
}
- rtmp = re.search(r'^(?P<url>rtmpe?://
[^/]+
/(?P<app>.+))/(?P<playpath>mp4:.+)$', stream_url)
+ rtmp = re.search(r'^(?P<url>rtmpe?://
(?P<host>[^/]+)
/(?P<app>.+))/(?P<playpath>mp4:.+)$', stream_url)
if rtmp:
format_id = 'rtmp'
if stream.get('videoBitRate'):
format_id += '-%d' % int_or_none(stream['videoBitRate'])
if rtmp:
format_id = 'rtmp'
if stream.get('videoBitRate'):
format_id += '-%d' % int_or_none(stream['videoBitRate'])
+ http_fmt = fmt.copy()
+ http_fmt.update({
+ 'url': 'http://%s/%s' % (rtmp.group('host').replace('csl.', 'cpl.'), rtmp.group('playpath')[4:]),
+ 'format_id': format_id.replace('rtmp', 'http'),
+ })
+ formats.append(http_fmt)
fmt.update({
'url': rtmp.group('url'),
'play_path': rtmp.group('playpath'),
fmt.update({
'url': rtmp.group('url'),
'play_path': rtmp.group('playpath'),
@@
-166,9
+172,10
@@
class LimelightMediaIE(LimelightBaseIE):
}, {
# video with subtitles
'url': 'limelight:media:a3e00274d4564ec4a9b29b9466432335',
}, {
# video with subtitles
'url': 'limelight:media:a3e00274d4564ec4a9b29b9466432335',
+ 'md5': '2fa3bad9ac321e23860ca23bc2c69e3d',
'info_dict': {
'id': 'a3e00274d4564ec4a9b29b9466432335',
'info_dict': {
'id': 'a3e00274d4564ec4a9b29b9466432335',
- 'ext': '
flv
',
+ 'ext': '
mp4
',
'title': '3Play Media Overview Video',
'thumbnail': 're:^https?://.*\.jpeg$',
'duration': 78.101,
'title': '3Play Media Overview Video',
'thumbnail': 're:^https?://.*\.jpeg$',
'duration': 78.101,
@@
-176,10
+183,6
@@
class LimelightMediaIE(LimelightBaseIE):
'upload_date': '20120605',
'subtitles': 'mincount:9',
},
'upload_date': '20120605',
'subtitles': 'mincount:9',
},
- 'params': {
- # m3u8 download
- 'skip_download': True,
- },
}, {
'url': 'https://assets.delvenetworks.com/player/loader.swf?mediaId=8018a574f08d416e95ceaccae4ba0452',
'only_matching': True,
}, {
'url': 'https://assets.delvenetworks.com/player/loader.swf?mediaId=8018a574f08d416e95ceaccae4ba0452',
'only_matching': True,