Merge remote-tracking branch 'Asido/master'

[youtube-dl] / youtube_dl / PostProcessor.py

diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py
index 52e686a7f5ad1c52e7e1b717850f785282d5e944..0501cc7f6075cc4b99264cae2f84b57691fb1d3a 100644 (file)
--- a/youtube_dl/PostProcessor.py
+++ b/youtube_dl/PostProcessor.py
@@ -60,7 +60,6 @@ class AudioConversionError(BaseException):
                self.message = message
 
 class FFmpegExtractAudioPP(PostProcessor):
-
        def __init__(self, downloader=None, preferredcodec=None, preferredquality=None, keepvideo=False):
                PostProcessor.__init__(self, downloader)
                if preferredcodec is None:
@@ -68,11 +67,23 @@ class FFmpegExtractAudioPP(PostProcessor):
                self._preferredcodec = preferredcodec
                self._preferredquality = preferredquality
                self._keepvideo = keepvideo
+               self._exes = self.detect_executables()
 
        @staticmethod
-       def get_audio_codec(path):
+       def detect_executables():
+               def executable(exe):
+                       try:
+                               subprocess.Popen([exe, '-version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+                       except OSError:
+                               return False
+                       return exe
+               programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe']
+               return dict((program, executable(program)) for program in programs)
+
+       def get_audio_codec(self, path):
+               if not self._exes['ffprobe'] and not self._exes['avprobe']: return None
                try:
-                       cmd = ['ffprobe', '-show_streams', '--', encodeFilename(path)]
+                       cmd = [self._exes['avprobe'] or self._exes['ffprobe'], '-show_streams', '--', encodeFilename(path)]
                        handle = subprocess.Popen(cmd, stderr=file(os.path.devnull, 'w'), stdout=subprocess.PIPE)
                        output = handle.communicate()[0]
                        if handle.wait() != 0:
@@ -87,22 +98,18 @@ class FFmpegExtractAudioPP(PostProcessor):
                                return audio_codec
                return None
 
-       @staticmethod
-       def run_ffmpeg(path, out_path, codec, more_opts):
+       def run_ffmpeg(self, path, out_path, codec, more_opts):
+               if not self._exes['ffmpeg'] and not self._exes['avconv']:
+                       raise AudioConversionError('ffmpeg or avconv not found. Please install one.')   
                if codec is None:
                        acodec_opts = []
                else:
                        acodec_opts = ['-acodec', codec]
-               cmd = ['ffmpeg', '-y', '-i', encodeFilename(path), '-vn'] + acodec_opts + more_opts + ['--', encodeFilename(out_path)]
-               try:
-                       p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                       stdout,stderr = p.communicate()
-               except (IOError, OSError):
-                       e = sys.exc_info()[1]
-                       if isinstance(e, OSError) and e.errno == 2:
-                               raise AudioConversionError('ffmpeg not found. Please install ffmpeg.')
-                       else:
-                               raise e
+               cmd = ([self._exes['avconv'] or self._exes['ffmpeg'], '-y', '-i', encodeFilename(path), '-vn']
+                          + acodec_opts + more_opts +
+                          ['--', encodeFilename(out_path)])
+               p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+               stdout,stderr = p.communicate()
                if p.returncode != 0:
                        msg = stderr.strip().split('\n')[-1]
                        raise AudioConversionError(msg)
@@ -121,7 +128,7 @@ class FFmpegExtractAudioPP(PostProcessor):
                                # Lossless, but in another container
                                acodec = 'copy'
                                extension = self._preferredcodec
-                               more_opts = ['-absf', 'aac_adtstoasc']
+                               more_opts = [self._exes['avconv'] and '-bsf:a' or '-absf', 'aac_adtstoasc']
                        elif filecodec in ['aac', 'mp3', 'vorbis']:
                                # Lossless if possible
                                acodec = 'copy'
@@ -136,18 +143,24 @@ class FFmpegExtractAudioPP(PostProcessor):
                                extension = 'mp3'
                                more_opts = []
                                if self._preferredquality is not None:
-                                       more_opts += ['-ab', self._preferredquality]
+                                       if int(self._preferredquality) < 10:
+                                               more_opts += [self._exes['avconv'] and '-q:a' or '-aq', self._preferredquality]
+                                       else:
+                                               more_opts += [self._exes['avconv'] and '-b:a' or '-ab', self._preferredquality + 'k']
                else:
                        # We convert the audio (lossy)
                        acodec = {'mp3': 'libmp3lame', 'aac': 'aac', 'm4a': 'aac', 'vorbis': 'libvorbis', 'wav': None}[self._preferredcodec]
                        extension = self._preferredcodec
                        more_opts = []
                        if self._preferredquality is not None:
-                               more_opts += ['-ab', self._preferredquality]
+                               if int(self._preferredquality) < 10:
+                                       more_opts += [self._exes['avconv'] and '-q:a' or '-aq', self._preferredquality]
+                               else:
+                                       more_opts += [self._exes['avconv'] and '-b:a' or '-ab', self._preferredquality + 'k']
                        if self._preferredcodec == 'aac':
                                more_opts += ['-f', 'adts']
                        if self._preferredcodec == 'm4a':
-                               more_opts += ['-absf', 'aac_adtstoasc']
+                               more_opts += [self._exes['avconv'] and '-bsf:a' or '-absf', 'aac_adtstoasc']
                        if self._preferredcodec == 'vorbis':
                                extension = 'ogg'
                        if self._preferredcodec == 'wav':
@@ -156,7 +169,7 @@ class FFmpegExtractAudioPP(PostProcessor):
 
                prefix, sep, ext = path.rpartition(u'.') # not os.path.splitext, since the latter does not work on unicode in all setups
                new_path = prefix + sep + extension
-               self._downloader.to_screen(u'[ffmpeg] Destination: ' + new_path)
+               self._downloader.to_screen(u'[' + (self._exes['avconv'] and 'avconv' or 'ffmpeg') + '] Destination: ' + new_path)
                try:
                        self.run_ffmpeg(path, new_path, acodec, more_opts)
                except:
@@ -164,7 +177,7 @@ class FFmpegExtractAudioPP(PostProcessor):
                        if isinstance(e, AudioConversionError):
                                self._downloader.to_stderr(u'ERROR: audio conversion failed: ' + e.message)
                        else:
-                               self._downloader.to_stderr(u'ERROR: error running ffmpeg')
+                               self._downloader.to_stderr(u'ERROR: error running ' + (self._exes['avconv'] and 'avconv' or 'ffmpeg'))
                        return None
 
                # Try to update the date time for extracted audio file.