Changeset 1353


Ignore:
Timestamp:
Mar 20, 2009 7:53:28 PM (14 years ago)
Author:
gah
Message:

my first cut at flowvisviewer client based on work by dsk

Location:
trunk/packages/vizservers
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/vizservers/configure

    r1351 r1353  
    18181818
    18191819
    1820 ac_config_headers="$ac_config_headers nanoscale/config.h nanovis/nvconf.h"
     1820ac_config_headers="$ac_config_headers nanovis/nvconf.h nanoscale/config.h"
    18211821
    18221822
     
    66126612done
    66136613
     6614LIBS=-lavformat
     6615
     6616for ac_func in avformat_alloc_context
     6617do
     6618as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
     6619{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
     6620$as_echo_n "checking for $ac_func... " >&6; }
     6621if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
     6622  $as_echo_n "(cached) " >&6
     6623else
     6624  cat >conftest.$ac_ext <<_ACEOF
     6625/* confdefs.h.  */
     6626_ACEOF
     6627cat confdefs.h >>conftest.$ac_ext
     6628cat >>conftest.$ac_ext <<_ACEOF
     6629/* end confdefs.h.  */
     6630/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
     6631   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
     6632#define $ac_func innocuous_$ac_func
     6633
     6634/* System header to define __stub macros and hopefully few prototypes,
     6635    which can conflict with char $ac_func (); below.
     6636    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     6637    <limits.h> exists even on freestanding compilers.  */
     6638
     6639#ifdef __STDC__
     6640# include <limits.h>
     6641#else
     6642# include <assert.h>
     6643#endif
     6644
     6645#undef $ac_func
     6646
     6647/* Override any GCC internal prototype to avoid an error.
     6648   Use char because int might match the return type of a GCC
     6649   builtin and then its argument prototype would still apply.  */
     6650#ifdef __cplusplus
     6651extern "C"
     6652#endif
     6653char $ac_func ();
     6654/* The GNU C library defines this for functions which it implements
     6655    to always fail with ENOSYS.  Some functions are actually named
     6656    something starting with __ and the normal name is an alias.  */
     6657#if defined __stub_$ac_func || defined __stub___$ac_func
     6658choke me
     6659#endif
     6660
     6661int
     6662main ()
     6663{
     6664return $ac_func ();
     6665  ;
     6666  return 0;
     6667}
     6668_ACEOF
     6669rm -f conftest.$ac_objext conftest$ac_exeext
     6670if { (ac_try="$ac_link"
     6671case "(($ac_try" in
     6672  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     6673  *) ac_try_echo=$ac_try;;
     6674esac
     6675eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     6676$as_echo "$ac_try_echo") >&5
     6677  (eval "$ac_link") 2>conftest.er1
     6678  ac_status=$?
     6679  grep -v '^ *+' conftest.er1 >conftest.err
     6680  rm -f conftest.er1
     6681  cat conftest.err >&5
     6682  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     6683  (exit $ac_status); } && {
     6684         test -z "$ac_cxx_werror_flag" ||
     6685         test ! -s conftest.err
     6686       } && test -s conftest$ac_exeext && {
     6687         test "$cross_compiling" = yes ||
     6688         $as_test_x conftest$ac_exeext
     6689       }; then
     6690  eval "$as_ac_var=yes"
     6691else
     6692  $as_echo "$as_me: failed program was:" >&5
     6693sed 's/^/| /' conftest.$ac_ext >&5
     6694
     6695        eval "$as_ac_var=no"
     6696fi
     6697
     6698rm -rf conftest.dSYM
     6699rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
     6700      conftest$ac_exeext conftest.$ac_ext
     6701fi
     6702ac_res=`eval 'as_val=${'$as_ac_var'}
     6703                 $as_echo "$as_val"'`
     6704               { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
     6705$as_echo "$ac_res" >&6; }
     6706as_val=`eval 'as_val=${'$as_ac_var'}
     6707                 $as_echo "$as_val"'`
     6708   if test "x$as_val" = x""yes; then
     6709  cat >>confdefs.h <<_ACEOF
     6710#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
     6711_ACEOF
     6712
     6713fi
     6714done
     6715
    66146716LIBS=$oldLIBS
    66156717
     
    72447346do
    72457347  case $ac_config_target in
     7348    "nanovis/nvconf.h") CONFIG_HEADERS="$CONFIG_HEADERS nanovis/nvconf.h" ;;
    72467349    "nanoscale/config.h") CONFIG_HEADERS="$CONFIG_HEADERS nanoscale/config.h" ;;
    7247     "nanovis/nvconf.h") CONFIG_HEADERS="$CONFIG_HEADERS nanovis/nvconf.h" ;;
    72487350    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    72497351    "nanoscale/Makefile") CONFIG_FILES="$CONFIG_FILES nanoscale/Makefile" ;;
  • trunk/packages/vizservers/configure.in

    r1351 r1353  
    11AC_INIT(vizservers, 0.1, rappture@nanohub.org)
    2 AC_CONFIG_HEADER(nanoscale/config.h nanovis/nvconf.h)
     2AC_CONFIG_HEADER(nanovis/nvconf.h nanoscale/config.h)
    33
    44VERSION=0.0.1
     
    189189LIBS=-lavcodec
    190190AC_CHECK_FUNCS(img_convert)
     191LIBS=-lavformat
     192AC_CHECK_FUNCS(avformat_alloc_context)
    191193LIBS=$oldLIBS
    192194
  • trunk/packages/vizservers/nanoscale/config.h.in

    r1351 r1353  
    66/* Define to 1 if you have the <arpa/inet.h> header file. */
    77#undef HAVE_ARPA_INET_H
     8
     9/* Define to 1 if you have the `avformat_alloc_context' function. */
     10#undef HAVE_AVFORMAT_ALLOC_CONTEXT
    811
    912/* Define to 1 if you have the <ffmpeg/avcodec.h> header file. */
  • trunk/packages/vizservers/nanovis/RpAVTranslate.cpp

    r1351 r1353  
    112112    }
    113113
    114 #ifdef notdef
     114#ifdef HAVE_AVFORMAT_ALLOC_CONTEXT
    115115    /* allocate the output media context */
     116    _ocPtr = avformat_alloc_context();
     117#else
    116118    _ocPtr = av_alloc_format_context();
    117 #else
    118     _ocPtr = avformat_alloc_context();
    119119#endif
     120
    120121    if (!_ocPtr) {
    121122        status.addError("Memory error while allocating format context");
  • trunk/packages/vizservers/nanovis/nvconf.h.in

    r1309 r1353  
    1 /* nanovis/autoconf.h.in.  Generated from configure.in by autoheader.  */
     1/* nanovis/nvconf.h.in.  Generated from configure.in by autoheader.  */
    22
    33/* Define if building universal (internal helper macro) */
     
    66/* Define to 1 if you have the <arpa/inet.h> header file. */
    77#undef HAVE_ARPA_INET_H
     8
     9/* Define to 1 if you have the `avformat_alloc_context' function. */
     10#undef HAVE_AVFORMAT_ALLOC_CONTEXT
    811
    912/* Define to 1 if you have the <ffmpeg/avcodec.h> header file. */
     
    1518/* Define to 1 if you have the <ffmpeg/avutil.h> header file. */
    1619#undef HAVE_FFMPEG_AVUTIL_H
     20
     21/* Define to 1 if you have the `img_convert' function. */
     22#undef HAVE_IMG_CONVERT
    1723
    1824/* Define to 1 if you have the <inttypes.h> header file. */
Note: See TracChangeset for help on using the changeset viewer.