API movies/FFmpeg: default framerate=24

Author: christianbrodbeck

surfer/utils.py

@@ -660,7 +660,7 @@ def assert_ffmpeg_is_available():
 requires_ffmpeg = np.testing.dec.skipif(not has_ffmpeg(), 'Requires FFmpeg')
 
 
-def ffmpeg(dst, frame_path, framerate=25, codec='mpeg4'):
+def ffmpeg(dst, frame_path, framerate=24, codec='mpeg4'):
     """Run FFmpeg in a subprocess to convert an image sequence into a movie
 
     Parameters
@@ -671,7 +671,7 @@ def ffmpeg(dst, frame_path, framerate=25, codec='mpeg4'):
     frame_path : str
         Path to the source frames (with a frame number field like '%04d').
     framerate : float
-        Framerate of the movie (frames per second, default 25).
+        Framerate of the movie (frames per second, default 24).
     codec : str
         Codec to use (default 'mpeg4').
 

surfer/viz.py

@@ -2094,7 +2094,7 @@ def save_montage(self, filename, order=['lat', 'ven', 'med'],
         return out
 
     def save_movie(self, fname, time_dilation=4., tmin=None, tmax=None,
-                   framerate=25, interpolation='quadratic', codec='mpeg4'):
+                   framerate=24, interpolation='quadratic', codec='mpeg4'):
         """Save a movie (for data with a time axis)
 
         .. Warning::
@@ -2115,7 +2115,7 @@ def save_movie(self, fname, time_dilation=4., tmin=None, tmax=None,
         tmax : float
             Last time point to include (default: all data).
         framerate : float
-            Framerate of the movie (frames per second, default 25).
+            Framerate of the movie (frames per second, default 24).
         interpolation : str
             Interpolation method (``scipy.interpolate.interp1d`` parameter,
             one of 'linear' | 'nearest' | 'zero' | 'slinear' | 'quadratic' |