Ignore:
Timestamp:
Dec 27, 2011 12:41:24 PM (11 years ago)
Author:
gah
Message:

sync with trunk

Location:
branches/blt4/packages/vizservers
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • branches/blt4/packages/vizservers/configure

    r2681 r2742  
    85298529  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
    85308530ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
    8531 #define SIZEOF_LONG ${ac_cv_sizeof_long}
    8532 #if SIZEOF_LONG == 8
    8533 #  define INT64_C(c)  c ## L
    8534 #  define UINT64_C(c) c ## UL
    8535 #else
    8536 #  define INT64_C(c)  c ## LL
    8537 #  define UINT64_C(c) c ## ULL
    8538 #endif
     8531#define __STDC_CONSTANT_MACROS 1
    85398532
    85408533"
     
    85498542
    85508543CPPFLAGS=$save_CPPFLAGS
     8544
     8545{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lavcodec" >&5
     8546$as_echo_n "checking for main in -lavcodec... " >&6; }
     8547if ${ac_cv_lib_avcodec_main+:} false; then :
     8548  $as_echo_n "(cached) " >&6
     8549else
     8550  ac_check_lib_save_LIBS=$LIBS
     8551LIBS="-lavcodec  $LIBS"
     8552cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     8553/* end confdefs.h.  */
     8554
     8555
     8556int
     8557main ()
     8558{
     8559return main ();
     8560  ;
     8561  return 0;
     8562}
     8563_ACEOF
     8564if ac_fn_cxx_try_link "$LINENO"; then :
     8565  ac_cv_lib_avcodec_main=yes
     8566else
     8567  ac_cv_lib_avcodec_main=no
     8568fi
     8569rm -f core conftest.err conftest.$ac_objext \
     8570    conftest$ac_exeext conftest.$ac_ext
     8571LIBS=$ac_check_lib_save_LIBS
     8572fi
     8573{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_main" >&5
     8574$as_echo "$ac_cv_lib_avcodec_main" >&6; }
     8575if test "x$ac_cv_lib_avcodec_main" = xyes; then :
     8576  cat >>confdefs.h <<_ACEOF
     8577#define HAVE_LIBAVCODEC 1
     8578_ACEOF
     8579
     8580  LIBS="-lavcodec $LIBS"
     8581
     8582else
     8583  as_fn_error $? "requires libavcodec" "$LINENO" 5
     8584fi
     8585
     8586{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lavutil" >&5
     8587$as_echo_n "checking for main in -lavutil... " >&6; }
     8588if ${ac_cv_lib_avutil_main+:} false; then :
     8589  $as_echo_n "(cached) " >&6
     8590else
     8591  ac_check_lib_save_LIBS=$LIBS
     8592LIBS="-lavutil  $LIBS"
     8593cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     8594/* end confdefs.h.  */
     8595
     8596
     8597int
     8598main ()
     8599{
     8600return main ();
     8601  ;
     8602  return 0;
     8603}
     8604_ACEOF
     8605if ac_fn_cxx_try_link "$LINENO"; then :
     8606  ac_cv_lib_avutil_main=yes
     8607else
     8608  ac_cv_lib_avutil_main=no
     8609fi
     8610rm -f core conftest.err conftest.$ac_objext \
     8611    conftest$ac_exeext conftest.$ac_ext
     8612LIBS=$ac_check_lib_save_LIBS
     8613fi
     8614{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avutil_main" >&5
     8615$as_echo "$ac_cv_lib_avutil_main" >&6; }
     8616if test "x$ac_cv_lib_avutil_main" = xyes; then :
     8617  cat >>confdefs.h <<_ACEOF
     8618#define HAVE_LIBAVUTIL 1
     8619_ACEOF
     8620
     8621  LIBS="-lavutil $LIBS"
     8622
     8623else
     8624  as_fn_error $? "requires libavutil" "$LINENO" 5
     8625fi
     8626
     8627{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lavformat" >&5
     8628$as_echo_n "checking for main in -lavformat... " >&6; }
     8629if ${ac_cv_lib_avformat_main+:} false; then :
     8630  $as_echo_n "(cached) " >&6
     8631else
     8632  ac_check_lib_save_LIBS=$LIBS
     8633LIBS="-lavformat  $LIBS"
     8634cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     8635/* end confdefs.h.  */
     8636
     8637
     8638int
     8639main ()
     8640{
     8641return main ();
     8642  ;
     8643  return 0;
     8644}
     8645_ACEOF
     8646if ac_fn_cxx_try_link "$LINENO"; then :
     8647  ac_cv_lib_avformat_main=yes
     8648else
     8649  ac_cv_lib_avformat_main=no
     8650fi
     8651rm -f core conftest.err conftest.$ac_objext \
     8652    conftest$ac_exeext conftest.$ac_ext
     8653LIBS=$ac_check_lib_save_LIBS
     8654fi
     8655{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_main" >&5
     8656$as_echo "$ac_cv_lib_avformat_main" >&6; }
     8657if test "x$ac_cv_lib_avformat_main" = xyes; then :
     8658  cat >>confdefs.h <<_ACEOF
     8659#define HAVE_LIBAVFORMAT 1
     8660_ACEOF
     8661
     8662  LIBS="-lavformat $LIBS"
     8663
     8664else
     8665  as_fn_error $? "requires libavformat" "$LINENO" 5
     8666fi
     8667
     8668{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lswscale" >&5
     8669$as_echo_n "checking for main in -lswscale... " >&6; }
     8670if ${ac_cv_lib_swscale_main+:} false; then :
     8671  $as_echo_n "(cached) " >&6
     8672else
     8673  ac_check_lib_save_LIBS=$LIBS
     8674LIBS="-lswscale  $LIBS"
     8675cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     8676/* end confdefs.h.  */
     8677
     8678
     8679int
     8680main ()
     8681{
     8682return main ();
     8683  ;
     8684  return 0;
     8685}
     8686_ACEOF
     8687if ac_fn_cxx_try_link "$LINENO"; then :
     8688  ac_cv_lib_swscale_main=yes
     8689else
     8690  ac_cv_lib_swscale_main=no
     8691fi
     8692rm -f core conftest.err conftest.$ac_objext \
     8693    conftest$ac_exeext conftest.$ac_ext
     8694LIBS=$ac_check_lib_save_LIBS
     8695fi
     8696{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_swscale_main" >&5
     8697$as_echo "$ac_cv_lib_swscale_main" >&6; }
     8698if test "x$ac_cv_lib_swscale_main" = xyes; then :
     8699  cat >>confdefs.h <<_ACEOF
     8700#define HAVE_LIBSWSCALE 1
     8701_ACEOF
     8702
     8703  LIBS="-lswscale $LIBS"
     8704
     8705fi
     8706
     8707for ac_func in avcodec_decode_video2
     8708do :
     8709  ac_fn_cxx_check_func "$LINENO" "avcodec_decode_video2" "ac_cv_func_avcodec_decode_video2"
     8710if test "x$ac_cv_func_avcodec_decode_video2" = xyes; then :
     8711  cat >>confdefs.h <<_ACEOF
     8712#define HAVE_AVCODEC_DECODE_VIDEO2 1
     8713_ACEOF
     8714
     8715fi
     8716done
     8717
     8718for ac_func in avcodec_decode_video
     8719do :
     8720  ac_fn_cxx_check_func "$LINENO" "avcodec_decode_video" "ac_cv_func_avcodec_decode_video"
     8721if test "x$ac_cv_func_avcodec_decode_video" = xyes; then :
     8722  cat >>confdefs.h <<_ACEOF
     8723#define HAVE_AVCODEC_DECODE_VIDEO 1
     8724_ACEOF
     8725
     8726fi
     8727done
     8728
     8729for ac_func in avformat_open_input
     8730do :
     8731  ac_fn_cxx_check_func "$LINENO" "avformat_open_input" "ac_cv_func_avformat_open_input"
     8732if test "x$ac_cv_func_avformat_open_input" = xyes; then :
     8733  cat >>confdefs.h <<_ACEOF
     8734#define HAVE_AVFORMAT_OPEN_INPUT 1
     8735_ACEOF
     8736
     8737fi
     8738done
     8739
     8740for ac_func in av_open_input_file
     8741do :
     8742  ac_fn_cxx_check_func "$LINENO" "av_open_input_file" "ac_cv_func_av_open_input_file"
     8743if test "x$ac_cv_func_av_open_input_file" = xyes; then :
     8744  cat >>confdefs.h <<_ACEOF
     8745#define HAVE_AV_OPEN_INPUT_FILE 1
     8746_ACEOF
     8747
     8748fi
     8749done
     8750
     8751for ac_func in av_guess_format
     8752do :
     8753  ac_fn_cxx_check_func "$LINENO" "av_guess_format" "ac_cv_func_av_guess_format"
     8754if test "x$ac_cv_func_av_guess_format" = xyes; then :
     8755  cat >>confdefs.h <<_ACEOF
     8756#define HAVE_AV_GUESS_FORMAT 1
     8757_ACEOF
     8758
     8759fi
     8760done
     8761
     8762for ac_func in guess_format
     8763do :
     8764  ac_fn_cxx_check_func "$LINENO" "guess_format" "ac_cv_func_guess_format"
     8765if test "x$ac_cv_func_guess_format" = xyes; then :
     8766  cat >>confdefs.h <<_ACEOF
     8767#define HAVE_GUESS_FORMAT 1
     8768_ACEOF
     8769
     8770fi
     8771done
     8772
     8773for ac_func in av_dump_format
     8774do :
     8775  ac_fn_cxx_check_func "$LINENO" "av_dump_format" "ac_cv_func_av_dump_format"
     8776if test "x$ac_cv_func_av_dump_format" = xyes; then :
     8777  cat >>confdefs.h <<_ACEOF
     8778#define HAVE_AV_DUMP_FORMAT 1
     8779_ACEOF
     8780
     8781fi
     8782done
     8783
     8784for ac_func in dump_format
     8785do :
     8786  ac_fn_cxx_check_func "$LINENO" "dump_format" "ac_cv_func_dump_format"
     8787if test "x$ac_cv_func_dump_format" = xyes; then :
     8788  cat >>confdefs.h <<_ACEOF
     8789#define HAVE_DUMP_FORMAT 1
     8790_ACEOF
     8791
     8792fi
     8793done
     8794
     8795for ac_func in avio_open
     8796do :
     8797  ac_fn_cxx_check_func "$LINENO" "avio_open" "ac_cv_func_avio_open"
     8798if test "x$ac_cv_func_avio_open" = xyes; then :
     8799  cat >>confdefs.h <<_ACEOF
     8800#define HAVE_AVIO_OPEN 1
     8801_ACEOF
     8802
     8803fi
     8804done
     8805
     8806for ac_func in url_fopen
     8807do :
     8808  ac_fn_cxx_check_func "$LINENO" "url_fopen" "ac_cv_func_url_fopen"
     8809if test "x$ac_cv_func_url_fopen" = xyes; then :
     8810  cat >>confdefs.h <<_ACEOF
     8811#define HAVE_URL_FOPEN 1
     8812_ACEOF
     8813
     8814fi
     8815done
     8816
     8817for ac_func in avio_close
     8818do :
     8819  ac_fn_cxx_check_func "$LINENO" "avio_close" "ac_cv_func_avio_close"
     8820if test "x$ac_cv_func_avio_close" = xyes; then :
     8821  cat >>confdefs.h <<_ACEOF
     8822#define HAVE_AVIO_CLOSE 1
     8823_ACEOF
     8824
     8825fi
     8826done
     8827
     8828for ac_func in url_fclose
     8829do :
     8830  ac_fn_cxx_check_func "$LINENO" "url_fclose" "ac_cv_func_url_fclose"
     8831if test "x$ac_cv_func_url_fclose" = xyes; then :
     8832  cat >>confdefs.h <<_ACEOF
     8833#define HAVE_URL_FCLOSE 1
     8834_ACEOF
     8835
     8836fi
     8837done
     8838
     8839for ac_func in avformat_alloc_context
     8840do :
     8841  ac_fn_cxx_check_func "$LINENO" "avformat_alloc_context" "ac_cv_func_avformat_alloc_context"
     8842if test "x$ac_cv_func_avformat_alloc_context" = xyes; then :
     8843  cat >>confdefs.h <<_ACEOF
     8844#define HAVE_AVFORMAT_ALLOC_CONTEXT 1
     8845_ACEOF
     8846
     8847fi
     8848done
     8849
     8850for ac_func in av_alloc_format_context
     8851do :
     8852  ac_fn_cxx_check_func "$LINENO" "av_alloc_format_context" "ac_cv_func_av_alloc_format_context"
     8853if test "x$ac_cv_func_av_alloc_format_context" = xyes; then :
     8854  cat >>confdefs.h <<_ACEOF
     8855#define HAVE_AV_ALLOC_FORMAT_CONTEXT 1
     8856_ACEOF
     8857
     8858fi
     8859done
     8860
     8861for ac_func in av_set_parameters
     8862do :
     8863  ac_fn_cxx_check_func "$LINENO" "av_set_parameters" "ac_cv_func_av_set_parameters"
     8864if test "x$ac_cv_func_av_set_parameters" = xyes; then :
     8865  cat >>confdefs.h <<_ACEOF
     8866#define HAVE_AV_SET_PARAMETERS 1
     8867_ACEOF
     8868
     8869fi
     8870done
     8871
     8872for ac_func in avformat_write_header
     8873do :
     8874  ac_fn_cxx_check_func "$LINENO" "avformat_write_header" "ac_cv_func_avformat_write_header"
     8875if test "x$ac_cv_func_avformat_write_header" = xyes; then :
     8876  cat >>confdefs.h <<_ACEOF
     8877#define HAVE_AVFORMAT_WRITE_HEADER 1
     8878_ACEOF
     8879
     8880fi
     8881done
     8882
     8883for ac_func in av_write_header
     8884do :
     8885  ac_fn_cxx_check_func "$LINENO" "av_write_header" "ac_cv_func_av_write_header"
     8886if test "x$ac_cv_func_av_write_header" = xyes; then :
     8887  cat >>confdefs.h <<_ACEOF
     8888#define HAVE_AV_WRITE_HEADER 1
     8889_ACEOF
     8890
     8891fi
     8892done
     8893
     8894ac_fn_cxx_check_func "$LINENO" "av_write_trailer" "ac_cv_func_av_write_trailer"
     8895if test "x$ac_cv_func_av_write_trailer" = xyes; then :
     8896
     8897else
     8898  as_fn_error $? "oops! no av_write_trailer?!?" "$LINENO" 5
     8899fi
     8900
     8901ac_fn_cxx_check_func "$LINENO" "av_freep" "ac_cv_func_av_freep"
     8902if test "x$ac_cv_func_av_freep" = xyes; then :
     8903
     8904else
     8905  as_fn_error $? "oops! no av_freep ?!?" "$LINENO" 5
     8906fi
     8907
     8908ac_fn_cxx_check_func "$LINENO" "av_free" "ac_cv_func_av_free"
     8909if test "x$ac_cv_func_av_free" = xyes; then :
     8910
     8911else
     8912  as_fn_error $? "oops! no av_free ?!?" "$LINENO" 5
     8913fi
     8914
     8915ac_fn_cxx_check_func "$LINENO" "av_new_stream" "ac_cv_func_av_new_stream"
     8916if test "x$ac_cv_func_av_new_stream" = xyes; then :
     8917
     8918else
     8919  as_fn_error $? "oops! av_new_stream ?!?" "$LINENO" 5
     8920fi
     8921
     8922ac_fn_cxx_check_func "$LINENO" "av_malloc" "ac_cv_func_av_malloc"
     8923if test "x$ac_cv_func_av_malloc" = xyes; then :
     8924
     8925else
     8926  as_fn_error $? "oops! no av_malloc ?!?" "$LINENO" 5
     8927fi
     8928
     8929ac_fn_cxx_check_func "$LINENO" "av_init_packet" "ac_cv_func_av_init_packet"
     8930if test "x$ac_cv_func_av_init_packet" = xyes; then :
     8931
     8932else
     8933  as_fn_error $? "oops! no av_init_packet ?!?" "$LINENO" 5
     8934fi
     8935
     8936ac_fn_cxx_check_func "$LINENO" "av_rescale_q" "ac_cv_func_av_rescale_q"
     8937if test "x$ac_cv_func_av_rescale_q" = xyes; then :
     8938
     8939else
     8940  as_fn_error $? "oops! no av_rescale_q ?!?" "$LINENO" 5
     8941fi
     8942
     8943ac_fn_cxx_check_func "$LINENO" "av_write_frame" "ac_cv_func_av_write_frame"
     8944if test "x$ac_cv_func_av_write_frame" = xyes; then :
     8945
     8946else
     8947  as_fn_error $? "oops! av_write_frame ?!?" "$LINENO" 5
     8948fi
     8949
     8950ac_fn_cxx_check_func "$LINENO" "avformat_alloc_context" "ac_cv_func_avformat_alloc_context"
     8951if test "x$ac_cv_func_avformat_alloc_context" = xyes; then :
     8952
     8953else
     8954  as_fn_error $? "oops! avformat_alloc_context ?!?" "$LINENO" 5
     8955fi
     8956
     8957for ac_func in img_convert
     8958do :
     8959  ac_fn_cxx_check_func "$LINENO" "img_convert" "ac_cv_func_img_convert"
     8960if test "x$ac_cv_func_img_convert" = xyes; then :
     8961  cat >>confdefs.h <<_ACEOF
     8962#define HAVE_IMG_CONVERT 1
     8963_ACEOF
     8964
     8965fi
     8966done
     8967
     8968for ac_func in sws_scale
     8969do :
     8970  ac_fn_cxx_check_func "$LINENO" "sws_scale" "ac_cv_func_sws_scale"
     8971if test "x$ac_cv_func_sws_scale" = xyes; then :
     8972  cat >>confdefs.h <<_ACEOF
     8973#define HAVE_SWS_SCALE 1
     8974_ACEOF
     8975
     8976fi
     8977done
     8978
     8979cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     8980/* end confdefs.h.  */
     8981
     8982#define __STDC_CONSTANT_MACROS 1
     8983#include <stdlib.h>
     8984#ifdef HAVE_FFMPEG_AVCODEC_H
     8985# include <ffmpeg/avcodec.h>
     8986#endif
     8987#ifdef HAVE_LIBAVCODEC_AVCODEC_H
     8988# include <libavcodec/avcodec.h>
     8989#endif
     8990int x = AVMEDIA_TYPE_VIDEO;
     8991
     8992int
     8993main ()
     8994{
     8995
     8996  ;
     8997  return 0;
     8998}
     8999_ACEOF
     9000if ac_fn_cxx_try_compile "$LINENO"; then :
     9001  ac_avmedia_type_video="yes"
     9002else
     9003  ac_avmedia_type_video="no"
     9004fi
     9005rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     9006if test "$ac_avmedia_type_video" == "yes" ; then
     9007
     9008$as_echo "#define HAVE_AVMEDIA_TYPE_VIDEO 1" >>confdefs.h
     9009
     9010fi
    85519011
    85529012{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcodec_alloc_frame in -lavcodec" >&5
     
    86899149
    86909150fi
    8691 
    8692 for ac_func in avformat_alloc_context
    8693 do :
    8694   ac_fn_cxx_check_func "$LINENO" "avformat_alloc_context" "ac_cv_func_avformat_alloc_context"
    8695 if test "x$ac_cv_func_avformat_alloc_context" = xyes; then :
    8696   cat >>confdefs.h <<_ACEOF
    8697 #define HAVE_AVFORMAT_ALLOC_CONTEXT 1
    8698 _ACEOF
    8699 
    8700 fi
    8701 done
    8702 
    8703 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_free in -lavutil" >&5
    8704 $as_echo_n "checking for av_free in -lavutil... " >&6; }
    8705 if ${ac_cv_lib_avutil_av_free+:} false; then :
    8706   $as_echo_n "(cached) " >&6
    8707 else
    8708   ac_check_lib_save_LIBS=$LIBS
    8709 LIBS="-lavutil  $LIBS"
    8710 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    8711 /* end confdefs.h.  */
    8712 
    8713 /* Override any GCC internal prototype to avoid an error.
    8714    Use char because int might match the return type of a GCC
    8715    builtin and then its argument prototype would still apply.  */
    8716 #ifdef __cplusplus
    8717 extern "C"
    8718 #endif
    8719 char av_free ();
    8720 int
    8721 main ()
    8722 {
    8723 return av_free ();
    8724   ;
    8725   return 0;
    8726 }
    8727 _ACEOF
    8728 if ac_fn_cxx_try_link "$LINENO"; then :
    8729   ac_cv_lib_avutil_av_free=yes
    8730 else
    8731   ac_cv_lib_avutil_av_free=no
    8732 fi
    8733 rm -f core conftest.err conftest.$ac_objext \
    8734     conftest$ac_exeext conftest.$ac_ext
    8735 LIBS=$ac_check_lib_save_LIBS
    8736 fi
    8737 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avutil_av_free" >&5
    8738 $as_echo "$ac_cv_lib_avutil_av_free" >&6; }
    8739 if test "x$ac_cv_lib_avutil_av_free" = xyes; then :
    8740   cat >>confdefs.h <<_ACEOF
    8741 #define HAVE_LIBAVUTIL 1
    8742 _ACEOF
    8743 
    8744   LIBS="-lavutil $LIBS"
    8745 
    8746 fi
    8747 
    8748 for ac_func in img_convert
    8749 do :
    8750   ac_fn_cxx_check_func "$LINENO" "img_convert" "ac_cv_func_img_convert"
    8751 if test "x$ac_cv_func_img_convert" = xyes; then :
    8752   cat >>confdefs.h <<_ACEOF
    8753 #define HAVE_IMG_CONVERT 1
    8754 _ACEOF
    8755 
    8756 fi
    8757 done
    87589151
    87599152
  • branches/blt4/packages/vizservers/configure.in

    r2674 r2742  
    275275
    276276AC_CHECK_HEADERS([ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h],,,[
    277 #define SIZEOF_LONG ${ac_cv_sizeof_long}
    278 #if SIZEOF_LONG == 8
    279 #  define INT64_C(c)  c ## L
    280 #  define UINT64_C(c) c ## UL
    281 #else
    282 #  define INT64_C(c)  c ## LL
    283 #  define UINT64_C(c) c ## ULL
    284 #endif
     277#define __STDC_CONSTANT_MACROS 1
    285278])
    286279CPPFLAGS=$save_CPPFLAGS
     280
     281AC_CHECK_LIB(avcodec, main,,AC_MSG_ERROR(requires libavcodec))
     282AC_CHECK_LIB(avutil, main,,AC_MSG_ERROR(requires libavutil))
     283AC_CHECK_LIB(avformat, main,,AC_MSG_ERROR(requires libavformat))
     284AC_CHECK_LIB(swscale, main)
     285AC_CHECK_FUNCS(avcodec_decode_video2)
     286AC_CHECK_FUNCS(avcodec_decode_video)
     287AC_CHECK_FUNCS(avformat_open_input)
     288AC_CHECK_FUNCS(av_open_input_file)
     289AC_CHECK_FUNCS(av_guess_format)
     290AC_CHECK_FUNCS(guess_format)
     291AC_CHECK_FUNCS(av_dump_format)
     292AC_CHECK_FUNCS(dump_format)
     293AC_CHECK_FUNCS(avio_open)
     294AC_CHECK_FUNCS(url_fopen)
     295AC_CHECK_FUNCS(avio_close)
     296AC_CHECK_FUNCS(url_fclose)
     297AC_CHECK_FUNCS(avformat_alloc_context)
     298AC_CHECK_FUNCS(av_alloc_format_context)
     299AC_CHECK_FUNCS(av_set_parameters)
     300AC_CHECK_FUNCS(avformat_write_header)
     301AC_CHECK_FUNCS(av_write_header)
     302AC_CHECK_FUNC(av_write_trailer,,
     303  AC_MSG_ERROR(oops! no av_write_trailer?!?))
     304AC_CHECK_FUNC(av_freep,, AC_MSG_ERROR(oops! no av_freep ?!?))
     305AC_CHECK_FUNC(av_free,,AC_MSG_ERROR(oops! no av_free ?!?))
     306AC_CHECK_FUNC(av_new_stream,,AC_MSG_ERROR(oops! av_new_stream ?!?))
     307AC_CHECK_FUNC(av_malloc,, AC_MSG_ERROR(oops! no av_malloc ?!?))
     308AC_CHECK_FUNC(av_init_packet,,AC_MSG_ERROR(oops! no av_init_packet ?!?))
     309AC_CHECK_FUNC(av_rescale_q,,AC_MSG_ERROR(oops! no av_rescale_q ?!?))
     310AC_CHECK_FUNC(av_write_frame,,AC_MSG_ERROR(oops! av_write_frame ?!?))
     311AC_CHECK_FUNC(avformat_alloc_context,,
     312  AC_MSG_ERROR(oops! avformat_alloc_context ?!?))
     313AC_CHECK_FUNCS(img_convert)
     314AC_CHECK_FUNCS(sws_scale)
     315AC_TRY_COMPILE([
     316#define __STDC_CONSTANT_MACROS 1
     317#include <stdlib.h>
     318#ifdef HAVE_FFMPEG_AVCODEC_H
     319# include <ffmpeg/avcodec.h>
     320#endif
     321#ifdef HAVE_LIBAVCODEC_AVCODEC_H
     322# include <libavcodec/avcodec.h>
     323#endif
     324int x = AVMEDIA_TYPE_VIDEO;
     325],, ac_avmedia_type_video="yes", ac_avmedia_type_video="no")
     326if test "$ac_avmedia_type_video" == "yes" ; then
     327  AC_DEFINE(HAVE_AVMEDIA_TYPE_VIDEO,1,[Define if AVMEDIA_TYPE_VIDEO enum exists. ])
     328fi
    287329
    288330AC_CHECK_LIB([avcodec], [avcodec_alloc_frame])
     
    291333    AC_CHECK_LIB([avformat], [av_alloc_format_context], [],
    292334        [AC_MSG_WARN([libavformat not usable])]))
    293 AC_CHECK_FUNCS([avformat_alloc_context])
    294 AC_CHECK_LIB([avutil], [av_free])
    295 AC_CHECK_FUNCS([img_convert])
    296335
    297336
  • branches/blt4/packages/vizservers/nanovis/Command.cpp

    r2681 r2742  
    12151215#endif  /*__TEST_CODE__*/
    12161216    } else {
     1217        if ((nBytes > 5) && (strncmp(bytes, "<ODX>", 5) == 0)) {
     1218            bytes += 5;
     1219            nBytes -= 5;
     1220        }
    12171221        TRACE("DX loading...\n");
    12181222        std::stringstream fdata;
  • branches/blt4/packages/vizservers/nanovis/RpAVTranslate.cpp

    r2409 r2742  
    3434
    3535#include "RpAVTranslate.h"
     36
     37#ifndef HAVE_AVMEDIA_TYPE_VIDEO
     38#define AVMEDIA_TYPE_VIDEO      CODEC_TYPE_VIDEO
     39#endif  /* HAVE_AVMEDIA_TYPE_VIDEO */
     40
     41#ifndef AV_PKT_FLAG_KEY
     42#define AV_PKT_FLAG_KEY         PKT_FLAG_KEY           
     43#endif
     44
     45#ifndef HAVE_AV_GUESS_FORMAT
     46#define av_guess_format         guess_format
     47#endif  /*HAVE_AV_GUESS_FORMAT*/
     48
     49#ifndef HAVE_AV_DUMP_FORMAT
     50#define av_dump_format          dump_format
     51#endif  /*HAVE_AV_DUMP_FORMAT*/
     52
     53#ifndef HAVE_AVIO_OPEN
     54#define avio_open               url_fopen       
     55#endif  /*HAVE_AVIO_OPEN*/
     56
     57#ifndef HAVE_AVIO_CLOSE
     58#define avio_close              url_fclose     
     59#endif  /*HAVE_AVIO_CLOSE*/
    3660
    3761#ifndef M_PI
     
    101125
    102126    /* Auto detect the output format from the name. default is mpeg. */
    103     _fmtPtr = guess_format(NULL, filename, NULL);
     127    _fmtPtr = av_guess_format(NULL, filename, NULL);
    104128    if (_fmtPtr == NULL) {
    105129        /*
     
    107131                 "file extension: using MPEG.\n");
    108132        */
    109         _fmtPtr = guess_format("mpeg", NULL, NULL);
     133        _fmtPtr = av_guess_format("mpeg", NULL, NULL);
    110134    }
    111135    if (_fmtPtr == NULL) {
     
    136160    }
    137161
     162#if defined(HAVE_AV_SET_PARAMETERS) && !defined(HAVE_AVFORMAT_WRITE_HEADER)
    138163    /* Set the output parameters (must be done even if no parameters). */
    139164    if (av_set_parameters(_ocPtr, NULL) < 0) {
     
    141166        return false;
    142167    }
    143 
    144     dump_format(_ocPtr, 0, filename, 1);
     168#endif
     169    av_dump_format(_ocPtr, 0, filename, 1);
    145170
    146171    /* Now that all the parameters are set, we can open the video codec and
     
    154179    /* Open the output file, if needed. */
    155180    if (!(_fmtPtr->flags & AVFMT_NOFILE)) {
    156         if (url_fopen(&_ocPtr->pb, filename, URL_WRONLY) < 0) {
     181        if (avio_open(&_ocPtr->pb, filename, URL_WRONLY) < 0) {
    157182            status.addError("Could not open '%s'", filename);
    158183            return false;
     
    161186
    162187    /* write the stream header, if any */
     188#ifdef HAVE_AVFORMAT_WRITE_HEADER
     189    avformat_write_header(_ocPtr, NULL);
     190#else
    163191    av_write_header(_ocPtr);
     192#endif
    164193    return true;
    165194}
     
    226255    if (!(_fmtPtr->flags & AVFMT_NOFILE)) {
    227256        /* close the output file */
    228         url_fclose(_ocPtr->pb);
     257        avio_close(_ocPtr->pb);
    229258    }
    230259
     
    257286    codecPtr = streamPtr->codec;
    258287    codecPtr->codec_id = codec_id;
    259     codecPtr->codec_type = CODEC_TYPE_VIDEO;
     288    codecPtr->codec_type = AVMEDIA_TYPE_VIDEO;
    260289
    261290    /* Put sample parameters */
     
    393422                           _avStreamPtr->time_base);
    394423    if (codecPtr->coded_frame->key_frame) {
    395         pkt.flags |= PKT_FLAG_KEY;
     424        pkt.flags |= AV_PKT_FLAG_KEY;
    396425    }
    397426    pkt.stream_index = _avStreamPtr->index;
  • branches/blt4/packages/vizservers/nanovis/config.h

    r1431 r2742  
    4545 * runtime if mesh decimation is required]
    4646 */
    47 #define ISO_TEST                1
     47#define ISO_TEST                0
    4848
    4949/*
  • branches/blt4/packages/vizservers/nanovis/nanovis.cpp

    r2409 r2742  
    754754
    755755    if(lastError) {
    756         const char *listing = cgGetLastListing(g_context);
    757756        TRACE("\n---------------------------------------------------\n");
    758757        TRACE("%s\n\n", cgGetErrorString(lastError));
    759         TRACE("%s\n", listing);
     758        TRACE("%s\n", cgGetLastListing(g_context));
    760759        TRACE("-----------------------------------------------------\n");
    761760        TRACE("Cg error, exiting...\n");
     
    22492248    char *newPath;
    22502249    struct timeval tv;
    2251         int n, i;
    22522250    newPath = NULL;
    22532251    path = NULL;
  • branches/blt4/packages/vizservers/nanovis/nvconf.h.in

    r2681 r2742  
    1010#undef HAVE_ARPA_INET_H
    1111
     12/* Define to 1 if you have the `avcodec_decode_video' function. */
     13#undef HAVE_AVCODEC_DECODE_VIDEO
     14
     15/* Define to 1 if you have the `avcodec_decode_video2' function. */
     16#undef HAVE_AVCODEC_DECODE_VIDEO2
     17
    1218/* Define to 1 if you have the `avformat_alloc_context' function. */
    1319#undef HAVE_AVFORMAT_ALLOC_CONTEXT
    1420
     21/* Define to 1 if you have the `avformat_open_input' function. */
     22#undef HAVE_AVFORMAT_OPEN_INPUT
     23
     24/* Define to 1 if you have the `avformat_write_header' function. */
     25#undef HAVE_AVFORMAT_WRITE_HEADER
     26
     27/* Define to 1 if you have the `avio_close' function. */
     28#undef HAVE_AVIO_CLOSE
     29
     30/* Define to 1 if you have the `avio_open' function. */
     31#undef HAVE_AVIO_OPEN
     32
     33/* Define if AVMEDIA_TYPE_VIDEO enum exists. */
     34#undef HAVE_AVMEDIA_TYPE_VIDEO
     35
     36/* Define to 1 if you have the `av_alloc_format_context' function. */
     37#undef HAVE_AV_ALLOC_FORMAT_CONTEXT
     38
     39/* Define to 1 if you have the `av_dump_format' function. */
     40#undef HAVE_AV_DUMP_FORMAT
     41
     42/* Define to 1 if you have the `av_guess_format' function. */
     43#undef HAVE_AV_GUESS_FORMAT
     44
     45/* Define to 1 if you have the `av_open_input_file' function. */
     46#undef HAVE_AV_OPEN_INPUT_FILE
     47
     48/* Define to 1 if you have the `av_set_parameters' function. */
     49#undef HAVE_AV_SET_PARAMETERS
     50
     51/* Define to 1 if you have the `av_write_header' function. */
     52#undef HAVE_AV_WRITE_HEADER
     53
    1554/* Define to 1 if you have the <Cg/cgGL.h> header file. */
    1655#undef HAVE_CG_CGGL_H
    1756
     57/* Define to 1 if you have the `dump_format' function. */
     58#undef HAVE_DUMP_FORMAT
     59
    1860/* Define to 1 if you have the <dx/dx.h> header file. */
    1961#undef HAVE_DX_DX_H
     
    2870#undef HAVE_FFMPEG_AVUTIL_H
    2971
     72/* Define to 1 if you have the `guess_format' function. */
     73#undef HAVE_GUESS_FORMAT
     74
    3075/* Define to 1 if you have the `img_convert' function. */
    3176#undef HAVE_IMG_CONVERT
     
    55100#undef HAVE_LIBHIGHGUI
    56101
     102/* Define to 1 if you have the `swscale' library (-lswscale). */
     103#undef HAVE_LIBSWSCALE
     104
    57105/* Define to 1 if you have the <memory.h> header file. */
    58106#undef HAVE_MEMORY_H
     
    88136#undef HAVE_STRING_H
    89137
     138/* Define to 1 if you have the `sws_scale' function. */
     139#undef HAVE_SWS_SCALE
     140
    90141/* Define to 1 if you have the <sys/socket.h> header file. */
    91142#undef HAVE_SYS_SOCKET_H
     
    102153/* Define to 1 if you have the <unistd.h> header file. */
    103154#undef HAVE_UNISTD_H
     155
     156/* Define to 1 if you have the `url_fclose' function. */
     157#undef HAVE_URL_FCLOSE
     158
     159/* Define to 1 if you have the `url_fopen' function. */
     160#undef HAVE_URL_FOPEN
    104161
    105162/* Define to 1 if you have the <vtkSmartPointer.h> header file. */
  • branches/blt4/packages/vizservers/vtkvis/RpVtkRenderer.cpp

    r2681 r2742  
    11001100                              double range[2],
    11011101                              int width, int height,
     1102                              bool opaque,
    11021103                              int numLabels,
    11031104                              vtkUnsignedCharArray *imgData)
     
    11101111                                  NULL,
    11111112                                  DataSet::POINT_DATA,
    1112                                   title, range, width, height, numLabels, imgData);
     1113                                  title, range, width, height, opaque, numLabels, imgData);
    11131114        } else {
    11141115            dataSet = _dataSets.begin()->second;
     
    11261127                              dataSet->getActiveScalarsName(),
    11271128                              dataSet->getActiveScalarsType(),
    1128                               title, range, width, height, numLabels, imgData);
     1129                              title, range, width, height, opaque, numLabels, imgData);
    11291130    } else {
    11301131        return renderColorMap(id, dataSetID, legendType,
    11311132                              dataSet->getActiveVectorsName(),
    11321133                              dataSet->getActiveVectorsType(),
    1133                               title, range, width, height, numLabels, imgData);
     1134                              title, range, width, height, opaque, numLabels, imgData);
    11341135    }
    11351136}
     
    11661167                              double range[2],
    11671168                              int width, int height,
     1169                              bool opaque,
    11681170                              int numLabels,
    11691171                              vtkUnsignedCharArray *imgData)
     
    11761178                                  NULL,
    11771179                                  DataSet::POINT_DATA,
    1178                                   title, range, width, height, numLabels, imgData);
     1180                                  title, range, width, height, opaque, numLabels, imgData);
    11791181        } else {
    11801182            dataSet = _dataSets.begin()->second;
     
    11961198                          fieldName,
    11971199                          attrType,
    1198                           title, range, width, height, numLabels, imgData);
     1200                          title, range, width, height, opaque, numLabels, imgData);
    11991201}
    12001202
     
    12291231                              double range[2],
    12301232                              int width, int height,
     1233                              bool opaque,
    12311234                              int numLabels,
    12321235                              vtkUnsignedCharArray *imgData)
     
    12591262    if (_scalarBarActor == NULL) {
    12601263        _scalarBarActor = vtkSmartPointer<vtkScalarBarActor>::New();
     1264        _legendRenderer->AddViewProp(_scalarBarActor);
     1265    }
     1266
     1267    if (opaque) {
     1268        _scalarBarActor->UseOpacityOff();
     1269    } else {
    12611270        _scalarBarActor->UseOpacityOn();
    1262         _legendRenderer->AddViewProp(_scalarBarActor);
    12631271    }
    12641272
  • branches/blt4/packages/vizservers/vtkvis/RpVtkRenderer.h

    r2681 r2742  
    269269                        double range[2],
    270270                        int width, int height,
     271                        bool opaque,
    271272                        int numLabels,
    272273                        vtkUnsignedCharArray *imgData);
     
    279280                        double range[2],
    280281                        int width, int height,
     282                        bool opaque,
    281283                        int numLabels,
    282284                        vtkUnsignedCharArray *imgData);
     
    288290                        double range[2],
    289291                        int width, int height,
     292                        bool opaque,
    290293                        int numLabels,
    291294                        vtkUnsignedCharArray *imgData);
  • branches/blt4/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

    r2681 r2742  
    30753075        const char *dataSetName = Tcl_GetString(objv[8]);
    30763076        if (!g_renderer->renderColorMap(colorMapName, dataSetName, legendType, fieldName, title,
    3077                                         range, width, height, numLabels, imgData)) {
     3077                                        range, width, height, true, numLabels, imgData)) {
    30783078            Tcl_AppendResult(interp, "Color map \"",
    30793079                             colorMapName, "\" or dataset \"",
     
    30833083    } else {
    30843084        if (!g_renderer->renderColorMap(colorMapName, "all", legendType, fieldName, title,
    3085                                         range, width, height, numLabels, imgData)) {
     3085                                        range, width, height, true, numLabels, imgData)) {
    30863086            Tcl_AppendResult(interp, "Color map \"",
    30873087                             colorMapName, "\" was not found", (char*)NULL);
Note: See TracChangeset for help on using the changeset viewer.