mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-12-24 18:36:52 +00:00
8e2915d70b
This reverts commit 7360db05b4.
This commit was added as an attempt to fix #6046. Unfortunately, the fix
is completely wrong. As reported on #10359, embedded thumbnails are not
displayed in VLC, and Se7en on IRC reports that the embedded thumbnail
misleads mpv as well.
The correct way is using -attachment of ffmpeg, while the current
run_ffmpeg_multiple_files API can't handle it cleanly.
93 lines
3.4 KiB
Python
93 lines
3.4 KiB
Python
# coding: utf-8
|
|
from __future__ import unicode_literals
|
|
|
|
|
|
import os
|
|
import subprocess
|
|
|
|
from .ffmpeg import FFmpegPostProcessor
|
|
|
|
from ..utils import (
|
|
check_executable,
|
|
encodeArgument,
|
|
encodeFilename,
|
|
PostProcessingError,
|
|
prepend_extension,
|
|
shell_quote
|
|
)
|
|
|
|
|
|
class EmbedThumbnailPPError(PostProcessingError):
|
|
pass
|
|
|
|
|
|
class EmbedThumbnailPP(FFmpegPostProcessor):
|
|
def __init__(self, downloader=None, already_have_thumbnail=False):
|
|
super(EmbedThumbnailPP, self).__init__(downloader)
|
|
self._already_have_thumbnail = already_have_thumbnail
|
|
|
|
def run(self, info):
|
|
filename = info['filepath']
|
|
temp_filename = prepend_extension(filename, 'temp')
|
|
|
|
if not info.get('thumbnails'):
|
|
raise EmbedThumbnailPPError('Thumbnail was not found. Nothing to do.')
|
|
|
|
thumbnail_filename = info['thumbnails'][-1]['filename']
|
|
|
|
if not os.path.exists(encodeFilename(thumbnail_filename)):
|
|
self._downloader.report_warning(
|
|
'Skipping embedding the thumbnail because the file is missing.')
|
|
return [], info
|
|
|
|
if info['ext'] == 'mp3':
|
|
options = [
|
|
'-c', 'copy', '-map', '0', '-map', '1',
|
|
'-metadata:s:v', 'title="Album cover"', '-metadata:s:v', 'comment="Cover (Front)"']
|
|
|
|
self._downloader.to_screen('[ffmpeg] Adding thumbnail to "%s"' % filename)
|
|
|
|
self.run_ffmpeg_multiple_files([filename, thumbnail_filename], temp_filename, options)
|
|
|
|
if not self._already_have_thumbnail:
|
|
os.remove(encodeFilename(thumbnail_filename))
|
|
os.remove(encodeFilename(filename))
|
|
os.rename(encodeFilename(temp_filename), encodeFilename(filename))
|
|
|
|
elif info['ext'] in ['m4a', 'mp4']:
|
|
if not check_executable('AtomicParsley', ['-v']):
|
|
raise EmbedThumbnailPPError('AtomicParsley was not found. Please install.')
|
|
|
|
cmd = [encodeFilename('AtomicParsley', True),
|
|
encodeFilename(filename, True),
|
|
encodeArgument('--artwork'),
|
|
encodeFilename(thumbnail_filename, True),
|
|
encodeArgument('-o'),
|
|
encodeFilename(temp_filename, True)]
|
|
|
|
self._downloader.to_screen('[atomicparsley] Adding thumbnail to "%s"' % filename)
|
|
|
|
if self._downloader.params.get('verbose', False):
|
|
self._downloader.to_screen('[debug] AtomicParsley command line: %s' % shell_quote(cmd))
|
|
|
|
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
|
stdout, stderr = p.communicate()
|
|
|
|
if p.returncode != 0:
|
|
msg = stderr.decode('utf-8', 'replace').strip()
|
|
raise EmbedThumbnailPPError(msg)
|
|
|
|
if not self._already_have_thumbnail:
|
|
os.remove(encodeFilename(thumbnail_filename))
|
|
# for formats that don't support thumbnails (like 3gp) AtomicParsley
|
|
# won't create to the temporary file
|
|
if b'No changes' in stdout:
|
|
self._downloader.report_warning('The file format doesn\'t support embedding a thumbnail')
|
|
else:
|
|
os.remove(encodeFilename(filename))
|
|
os.rename(encodeFilename(temp_filename), encodeFilename(filename))
|
|
else:
|
|
raise EmbedThumbnailPPError('Only mp3 and m4a/mp4 are supported for thumbnail embedding for now.')
|
|
|
|
return [], info
|