summary refs log tree commit diff
diff options
context:
space:
mode:
authorpulpe <Pulpan3@gmail.com>2015-04-24 09:08:57 +0200
committerpulpe <Pulpan3@gmail.com>2015-04-24 09:08:57 +0200
commit31fd9c76013faaa86b0c515d9305de548856ef84 (patch)
treed8c0ceffd57423005aa7c425b1b413ad3645d349
parentddbed36455f8b3053f38d84b2e62e2fb5cd66eac (diff)
downloadyoutube-dl-31fd9c76013faaa86b0c515d9305de548856ef84.tar.gz
youtube-dl-31fd9c76013faaa86b0c515d9305de548856ef84.tar.xz
youtube-dl-31fd9c76013faaa86b0c515d9305de548856ef84.zip
[embedthumbnail] use FFmpegPostProcessor for mp3
-rw-r--r--youtube_dl/postprocessor/embedthumbnail.py21
1 files changed, 6 insertions, 15 deletions
diff --git a/youtube_dl/postprocessor/embedthumbnail.py b/youtube_dl/postprocessor/embedthumbnail.py
index b6507db27..a2d6b14db 100644
--- a/youtube_dl/postprocessor/embedthumbnail.py
+++ b/youtube_dl/postprocessor/embedthumbnail.py
@@ -5,7 +5,8 @@ from __future__ import unicode_literals
 import os
 import subprocess
 
-from .common import PostProcessor
+from .ffmpeg import FFmpegPostProcessor
+
 from ..compat import (
     compat_urlretrieve,
 )
@@ -22,7 +23,7 @@ class EmbedThumbnailPPError(PostProcessingError):
     pass
 
 
-class EmbedThumbnailPP(PostProcessor):
+class EmbedThumbnailPP(FFmpegPostProcessor):
     def run(self, info):
         filename = info['filepath']
         temp_filename = prepend_extension(filename, 'temp')
@@ -34,22 +35,12 @@ class EmbedThumbnailPP(PostProcessor):
         compat_urlretrieve(info['thumbnail'], temp_thumbnail)
 
         if info['ext'] == 'mp3':
-            if not check_executable('ffmpeg', ['-version']):
-                raise AtomicParsleyPPError('FFmpeg was not found. Please install.')
-
-            cmd = ['ffmpeg', '-i', filename, '-i', temp_thumbnail, '-c', 'copy', '-map', '0', '-map', '1', '-metadata:s:v', 'title="Album cover"', '-metadata:s:v', 'comment="Cover (Front)"', temp_filename]
+            options = ['-i', temp_thumbnail, '-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)
 
-            if self._downloader.params.get('verbose', False):
-                self._downloader.to_screen('[debug] FFmpeg 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)
+            self.run_ffmpeg(filename, temp_filename, options)
 
             os.remove(encodeFilename(temp_thumbnail))
             os.remove(encodeFilename(filename))