[youtube] Prefer DASH formats (closes #28070)
authorSergey M․ <dstftw@gmail.com>
Thu, 4 Feb 2021 06:07:43 +0000 (13:07 +0700)
committerSergey M․ <dstftw@gmail.com>
Thu, 4 Feb 2021 06:07:43 +0000 (13:07 +0700)
youtube_dl/extractor/youtube.py

index 42b0f452c79b5cfd0f38376faa56d23967e1ff9b..a3b10c0942345d2bbdd81076cc1a38c91eef0c0a 100644 (file)
@@ -1549,16 +1549,22 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
         if self._downloader.params.get('youtube_include_dash_manifest'):
             dash_manifest_url = streaming_data.get('dashManifestUrl')
             if dash_manifest_url:
+                dash_formats = []
                 for f in self._extract_mpd_formats(
                         dash_manifest_url, video_id, fatal=False):
-                    if f['format_id'] in itags:
-                        continue
                     filesize = int_or_none(self._search_regex(
                         r'/clen/(\d+)', f.get('fragment_base_url')
                         or f['url'], 'file size', default=None))
                     if filesize:
                         f['filesize'] = filesize
-                    formats.append(f)
+                    dash_formats.append(f)
+                # Until further investigation prefer DASH formats as non-DASH
+                # may not be available (see [1])
+                # 1. https://github.com/ytdl-org/youtube-dl/issues/28070
+                if dash_formats:
+                    dash_formats_keys = [f['format_id'] for f in dash_formats]
+                    formats = [f for f in formats if f['format_id'] not in dash_formats_keys]
+                    formats.extend(dash_formats)
 
         if not formats:
             if streaming_data.get('licenseInfos'):