Changeset 4353

Timestamp:

May 2, 2014, 10:15:12 AM (11 years ago)

Author:

ldelgass

Message:

Use avconv instead of ffmpeg if found (Debian uses the libav fork and ffmpeg
is removed in e.g. Ubuntu 14.04).

Location:

trunk/packages/vizservers/nanovis

Files:

• FlowCmd.cpp (modified) (2 diffs)
• configure (modified) (6 diffs)
• configure.in (modified) (3 diffs)
• nvconf.h.in (modified) (1 diff)

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -969 +969 @@
 }
 
-#ifdef HAVE_FFMPEG
+#if defined(HAVE_FFMPEG) || defined(HAVE_AVCONV)
 
 /**
@@ -1112 +1112 @@
           FlowVideoSwitches *switchesPtr)
 {
+    char cmd[BUFSIZ];
+#ifdef HAVE_AVCONV
+    /* Generate the movie from the frame images by exec-ing avconv */
+    /* The avconv command is
+     *   avconv -f image2 -i /var/tmp/xxxxx/image%d.ppm                 \
+     *      -f outformat -b bitrate -r framerate /var/tmp/xxxxx/movie.mpeg 
+     */
+#ifndef AVCONV
+#  define AVCONV "/usr/bin/avconv"
+#endif
+    sprintf(cmd, "%s -f image2 -i %s/image%%d.ppm -f %s -b %d -r %f -",
+            AVCONV, tmpFileName, Tcl_GetString(switchesPtr->formatObjPtr), 
+            switchesPtr->bitRate, switchesPtr->frameRate);
+#else
+    /* Generate the movie from the frame images by exec-ing ffmpeg */
+    /* The ffmpeg command is
+     *   ffmpeg -f image2 -i /var/tmp/xxxxx/image%d.ppm                 \
+     *      -f outformat -b bitrate -r framerate /var/tmp/xxxxx/movie.mpeg 
+     */
 #ifndef FFMPEG 
 #  define FFMPEG "/usr/bin/ffmpeg"
 #endif
-    /* Generate the movie from the frame images by exec-ing ffmpeg */
-    /* The ffmpeg command is
-     *   ffmpeg -f image2 -i /var/tmp/xxxxx/image%d.ppm                 \
-     *      -b bitrate -f framerate /var/tmp/xxxxx/movie.mpeg 
-     */
-    char cmd[BUFSIZ];
     sprintf(cmd, "%s -f image2 -i %s/image%%d.ppm -f %s -b %d -r %f -",
             FFMPEG, tmpFileName, Tcl_GetString(switchesPtr->formatObjPtr), 
             switchesPtr->bitRate, switchesPtr->frameRate);
+#endif
     TRACE("Enter: %s", cmd);
     FILE *f;

trunk/packages/vizservers/nanovis/configure

@@ -638 +638 @@
 CG_INC_SPEC
 FFMPEG
+AVCONV
 EGREP
 GREP
@@ -705 +706 @@
 with_vtk
 with_ffmpeg
+with_avconv
 with_statsdir
 '
@@ -1336 +1338 @@
   --with-vtk=VERSION      Version of VTK required [default=6.1]
   --with-ffmpeg=DIR       location of ffmpeg [default=yes]
+  --with-avconv=DIR       location of avconv [default=yes]
   --with-statsdir=DIR     Write statistics in DIR
 
@@ -2296 +2299 @@
 
 
+# Check whether --with-avconv was given.
+if test "${with_avconv+set}" = set; then :
+  withval=$with_avconv;
+else
+  with_avconv=yes
+fi
+
+
+
 # Check whether --with-statsdir was given.
 if test "${with_statsdir+set}" = set; then :
@@ -4800 +4812 @@
 
 #--------------------------------------------------------------------
+# search for avconv executable
+#--------------------------------------------------------------------
+if test "${with_avconv}" != "no" ; then
+  if test "${with_avconv}" = "yes" ; then
+    # Extract the first word of "avconv", so it can be a program name with args.
+set dummy avconv; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_AVCONV+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $AVCONV in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_AVCONV="$AVCONV" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_AVCONV="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+AVCONV=$ac_cv_path_AVCONV
+if test -n "$AVCONV"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AVCONV" >&5
+$as_echo "$AVCONV" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    # Extract the first word of "avconv", so it can be a program name with args.
+set dummy avconv; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_AVCONV+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $AVCONV in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_AVCONV="$AVCONV" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="${with_avconv}/bin:${with_avconv}"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_AVCONV="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+AVCONV=$ac_cv_path_AVCONV
+if test -n "$AVCONV"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AVCONV" >&5
+$as_echo "$AVCONV" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  if test "${AVCONV}x" != "x" ; then
+
+$as_echo "#define HAVE_AVCONV 1" >>confdefs.h
+
+  fi
+fi
+
+#--------------------------------------------------------------------
 # search for ffmpeg executable
 #--------------------------------------------------------------------
@@ -4954 +5061 @@
   LD_RPATH="$loader_run_path:${CG_LIB_DIR}"
 fi
+
 
 

trunk/packages/vizservers/nanovis/configure.in

@@ -45 +45 @@
     [],
     [with_ffmpeg=yes])
+
+AC_ARG_WITH(
+    [avconv],
+    [AS_HELP_STRING([--with-avconv[=DIR]],
+      [location of avconv @<:@default=yes@:>@])],
+    [],
+    [with_avconv=yes])
 
 AC_ARG_WITH(
@@ -198 +205 @@
 
 #--------------------------------------------------------------------
+# search for avconv executable
+#--------------------------------------------------------------------
+if test "${with_avconv}" != "no" ; then
+  if test "${with_avconv}" = "yes" ; then 
+    AC_PATH_PROG(AVCONV, avconv)
+  else 
+    AC_PATH_PROG(AVCONV, avconv, [], [${with_avconv}/bin:${with_avconv}])
+  fi 
+  if test "${AVCONV}x" != "x" ; then
+    AC_DEFINE(HAVE_AVCONV, 1, [nanovis can use avconv to create videos.])
+  fi
+fi
+
+#--------------------------------------------------------------------
 # search for ffmpeg executable
 #--------------------------------------------------------------------
@@ -258 +279 @@
 AC_SUBST(CG_INC_SPEC)
 AC_SUBST(CG_LIB_SPEC)
+AC_SUBST(AVCONV)
 AC_SUBST(FFMPEG)
 AC_SUBST(LD_RPATH)

trunk/packages/vizservers/nanovis/nvconf.h.in

@@ -9 +9 @@
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #undef HAVE_ARPA_INET_H
+
+/* nanovis can use avconv to create videos. */
+#undef HAVE_AVCONV
 
 /* Define to 1 if you have the <Cg/cgGL.h> header file. */