Changeset 1353 for trunk/packages

Timestamp:

Mar 20, 2009, 7:53:28 PM (16 years ago)

Author:

gah

Message:

my first cut at flowvisviewer client based on work by dsk

Location:

trunk/packages/vizservers

Files:

• configure (modified) (3 diffs)
• configure.in (modified) (2 diffs)
• nanoscale/config.h.in (modified) (1 diff)
• nanovis/RpAVTranslate.cpp (modified) (1 diff)
• nanovis/nvconf.h.in (modified) (3 diffs)

trunk/packages/vizservers/configure

@@ -1818 +1818 @@
 
 
-ac_config_headers="$ac_config_headers nanoscale/config.h nanovis/nvconf.h"
+ac_config_headers="$ac_config_headers nanovis/nvconf.h nanoscale/config.h"
 
 
@@ -6612 +6612 @@
 done
 
+LIBS=-lavformat
+
+for ac_func in avformat_alloc_context
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+         test -z "$ac_cxx_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+         test "$cross_compiling" = yes ||
+         $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+        eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+                 $as_echo "$as_val"'`
+               { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+                 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
 LIBS=$oldLIBS
 
@@ -7244 +7346 @@
 do
   case $ac_config_target in
+    "nanovis/nvconf.h") CONFIG_HEADERS="$CONFIG_HEADERS nanovis/nvconf.h" ;;
     "nanoscale/config.h") CONFIG_HEADERS="$CONFIG_HEADERS nanoscale/config.h" ;;
-    "nanovis/nvconf.h") CONFIG_HEADERS="$CONFIG_HEADERS nanovis/nvconf.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "nanoscale/Makefile") CONFIG_FILES="$CONFIG_FILES nanoscale/Makefile" ;;

trunk/packages/vizservers/configure.in

@@ -1 +1 @@
 AC_INIT(vizservers, 0.1, rappture@nanohub.org)
-AC_CONFIG_HEADER(nanoscale/config.h nanovis/nvconf.h)
+AC_CONFIG_HEADER(nanovis/nvconf.h nanoscale/config.h)
 
 VERSION=0.0.1
@@ -189 +189 @@
 LIBS=-lavcodec
 AC_CHECK_FUNCS(img_convert)
+LIBS=-lavformat
+AC_CHECK_FUNCS(avformat_alloc_context)
 LIBS=$oldLIBS
 

trunk/packages/vizservers/nanoscale/config.h.in

@@ -6 +6 @@
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #undef HAVE_ARPA_INET_H
+
+/* Define to 1 if you have the `avformat_alloc_context' function. */
+#undef HAVE_AVFORMAT_ALLOC_CONTEXT
 
 /* Define to 1 if you have the <ffmpeg/avcodec.h> header file. */

trunk/packages/vizservers/nanovis/RpAVTranslate.cpp

@@ -112 +112 @@
     }
 
-#ifdef notdef
+#ifdef HAVE_AVFORMAT_ALLOC_CONTEXT
     /* allocate the output media context */
+    _ocPtr = avformat_alloc_context();
+#else 
     _ocPtr = av_alloc_format_context();
-#else 
-    _ocPtr = avformat_alloc_context();
 #endif
+
     if (!_ocPtr) {
         status.addError("Memory error while allocating format context");

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

@@ -1 @@
-/* nanovis/autoconf.h.in.  Generated from configure.in by autoheader.  */
+/* nanovis/nvconf.h.in.  Generated from configure.in by autoheader.  */
 
 /* Define if building universal (internal helper macro) */
@@ -6 +6 @@
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #undef HAVE_ARPA_INET_H
+
+/* Define to 1 if you have the `avformat_alloc_context' function. */
+#undef HAVE_AVFORMAT_ALLOC_CONTEXT
 
 /* Define to 1 if you have the <ffmpeg/avcodec.h> header file. */
@@ -15 +18 @@
 /* Define to 1 if you have the <ffmpeg/avutil.h> header file. */
 #undef HAVE_FFMPEG_AVUTIL_H
+
+/* Define to 1 if you have the `img_convert' function. */
+#undef HAVE_IMG_CONVERT
 
 /* Define to 1 if you have the <inttypes.h> header file. */