[Mplayer-cvslog] CVS: main configure,1.396,1.397 dec_video.c,1.117,1.118

[Atmosfear]

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

Modified Files:
	configure dec_video.c 
Log Message:
DivX5 Build support, not usefull because current divx5linux from avifile.sf.net only decodes black/green image

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- configure	2 Mar 2002 14:36:18 -0000	1.396
+++ configure	6 Mar 2002 02:22:46 -0000	1.397
@@ -2605,7 +2605,8 @@
 fi
 
 
-echocheck "XviD/DivX4linux/OpenDivX decore"
+echocheck "XviD/DivX4linux/DivX5linux/OpenDivX decore"
+# DivX5: DEC_OPT_MEMORY_REQS - DivX4: DEC_OPT_FRAME_311
 cat > $TMPC << EOF
 #include <decore.h>
 int main(void) { (void) decore(0, 0, 0, 0);  return DEC_OPT_FRAME_311; }
@@ -2617,6 +2618,7 @@
   _ld_decore="$_xvidcore"
   _def_decore='#define NEW_DECORE 1'
   _def_divx='#define USE_DIVX'
+  _def_divx5='#undef DECORE_DIVX5'
   _def_odivx_postprocess='#undef HAVE_ODIVX_POSTPROCESS'
   _codecmodules="xvid $_codecmodules"
   echores "XviD (with $_xvidcore)"
@@ -2627,6 +2629,7 @@
   _ld_decore='-lxvidcore'
   _def_decore='#define NEW_DECORE 1'
   _def_divx='#define USE_DIVX'
+  _def_divx5='#undef DECORE_DIVX5'
   _def_odivx_postprocess='#undef HAVE_ODIVX_POSTPROCESS'
   _codecmodules="xvid $_codecmodules"
   echores "XviD (with libxvidcore.so)"
@@ -2637,9 +2640,31 @@
   _ld_decore='-ldivxdecore opendivx/postprocess.o'
   _def_decore='#define NEW_DECORE 1'
   _def_divx='#define USE_DIVX'
+  _def_divx5='#undef DECORE_DIVX5'
   _def_odivx_postprocess='#define HAVE_ODIVX_POSTPROCESS 1'
   _codecmodules="divx4linux $_codecmodules"
-  echores "Divx4linux (with libdivxdecore.so)"
+  echores "DivX4linux (with libdivxdecore.so)"
+elif test "$_divx4linux" != no ; then 
+# DivX5 check
+# OdivxPP disabled because of:
+# ld: Warning: type of symbol `dering' changed from 1 to 2 in opendivx/postprocess.o
+cat > $TMPC << EOF
+#include <decore.h>
+int main(void) { (void) decore(0, 0, 0, 0);  return DEC_OPT_MEMORY_REQS; }
+EOF
+if cc_check -lm -ldivxdecore -lm ; then
+  _xvid=no
+  _divx4linux=yes
+  _opendivx=no
+#  _ld_decore='-ldivxdecore opendivx/postprocess.o'
+  _ld_decore='-ldivxdecore'
+  _def_decore='#define NEW_DECORE 1'
+  _def_divx='#define USE_DIVX'
+  _def_divx5='#define DECORE_DIVX5 1'
+#  _def_odivx_postprocess='#define HAVE_ODIVX_POSTPROCESS 1'
+  _def_odivx_postprocess='#undef HAVE_ODIVX_POSTPROCESS'
+  _codecmodules="divx5linux $_codecmodules"
+  echores "DivX5linux (with libdivxdecore.so)"
 elif test "$_opendivx" != no ; then
   _xvid=no
   _divx4linux=no
@@ -2647,6 +2672,7 @@
   _ld_decore='-Lopendivx -ldecore'
   _def_decore='#undef NEW_DECORE'
   _def_divx='#define USE_DIVX'
+  _def_divx5='#undef DECORE_DIVX5'
   _def_odivx_postprocess='#define HAVE_ODIVX_POSTPROCESS 1'
   _codecmodules="opendivx $_codecmodules"
   echores "OpenDivX"
@@ -2657,8 +2683,10 @@
   _ld_decore=''
   _def_decore='#undef NEW_DECORE'
   _def_divx='#undef USE_DIVX'
+  _def_divx5='#undef DECORE_DIVX5'
   _def_odivx_postprocess='#undef HAVE_ODIVX_POSTPROCESS'
   echores "no"
+fi # DivX5 check
 fi
 
 
@@ -3125,6 +3153,9 @@
 /* Define for using new XviD/DivX4Linux library, instead of open-source OpenDivX */
 /* You have to change DECORE_LIBS in config.mak too! */
 $_def_decore
+
+/* Define if you are using DivX5Linux Decore library */
+$_def_divx5
 
 /* If build mencoder */
 $_mencoder_flag

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_video.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- dec_video.c	4 Mar 2002 06:10:43 -0000	1.117
+++ dec_video.c	6 Mar 2002 02:22:46 -0000	1.118
@@ -897,7 +897,11 @@
 #ifdef NEW_DECORE
         dec_frame.bmp=&dec_pic;
         dec_pic.y=dec_pic.u=dec_pic.v=NULL;
+#ifdef DECORE_DIVX5
+	decore(0x123, DEC_OPT_FRAME, &dec_frame, NULL);
+#else
 	decore(0x123, (sh_video->format==mmioFOURCC('D','I','V','3'))?DEC_OPT_FRAME_311:DEC_OPT_FRAME, &dec_frame, NULL);
+#endif
 #else
         opendivx_src[0]=NULL;
 	decore(0x123, 0, &dec_frame, NULL);
@@ -943,7 +947,11 @@
         dec_frame.bmp=sh_video->our_out_buffer;
         dec_frame.stride=sh_video->disp_w;
 //	printf("Decoding DivX4 frame\n");
+#ifdef DECORE_DIVX5
+	decore(0x123, DEC_OPT_FRAME, &dec_frame, NULL);
+#else
 	decore(0x123, (sh_video->format==mmioFOURCC('D','I','V','3'))?DEC_OPT_FRAME_311:DEC_OPT_FRAME, &dec_frame, NULL);
+#endif
     if(!drop_frame) blit_frame=3;
     break;
   }