[Mplayer-cvslog] CVS: main configure,1.729,1.730 codec-cfg.c,1.101,1.102

[Ivan Kalvachev CVS]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv20940

Modified Files:
	configure codec-cfg.c 
Log Message:
basic xvmc image support

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.729
retrieving revision 1.730
diff -u -r1.729 -r1.730
--- configure	20 Jun 2003 13:18:31 -0000	1.729
+++ configure	21 Jun 2003 01:47:02 -0000	1.730
@@ -215,6 +215,7 @@
   --enable-xmga          build with mga_vid X Window support
                          (check for X & /dev/mga_vid) [autodetect]
   --enable-xv            build with Xv render support for X 4.x [autodetect]
+  --enable-xvmc          build with XvMC acceleration for X 4.x [autodetect]
   --enable-vm            build with XF86VidMode support for X11 [autodetect]
   --enable-xinerama      build with Xinerama support for X11 [autodetect]
   --enable-x11           build with X11 render support [autodetect]
@@ -288,6 +289,7 @@
   --with-win32libdir=DIR   W*ndows DLL files in DIR
   --with-xanimlibdir=DIR   XAnim DLL files in DIR
   --with-reallibdir=DIR    RealPlayer DLL files in DIR
+  --with-xvmclib=PATH      path to adapter specific XvMCxxxxx.so (e.g. NVIDIA)
   --with-xvidcore=PATH     path to XviD libxvidcore.a
                            (e.g. /opt/lib/libxvidcore.a)
   --with-sdl-config=PATH   path to sdl*-config (e.g. /opt/bin/sdl-config)
@@ -991,6 +993,7 @@
 
 
 _prefix="/usr/local"
+_xvmclib="XvMCNVIDIA"
 
 # GOTCHA: the variables below defines the default behavior for autodetection
 # and have - unless stated otherwise - at least 2 states : yes no
@@ -1003,6 +1006,7 @@
 _x11=auto
 _dga=auto	# 1 2 no auto
 _xv=auto
+_xvmc=no  #auto when complete
 _sdl=auto
 _directx=auto
 _win32waveout=auto
@@ -1129,6 +1133,8 @@
   --disable-x11)	_x11=no		;;
   --enable-xv)		_xv=yes		;;
   --disable-xv)		_xv=no		;;
+  --enable-xvmc)        _xvmc=yes       ;;
+  --disable-xvmc)       _xvmc=no        ;;
   --enable-sdl)		_sdl=yes	;;
   --disable-sdl)	_sdl=no		;;
   --enable-directx)     _directx=yes    ;;
@@ -1417,6 +1423,9 @@
   --with-dxr2incdir=*)
     _inc_dxr2=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
     ;;
+  --with-xvmclib=*)
+    _xvmclib=`echo $ac_option | cut -d '=' -f 2`
+    ;;
   --with-xvidcore=*)
     _xvidcore=`echo $ac_option | cut -d '=' -f 2`
     ;;
@@ -2736,6 +2745,32 @@
 echores "$_xv"
 
 
+echocheck "XvMC"
+if test "$_x11" = yes && test "$_xv" && test "$_xvmc" != no ; then
+  _xvmc=no
+  cat > $TMPC <<EOF
+#include <X11/Xlib.h>
+#include <X11/extensions/Xvlib.h>
+#include <X11/extensions/XvMClib.h>
+int main(void) { 
+  (void) XvMCQueryExtension(0,0,0);
+  (void) XvMCCreateContext(0,0,0,0,0,0,0);
+  return 0; }
+EOF
+  cc_check $_inc_x11 $_ld_x11 $_ld_xv -lXvMC -l$_xvmclib && _xvmc=yes
+fi
+if test "$_xvmc" = yes ; then
+  _def_xvmc='#define HAVE_XVMC 1'
+  _ld_xvmc="-lXvMC -l$_xvmclib"
+  _vosrc="$_vosrc vo_xvmc.c"
+  _vomodules="xvmc $_vomodules"
+else
+  _def_xvmc='#undef HAVE_XVMC'
+  _novomodules="xvmc $_novomodules"
+fi
+echores "$_xvmc"
+
+
 echocheck "Xinerama"
 if test "$_x11" = yes && test "$_xinerama" != no ; then
   cat > $TMPC <<EOF
@@ -5310,7 +5345,7 @@
 SRC_PATH=.
 
 # video output
-X_LIB = $_ld_gl $_ld_dga $_ld_xv $_ld_vm $_ld_xinerama $_ld_x11 $_ld_mad $_ld_sock
+X_LIB = $_ld_gl $_ld_dga $_ld_xv $_ld_xvmc $_ld_vm $_ld_xinerama $_ld_x11 $_ld_mad $_ld_sock
 GGI_LIB = $_ld_ggi
 MLIB_LIB =  $_ld_mlib
 MLIB_INC = $_inc_mlib
@@ -5883,6 +5918,7 @@
 #define SCREEN_SIZE_Y 1
 $_def_x11
 $_def_xv
+$_def_xvmc
 $_def_vm
 $_def_xinerama
 $_def_gl

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- codec-cfg.c	13 Jun 2003 01:25:08 -0000	1.101
+++ codec-cfg.c	21 Jun 2003 01:47:03 -0000	1.102
@@ -158,6 +158,10 @@
 		{"BGR1",  IMGFMT_BGR|1},
 
 		{"MPES",  IMGFMT_MPEGPES},
+
+		{"IDCT_MPEG2",IMGFMT_XVMC_IDCT_MPEG2},
+		{"MOCO_MPEG2",IMGFMT_XVMC_MOCO_MPEG2},
+
 		{NULL,    0}
 	};