debian/changelog: Start new release.

[youtubedl] / youtube_dl / postprocessor / ffmpeg.py

diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py
index 45328ed43ef44052fedb9dcf5f2de012aa3007ae..083c79592b54f069cc25512017260f10882fb76b 100644 (file)
--- a/youtube_dl/postprocessor/ffmpeg.py
+++ b/youtube_dl/postprocessor/ffmpeg.py
@@ -1,4 +1,5 @@
 import os
 import os

+import re

 import subprocess
 import sys
 import time
 import subprocess
 import sys
 import time


@@ -7,10 +8,10 @@ import time
 from .common import AudioConversionError, PostProcessor
 
 from ..utils import (
 from .common import AudioConversionError, PostProcessor
 
 from ..utils import (

-    check_executable,

     compat_subprocess_get_DEVNULL,
     encodeArgument,
     encodeFilename,
     compat_subprocess_get_DEVNULL,
     encodeArgument,
     encodeFilename,

+    is_outdated_version,

     PostProcessingError,
     prepend_extension,
     shell_quote,
     PostProcessingError,
     prepend_extension,
     shell_quote,


@@ -18,37 +19,82 @@ from ..utils import (
 )
 
 
 )
 
 

+def get_version(executable):
+    """ Returns the version of the specified executable,
+    or False if the executable is not present """
+    try:
+        out, err = subprocess.Popen(
+            [executable, '-version'],
+            stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()
+    except OSError:
+        return False
+    firstline = out.partition(b'\n')[0].decode('ascii', 'ignore')
+    m = re.search(r'version\s+([0-9._-a-zA-Z]+)', firstline)
+    if not m:
+        return u'present'
+    else:
+        return m.group(1)
+

 
 class FFmpegPostProcessorError(PostProcessingError):
     pass
 
 
 class FFmpegPostProcessorError(PostProcessingError):
     pass
 

+

 class FFmpegPostProcessor(PostProcessor):
 class FFmpegPostProcessor(PostProcessor):

-    def __init__(self,downloader=None):
+    def __init__(self, downloader=None, deletetempfiles=False):

         PostProcessor.__init__(self, downloader)
         PostProcessor.__init__(self, downloader)

-        self._exes = self.detect_executables()
+        self._versions = self.get_versions()
+        self._deletetempfiles = deletetempfiles
+
+    def check_version(self):
+        if not self._executable:
+            raise FFmpegPostProcessorError(u'ffmpeg or avconv not found. Please install one.')
+
+        REQUIRED_VERSION = '1.0'
+        if is_outdated_version(
+                self._versions[self._executable], REQUIRED_VERSION):
+            warning = u'Your copy of %s is outdated, update %s to version %s or newer if you encounter any errors.' % (
+                self._executable, self._executable, REQUIRED_VERSION)
+            if self._downloader:
+                self._downloader.report_warning(warning)

 
     @staticmethod
 
     @staticmethod

-    def detect_executables():
+    def get_versions():

         programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe']
         programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe']

-        return dict((program, check_executable(program, ['-version'])) for program in programs)
+        return dict((program, get_version(program)) for program in programs)
+
+    @property
+    def _executable(self):
+        if self._downloader.params.get('prefer_ffmpeg', False):
+            prefs = ('ffmpeg', 'avconv')
+        else:
+            prefs = ('avconv', 'ffmpeg')
+        for p in prefs:
+            if self._versions[p]:
+                return p
+        return None

 
 

-    def _get_executable(self):
+    @property
+    def _probe_executable(self):

         if self._downloader.params.get('prefer_ffmpeg', False):
         if self._downloader.params.get('prefer_ffmpeg', False):

-            return self._exes['ffmpeg'] or self._exes['avconv']
+            prefs = ('ffprobe', 'avprobe')

         else:
         else:

-            return self._exes['avconv'] or self._exes['ffmpeg']
+            prefs = ('avprobe', 'ffprobe')
+        for p in prefs:
+            if self._versions[p]:
+                return p
+        return None

 
     def _uses_avconv(self):
 
     def _uses_avconv(self):

-        return self._get_executable() == self._exes['avconv']
+        return self._executable == 'avconv'

 
     def run_ffmpeg_multiple_files(self, input_paths, out_path, opts):
 
     def run_ffmpeg_multiple_files(self, input_paths, out_path, opts):

-        if not self._get_executable():
-            raise FFmpegPostProcessorError(u'ffmpeg or avconv not found. Please install one.')
+        self.check_version()

 
         files_cmd = []
         for path in input_paths:
             files_cmd.extend(['-i', encodeFilename(path, True)])
 
         files_cmd = []
         for path in input_paths:
             files_cmd.extend(['-i', encodeFilename(path, True)])

-        cmd = ([self._get_executable(), '-y'] + files_cmd
+        cmd = ([self._executable, '-y'] + files_cmd

                + [encodeArgument(o) for o in opts] +
                [encodeFilename(self._ffmpeg_filename_argument(out_path), True)])
 
                + [encodeArgument(o) for o in opts] +
                [encodeFilename(self._ffmpeg_filename_argument(out_path), True)])
 


@@ -60,6 +106,9 @@ class FFmpegPostProcessor(PostProcessor):
             stderr = stderr.decode('utf-8', 'replace')
             msg = stderr.strip().split('\n')[-1]
             raise FFmpegPostProcessorError(msg)
             stderr = stderr.decode('utf-8', 'replace')
             msg = stderr.strip().split('\n')[-1]
             raise FFmpegPostProcessorError(msg)

+        if self._deletetempfiles:
+            for ipath in input_paths:
+                os.remove(ipath)

 
     def run_ffmpeg(self, path, out_path, opts):
         self.run_ffmpeg_multiple_files([path], out_path, opts)
 
     def run_ffmpeg(self, path, out_path, opts):
         self.run_ffmpeg_multiple_files([path], out_path, opts)


@@ -81,11 +130,12 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
         self._nopostoverwrites = nopostoverwrites
 
     def get_audio_codec(self, path):
         self._nopostoverwrites = nopostoverwrites
 
     def get_audio_codec(self, path):

-        if not self._exes['ffprobe'] and not self._exes['avprobe']:
+
+        if not self._probe_executable:

             raise PostProcessingError(u'ffprobe or avprobe not found. Please install one.')
         try:
             cmd = [
             raise PostProcessingError(u'ffprobe or avprobe not found. Please install one.')
         try:
             cmd = [

-                self._exes['avprobe'] or self._exes['ffprobe'],
+                self._probe_executable,

                 '-show_streams',
                 encodeFilename(self._ffmpeg_filename_argument(path), True)]
             handle = subprocess.Popen(cmd, stderr=compat_subprocess_get_DEVNULL(), stdout=subprocess.PIPE)
                 '-show_streams',
                 encodeFilename(self._ffmpeg_filename_argument(path), True)]
             handle = subprocess.Popen(cmd, stderr=compat_subprocess_get_DEVNULL(), stdout=subprocess.PIPE)


@@ -178,14 +228,14 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
             if self._nopostoverwrites and os.path.exists(encodeFilename(new_path)):
                 self._downloader.to_screen(u'[youtube] Post-process file %s exists, skipping' % new_path)
             else:
             if self._nopostoverwrites and os.path.exists(encodeFilename(new_path)):
                 self._downloader.to_screen(u'[youtube] Post-process file %s exists, skipping' % new_path)
             else:

-                self._downloader.to_screen(u'[' + self._get_executable() + '] Destination: ' + new_path)
+                self._downloader.to_screen(u'[' + self._executable + '] Destination: ' + new_path)

                 self.run_ffmpeg(path, new_path, acodec, more_opts)
         except:
             etype,e,tb = sys.exc_info()
             if isinstance(e, AudioConversionError):
                 msg = u'audio conversion failed: ' + e.msg
             else:
                 self.run_ffmpeg(path, new_path, acodec, more_opts)
         except:
             etype,e,tb = sys.exc_info()
             if isinstance(e, AudioConversionError):
                 msg = u'audio conversion failed: ' + e.msg
             else:

-                msg = u'error running ' + self._get_executable()
+                msg = u'error running ' + self._executable

             raise PostProcessingError(msg)
 
         # Try to update the date time for extracted audio file.
             raise PostProcessingError(msg)
 
         # Try to update the date time for extracted audio file.


@@ -483,7 +533,7 @@ class FFmpegMetadataPP(FFmpegPostProcessor):
 class FFmpegMergerPP(FFmpegPostProcessor):
     def run(self, info):
         filename = info['filepath']
 class FFmpegMergerPP(FFmpegPostProcessor):
     def run(self, info):
         filename = info['filepath']

-        args = ['-c', 'copy']
+        args = ['-c', 'copy', '-map', '0:v:0', '-map', '1:a:0', '-shortest']

         self._downloader.to_screen(u'[ffmpeg] Merging formats into "%s"' % filename)
         self.run_ffmpeg_multiple_files(info['__files_to_merge'], filename, args)
         return True, info
         self._downloader.to_screen(u'[ffmpeg] Merging formats into "%s"' % filename)
         self.run_ffmpeg_multiple_files(info['__files_to_merge'], filename, args)
         return True, info