[Mplayer-cvslog] CVS: main cfg-common.h,1.66,1.67 cfg-mencoder.h,1.51,1.52 cfg-mplayer.h,1.176,1.177 Makefile,1.225,1.226 configure,1.587,1.588

Mon Oct 28 20:31:30 CET 2002

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

Modified Files:
	cfg-common.h cfg-mencoder.h cfg-mplayer.h Makefile configure 
Log Message:
postprocessing cleanup:
remove opendivx #ifdefs
remove rk1 filter
remove unused / obsolete stuff
add -1,4,2,4,-1 deinterlacing filter (ffmpeg uses that)
threadsafe / no more non-const globals
some optimizations
different strides for Y,U,V possible
remove ebx usage (someone really should fix gcc, this is really lame)
change the dering filter slightly (tell me if its worse for any files)



Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67

--- cfg-common.h	25 Oct 2002 09:42:18 -0000	1.66
+++ cfg-common.h	28 Oct 2002 19:30:29 -0000	1.67
@@ -135,7 +135,6 @@
 	{"divxq", "Option -divxq has been renamed to -pp (postprocessing), use -pp !\n",
             CONF_TYPE_PRINT, 0, 0, 0, NULL},
 	{"pp", readPPOpt, CONF_TYPE_FUNC_PARAM, 0, 0, 0, (cfg_default_func_t)&revertPPOpt},
-	{"npp", readNPPOpt, CONF_TYPE_FUNC_PARAM, 0, 0, 0, (cfg_default_func_t)&revertPPOpt},
 #ifdef HAVE_ODIVX_POSTPROCESS
         {"oldpp", &use_old_pp, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 #else

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- cfg-mencoder.h	21 Sep 2002 12:41:29 -0000	1.51
+++ cfg-mencoder.h	28 Oct 2002 19:30:29 -0000	1.52
@@ -13,7 +13,6 @@
 
 extern int sws_flags;
 extern int readPPOpt(void *, char *arg);
-extern int readNPPOpt(void *conf, char *arg);
 extern void revertPPOpt(void *conf, char* opt);
 
 #ifdef HAVE_DIVX4ENCORE

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- cfg-mplayer.h	23 Oct 2002 17:20:59 -0000	1.176
+++ cfg-mplayer.h	28 Oct 2002 19:30:29 -0000	1.177
@@ -153,7 +153,6 @@
 
 extern int sws_flags;
 extern int readPPOpt(void *conf, char *arg);
-extern int readNPPOpt(void *conf, char *arg);
 extern void revertPPOpt(void *conf, char* opt);
 
 
@@ -357,7 +356,7 @@
 	{"dumpmicrodvdsub", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 7, NULL},
 
 #ifdef HAVE_LIRC
-	{"lircconf", &lirc_configfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, 
+	{"lircconf", &lirc_configfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
 #endif
 
 	{"gui", &use_gui, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCMD, 0, 1, NULL},

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- Makefile	25 Oct 2002 16:22:59 -0000	1.225
+++ Makefile	28 Oct 2002 19:30:29 -0000	1.226
@@ -40,7 +40,7 @@
 VO_LIBS = $(SDL_LIB) $(GGI_LIB) $(AA_LIB) $(X_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) $(GIF_LIB) 
 AO_LIBS = $(ARTS_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
 CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(LZO_LIB) $(XVID_LIB) $(DECORE_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) 
-COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libpostproc.a linux/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB)
+COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a $(PP_LIB) postproc/libswscale.a linux/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB)
 
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(EXTRA_INC) $(CDPARANOIA_INC) $(FREETYPE_INC) $(SDL_INC) # -Wall
 
@@ -73,7 +73,12 @@
 ALL_PRG += $(PRG_FIBMAP)
 endif
 
-COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a input/libinput.a libvo/libvo.a libaf/libaf.a
+COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a
+ifeq (($SHARED_PP),yes)
+COMMON_DEPS += postproc/libpostproc.so
+else
+COMMON_DEPS += postproc/libpostproc.a
+endif
 
 ifeq ($(VIDIX),yes)
 COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
@@ -158,9 +163,15 @@
 linux/libosdep.a:
 	$(MAKE) -C linux
 
+postproc/libswscale.a:
+	$(MAKE) -C postproc
+
 postproc/libpostproc.a:
 	$(MAKE) -C postproc
 
+postproc/libpostproc.so:
+	$(MAKE) -C postproc
+
 input/libinput.a:
 	$(MAKE) -C input
 
@@ -200,6 +211,9 @@
 install: $(ALL_PRG)
 ifeq ($(VIDIX),yes)
 	$(DO_MAKE)
+endif
+ifeq ($(SHARED_PP),yes)
+	$(MAKE) install -C postproc 
 endif
 	if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
 	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG)

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.587
retrieving revision 1.588
diff -u -r1.587 -r1.588
--- configure	25 Oct 2002 17:42:20 -0000	1.587
+++ configure	28 Oct 2002 19:30:29 -0000	1.588
@@ -216,6 +216,7 @@
                          options with --enable-static="-lslang -lncurses"
   --language=xx          select a language (for translated messages/gui) [en]
                          (Available: $LANGUAGES)
+  --enabled-shared-pp    install & use shared postprocessing lib
 
 Advanced options:
   --enable-mmx           build with mmx support [autodetect]
@@ -1006,6 +1007,7 @@
 _cdparanoia=auto
 _big_endian=auto
 _freetype=no
+_shared_pp=no
 
 for ac_option do
   case "$ac_option" in
@@ -1181,6 +1183,9 @@
   --enable-dga=*) _dga=`echo $ac_option | cut -d '=' -f 2` ;;
   --disable-dga) _dga=no ;;
 
+  --enable-shared-pp) _shared_pp=yes ;;
+  --disable-shared-pp) _shared_pp=no ;;
+
   --language=*)
     LINGUAS=`echo $ac_option | cut -d '=' -f 2`
     ;;
@@ -4164,6 +4169,14 @@
 fi
 echores "$_byte_order"
 
+echocheck "shared postprocess lib"
+if test "$_shared_pp" = yes ; then
+  _ld_pp='-lpostproc'
+else
+  _ld_pp='postproc/libpostproc.a'
+fi
+echores "$_shared_pp"
+
 # --------------- GUI specific tests begin -------------------
 echocheck "GUI"
 echo "$_gui"
@@ -4431,6 +4444,8 @@
 STREAMING_LIVE_DOT_COM = $_live
 STREAMING_LIB = $_ld_streaming $_ld_live
 VIDIX = $_vidix
+PP_LIB = $_ld_pp
+SHARED_PP = $_shared_pp
 
 OPENDIVX = $_opendivx
 


