mirror
/
yt-dlc
mirror of https://github.com/blackjack4494/yt-dlc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[extractor] Always prefer native hls downloader by default 

When the manifest is not downloadable by native downloader, it already is able to detect it and switch to `ffmpeg`. So there doesn't seem to be a reason anymore to use ffmpeg as the preferred downloader
This commit is contained in:
pukkandan 2021-05-22 23:58:11 +05:30
parent b25522ba52
commit 177877c544
No known key found for this signature in database
GPG Key ID: 0F00D95A001F4698
5 changed files with 434 additions and 438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

856
test/test_InfoExtractor.py
View File

File diff suppressed because it is too large Load Diff

4
yt_dlp/extractor/common.py
View File

@ -1902,7 +1902,7 @@ class InfoExtractor(object):
return fmts
def _extract_m3u8_formats_and_subtitles(
self, m3u8_url, video_id, ext=None, entry_protocol='m3u8',
self, m3u8_url, video_id, ext=None, entry_protocol='m3u8_native',
preference=None, quality=None, m3u8_id=None, note=None,
errnote=None, fatal=True, live=False, data=None, headers={},
query={}):
@ -1926,7 +1926,7 @@ class InfoExtractor(object):
headers=headers, query=query, video_id=video_id)
def _parse_m3u8_formats_and_subtitles(
self, m3u8_doc, m3u8_url, ext=None, entry_protocol='m3u8',
self, m3u8_doc, m3u8_url, ext=None, entry_protocol='m3u8_native',
preference=None, quality=None, m3u8_id=None, live=False, note=None,
errnote=None, fatal=True, data=None, headers={}, query={},
video_id=None):

3
yt_dlp/extractor/egghead.py
View File

@ -107,8 +107,7 @@ class EggheadLessonIE(EggheadBaseIE):
ext = determine_ext(format_url)
if ext == 'm3u8':
formats.extend(self._extract_m3u8_formats(
format_url, lesson_id, 'mp4', entry_protocol='m3u8',
m3u8_id='hls', fatal=False))
format_url, lesson_id, 'mp4', m3u8_id='hls', fatal=False))
elif ext == 'mpd':
formats.extend(self._extract_mpd_formats(
format_url, lesson_id, mpd_id='dash', fatal=False))

3
yt_dlp/extractor/odnoklassniki.py
View File

@ -247,8 +247,7 @@ class OdnoklassnikiIE(InfoExtractor):
m3u8_url = metadata.get('hlsMasterPlaylistUrl')
if m3u8_url:
formats.extend(self._extract_m3u8_formats(
m3u8_url, video_id, 'mp4', entry_protocol='m3u8',
m3u8_id='hls', fatal=False))
m3u8_url, video_id, 'mp4', m3u8_id='hls', fatal=False))
rtmp_url = metadata.get('rtmpUrl')
if rtmp_url:
formats.append({

6
yt_dlp/extractor/whowatch.py
View File

@ -47,8 +47,7 @@ class WhoWatchIE(InfoExtractor):
if hls_url:
hls_fmts = self._extract_m3u8_formats(
hls_url, video_id, ext='mp4', entry_protocol='m3u8',
m3u8_id='hls-%s' % name, quality=quality)
hls_url, video_id, ext='mp4', m3u8_id='hls-%s' % name, quality=quality)
formats.extend(hls_fmts)
else:
hls_fmts = []
@ -71,8 +70,7 @@ class WhoWatchIE(InfoExtractor):
# This contains the same formats as the above manifests and is used only as a fallback
formats.extend(self._extract_m3u8_formats(
hls_url, video_id, ext='mp4', entry_protocol='m3u8',
m3u8_id='hls'))
hls_url, video_id, ext='mp4', m3u8_id='hls'))
self._remove_duplicate_formats(formats)
self._sort_formats(formats)