|
|
@ -70,19 +70,19 @@ class ScreenwaveMediaIE(InfoExtractor):
|
|
|
|
|
|
|
|
|
|
|
|
formats = []
|
|
|
|
formats = []
|
|
|
|
for source in sources:
|
|
|
|
for source in sources:
|
|
|
|
if source['type'] == 'hls':
|
|
|
|
file_ = source.get('file')
|
|
|
|
formats.extend(self._extract_m3u8_formats(source['file'], video_id, ext='mp4'))
|
|
|
|
if not file_:
|
|
|
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
if source.get('type') == 'hls':
|
|
|
|
|
|
|
|
formats.extend(self._extract_m3u8_formats(file_, video_id, ext='mp4'))
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
file_ = source.get('file')
|
|
|
|
|
|
|
|
if not file_:
|
|
|
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
format_label = source.get('label')
|
|
|
|
format_label = source.get('label')
|
|
|
|
format_id = self._search_regex(
|
|
|
|
format_id = self._search_regex(
|
|
|
|
r'_(.+?)\.[^.]+$', file_, 'format id', default=None)
|
|
|
|
r'_(.+?)\.[^.]+$', file_, 'format id', default=None)
|
|
|
|
height = int_or_none(self._search_regex(
|
|
|
|
height = int_or_none(self._search_regex(
|
|
|
|
r'^(\d+)[pP]', format_label, 'height', default=None))
|
|
|
|
r'^(\d+)[pP]', format_label, 'height', default=None))
|
|
|
|
formats.append({
|
|
|
|
formats.append({
|
|
|
|
'url': source['file'],
|
|
|
|
'url': file_,
|
|
|
|
'format_id': format_id,
|
|
|
|
'format_id': format_id,
|
|
|
|
'format': format_label,
|
|
|
|
'format': format_label,
|
|
|
|
'ext': source.get('type'),
|
|
|
|
'ext': source.get('type'),
|
|
|
|