Roxedus/ytdl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[limelight] Improve and make more robust (closes #11737)

Browse Source 
+ Add support for direct http for videos hosted on video.llnw.net
* Check handmade http URLs
This commit is contained in:
Sergey M․ 2017-01-16 21:54:47 +07:00
parent 16e2c8f771
commit 906420cae3
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
youtube_dl/extractor/limelight.py
View File

@ -59,14 +59,26 @@ class LimelightBaseIE(InfoExtractor):
format_id = 'rtmp' format_id = 'rtmp'
if stream.get('videoBitRate'): if stream.get('videoBitRate'):
format_id += '-%d' % int_or_none(stream['videoBitRate']) format_id += '-%d' % int_or_none(stream['videoBitRate'])
http_url = 'http://cpl.delvenetworks.com/' + rtmp.group('playpath')[4:] http_format_id = format_id.replace('rtmp', 'http')
urls.append(http_url)
http_fmt = fmt.copy() CDN_HOSTS = (
http_fmt.update({ ('delvenetworks.com', 'cpl.delvenetworks.com'),
'url': http_url, ('video.llnw.net', 's2.content.video.llnw.net'),
'format_id': format_id.replace('rtmp', 'http'), )
}) for cdn_host, http_host in CDN_HOSTS:
formats.append(http_fmt) if cdn_host not in rtmp.group('host').lower():
continue
http_url = 'http://%s/%s' % (http_host, rtmp.group('playpath')[4:])
urls.append(http_url)
if self._is_valid_url(http_url, video_id, http_format_id):
http_fmt = fmt.copy()
http_fmt.update({
'url': http_url,
'format_id': http_format_id,
})
formats.append(http_fmt)
break
fmt.update({ fmt.update({
'url': rtmp.group('url'), 'url': rtmp.group('url'),
'play_path': rtmp.group('playpath'), 'play_path': rtmp.group('playpath'),