parent
3856407a86
commit
079a7cfc71
4 changed files with 4 additions and 5 deletions
|
@ -117,7 +117,7 @@ def _get_suitable_downloader(info_dict, protocol, params, default):
|
||||||
return FFmpegFD
|
return FFmpegFD
|
||||||
elif (external_downloader or '').lower() == 'native':
|
elif (external_downloader or '').lower() == 'native':
|
||||||
return HlsFD
|
return HlsFD
|
||||||
elif get_suitable_downloader(
|
elif protocol == 'm3u8_native' and get_suitable_downloader(
|
||||||
info_dict, params, None, protocol='m3u8_frag_urls', to_stdout=info_dict['to_stdout']):
|
info_dict, params, None, protocol='m3u8_frag_urls', to_stdout=info_dict['to_stdout']):
|
||||||
return HlsFD
|
return HlsFD
|
||||||
elif params.get('hls_prefer_native') is True:
|
elif params.get('hls_prefer_native') is True:
|
||||||
|
|
|
@ -3108,7 +3108,7 @@ class InfoExtractor(object):
|
||||||
})
|
})
|
||||||
return formats, subtitles
|
return formats, subtitles
|
||||||
|
|
||||||
def _parse_html5_media_entries(self, base_url, webpage, video_id, m3u8_id=None, m3u8_entry_protocol='m3u8', mpd_id=None, preference=None, quality=None):
|
def _parse_html5_media_entries(self, base_url, webpage, video_id, m3u8_id=None, m3u8_entry_protocol='m3u8_native', mpd_id=None, preference=None, quality=None):
|
||||||
def absolute_url(item_url):
|
def absolute_url(item_url):
|
||||||
return urljoin(base_url, item_url)
|
return urljoin(base_url, item_url)
|
||||||
|
|
||||||
|
|
|
@ -42,8 +42,7 @@ class OpenRecBaseIE(InfoExtractor):
|
||||||
if not m3u8_url:
|
if not m3u8_url:
|
||||||
continue
|
continue
|
||||||
formats.extend(self._extract_m3u8_formats(
|
formats.extend(self._extract_m3u8_formats(
|
||||||
m3u8_url, video_id, ext='mp4', entry_protocol='m3u8',
|
m3u8_url, video_id, ext='mp4', live=is_live, m3u8_id='hls-%s' % name))
|
||||||
m3u8_id='hls-%s' % name, live=True))
|
|
||||||
|
|
||||||
self._sort_formats(formats)
|
self._sort_formats(formats)
|
||||||
|
|
||||||
|
|
|
@ -688,7 +688,7 @@ class VKWallPostIE(VKBaseIE):
|
||||||
'artist': performer,
|
'artist': performer,
|
||||||
'track': title,
|
'track': title,
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'protocol': 'm3u8',
|
'protocol': 'm3u8_native',
|
||||||
})
|
})
|
||||||
|
|
||||||
for video in re.finditer(
|
for video in re.finditer(
|
||||||
|
|
Loading…
Reference in a new issue