[Mplayer-cvslog] CVS: main dec_video.c,1.45,1.46 configure,1.185,1.186 Makefile,1.74,1.75

[Arpi of Ize]

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

Modified Files:
	dec_video.c configure Makefile 
Log Message:
integrated new postproc code

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_video.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- dec_video.c	5 Oct 2001 00:08:58 -0000	1.45
+++ dec_video.c	13 Oct 2001 15:33:12 -0000	1.46
@@ -43,6 +43,8 @@
 #include "libmpeg2/mpeg2.h"
 #include "libmpeg2/mpeg2_internal.h"
 
+#include "postproc/postprocess.h"
+
 extern picture_t *picture;	// exported from libmpeg2/decode.c
 
 
@@ -98,7 +100,7 @@
 #ifdef USE_WIN32DLL
   case VFM_VFW:
   case VFM_VFWEX:
-      return 6;
+      return 9; // for Divx.dll (divx4)
 #endif
 #ifdef USE_DIRECTSHOW
   case VFM_DSHOW:
@@ -106,10 +108,15 @@
 #endif
 #ifdef MPEG12_POSTPROC
   case VFM_MPEG:
+      return GET_PP_QUALITY_MAX;
 #endif
   case VFM_DIVX4:
   case VFM_ODIVX:
-      return 6;
+#ifdef NEW_DECORE
+      return 9; // for divx4linux
+#else
+      return GET_PP_QUALITY_MAX;  // for opendivx
+#endif
  }
  return 0;
 }
@@ -131,16 +138,21 @@
 #endif
 #ifdef MPEG12_POSTPROC
   case VFM_MPEG: {
-   if(quality<0 || quality>6) quality=6;
-   picture->pp_options=(1<<quality)-1;
+   if(quality<0 || quality>GET_PP_QUALITY_MAX) quality=GET_PP_QUALITY_MAX;
+   picture->pp_options=getPpModeForQuality(quality);
   }
   break;
 #endif
   case VFM_DIVX4:
   case VFM_ODIVX: {
    DEC_SET dec_set;
-   if(quality<0 || quality>6) quality=6;
-   dec_set.postproc_level=(1<<quality)-1;
+#ifdef NEW_DECORE
+   if(quality<0 || quality>9) quality=9;
+   dec_set.postproc_level=quality*10;
+#else
+   if(quality<0 || quality>GET_PP_QUALITY_MAX) quality=GET_PP_QUALITY_MAX;
+   dec_set.postproc_level=getPpModeForQuality(quality);
+#endif
    decore(0x123,DEC_OPT_SETPP,&dec_set,NULL);
   }
   break;

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- configure	12 Oct 2001 08:42:20 -0000	1.185
+++ configure	13 Oct 2001 15:33:12 -0000	1.186
@@ -2393,6 +2393,8 @@
 /* Define this to enable MPEG 1/2 image postprocessing (requires FAST cpu!) */
 #define MPEG12_POSTPROC
 
+#define HAVE_ODIVX_POSTPROCESS
+
 /* Win32 DLL support */
 $_win32dll
 

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- Makefile	11 Oct 2001 23:35:52 -0000	1.74
+++ Makefile	13 Oct 2001 15:33:13 -0000	1.75
@@ -16,7 +16,7 @@
 #prefix = /usr/local
 BINDIR = ${prefix}/bin
 # BINDIR = /usr/local/bin
-SRCS = mp_msg.c open.c parse_es.c ac3-iec958.c find_sub.c aviprint.c dec_audio.c dec_video.c aviwrite.c aviheader.c asfheader.c demux_avi.c demux_asf.c demux_mpg.c demux_mov.c demuxer.c stream.c codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c xa/rle8.c lirc_mp.c cfgparser.c mixer.c dvdauth.c spudec.c $(STREAM_SRCS)
+SRCS = postproc/postprocess.c mp_msg.c open.c parse_es.c ac3-iec958.c find_sub.c aviprint.c dec_audio.c dec_video.c aviwrite.c aviheader.c asfheader.c demux_avi.c demux_asf.c demux_mpg.c demux_mov.c demuxer.c stream.c codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c xa/rle8.c lirc_mp.c cfgparser.c mixer.c dvdauth.c spudec.c $(STREAM_SRCS)
 OBJS = $(SRCS:.c=.o)
 CFLAGS = $(OPTFLAGS) -Iloader -Ilibvo $(CSS_INC) $(EXTRA_INC) # -Wall
 A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB)