Changeset 2723 for trunk

Timestamp:

Dec 9, 2011, 10:46:35 AM (13 years ago)

Author:

gah

Message:

Addition checks for ffmeg

Location:

trunk

Files:

• configure (modified) (4 diffs)
• configure.in (modified) (2 diffs)
• src/core/config.h.in (modified) (5 diffs)
• src/objects/RpVideo.c (modified) (3 diffs)

trunk/configure

@@ -9688 +9688 @@
 
 
+
 HAVE_FFMPEG_LIBS=""
 if test "${with_ffmpeg}" != "no"; then
@@ -9703 +9704 @@
 
   fi
-fi
-
-for ac_func in img_convert
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lavcodec" >&5
+$as_echo_n "checking for main in -lavcodec... " >&6; }
+if ${ac_cv_lib_avcodec_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lavcodec  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_avcodec_main=yes
+else
+  ac_cv_lib_avcodec_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_main" >&5
+$as_echo "$ac_cv_lib_avcodec_main" >&6; }
+if test "x$ac_cv_lib_avcodec_main" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBAVCODEC 1
+_ACEOF
+
+  LIBS="-lavcodec $LIBS"
+
+else
+  as_fn_error $? "librappture requires libavcodec" "$LINENO" 5
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lavutil" >&5
+$as_echo_n "checking for main in -lavutil... " >&6; }
+if ${ac_cv_lib_avutil_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lavutil  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_avutil_main=yes
+else
+  ac_cv_lib_avutil_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avutil_main" >&5
+$as_echo "$ac_cv_lib_avutil_main" >&6; }
+if test "x$ac_cv_lib_avutil_main" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBAVUTIL 1
+_ACEOF
+
+  LIBS="-lavutil $LIBS"
+
+else
+  as_fn_error $? "librappture requires libavutil" "$LINENO" 5
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lavformat" >&5
+$as_echo_n "checking for main in -lavformat... " >&6; }
+if ${ac_cv_lib_avformat_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lavformat  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_avformat_main=yes
+else
+  ac_cv_lib_avformat_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_main" >&5
+$as_echo "$ac_cv_lib_avformat_main" >&6; }
+if test "x$ac_cv_lib_avformat_main" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBAVFORMAT 1
+_ACEOF
+
+  LIBS="-lavformat $LIBS"
+
+else
+  as_fn_error $? "librappture requires libavformat" "$LINENO" 5
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lswscale" >&5
+$as_echo_n "checking for main in -lswscale... " >&6; }
+if ${ac_cv_lib_swscale_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lswscale  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_swscale_main=yes
+else
+  ac_cv_lib_swscale_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_swscale_main" >&5
+$as_echo "$ac_cv_lib_swscale_main" >&6; }
+if test "x$ac_cv_lib_swscale_main" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSWSCALE 1
+_ACEOF
+
+  LIBS="-lswscale $LIBS"
+
+else
+  as_fn_error $? "librappture requires libswscale" "$LINENO" 5
+fi
+
+  for ac_func in avcodec_decode_video2
+do :
+  ac_fn_cxx_check_func "$LINENO" "avcodec_decode_video2" "ac_cv_func_avcodec_decode_video2"
+if test "x$ac_cv_func_avcodec_decode_video2" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVCODEC_DECODE_VIDEO2 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in avcodec_decode_video
+do :
+  ac_fn_cxx_check_func "$LINENO" "avcodec_decode_video" "ac_cv_func_avcodec_decode_video"
+if test "x$ac_cv_func_avcodec_decode_video" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVCODEC_DECODE_VIDEO 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in avformat_open_input
+do :
+  ac_fn_cxx_check_func "$LINENO" "avformat_open_input" "ac_cv_func_avformat_open_input"
+if test "x$ac_cv_func_avformat_open_input" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVFORMAT_OPEN_INPUT 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in av_open_input_file
+do :
+  ac_fn_cxx_check_func "$LINENO" "av_open_input_file" "ac_cv_func_av_open_input_file"
+if test "x$ac_cv_func_av_open_input_file" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AV_OPEN_INPUT_FILE 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in avio_close
+do :
+  ac_fn_cxx_check_func "$LINENO" "avio_close" "ac_cv_func_avio_close"
+if test "x$ac_cv_func_avio_close" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVIO_CLOSE 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in url_close
+do :
+  ac_fn_cxx_check_func "$LINENO" "url_close" "ac_cv_func_url_close"
+if test "x$ac_cv_func_url_close" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_URL_CLOSE 1
+_ACEOF
+
+fi
+done
+
+  ac_fn_cxx_check_func "$LINENO" "av_find_stream_info" "ac_cv_func_av_find_stream_info"
+if test "x$ac_cv_func_av_find_stream_info" = xyes; then :
+
+else
+  as_fn_error $? "oops! no av_find_stream_info?!?" "$LINENO" 5
+fi
+
+  ac_fn_cxx_check_func "$LINENO" "avcodec_find_decoder" "ac_cv_func_avcodec_find_decoder"
+if test "x$ac_cv_func_avcodec_find_decoder" = xyes; then :
+
+else
+  as_fn_error $? "oops! no av_codec_find_decoder ?!?" "$LINENO" 5
+fi
+
+  ac_fn_cxx_check_func "$LINENO" "avcodec_open" "ac_cv_func_avcodec_open"
+if test "x$ac_cv_func_avcodec_open" = xyes; then :
+
+else
+  as_fn_error $? "oops! avcodec_open ?!?" "$LINENO" 5
+fi
+
+  ac_fn_cxx_check_func "$LINENO" "avcodec_alloc_frame" "ac_cv_func_avcodec_alloc_frame"
+if test "x$ac_cv_func_avcodec_alloc_frame" = xyes; then :
+
+else
+  as_fn_error $? "oops! no avcode_alloc_frame ?!?" "$LINENO" 5
+fi
+
+  ac_fn_cxx_check_func "$LINENO" "av_rescale_q" "ac_cv_func_av_rescale_q"
+if test "x$ac_cv_func_av_rescale_q" = xyes; then :
+
+else
+  as_fn_error $? "oops! no av_rescale_q ?!?" "$LINENO" 5
+fi
+
+  ac_fn_cxx_check_func "$LINENO" "av_read_frame" "ac_cv_func_av_read_frame"
+if test "x$ac_cv_func_av_read_frame" = xyes; then :
+
+else
+  as_fn_error $? "oops! av_read_frame ?!?" "$LINENO" 5
+fi
+
+  ac_fn_cxx_check_func "$LINENO" "av_free" "ac_cv_func_av_free"
+if test "x$ac_cv_func_av_free" = xyes; then :
+
+else
+  as_fn_error $? "oops! no av_frame ?!?" "$LINENO" 5
+fi
+
+  ac_fn_cxx_check_func "$LINENO" "avcodec_default_release_buffer" "ac_cv_func_avcodec_default_release_buffer"
+if test "x$ac_cv_func_avcodec_default_release_buffer" = xyes; then :
+
+else
+  as_fn_error $? "oops! no avcode_default_release_buffer ?!?" "$LINENO" 5
+fi
+
+  ac_fn_cxx_check_func "$LINENO" "avpicture_get_size" "ac_cv_func_avpicture_get_size"
+if test "x$ac_cv_func_avpicture_get_size" = xyes; then :
+
+else
+  as_fn_error $? "oops! no avpicture_get_size ?!?" "$LINENO" 5
+fi
+
+  ac_fn_cxx_check_func "$LINENO" "avpicture_fill" "ac_cv_func_avpicture_fill"
+if test "x$ac_cv_func_avpicture_fill" = xyes; then :
+
+else
+  as_fn_error $? "oops! no avpicture_fill ?!?" "$LINENO" 5
+fi
+
+  ac_fn_cxx_check_func "$LINENO" "sws_getCachedContext" "ac_cv_func_sws_getCachedContext"
+if test "x$ac_cv_func_sws_getCachedContext" = xyes; then :
+
+else
+  as_fn_error $? "oops! no sws_getCachedContext ?!?" "$LINENO" 5
+fi
+
+  for ac_func in img_convert
 do :
   ac_fn_cxx_check_func "$LINENO" "img_convert" "ac_cv_func_img_convert"
@@ -9716 +10022 @@
 done
 
-for ac_func in sws_scale
+  for ac_func in sws_scale
 do :
   ac_fn_cxx_check_func "$LINENO" "sws_scale" "ac_cv_func_sws_scale"
@@ -9727 +10033 @@
 done
 
+fi
 
 

trunk/configure.in

@@ -338 +338 @@
 ]])
 
+
 HAVE_FFMPEG_LIBS=""
 if test "${with_ffmpeg}" != "no"; then
@@ -351 +352 @@
     AC_DEFINE(BUILD_with_ffmpeg, 1, [Build rappture with ffmpeg widgets])
   fi
-fi
-
-AC_CHECK_FUNCS(img_convert)
-AC_CHECK_FUNCS(sws_scale)
+  AC_CHECK_LIB(avcodec, main,,AC_MSG_ERROR(librappture requires libavcodec))
+  AC_CHECK_LIB(avutil, main,,AC_MSG_ERROR(librappture requires libavutil))
+  AC_CHECK_LIB(avformat, main,,AC_MSG_ERROR(librappture requires libavformat))
+  AC_CHECK_LIB(swscale, main,,AC_MSG_ERROR(librappture requires libswscale))
+  AC_CHECK_FUNCS(avcodec_decode_video2)
+  AC_CHECK_FUNCS(avcodec_decode_video)
+  AC_CHECK_FUNCS(avformat_open_input)
+  AC_CHECK_FUNCS(av_open_input_file)
+  AC_CHECK_FUNCS(avio_close)
+  AC_CHECK_FUNCS(url_close)
+  AC_CHECK_FUNC(av_find_stream_info,, 
+  AC_MSG_ERROR(oops! no av_find_stream_info?!?))
+  AC_CHECK_FUNC(avcodec_find_decoder,,
+    AC_MSG_ERROR(oops! no av_codec_find_decoder ?!?))
+  AC_CHECK_FUNC(avcodec_open,,AC_MSG_ERROR(oops! avcodec_open ?!?))
+  AC_CHECK_FUNC(avcodec_alloc_frame,,
+    AC_MSG_ERROR(oops! no avcode_alloc_frame ?!?))
+  AC_CHECK_FUNC(av_rescale_q,,AC_MSG_ERROR(oops! no av_rescale_q ?!?))
+  AC_CHECK_FUNC(av_read_frame,,AC_MSG_ERROR(oops! av_read_frame ?!?))
+  AC_CHECK_FUNC(av_free,,AC_MSG_ERROR(oops! no av_frame ?!?))
+  AC_CHECK_FUNC(avcodec_default_release_buffer,,
+    AC_MSG_ERROR(oops! no avcode_default_release_buffer ?!?))
+  AC_CHECK_FUNC(avpicture_get_size,,
+    AC_MSG_ERROR(oops! no avpicture_get_size ?!?))
+  AC_CHECK_FUNC(avpicture_fill,,AC_MSG_ERROR(oops! no avpicture_fill ?!?))
+  AC_CHECK_FUNC(sws_getCachedContext,,
+    AC_MSG_ERROR(oops! no sws_getCachedContext ?!?))
+  AC_CHECK_FUNCS(img_convert)
+  AC_CHECK_FUNCS(sws_scale)
+fi
 
 AC_SUBST(CFLAGS_DEBUG)

trunk/src/core/config.h.in

@@ -13 +13 @@
 #undef HAVE_ASSERT_H
 
+/* Define to 1 if you have the `avcodec_decode_video' function. */
+#undef HAVE_AVCODEC_DECODE_VIDEO
+
+/* Define to 1 if you have the `avcodec_decode_video2' function. */
+#undef HAVE_AVCODEC_DECODE_VIDEO2
+
+/* Define to 1 if you have the `avformat_open_input' function. */
+#undef HAVE_AVFORMAT_OPEN_INPUT
+
+/* Define to 1 if you have the `avio_close' function. */
+#undef HAVE_AVIO_CLOSE
+
+/* Define to 1 if you have the `av_open_input_file' function. */
+#undef HAVE_AV_OPEN_INPUT_FILE
+
 /* Define to 1 if you have the <cctype> header file. */
 #undef HAVE_CCTYPE
@@ -67 +82 @@
 #undef HAVE_ITERATOR
 
+/* Define to 1 if you have the `avcodec' library (-lavcodec). */
+#undef HAVE_LIBAVCODEC
+
 /* Define to 1 if you have the <libavcodec/avcodec.h> header file. */
 #undef HAVE_LIBAVCODEC_AVCODEC_H
 
+/* Define to 1 if you have the `avformat' library (-lavformat). */
+#undef HAVE_LIBAVFORMAT
+
 /* Define to 1 if you have the <libavformat/avformat.h> header file. */
 #undef HAVE_LIBAVFORMAT_AVFORMAT_H
 
+/* Define to 1 if you have the `avutil' library (-lavutil). */
+#undef HAVE_LIBAVUTIL
+
 /* Define to 1 if you have the <libavutil/avutil.h> header file. */
 #undef HAVE_LIBAVUTIL_AVUTIL_H
@@ -82 +106 @@
 #undef HAVE_LIBSTDC__
 
+/* Define to 1 if you have the `swscale' library (-lswscale). */
+#undef HAVE_LIBSWSCALE
+
 /* Define to 1 if you have the <libswscale/swscale.h> header file. */
 #undef HAVE_LIBSWSCALE_SWSCALE_H
@@ -100 +127 @@
 #undef HAVE_MEMORY_H
 
+/* Define to 1 if you have the <Python.h> header file. */
+#undef HAVE_PYTHON_H
+
 /* Define to 1 if you have the <sstream> header file. */
 #undef HAVE_SSTREAM
@@ -141 +171 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `url_close' function. */
+#undef HAVE_URL_CLOSE
 
 /* Define to 1 if you have the <vector> header file. */

trunk/src/objects/RpVideo.c

@@ -58 +58 @@
 #define AVMEDIA_TYPE_VIDEO      CODEC_TYPE_VIDEO
 #define AV_PKT_FLAG_KEY         PKT_FLAG_KEY            
+#endif  /* LIBAVUTIL_VERSION_MAJOR */
+
+#ifndef HAVE_AVIO_CLOSE
 #define avio_close              url_fclose
-#define avformat_open_input     av_open_input_file
-#endif  /* LIBAVUTIL_VERSION_MAJOR */
-
+#endif
 
 /*
@@ -343 +344 @@
      * Open the video stream from that file.
      */
-#if LIBAVUTIL_VERSION_MAJOR < 51
+#ifdef HAVE_AVFORMAT_OPEN_INPUT
+    if (avformat_open_input(&vidPtr->pFormatCtx, vidPtr->fileName, NULL, 
+        NULL) != 0) {
+        return -3;
+    }
+#else
     if (av_open_input_file(&vidPtr->pFormatCtx, vidPtr->fileName,
             NULL, 0, NULL) != 0) {
         return -3;
-    }
-#else
-    if (avformat_open_input(&vidPtr->pFormatCtx, vidPtr->fileName, NULL, 
-        NULL) != 0) {
-        return -3;
     }
 #endif
@@ -715 +716 @@
                     global_video_pkt_pts = packet.pts;
 
-#ifdef FFMPEG_AVCODEC_H
+#ifdef HAVE_AVCODEC_DECODE_VIDEO2
+                    // new avcodec decode video function
+                    avcodec_decode_video2(vcodecCtx, vidPtr->pFrameYUV,
+                        &frameFinished, &packet);
+#else
                     // old avcodec decode video function
                     avcodec_decode_video(vcodecCtx, vidPtr->pFrameYUV,
                         &frameFinished, packet.data, packet.size);
-#else
-                    // new avcodec decode video function
-                    avcodec_decode_video2(vcodecCtx, vidPtr->pFrameYUV,
-                        &frameFinished, &packet);
 #endif
-
                     if (packet.dts == AV_NOPTS_VALUE
                           && vidPtr->pFrameYUV->opaque