Mirrors
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[vzaar] add support for AES HLS manifests(closes #17521)(closes #23299)

This commit is contained in:
Remita Amine 2019-12-03 11:37:30 +01:00
parent 12cc89122d
commit 6797de75e0
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
youtube_dl/extractor/vzaar.py
View File

@ -32,6 +32,15 @@ class VzaarIE(InfoExtractor):
'ext': 'mp3', 'ext': 'mp3',
'title': 'MP3', 'title': 'MP3',
}, },
}, {
# hlsAes = true
'url': 'https://view.vzaar.com/10165560/player',
'md5': '5f66f121fb28b9d16cce3d4f3df7e72e',
'info_dict': {
'id': '10165560',
'ext': 'mp4',
'title': 'Video Demo vzaar Secure.mp4',
},
}, { }, {
# with null videoTitle # with null videoTitle
'url': 'https://view.vzaar.com/20313539/download', 'url': 'https://view.vzaar.com/20313539/download',
@ -58,6 +67,7 @@ class VzaarIE(InfoExtractor):
f = { f = {
'url': source_url, 'url': source_url,
'format_id': 'http', 'format_id': 'http',
'preference': 1,
} }
if 'audio' in source_url: if 'audio' in source_url:
f.update({ f.update({
@ -75,12 +85,13 @@ class VzaarIE(InfoExtractor):
video_guid = video_data.get('guid') video_guid = video_data.get('guid')
usp = video_data.get('usp') usp = video_data.get('usp')
if isinstance(video_guid, compat_str) and isinstance(usp, dict): if video_data.get('uspEnabled') and isinstance(video_guid, compat_str) and isinstance(usp, dict):
m3u8_url = ('http://fable.vzaar.com/v4/usp/%s/%s.ism/.m3u8?' hls_aes = video_data.get('hlsAes')
% (video_guid, video_id)) + '&'.join( m3u8_url = ('http://fable.vzaar.com/v5/usp%s/%s/%s.ism/.m3u8?'
% ('aes' if hls_aes else '', video_guid, video_id)) + '&'.join(
'%s=%s' % (k, v) for k, v in usp.items()) '%s=%s' % (k, v) for k, v in usp.items())
formats.extend(self._extract_m3u8_formats( formats.extend(self._extract_m3u8_formats(
m3u8_url, video_id, 'mp4', entry_protocol='m3u8_native', m3u8_url, video_id, 'mp4', 'm3u8' if hls_aes else 'm3u8_native',
m3u8_id='hls', fatal=False)) m3u8_id='hls', fatal=False))
self._sort_formats(formats) self._sort_formats(formats)