Upstream/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-12-11 14:18:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

[downloader] Do not use aria2c for non-native m3u8

Browse Source 
Closes #2718
This commit is contained in:
pukkandan 2022-02-11 12:09:03 +05:30
parent 3856407a86
commit 079a7cfc71
No known key found for this signature in database
GPG Key ID: 7EEE9E1E817D0A39
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yt_dlp/downloader/__init__.py
View File

@ -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:

2
yt_dlp/extractor/common.py
View File

@ -3108,7 +3108,7 @@ def _parse_ism_formats_and_subtitles(self, ism_doc, ism_url, ism_id=None):
}) })
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)

3
yt_dlp/extractor/openrec.py
View File

@ -42,8 +42,7 @@ def _extract_movie(self, webpage, video_id, name, is_live):
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)

2
yt_dlp/extractor/vk.py
View File

@ -688,7 +688,7 @@ def _real_extract(self, url):
'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(