diff options
| -rw-r--r-- | acconfig.h | 3 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rwxr-xr-x | cvscompile.sh | 2 | ||||
| -rw-r--r-- | m4/libfame.m4 | 181 | ||||
| -rw-r--r-- | src/dxr3/dxr3_mpeg_encoders.c | 9 |
5 files changed, 194 insertions, 2 deletions
diff --git a/acconfig.h b/acconfig.h index 03c086399..7403a998e 100644 --- a/acconfig.h +++ b/acconfig.h @@ -107,6 +107,9 @@ /* Define this if you have libfame mpeg encoder installed (fame.sf.net) */ #undef HAVE_LIBFAME +/* Define this if you have libfame 0.8.10 or above */ +#undef HAVE_NEW_LIBFAME + /* Define this if you have librte mpeg encoder installed (zapping.sf.net) */ #undef HAVE_LIBRTE diff --git a/configure.in b/configure.in index 02502e990..881db77d9 100644 --- a/configure.in +++ b/configure.in @@ -441,6 +441,7 @@ AC_SUBST([LINUX_INCLUDE]) AC_CHECK_DXR3() AM_CONDITIONAL(HAVE_DXR3, test x"$have_dxr3" = "xyes") AM_CONDITIONAL(HAVE_LIBFAME, test x"$have_libfame" = "xyes") +AM_PATH_LIBFAME(0.8.10, [AC_DEFINE([HAVE_NEW_LIBFAME])]) AM_CONDITIONAL(HAVE_LIBRTE, test x"$have_librte" = "xyes") AM_CONDITIONAL(HAVE_ENCODER, test x"$have_encoder" = "xyes") diff --git a/cvscompile.sh b/cvscompile.sh index 5c4ffb45f..eef2c960e 100755 --- a/cvscompile.sh +++ b/cvscompile.sh @@ -16,7 +16,7 @@ rm -f config.cache srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -m4_files="_xine.m4 arts.m4 esd.m4 iconv.m4 lcmessage.m4 vorbis.m4 aa.m4 gettext.m4 irixal.m4 ogg.m4 alsa.m4 codeset.m4 glibc21.m4 isc-posix.m4 progtest.m4 sdl.m4 xvid.m4" +m4_files="_xine.m4 arts.m4 esd.m4 iconv.m4 lcmessage.m4 vorbis.m4 aa.m4 gettext.m4 irixal.m4 ogg.m4 alsa.m4 codeset.m4 glibc21.m4 isc-posix.m4 progtest.m4 sdl.m4 xvid.m4 libfame.m4" if test -d $srcdir/m4; then rm -f acinclude.m4 for m4f in $m4_files; do diff --git a/m4/libfame.m4 b/m4/libfame.m4 new file mode 100644 index 000000000..1d660ef10 --- /dev/null +++ b/m4/libfame.m4 @@ -0,0 +1,181 @@ +dnl AM_PATH_LIBFAME([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for libfame, and define LIBFAME_CFLAGS and LIBFAME_LIBS +dnl Vivien Chappelier 12/11/00 +dnl stolen from ORBit autoconf +dnl +AC_DEFUN(AM_PATH_LIBFAME, +[dnl +dnl Get the cflags and libraries from the libfame-config script +dnl +AC_ARG_WITH(libfame-prefix,[ --with-libfame-prefix=PFX Prefix where libfame is installed (optional)], + libfame_config_prefix="$withval", libfame_config_prefix="") +AC_ARG_WITH(libfame-exec-prefix,[ --with-libfame-exec-prefix=PFX Exec prefix where libfame is installed (optional)], + libfame_config_exec_prefix="$withval", libfame_config_exec_prefix="") +AC_ARG_ENABLE(libfametest, [ --disable-libfametest Do not try to compile and run a test libfame program], + , enable_libfametest=yes) + + if test x$libfame_config_exec_prefix != x ; then + libfame_config_args="$libfame_config_args --exec-prefix=$libfame_config_exec_prefix" + if test x${LIBFAME_CONFIG+set} != xset ; then + LIBFAME_CONFIG=$libfame_config_exec_prefix/bin/libfame-config + fi + fi + if test x$libfame_config_prefix != x ; then + libfame_config_args="$libfame_config_args --prefix=$libfame_config_prefix" + if test x${LIBFAME_CONFIG+set} != xset ; then + LIBFAME_CONFIG=$libfame_config_prefix/bin/libfame-config + fi + fi + + AC_PATH_PROG(LIBFAME_CONFIG, libfame-config, no) + min_libfame_version=ifelse([$1], , 0.9.0, $1) + AC_MSG_CHECKING(for libfame - version >= $min_libfame_version) + no_libfame="" + if test "$LIBFAME_CONFIG" = "no" ; then + no_libfame=yes + else + LIBFAME_CFLAGS=`$LIBFAME_CONFIG $libfame_config_args --cflags` + LIBFAME_LIBS=`$LIBFAME_CONFIG $libfame_config_args --libs` + libfame_config_major_version=`$LIBFAME_CONFIG $libfame_config_args --version | \ + sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + libfame_config_minor_version=`$LIBFAME_CONFIG $libfame_config_args --version | \ + sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + libfame_config_micro_version=`$LIBFAME_CONFIG $libfame_config_args --version | \ + sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_libfametest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $LIBFAME_CFLAGS" + LIBS="$LIBFAME_LIBS $LIBS" +dnl +dnl Now check if the installed LIBFAME is sufficiently new. (Also sanity +dnl checks the results of libfame-config to some extent +dnl + rm -f conf.libfametest + AC_TRY_RUN([ +#include <fame.h> +#include <stdio.h> +#include <stdlib.h> + +int +main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.libfametest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = strdup("$min_libfame_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_libfame_version"); + exit(1); + } + + if ((libfame_major_version != $libfame_config_major_version) || + (libfame_minor_version != $libfame_config_minor_version) || + (libfame_micro_version != $libfame_config_micro_version)) + { + printf("\n*** 'libfame-config --version' returned %d.%d.%d, but Libfame (%d.%d.%d)\n", + $libfame_config_major_version, $libfame_config_minor_version, $libfame_config_micro_version, + libfame_major_version, libfame_minor_version, libfame_micro_version); + printf ("*** was found! If libfame-config was correct, then it is best\n"); + printf ("*** to remove the old version of libfame. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If libfame-config was wrong, set the environment variable LIBFAME_CONFIG\n"); + printf("*** to point to the correct copy of libfame-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } +#if defined (LIBFAME_MAJOR_VERSION) && defined (LIBFAME_MINOR_VERSION) && defined (LIBFAME_MICRO_VERSION) + else if ((libfame_major_version != LIBFAME_MAJOR_VERSION) || + (libfame_minor_version != LIBFAME_MINOR_VERSION) || + (libfame_micro_version != LIBFAME_MICRO_VERSION)) + { + printf("*** libfame header files (version %d.%d.%d) do not match\n", + LIBFAME_MAJOR_VERSION, LIBFAME_MINOR_VERSION, LIBFAME_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + libfame_major_version, libfame_minor_version, libfame_micro_version); + } +#endif /* defined (LIBFAME_MAJOR_VERSION) ... */ + else + { + if ((libfame_major_version > major) || + ((libfame_major_version == major) && (libfame_minor_version > minor)) || + ((libfame_major_version == major) && (libfame_minor_version == minor) && (libfame_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of libfame (%d.%d.%d) was found.\n", + libfame_major_version, libfame_minor_version, libfame_micro_version); + printf("*** You need a version of libfame newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** libfame is always available from http://www-eleves.enst-bretagne.fr/~chappeli/fame\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the libfame-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of libfame, but you can also set the LIBFAME_CONFIG environment to point to the\n"); + printf("*** correct copy of libfame-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_libfame=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_libfame" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$LIBFAME_CONFIG" = "no" ; then + echo "*** The libfame-config script installed by libfame could not be found" + echo "*** If libfame was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the LIBFAME_CONFIG environment variable to the" + echo "*** full path to libfame-config." + else + if test -f conf.libfametest ; then + : + else + echo "*** Could not run libfame test program, checking why..." + CFLAGS="$CFLAGS $LIBFAME_CFLAGS" + LIBS="$LIBS $LIBFAME_LIBS" + AC_TRY_LINK([ +#include <fame.h> +#include <stdio.h> +], [ return ((libfame_major_version) || (libfame_minor_version) || (libfame_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding libfame or finding the wrong" + echo "*** version of LIBFAME. If it is not finding libfame, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" + echo "***" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means libfame was incorrectly installed" + echo "*** or that you have moved libfame since it was installed. In the latter case, you" + echo "*** may want to edit the libfame-config script: $LIBFAME_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + LIBFAME_CFLAGS="" + LIBFAME_LIBS="" + ifelse([$3], , :, [$3]) + fi + + AC_SUBST(LIBFAME_CFLAGS) + AC_SUBST(LIBFAME_LIBS) + rm -f conf.libfametest +]) diff --git a/src/dxr3/dxr3_mpeg_encoders.c b/src/dxr3/dxr3_mpeg_encoders.c index 4dfc4cccb..46d3f4fc7 100644 --- a/src/dxr3/dxr3_mpeg_encoders.c +++ b/src/dxr3/dxr3_mpeg_encoders.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: dxr3_mpeg_encoders.c,v 1.1 2002/05/24 22:09:44 miguelfreitas Exp $ + * $Id: dxr3_mpeg_encoders.c,v 1.2 2002/06/01 17:21:28 mroi Exp $ */ /* mpeg encoders for the dxr3 video out plugin. @@ -457,7 +457,14 @@ static int fame_on_display_frame(dxr3_driver_t *drv, dxr3_frame_t *frame) return 1; fame_prepare_frame(this, drv, frame); +#ifdef HAVE_NEW_LIBFAME + fame_start_frame(this->context, &this->yuv, NULL); + size = fame_encode_slice(this->context); + fame_end_frame(this->context, NULL); +#else size = fame_encode_frame(this->context, &this->yuv, NULL); +#endif + frame->vo_frame.displayed(&frame->vo_frame); if (drv->fd_video == CLOSED_FOR_ENCODER) { |