Merge remote-tracking branch 'kbarnhart/ffmpeg' into kbarnhart-ffmpeg

* kbarnhart/ffmpeg:
  handle html and mp4 separately for dpi/embedded figure width in browser issues.
  improve mp4/ffmpeg support
  add basic ffmpeg support

src/python/visclaw/animation_tools.py

@@ -242,7 +242,8 @@ def make_rst(anim, file_name='anim.rst',
 
 
 def make_mp4(anim, file_name='anim.mp4',
-              fps=None, embed_frames=True, default_mode='once'):
+              fps=None, embed_frames=True, default_mode='once',
+              dpi=None):
     """
     Take an animation and covert to mp4 file using ffmpeg, which must be
     installed.
@@ -259,7 +260,7 @@ def make_mp4(anim, file_name='anim.mp4',
     if fps is None:
         fps = 3
     writer = animation.writers['ffmpeg'](fps=fps)
-    anim.save(file_name, writer=writer)
+    anim.save(file_name, writer=writer, dpi=dpi)
     print("Created %s" % file_name)
 
 
@@ -409,8 +410,9 @@ def make_anim_outputs_from_plotdir(plotdir='_plots', fignos='all',
 
         if 'mp4' in outputs:
             file_name = file_name_prefix + 'fig%s.mp4' % figno
+
             make_mp4(anim, file_name, fps=fps, \
-                embed_frames=True, default_mode='once')
+                embed_frames=True, default_mode='once', dpi=dpi)
 
         if 'html' in outputs:
             file_name = file_name_prefix + 'fig%s.html' % figno
@@ -423,7 +425,7 @@ def make_anim_outputs_from_plotdir(plotdir='_plots', fignos='all',
                 embed_frames=True, default_mode='once')
 
 
-def animate_from_plotdir(plotdir='_plots', figno=None, figsize=None, 
+def animate_from_plotdir(plotdir='_plots', figno=None, figsize=None,
                          dpi=None, fps=5):
     """
     Use the png files in plotdir to create an animation that is returned.

src/python/visclaw/data.py

@@ -89,7 +89,9 @@ def __init__(self, controller=None):
         self.add_attribute('html_index_title','Plot Index')   # title at top of index page
         self.add_attribute('html_homelink',None)       # link to here from top of _PlotIndex.html
         self.add_attribute('html_movie','JSAnimation') # make html with java script for movie
-        self.add_attribute('html_movie_width', 500)    # width of movie
+        self.add_attribute('html_movie_width', 500)    # width of movie (not used?)
+        self.add_attribute('html_movie_dpi', 100)      # dpi of movie
+
         self.add_attribute('html_eagle',False)         # use EagleClaw titles on html pages?
 
         self.add_attribute('kml',False)                # make kml plots and a kml file for figures
@@ -104,6 +106,8 @@ def __init__(self, controller=None):
 
         self.add_attribute('gif_movie',False)          # make animated gif movie of frames
 
+        self.add_attribute('mp4_movie',False)         # make animated mp4 movie of frames
+        self.add_attribute('movie_name_prefix', 'movie_')
         self.add_attribute('setplot',False)            # Execute setplot.py in plot routine
 
         self.add_attribute('mapc2p',None)              # function to map computational
@@ -689,9 +693,9 @@ def __init__(self, name, plotfigure):
         self.add_attribute('title_fontsize', None)
         self.add_attribute('title_kwargs', {}) # e.g. to set color
         self.add_attribute('title_t_format', None) # format for t in title
-        self.add_attribute('xticks_fontsize', None) 
+        self.add_attribute('xticks_fontsize', None)
         self.add_attribute('xticks_kwargs', {}) # e.g. to set ticks,rotation
-        self.add_attribute('yticks_fontsize', None) 
+        self.add_attribute('yticks_fontsize', None)
         self.add_attribute('yticks_kwargs', {}) # e.g. to set ticks
         self.add_attribute('xlabel', None) # label for x-axis
         self.add_attribute('ylabel', None) # label for y-axis

src/python/visclaw/plotpages.py

@@ -2243,6 +2243,12 @@ def plotclaw2html(plotdata):
             html.write('\n   <td><a href="moviefig%s.gif">%s</a></td>' \
                            % (fignos[ifig],fignames[fignos[ifig]]))
         html.write('</tr>\n')
+    if plotdata.mp4_movie:
+        html.write('<p><tr><td><b>mp4 Movies:</b></td>')
+        for ifig in range(len(fignos)):
+            html.write(f'\n   <td><a href="{plotdata.movie_name_prefix}fig%s.mp4">%s</a></td>' \
+                           % (fignos[ifig],fignames[fignos[ifig]]))
+        html.write('</tr>\n')
     html.write('<p>\n<tr><td><b>All Frames:</b></td> ')
     for ifig in range(len(fignos)):
         html.write('\n   <td><a href="%s">%s</a></td>' \
@@ -3052,7 +3058,7 @@ def plotclaw_driver(plotdata, verbose=False, format='ascii'):
     if plotdata.kml:
         plotpages.plotclaw2kml(plotdata)
 
-    if (plotdata.html_movie == "JSAnimation") and (len(framenos) > 0):
+    if ((plotdata.html_movie == "JSAnimation") or plotdata.mp4_movie) and (len(framenos) > 0):
 
         # Create Animations
 
@@ -3070,16 +3076,45 @@ def plotclaw_driver(plotdata, verbose=False, format='ascii'):
                 png_prefix = ''
             else:
                 png_prefix = plotdata.file_prefix
-            animation_tools.make_anim_outputs_from_plotdir(plotdir=plotdir,
-                            #file_name_prefix='movieframe_allframes',
-                            file_name_prefix='movie_',
-                            png_prefix=png_prefix,
-                            figsize=None,
-                            fignos=[figno], outputs=['html'], raw_html=raw_html)
+
+            # get original fig shape
+            figname = plotdata._figname_from_num[figno]
+            plotfigure = plotdata.plotfigure_dict[figname]
+            figkwargs = getattr(plotfigure, 'kwargs', {})
+            figsize = getattr(plotfigure, 'figsize', None)
+            if figsize is None:
+                figsize = figkwargs.get('figsize', None)
+
+            # make animations
+            if plotdata.mp4_movie:
+                # use default dpi or get from plotdata
+                # this ensures that if it was set, dpi of mp4 is same as frames.
+                dpi = figkwargs.get('dpi', html_movie_dpi)
+                animation_tools.make_anim_outputs_from_plotdir(plotdir=plotdir,
+                                #file_name_prefix='movieframe_allframes',
+                                file_name_prefix=plotdata.movie_name_prefix,
+                                png_prefix=png_prefix,
+                                figsize=figsize,
+                                dpi=dpi,
+                                fignos=[figno], outputs=['mp4'],
+                                raw_html=raw_html)
+
+            if plotdata.html_movie == "JSAnimation":
+                # use different dpi so that plots do not take over browser width.
+                animation_tools.make_anim_outputs_from_plotdir(plotdir=plotdir,
+                                #file_name_prefix='movieframe_allframes',
+                                file_name_prefix=plotdata.movie_name_prefix,
+                                png_prefix=png_prefix,
+                                figsize=figsize,
+                                dpi=plotdata.html_movie_dpi,
+                                fignos=[figno], outputs=['html'],
+                                raw_html=raw_html)
 
             # Note: setting figsize=None above chooses figsize with aspect
             # ratio based on .png files read in, may fit better on page
-
+            # 3/21/24 - For MP4 size and dpi are taken from plotdata for
+            # each figure.
+
 
     #-----------
     # gif movie: