add threads parameter to speedup conversion

yuzhile · Oct 8, 2014 · 30a880b · 30a880b
1 parent 699ebf0
commit 30a880b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/moviepy/video/VideoClip.py b/moviepy/video/VideoClip.py
@@ -152,7 +152,7 @@ def write_videofile(self, filename, fps=24, codec=None,
                  audio_bitrate = None, audio_bufsize = 2000,
                  temp_audiofile=None,
                  rewrite_audio = True, remove_temp = True,
-                 write_logfile=False, verbose = True):
+                 write_logfile=False, verbose = True, threads=None):
         """Write the clip to a videofile.
 
         Parameters
@@ -318,7 +318,7 @@ def write_videofile(self, filename, fps=24, codec=None,
                            preset=preset,
                            write_logfile=write_logfile,
                            audiofile = audiofile,
-                           verbose=verbose)
+                           verbose=verbose, threads=threads)
 
         if remove_temp and make_audio:
             os.remove(audiofile)

diff --git a/moviepy/video/io/ffmpeg_writer.py b/moviepy/video/io/ffmpeg_writer.py
@@ -76,7 +76,7 @@ class FFMPEG_VideoWriter:
 
     def __init__(self, filename, size, fps, codec="libx264", audiofile=None,
                  preset="medium", bitrate=None, withmask=False,
-                 logfile=None):
+                 logfile=None, threads=None):
 
         if logfile is None:
           logfile = sp.PIPE
@@ -97,7 +97,8 @@ def __init__(self, filename, size, fps, codec="libx264", audiofile=None,
             + (["-i", audiofile, "-acodec", "copy"] if (audiofile is not None) else [])
             +['-vcodec', codec,
             '-preset', preset]
-            + (['-b',bitrate] if (bitrate!=None) else [])
+            + (['-b:v', bitrate] if (bitrate!=None) else [])
+            + (["-threads", str(threads)] if threads is not None else [])
             # http://trac.ffmpeg.org/ticket/658
             + (['-pix_fmt', 'yuv420p']
                   if ((codec == 'libx264') and
@@ -169,8 +170,8 @@ def close(self):
         del self.proc
 
 def ffmpeg_write_video(clip, filename, fps, codec="libx264", bitrate=None,
-                       preset = "medium", withmask=False, write_logfile=False,
-                       audiofile=None, verbose=True):
+                       preset="medium", withmask=False, write_logfile=False,
+                       audiofile=None, verbose=True, threads=None):
 
     if write_logfile:
         logfile = open(filename + ".log", 'w+')
@@ -181,7 +182,7 @@ def ffmpeg_write_video(clip, filename, fps, codec="libx264", bitrate=None,
     verbose_print(verbose, "\nWriting video into %s\n"%filename)
     writer = FFMPEG_VideoWriter(filename, clip.size, fps, codec = codec,
                                 preset=preset, bitrate=bitrate, logfile=logfile,
-                                audiofile = audiofile)
+                                audiofile=audiofile, threads=threads)
 
     nframes = int(clip.duration*fps)