diff options
| author | pukkandan <pukkandan.ytdlp@gmail.com> | 2021-05-22 23:58:11 +0530 |
|---|---|---|
| committer | pukkandan <pukkandan.ytdlp@gmail.com> | 2021-05-26 01:27:39 +0530 |
| commit | 177877c54493d0cb32f65e87ff9ed88a030cfbdb (patch) | |
| tree | c3d25a6d80555ed3057b6c363edbba36399aaea0 /yt_dlp/extractor | |
| parent | b25522ba5234bc9c313d18b54001c2e5e9e39c96 (diff) | |
| download | hypervideo-pre-177877c54493d0cb32f65e87ff9ed88a030cfbdb.tar.lz hypervideo-pre-177877c54493d0cb32f65e87ff9ed88a030cfbdb.tar.xz hypervideo-pre-177877c54493d0cb32f65e87ff9ed88a030cfbdb.zip | |
[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
Diffstat (limited to 'yt_dlp/extractor')
| -rw-r--r-- | yt_dlp/extractor/common.py | 4 | ||||
| -rw-r--r-- | yt_dlp/extractor/egghead.py | 3 | ||||
| -rw-r--r-- | yt_dlp/extractor/odnoklassniki.py | 3 | ||||
| -rw-r--r-- | yt_dlp/extractor/whowatch.py | 6 |
4 files changed, 6 insertions, 10 deletions
diff --git a/yt_dlp/extractor/common.py b/yt_dlp/extractor/common.py index 888cc8efa..dacd9b3d1 100644 --- a/yt_dlp/extractor/common.py +++ b/yt_dlp/extractor/common.py @@ -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): diff --git a/yt_dlp/extractor/egghead.py b/yt_dlp/extractor/egghead.py index aff9b88c0..22123e5d4 100644 --- a/yt_dlp/extractor/egghead.py +++ b/yt_dlp/extractor/egghead.py @@ -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)) diff --git a/yt_dlp/extractor/odnoklassniki.py b/yt_dlp/extractor/odnoklassniki.py index 0ce2e3776..9cacd3815 100644 --- a/yt_dlp/extractor/odnoklassniki.py +++ b/yt_dlp/extractor/odnoklassniki.py @@ -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({ diff --git a/yt_dlp/extractor/whowatch.py b/yt_dlp/extractor/whowatch.py index 8080f289a..f8bc2e73a 100644 --- a/yt_dlp/extractor/whowatch.py +++ b/yt_dlp/extractor/whowatch.py @@ -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) |