pick highest fps when concatenating (#416)

* readers.py cast chunksize from float to int

* choose highest fps of clips when concatenating

* pick highest fps when concatenating

* pick highest fps when concatenating

* fps either max or none

* remove resolve markers

removed resolve markers such as HEAD, etc so that the file will compile correctly.
Remove some double blank lines, etc

* update concatenate.py; add c.fps is not None

moviepy/audio/io/readers.py

@@ -110,6 +110,8 @@ def skip_chunk(self,chunksize):
 
 
     def read_chunk(self,chunksize):
+        # chunksize is not being autoconverted from float to int
+        chunksize = int(round(chunksize))
         L = self.nchannels*chunksize*self.nbytes
         s = self.proc.stdout.read(L)
         dt = {1: 'int8',2:'int16',4:'int32'}[self.nbytes]
@@ -234,6 +236,3 @@ def buffer_around(self,framenumber):
 
     def __del__(self):
         self.close_proc()
-
-
-

moviepy/video/compositing/concatenate.py

@@ -15,10 +15,10 @@
 def concatenate_videoclips(clips, method="chain", transition=None,
                            bg_color=None, ismask=False, padding = 0):
     """ Concatenates several video clips
-    
+
     Returns a video clip made by clip by concatenating several video clips.
     (Concatenated means that they will be played one after another).
-    
+
     There are two methods:
 
     - method="chain": will produce a clip that simply outputs
@@ -38,56 +38,50 @@ def concatenate_videoclips(clips, method="chain", transition=None,
        will be transparent if mask=True, else it will be of the
        color specified by ``bg_color``.
 
-    If all clips with a fps attribute have the same fps, it becomes the fps of
-    the result.
+    The clip with the highest FPS will be the FPS of the result clip.
 
     Parameters
     -----------
-
     clips
       A list of video clips which must all have their ``duration``
       attributes set.
-
     method
       "chain" or "compose": see above.
-
     transition
       A clip that will be played between each two clips of the list.
-    
+
     bg_color
       Only for method='compose'. Color of the background.
       Set to None for a transparent clip
-    
+
     padding
       Only for method='compose'. Duration during two consecutive clips.
       Note that for negative padding, a clip will partly play at the same
       time as the clip it follows (negative padding is cool for clips who fade
       in on one another). A non-null padding automatically sets the method to
       `compose`.
-           
+
     """
 
     if transition is not None:
         l = [[v, transition] for v in clips[:-1]]
         clips = reduce(lambda x, y: x + y, l) + [clips[-1]]
         transition = None
 
-
     tt = np.cumsum([0] + [c.duration for c in clips])
 
     sizes = [v.size for v in clips]
 
-
     w = max([r[0] for r in sizes])
     h = max([r[1] for r in sizes])
 
     tt = np.maximum(0, tt + padding*np.arange(len(tt)))
-    
+
     if method == "chain":
         def make_frame(t):
             i = max([i for i, e in enumerate(tt) if e <= t])
             return clips[i].get_frame(t - tt[i])
-        
+
         result = VideoClip(ismask = ismask, make_frame = make_frame)
         if any([c.mask is not None for c in clips]):
             masks = [c.mask if (c.mask is not None) else
@@ -96,8 +90,6 @@ def make_frame(t):
                      for c in clips]
             result.mask = concatenate_videoclips(masks, method="chain", ismask=True)
             result.clips = clips
-
-
     elif method == "compose":
         result = CompositeVideoClip( [c.set_start(t).set_pos('center')
                                 for (c, t) in zip(clips, tt)],
@@ -107,18 +99,20 @@ def make_frame(t):
                         "concatenate_videoclips must be 'chain' or 'compose'")
 
     result.tt = tt
-    
+
     result.start_times = tt[:-1]
     result.start, result.duration, result.end = 0, tt[-1] , tt[-1]
-    
+
     audio_t = [(c.audio,t) for c,t in zip(clips,tt) if c.audio is not None]
     if len(audio_t)>0:
         result.audio = CompositeAudioClip([a.set_start(t)
                                 for a,t in audio_t])
 
-    fps_list = list(set([c.fps for c in clips if hasattr(c,'fps')]))
-    if len(fps_list)==1:
-        result.fps= fps_list[0]
+    fpss = [c.fps for c in clips if hasattr(c,'fps') and c.fps is not None]
+    if len(fpss) == 0:
+        result.fps = None
+    else:
+        result.fps = max(fpss)
 
     return result