|
|
@ -79,6 +79,7 @@ class TV2IE(InfoExtractor):
|
|
|
|
formats.extend(self._extract_f4m_formats(
|
|
|
|
formats.extend(self._extract_f4m_formats(
|
|
|
|
video_url, video_id, f4m_id=format_id, fatal=False))
|
|
|
|
video_url, video_id, f4m_id=format_id, fatal=False))
|
|
|
|
elif ext == 'm3u8':
|
|
|
|
elif ext == 'm3u8':
|
|
|
|
|
|
|
|
if not data.get('drmProtected'):
|
|
|
|
formats.extend(self._extract_m3u8_formats(
|
|
|
|
formats.extend(self._extract_m3u8_formats(
|
|
|
|
video_url, video_id, 'mp4', entry_protocol='m3u8_native',
|
|
|
|
video_url, video_id, 'mp4', entry_protocol='m3u8_native',
|
|
|
|
m3u8_id=format_id, fatal=False))
|
|
|
|
m3u8_id=format_id, fatal=False))
|
|
|
@ -94,6 +95,8 @@ class TV2IE(InfoExtractor):
|
|
|
|
'tbr': int_or_none(item.get('bitrate')),
|
|
|
|
'tbr': int_or_none(item.get('bitrate')),
|
|
|
|
'filesize': int_or_none(item.get('fileSize')),
|
|
|
|
'filesize': int_or_none(item.get('fileSize')),
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
if not formats and data.get('drmProtected'):
|
|
|
|
|
|
|
|
raise ExtractorError('This video is DRM protected.', expected=True)
|
|
|
|
self._sort_formats(formats)
|
|
|
|
self._sort_formats(formats)
|
|
|
|
|
|
|
|
|
|
|
|
asset = self._download_json(
|
|
|
|
asset = self._download_json(
|
|
|
@ -104,7 +107,7 @@ class TV2IE(InfoExtractor):
|
|
|
|
thumbnails = [{
|
|
|
|
thumbnails = [{
|
|
|
|
'id': thumbnail.get('@type'),
|
|
|
|
'id': thumbnail.get('@type'),
|
|
|
|
'url': thumbnail.get('url'),
|
|
|
|
'url': thumbnail.get('url'),
|
|
|
|
} for _, thumbnail in asset.get('imageVersions', {}).items()]
|
|
|
|
} for _, thumbnail in (asset.get('imageVersions') or {}).items()]
|
|
|
|
|
|
|
|
|
|
|
|
return {
|
|
|
|
return {
|
|
|
|
'id': video_id,
|
|
|
|
'id': video_id,
|
|
|
|