[EmbedThumbnail] Prefer AtomicParsley over ffmpeg if available

yt_dlp/postprocessor/embedthumbnail.py

@@ -145,34 +145,18 @@ class EmbedThumbnailPP(FFmpegPostProcessor):
                     self.report_warning('unable to embed using mutagen; %s' % error_to_compat_str(err))
                     success = False
 
-            # Method 2: Use ffmpeg+ffprobe
+            # Method 2: Use AtomicParsley
-            if not success and not prefer_atomicparsley:
-                success = True
-                try:
-                    options = ['-c', 'copy', '-map', '0', '-dn', '-map', '1']
-
-                    old_stream, new_stream = self.get_stream_number(
-                        filename, ('disposition', 'attached_pic'), 1)
-                    if old_stream is not None:
-                        options.extend(['-map', '-0:%d' % old_stream])
-                        new_stream -= 1
-                    options.extend(['-disposition:%s' % new_stream, 'attached_pic'])
-
-                    self._report_run('ffmpeg', filename)
-                    self.run_ffmpeg_multiple_files([filename, thumbnail_filename], temp_filename, options)
-                except PostProcessingError as err:
-                    self.report_warning('unable to embed using ffprobe & ffmpeg; %s' % error_to_compat_str(err))
-                    success = False
-
-            # Method 3: Use AtomicParsley
             if not success:
                 success = True
                 atomicparsley = next((
                     x for x in ['AtomicParsley', 'atomicparsley']
                     if check_executable(x, ['-v'])), None)
                 if atomicparsley is None:
-                    raise EmbedThumbnailPPError('AtomicParsley was not found. Please install')
+                    self.to_screen('Neither mutagen nor AtomicParsley was found. Falling back to ffmpeg')
-
+                    success = False
+                else:
+                    if not prefer_atomicparsley:
+                        self.to_screen('mutagen was not found. Falling back to AtomicParsley')
                     cmd = [encodeFilename(atomicparsley, True),
                            encodeFilename(filename, True),
                            encodeArgument('--artwork'),
@@ -187,13 +171,34 @@ class EmbedThumbnailPP(FFmpegPostProcessor):
                     stdout, stderr = p.communicate_or_kill()
                     if p.returncode != 0:
                         msg = stderr.decode('utf-8', 'replace').strip()
-                    raise EmbedThumbnailPPError(msg)
+                        self.report_warning(f'Unable to embed thumbnails using AtomicParsley; {msg}')
                     # for formats that don't support thumbnails (like 3gp) AtomicParsley
                     # won't create to the temporary file
                     if b'No changes' in stdout:
                         self.report_warning('The file format doesn\'t support embedding a thumbnail')
                         success = False
 
+            # Method 3: Use ffmpeg+ffprobe
+            # Thumbnails attached using this method doesn't show up as cover in some cases
+            # See https://github.com/yt-dlp/yt-dlp/issues/2125, https://github.com/yt-dlp/yt-dlp/issues/411
+            if not success:
+                success = True
+                try:
+                    options = ['-c', 'copy', '-map', '0', '-dn', '-map', '1']
+
+                    old_stream, new_stream = self.get_stream_number(
+                        filename, ('disposition', 'attached_pic'), 1)
+                    if old_stream is not None:
+                        options.extend(['-map', '-0:%d' % old_stream])
+                        new_stream -= 1
+                    options.extend(['-disposition:%s' % new_stream, 'attached_pic'])
+
+                    self._report_run('ffmpeg', filename)
+                    self.run_ffmpeg_multiple_files([filename, thumbnail_filename], temp_filename, options)
+                except PostProcessingError as err:
+                    success = False
+                    raise EmbedThumbnailPPError(f'Unable to embed using ffprobe & ffmpeg; {err}')
+
         elif info['ext'] in ['ogg', 'opus', 'flac']:
             if not has_mutagen:
                 raise EmbedThumbnailPPError('module mutagen was not found. Please install using `python -m pip install mutagen`')