October 2001 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/libvo Makefile,1.18,1.19 vo_dga.c,1.30,1.31 vo_fbdev.c,1.48,1.49 vo_svga.c,1.35,1.36 vo_x11.c,1.37,1.38
by Nick Kurshev 01 Nov '01

01 Nov '01

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv6549 Modified Files: Makefile vo_dga.c vo_fbdev.c vo_svga.c vo_x11.c Log Message: Using new stuff of rgb15to16 Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libvo/Makefile,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- Makefile 29 Oct 2001 00:48:20 -0000 1.18 +++ Makefile 30 Oct 2001 17:04:31 -0000 1.19 @@ -7,7 +7,7 @@ OBJS=$(SRCS:.c=.o) ifeq ($(TARGET_ARCH_X86),yes) -SRCS += rgb15to16mmx.c yuv2rgb_mmx.c +SRCS += yuv2rgb_mmx.c ifeq ($(TARGET_OS),Linux) SRCS += vo_vesa.c endif Index: vo_dga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- vo_dga.c 13 Aug 2001 11:08:18 -0000 1.30 +++ vo_dga.c 30 Oct 2001 17:04:31 -0000 1.31 @@ -23,8 +23,8 @@ * - works only on x86 architectures * * $Log$ - * Revision 1.30 2001/08/13 11:08:18 atlka - * changes according to -utf8 option, draw_osd() function added + * Revision 1.31 2001/10/30 17:04:31 nick + * Using new stuff of rgb15to16 * * Revision 1.29 2001/07/16 18:41:52 jkeil * vo_dga doesn't compile on non-x86 architecture due to x86 asm usage. @@ -151,11 +151,9 @@ #include "x11_common.h" - +#include "../postproc/rgb2rgb.h" #include "fastmemcpy.h" -extern void rgb15to16_mmx(char* s0,char* d0,int count); - static vo_info_t vo_info = { #ifdef HAVE_DGA2 @@ -479,18 +477,9 @@ int i; char *e; for(i=0; i< vo_dga_lines; i++){ -#ifdef HAVE_MMX - rgb15to16_mmx( s, d, vo_dga_bytes_per_line); + rgb15to16( s, d, vo_dga_bytes_per_line); d+=vo_dga_bytes_per_line; s+=vo_dga_bytes_per_line; -#else - e = s+vo_dga_bytes_per_line; - while( s< e ){ - register uint16_t x = *(((uint16_t *)s)++); - *(((uint16_t *)d)++)=( x&0x001F )|( ( x&0x7FE0 )<<1 ); - } - -#endif d+= vo_dga_vp_skip; } } Index: vo_fbdev.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- vo_fbdev.c 21 Oct 2001 23:53:23 -0000 1.48 +++ vo_fbdev.c 30 Oct 2001 17:04:31 -0000 1.49 @@ -28,6 +28,7 @@ #include "fastmemcpy.h" #include "sub.h" #include "yuv2rgb.h" +#include "../postproc/rgb2rgb.h" LIBVO_EXTERN(fbdev) @@ -38,7 +39,6 @@ "" }; -extern void rgb15to16_mmx(char *s0, char *d0, int count); extern int verbose; /****************************** @@ -1146,20 +1146,10 @@ char *d = next_frame; char *s = src[0]; if (sbpp == fb_pixel_size) { - if (fb_real_bpp == 16 && pixel_format == (IMGFMT_BGR|15)) { -#ifdef HAVE_MMX - rgb15to16_mmx(s, d, 2 * in_width * in_height); -#else - unsigned short *s1 = (unsigned short *) s; - unsigned short *d1 = (unsigned short *) d; - unsigned short *e = s1 + in_width * in_height; - while (s1<e) { - register x = *(s1++); - *(d1++) = (x&0x001f)|((x&0x7fe0)<<1); - } -#endif - } else - memcpy(d, s, sbpp * in_width * in_height); + if (fb_real_bpp == 16 && pixel_format == (IMGFMT_BGR|15)) + rgb15to16(s, d, 2 * in_width * in_height); + else + memcpy(d, s, sbpp * in_width * in_height); } } return 0; Index: vo_svga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- vo_svga.c 14 Aug 2001 12:51:23 -0000 1.35 +++ vo_svga.c 30 Oct 2001 17:04:31 -0000 1.36 @@ -24,8 +24,8 @@ #endif #include "sub.h" +#include "../postproc/rgb2rgb.h" -extern void rgb15to16_mmx(char* s0,char* d0,int count); extern int vo_dbpp; extern int verbose; @@ -470,19 +470,7 @@ } } break; case 16: { -#ifdef HAVE_MMX - rgb15to16_mmx(src[0],bppbuf,maxw * maxh * 2); -#else - uint16_t *source = (uint16_t *) src[0]; - uint16_t *dest = (uint16_t *) bppbuf; - register uint32_t i = 0; - register uint16_t srcdata; - - while (i < (maxw * maxh)) { - srcdata = source[i]; - dest[i++] = (srcdata & 0x1f) | ((srcdata & 0x7fe0) << 1); - } -#endif + rgb15to16(src[0],bppbuf,maxw * maxh * 2); } break; } src[0] = bppbuf; Index: vo_x11.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- vo_x11.c 28 Oct 2001 18:30:59 -0000 1.37 +++ vo_x11.c 30 Oct 2001 17:04:31 -0000 1.38 @@ -40,6 +40,7 @@ #include "sub.h" #include "../postproc/swscale.h" +#include "../postproc/rgb2rgb.h" static vo_info_t vo_info = { @@ -495,8 +496,6 @@ return 0; } -void rgb15to16_mmx( char* s0,char* d0,int count ); - static uint32_t draw_frame( uint8_t *src[] ){ int sbpp=( ( image_format&0xFF )+7 )/8; int dbpp=( bpp+7 )/8; @@ -512,26 +511,9 @@ for( i=0;i<image_height;i++ ) { s-=sbpp*image_width; if( sbpp==dbpp ) { - if( depth==16 && image_format==( IMGFMT_BGR|15 ) ){ - - // do 15bpp->16bpp -#ifdef HAVE_MMX - rgb15to16_mmx( s,d,2*image_width ); -#else - unsigned short *s1=( unsigned short * )s; - unsigned short *d1=( unsigned short * )d; - unsigned short *e=s1+image_width; - while( s1<e ){ - register int x=*( s1++ ); - // rrrrrggggggbbbbb - // 0rrrrrgggggbbbbb - // 0111 1111 1110 0000=0x7FE0 - // 00000000000001 1111=0x001F - *( d1++ )=( x&0x001F )|( ( x&0x7FE0 )<<1 ); - } -#endif - - } else + if( depth==16 && image_format==( IMGFMT_BGR|15 ) ) + rgb15to16(s,d,2*image_width ); + else memcpy( d,s,sbpp*image_width ); } else { // sbpp!=dbpp @@ -549,24 +531,9 @@ } } else { if( sbpp==dbpp ) { - if( depth==16 && image_format==( IMGFMT_BGR|15 ) ){ - // do 15bpp->16bpp -#ifdef HAVE_MMX - rgb15to16_mmx( s,d,2*image_width*image_height ); -#else - unsigned short *s1=( unsigned short * )s; - unsigned short *d1=( unsigned short * )d; - unsigned short *e=s1+image_width*image_height; - while( s1<e ){ - register int x=*( s1++ ); - // rrrrrggggggbbbbb - // 0rrrrrgggggbbbbb - // 0111 1111 1110 0000=0x7FE0 - // 00000000000001 1111=0x001F - *( d1++ )=( x&0x001F )|( ( x&0x7FE0 )<<1 ); - } -#endif - } else + if( depth==16 && image_format==( IMGFMT_BGR|15 ) ) + rgb15to16( s,d,2*image_width*image_height ); + else memcpy( d,s,sbpp*image_width*image_height ); } else { // sbpp!=dbpp

2 1

CVS: main Makefile,1.89,1.90
by Alex Beregszaszi 31 Oct '01

31 Oct '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv14509 Modified Files: Makefile Log Message: added support for mencoder (compile with 'make mencoder') Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- Makefile 29 Oct 2001 00:48:05 -0000 1.89 +++ Makefile 31 Oct 2001 23:30:26 -0000 1.90 @@ -12,6 +12,7 @@ PRG_FIBMAP = fibmap_mplayer PRG_TV = tvision PRG_CFG = codec-cfg +PRG_MENCODER = mencoder #prefix = /usr/local BINDIR = ${prefix}/bin @@ -20,8 +21,11 @@ # a BSD compatible 'install' program INSTALL = install -SRCS = ima4.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c find_sub.c dec_audio.c dec_video.c codec-cfg.c subreader.c lirc_mp.c cfgparser.c mixer.c spudec.c -OBJS = $(SRCS:.c=.o) +SRCS_MENCODER = libvo/aclib.c libvo/img_format.c ima4.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c codec-cfg.c lirc_mp.c cfgparser.c mixer.c spudec.c +OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) + +SRCS_MPLAYER = ima4.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c find_sub.c dec_audio.c dec_video.c codec-cfg.c subreader.c lirc_mp.c cfgparser.c mixer.c spudec.c +OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(EXTRA_INC) $(MADLIB_INC) # -Wall A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB) $(MADLIB_LIB) $(SGI_AUDIO_LIB) VO_LIBS = -Llibvo -lvo $(MLIB_LIB) $(X_LIBS) @@ -29,6 +33,9 @@ PP_LIBS = -Lpostproc -lpostproc XA_LIBS = -Lxa -lxa +SRCS = $(SRCS_MENCODER) $(SRCS_MPLAYER) +OBJS = $(OBJS_MENCODER) $(OBJS_MPLAYER) + PARTS = libmpdemux mp3lib libac3 libmpeg2 opendivx libavcodec libvo libao2 drivers drivers/syncfb linux postproc xa ifeq ($(GUI),yes) @@ -37,6 +44,8 @@ ifneq ($(W32_LIB),) PARTS += loader loader/DirectShow +SRCS_MPLAYER += dll_init.c +SRCS_MENCODER += dll_init.c SRCS += dll_init.c endif LOADER_DEP = $(W32_DEP) $(DS_DEP) @@ -105,27 +114,36 @@ xa/libxa.a: $(MAKE) -C xa -MPLAYER_DEP = mplayer.o $(OBJS) $(LOADER_DEP) $(AV_DEP) $(COMMONLIBS) +MPLAYER_DEP = mplayer.o $(OBJS_MPLAYER) $(LOADER_DEP) $(AV_DEP) $(COMMONLIBS) ifeq ($(GUI),yes) MPLAYER_DEP += Gui/libgui.a endif + +MENCODER_DEP = mencoder.o $(OBJS_MENCODER) $(LOADER_DEP) $(AV_DEP) $(COMMONLIBS) +ifeq ($(GUI),yes) +MENCODER_DEP += Gui/libgui.a +endif + mplayerwithoutlink: $(MPLAYER_DEP) @for a in $(PARTS); do $(MAKE) -C $$a all ; done $(PRG): $(MPLAYER_DEP) - $(CC) -rdynamic $(CFLAGS) -o $(PRG) mplayer.o -Llibmpdemux -lmpdemux $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(LIB_LOADER) $(AV_LIB) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(VO_LIBS) $(CSS_LIB) $(GUI_LIBS) $(ARCH_LIBS) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIBS) $(TERMCAP_LIB) -lm + $(CC) -rdynamic $(CFLAGS) -o $(PRG) mplayer.o -Llibmpdemux -lmpdemux $(OBJS_MPLAYER) $(XMM_LIBS) $(LIRC_LIBS) $(LIB_LOADER) $(AV_LIB) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(VO_LIBS) $(CSS_LIB) $(GUI_LIBS) $(ARCH_LIBS) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIBS) $(TERMCAP_LIB) -lm -ldivxencore $(PRG_FIBMAP): fibmap_mplayer.o $(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o +$(PRG_MENCODER): $(MENCODER_DEP) + $(CC) -rdynamic $(CFLAGS) -o $(PRG_MENCODER) mencoder.o -Llibmpdemux -lmpdemux $(OBJS_MENCODER) $(X_LIBS) $(XMM_LIBS) $(LIRC_LIBS) $(LIB_LOADER) $(AV_LIB) -ldivxencore -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(CSS_LIB) $(GUI_LIBS) $(ARCH_LIBS) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIBS) $(TERMCAP_LIB) -lm + # $(PRG_HQ): depfile mplayerHQ.o $(OBJS) loader/libloader.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a # $(CC) $(CFLAGS) -o $(PRG_HQ) mplayerHQ.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Lencore -lencore -lpthread # $(PRG_AVIP): depfile aviparse.o $(OBJS) loader/libloader.a $(COMMONLIBS) # $(CC) $(CFLAGS) -o $(PRG_AVIP) aviparse.o $(OBJS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -ldl $(VO_LIBS) -lpthread -# $(PRG_TV): depfile tvision.o $(OBJS) $(COMMONLIBS) -# $(CC) $(CFLAGS) -o $(PRG_TV) tvision.o $(OBJS) -lm $(TERMCAP_LIB) $(VO_LIBS) +#$(PRG_TV): depfile tvision.o $(OBJS) $(COMMONLIBS) +# $(CC) $(CFLAGS) -o $(PRG_TV) tvision.o $(OBJS) -lm $(TERMCAP_LIB) $(VO_LIBS) # Every mplayer dependancy depends on version.h, to force building version.h # first (in serial mode) before any other of the dependancies for a parallel make @@ -164,14 +182,15 @@ rm -f *.o *~ $(OBJS) distclean: - rm -f *~ $(PRG) $(PRG_FIBMAP) $(PRG_HQ) $(PRG_AVIP) $(PRG_TV) $(OBJS) *.o *.a .depend + rm -f *~ $(PRG) $(PRG_FIBMAP) $(PRG_HQ) $(PRG_AVIP) $(PRG_TV) $(OBJS) $(PRG_MENCODER) *.o *.a .depend @for a in $(PARTS); do $(MAKE) -C $$a distclean; done dep: depend depend: ./version.sh - $(CC) -MM $(CFLAGS) mplayer.c $(SRCS) 1>.depend + $(CC) -MM $(CFLAGS) mplayer.c $(SRCS_MPLAYER) 1>.depend + $(CC) -MM $(CFLAGS) mencoder.c $(SRCS_MENCODER) 1>.depend @for a in $(PARTS); do $(MAKE) -C $$a dep; done # ./configure must be run if it changed in CVS

1 0

CVS: main mencoder.c,1.7,1.8
by Arpi of Ize 31 Oct '01

31 Oct '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv11019 Modified Files: mencoder.c Log Message: nosound fixed? Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mencoder.c 31 Oct 2001 16:08:01 -0000 1.7 +++ mencoder.c 31 Oct 2001 22:59:56 -0000 1.8 @@ -181,6 +181,8 @@ exit(0); // From unknown reason a hangup occurs here :(((((( } + dvd_title=2; + if(argc>1) stream=open_stream(argv[1],0,&file_format); else @@ -430,6 +432,7 @@ } #if 1 +if(sh_audio) switch(mux_a->codec){ case ACODEC_VBRMP3: @@ -534,6 +537,7 @@ sh_video->timer+=frame_time; +if(sh_audio){ if(pts_from_bps){ unsigned int samples=(sh_audio->audio.dwSampleSize)? ((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) : @@ -548,6 +552,8 @@ a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; } v_pts=d_video->pts; + +} mp_msg(MSGT_AVSYNC,MSGL_STATUS,"A:%6.1f V:%6.1f A-V:%7.3f ct:%7.3f %3d/%3d %2d%% %2d%% %4.1f%% %d%%\r", a_pts,v_pts,a_pts-v_pts,c_total,

1 0

CVS: main/libvo video_out.c,1.25,1.26 Makefile,1.19,1.20
by Alex Beregszaszi 31 Oct '01

31 Oct '01

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv3605 Modified Files: video_out.c Makefile Log Message: vo_format_name moved from video_out.c to img_format.c Index: video_out.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- video_out.c 29 Oct 2001 00:48:20 -0000 1.25 +++ video_out.c 31 Oct 2001 22:04:28 -0000 1.26 @@ -135,45 +135,3 @@ }; #include "sub.c" - -char *vo_format_name(int format) -{ - switch(format) - { - case IMGFMT_RGB8: return("RGB 8-bit"); - case IMGFMT_RGB15: return("RGB 15-bit"); - case IMGFMT_RGB16: return("RGB 16-bit"); - case IMGFMT_RGB24: return("RGB 24-bit"); - case IMGFMT_RGB32: return("RGB 32-bit"); - case IMGFMT_BGR8: return("BGR 8-bit"); - case IMGFMT_BGR15: return("BGR 15-bit"); - case IMGFMT_BGR16: return("BGR 16-bit"); - case IMGFMT_BGR24: return("BGR 24-bit"); - case IMGFMT_BGR32: return("BGR 32-bit"); - case IMGFMT_YVU9: return("Planar YVU9"); - case IMGFMT_IF09: return("Planar IF09"); - case IMGFMT_YV12: return("Planar YV12"); - case IMGFMT_I420: return("Planar I420"); - case IMGFMT_IYUV: return("Planar IYUV"); - case IMGFMT_CLPL: return("Planar CLPL"); - case IMGFMT_IYU1: return("Packed IYU1"); - case IMGFMT_IYU2: return("Packed IYU2"); - case IMGFMT_UYVY: return("Packed UYVY"); - case IMGFMT_UYNV: return("Packed UYNV"); - case IMGFMT_cyuv: return("Packed CYUV"); - case IMGFMT_YUY2: return("Packed YUY2"); - case IMGFMT_YUNV: return("Packed YUNV"); - case IMGFMT_YVYU: return("Packed YVYU"); - case IMGFMT_Y41P: return("Packed Y41P"); - case IMGFMT_Y211: return("Packed Y211"); - case IMGFMT_Y41T: return("Packed Y41T"); - case IMGFMT_Y42T: return("Packed Y42T"); - case IMGFMT_V422: return("Packed V422"); - case IMGFMT_V655: return("Packed V655"); - case IMGFMT_CLJR: return("Packed CLJR"); - case IMGFMT_YUVP: return("Packed YUVP"); - case IMGFMT_UYVP: return("Packed UYVP"); - case IMGFMT_MPEGPES: return("Mpeg PES"); - } - return("Unknown"); -} Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libvo/Makefile,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- Makefile 30 Oct 2001 17:04:31 -0000 1.19 +++ Makefile 31 Oct 2001 22:04:28 -0000 1.20 @@ -3,7 +3,7 @@ LIBNAME = libvo.a -SRCS=aspect.c aclib.c osd.c font_load.c yuv2rgb.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_mpegpes.c x11_common.c $(OPTIONAL_SRCS) +SRCS=aspect.c aclib.c osd.c font_load.c yuv2rgb.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_mpegpes.c x11_common.c $(OPTIONAL_SRCS) img_format.c OBJS=$(SRCS:.c=.o) ifeq ($(TARGET_ARCH_X86),yes)

1 0

CVS: main/libvo img_format.c,NONE,1.1
by Alex Beregszaszi 31 Oct '01

31 Oct '01

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv3455 Added Files: img_format.c Log Message: vo_format_name moved from video_out.c to img_format.c --- NEW FILE --- #include "config.h" #include "video_out.h" char *vo_format_name(int format) { switch(format) { case IMGFMT_RGB8: return("RGB 8-bit"); case IMGFMT_RGB15: return("RGB 15-bit"); case IMGFMT_RGB16: return("RGB 16-bit"); case IMGFMT_RGB24: return("RGB 24-bit"); case IMGFMT_RGB32: return("RGB 32-bit"); case IMGFMT_BGR8: return("BGR 8-bit"); case IMGFMT_BGR15: return("BGR 15-bit"); case IMGFMT_BGR16: return("BGR 16-bit"); case IMGFMT_BGR24: return("BGR 24-bit"); case IMGFMT_BGR32: return("BGR 32-bit"); case IMGFMT_YVU9: return("Planar YVU9"); case IMGFMT_IF09: return("Planar IF09"); case IMGFMT_YV12: return("Planar YV12"); case IMGFMT_I420: return("Planar I420"); case IMGFMT_IYUV: return("Planar IYUV"); case IMGFMT_CLPL: return("Planar CLPL"); case IMGFMT_IYU1: return("Packed IYU1"); case IMGFMT_IYU2: return("Packed IYU2"); case IMGFMT_UYVY: return("Packed UYVY"); case IMGFMT_UYNV: return("Packed UYNV"); case IMGFMT_cyuv: return("Packed CYUV"); case IMGFMT_YUY2: return("Packed YUY2"); case IMGFMT_YUNV: return("Packed YUNV"); case IMGFMT_YVYU: return("Packed YVYU"); case IMGFMT_Y41P: return("Packed Y41P"); case IMGFMT_Y211: return("Packed Y211"); case IMGFMT_Y41T: return("Packed Y41T"); case IMGFMT_Y42T: return("Packed Y42T"); case IMGFMT_V422: return("Packed V422"); case IMGFMT_V655: return("Packed V655"); case IMGFMT_CLJR: return("Packed CLJR"); case IMGFMT_YUVP: return("Packed YUVP"); case IMGFMT_UYVP: return("Packed UYVP"); case IMGFMT_MPEGPES: return("Mpeg PES"); } return("Unknown"); }

1 0

CVS: main/libmpdemux aviheader.c,1.30,1.31
by Arpi of Ize 31 Oct '01

31 Oct '01

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv23084 Modified Files: aviheader.c Log Message: -idx fixes: support for divx4 and ignoring bad movi_end Index: aviheader.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/aviheader.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- aviheader.c 21 Oct 2001 15:47:31 -0000 1.30 +++ aviheader.c 31 Oct 2001 20:43:13 -0000 1.31 @@ -122,6 +122,13 @@ case mmioFOURCC('D', 'I', 'V', '2'): case mmioFOURCC('A', 'P', '4', '1'): idxfix_divx=1; // we can fix keyframes only for divx coded files! + mp_msg(MSGT_HEADER,MSGL_V,"Regenerating keyframe table for DIVX 3 video\n"); + break; + case mmioFOURCC('D', 'I', 'V', 'X'): + case mmioFOURCC('d', 'i', 'v', 'x'): + idxfix_divx=2; // we can fix keyframes only for divx coded files! + mp_msg(MSGT_HEADER,MSGL_V,"Regenerating keyframe table for DIVX 4 video\n"); + break; } } else if(last_fccType==streamtypeAUDIO){ @@ -181,9 +188,9 @@ while(1){ int id,len,skip; AVIINDEXENTRY* idx; - unsigned char c; + unsigned int c; demuxer->filepos=stream_tell(demuxer->stream); - if(demuxer->filepos>=demuxer->movi_end) break; + if(demuxer->filepos>=demuxer->movi_end && demuxer->movi_start<demuxer->movi_end) break; id=stream_read_dword_le(demuxer->stream); len=stream_read_dword_le(demuxer->stream); if(id==mmioFOURCC('L','I','S','T')){ @@ -205,15 +212,17 @@ idx->dwChunkOffset=demuxer->filepos; idx->dwChunkLength=len; - c=stream_read_char(demuxer->stream); + c=stream_read_dword(demuxer->stream); // Fix keyframes for DivX files: if(idxfix_divx) if(avi_stream_id(id)==idxfix_videostream){ - if(c&0x40) idx->dwFlags=0; + switch(idxfix_divx){ + case 1: if(c&0x40000000) idx->dwFlags=0;break; // divx 3 + case 2: if(c==0x1B6) idx->dwFlags=0;break; // divx 4 + } } - - mp_dbg(MSGT_HEADER,MSGL_DBG2,"%08X %08X %.4s %02X %X\n",demuxer->filepos,id,(char *) &id,c,(unsigned int) idx->dwFlags); + mp_dbg(MSGT_HEADER,MSGL_DBG2,"%08X %08X %.4s %08X %X\n",(int)demuxer->filepos,id,(char *) &id,(int)c,(unsigned int) idx->dwFlags); #if 0 { unsigned char tmp[64]; int i;

1 0

CVS: main/DOCS mencoder.1,NONE,1.1
by Winner of tha face compo 31 Oct '01

31 Oct '01

Update of /cvsroot/mplayer/main/DOCS In directory mplayer:/var/tmp.root/cvs-serv17983 Added Files: mencoder.1 Log Message: alpha. currently no options working :) --- NEW FILE --- .\" MPlayer (C) 2000-2001 Arpad Gereoffy <arpi(a)esp-team.scene.hu> .\" This manpage was written, and is maintained by Gabucino .\" .TH MEncoder .SH NAME mencoder \- Movie Encoder for Linux .SH SYNOPSIS .B mencoder .RB [ \-i\ input\ file(s) ] .RB [ \-o\ input\ file ] .RB [ \-video\ mode ] .RB [ \-audio\ mode ] .RB [ \-vbr\ bitrate ] .RB [ \-abr\ bitrate ] .RB [ \-ivc\ codec ] .RB [ \-iac\ codec ] .PP .SH DESCRIPTION .I mencoder Encoder. .LP .SH "GENERAL OPTIONS" .TP .I NOTE Every "flag" option has "noflag" pair, e.g. -fs opposite is -nofs .TP .B \-i\ files specify input file(s) for encoding. Examples: -i /dev/dvd -i video.avi stream1.mp3 stream2.wav .TP .B \-o\ file specify output file. Examples: -o /dev/cdrw ;)) -o - -o output.avi -o video.avi audio.mp3 .TP .B \-video\ encoding mode specify what to do with the video stream(s?): -video copy -video divx4 -video divx42 (2 pass) .TP .B \-audio\ encoding mode specify what to do with the audio stream(s?): -audio copy -audio mp3 -audio vbrmp3 .TP .B \-vbr\ bitrate specify video bitrate to encode at (in kbits). -vbr 910 .TP .B \-abr\ bitrate specify audio bitrate to encode at (in kbits). -abr 128 .TP .B \-ivc\ codec use this codec to decode input video stream(s?) (from codecs.conf) -ivc ffdivx .TP .B \-avc\ codec use this codec to decode input audio stream(s?) (from codecs.conf) -ivc mp3lib .IP .SH BUGS This manpage is under SEVERE construction !!! Probably. Check the documentation. Bugreports should be addressed to the MPlayer-users mailing list (mplayer-users(a)mplayerhq.hu) ! If you want to submit a bugreport (which we love to receive!), please double-check the bugreports.html, and tell us all that we need to know to identify your problem. .LP .SH AUTHORS Check documentation ! MPlayer is (C) 2000-2001 .I Arpad Gereoffy <arpi(a)thot.banki.hu> This manpage is written and maintained by .I Gabucino . .LP .SH STANDARD DISCLAIMER Use only at your own risk! There may be errors and inaccuracies that could be damaging to your system or your eye. Proceed with caution, and although this is highly unlikely, the author doesn't take any responsibility for that! .\" end of file

1 0

CVS: main/libvo vo_svga.c,1.36,1.37 yuv2rgb_mmx.c,1.5,1.6 mmx.h,1.5,NONE
by Nick Kurshev 31 Oct '01

31 Oct '01

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv3825 Modified Files: vo_svga.c yuv2rgb_mmx.c Removed Files: mmx.h Log Message: Code cleanup Index: vo_svga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- vo_svga.c 30 Oct 2001 17:04:31 -0000 1.36 +++ vo_svga.c 31 Oct 2001 18:46:30 -0000 1.37 @@ -19,9 +19,6 @@ #include "video_out_internal.h" #include "yuv2rgb.h" -#ifdef HAVE_MMX -#include "mmx.h" -#endif #include "sub.h" #include "../postproc/rgb2rgb.h" Index: yuv2rgb_mmx.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/yuv2rgb_mmx.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- yuv2rgb_mmx.c 12 Jul 2001 15:23:26 -0000 1.5 +++ yuv2rgb_mmx.c 31 Oct 2001 18:46:30 -0000 1.6 @@ -30,7 +30,6 @@ #include "../config.h" -#include "mmx.h" //#include "libmpeg2/mpeg2.h" //#include "libmpeg2/mpeg2_internal.h" #include <inttypes.h> --- mmx.h DELETED ---

1 0

CVS: main/postproc postprocess.c,1.33,1.34
by Michael Niedermayer 31 Oct '01

31 Oct '01

Update of /cvsroot/mplayer/main/postproc In directory mplayer:/var/tmp.root/cvs-serv429 Modified Files: postprocess.c Log Message: deinterlace bugfix Index: postprocess.c =================================================================== RCS file: /cvsroot/mplayer/main/postproc/postprocess.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- postprocess.c 31 Oct 2001 02:29:02 -0000 1.33 +++ postprocess.c 31 Oct 2001 18:29:03 -0000 1.34 @@ -2117,11 +2117,14 @@ /** * Deinterlaces the given block - * will be called for every 8x8 block, and can read & write into an 8x16 block + * will be called for every 8x8 block and can read & write from line 4-15 + * lines 0-3 have been passed through the deblock / dering filters allready, but can be read too + * lines 4-12 will be read into the deblocking filter and should be deinterlaced */ static inline void deInterlaceInterpolateLinear(uint8_t src[], int stride) { #if defined (HAVE_MMX2) || defined (HAVE_3DNOW) + src+= 4*stride; asm volatile( "leal (%0, %1), %%eax \n\t" "leal (%%eax, %1, 4), %%ebx \n\t" @@ -2147,6 +2150,7 @@ ); #else int x; + src+= 4*stride; for(x=0; x<8; x++) { src[stride] = (src[0] + src[stride*2])>>1; @@ -2160,12 +2164,16 @@ /** * Deinterlaces the given block - * will be called for every 8x8 block, and can read & write into an 8x16 block + * will be called for every 8x8 block and can read & write from line 4-15 + * lines 0-3 have been passed through the deblock / dering filters allready, but can be read too + * lines 4-12 will be read into the deblocking filter and should be deinterlaced + * this filter will read lines 3-15 and write 7-13 * no cliping in C version */ static inline void deInterlaceInterpolateCubic(uint8_t src[], int stride) { #if defined (HAVE_MMX2) || defined (HAVE_3DNOW) + src+= stride*3; asm volatile( "leal (%0, %1), %%eax \n\t" "leal (%%eax, %1, 4), %%ebx \n\t" @@ -2207,6 +2215,7 @@ ); #else int x; + src+= stride*3; for(x=0; x<8; x++) { src[stride*3] = (-src[0] + 9*src[stride*2] + 9*src[stride*4] - src[stride*6])>>4; @@ -2220,12 +2229,16 @@ /** * Deinterlaces the given block - * will be called for every 8x8 block, and can read & write into an 8x16 block + * will be called for every 8x8 block and can read & write from line 4-15 + * lines 0-3 have been passed through the deblock / dering filters allready, but can be read too + * lines 4-12 will be read into the deblocking filter and should be deinterlaced * will shift the image up by 1 line (FIXME if this is a problem) + * this filter will read lines 4-13 and write 4-11 */ static inline void deInterlaceBlendLinear(uint8_t src[], int stride) { #if defined (HAVE_MMX2) || defined (HAVE_3DNOW) + src+= 4*stride; asm volatile( "leal (%0, %1), %%eax \n\t" "leal (%%eax, %1, 4), %%ebx \n\t" @@ -2273,6 +2286,7 @@ ); #else int x; + src+= 4*stride; for(x=0; x<8; x++) { src[0 ] = (src[0 ] + 2*src[stride ] + src[stride*2])>>2; @@ -2290,11 +2304,14 @@ /** * Deinterlaces the given block - * will be called for every 8x8 block, except the last row, and can read & write into an 8x16 block + * will be called for every 8x8 block and can read & write from line 4-15, + * lines 0-3 have been passed through the deblock / dering filters allready, but can be read too + * lines 4-12 will be read into the deblocking filter and should be deinterlaced */ static inline void deInterlaceMedian(uint8_t src[], int stride) { #ifdef HAVE_MMX + src+= 4*stride; #ifdef HAVE_MMX2 asm volatile( "leal (%0, %1), %%eax \n\t" @@ -2388,6 +2405,7 @@ #else //FIXME int x; + src+= 4*stride; for(x=0; x<8; x++) { src[0 ] = (src[0 ] + 2*src[stride ] + src[stride*2])>>2; @@ -2774,6 +2792,8 @@ src_stride >>= 1; dst_stride >>= 1; mode= ((mode&0xFF)>>4) | (mode&0xFFFFFF00); +// mode&= ~(LINEAR_IPOL_DEINT_FILTER | LINEAR_BLEND_DEINT_FILTER | +// MEDIAN_DEINT_FILTER | CUBIC_IPOL_DEINT_FILTER); if(1) { @@ -3088,9 +3108,82 @@ if(mode & LEVEL_FIX) QPCorrecture= packedYScale &0xFFFF; else QPCorrecture= 256; - /* copy first row of 8x8 blocks */ - for(x=0; x<width; x+=BLOCK_SIZE) - blockCopy(dst + x, dstStride, src + x, srcStride, 8, mode & LEVEL_FIX); + /* line before the first one */ + y=-BLOCK_SIZE; + { + //1% speedup if these are here instead of the inner loop + uint8_t *srcBlock= &(src[y*srcStride]); + uint8_t *dstBlock= &(dst[y*dstStride]); + + dstBlock= tempDst + dstStride; + + // From this point on it is guranteed that we can read and write 16 lines downward + // finish 1 block before the next otherwise weŽll might have a problem + // with the L1 Cache of the P4 ... or only a few blocks at a time or soemthing + for(x=0; x<width; x+=BLOCK_SIZE) + { + +#ifdef HAVE_MMX2 +/* + prefetchnta(srcBlock + (((x>>3)&3) + 5)*srcStride + 32); + prefetchnta(srcBlock + (((x>>3)&3) + 9)*srcStride + 32); + prefetcht0(dstBlock + (((x>>3)&3) + 5)*dstStride + 32); + prefetcht0(dstBlock + (((x>>3)&3) + 9)*dstStride + 32); +*/ +/* + prefetchnta(srcBlock + (((x>>2)&6) + 5)*srcStride + 32); + prefetchnta(srcBlock + (((x>>2)&6) + 6)*srcStride + 32); + prefetcht0(dstBlock + (((x>>2)&6) + 5)*dstStride + 32); + prefetcht0(dstBlock + (((x>>2)&6) + 6)*dstStride + 32); +*/ + + asm( + "movl %4, %%eax \n\t" + "shrl $2, %%eax \n\t" + "andl $6, %%eax \n\t" + "addl $8, %%eax \n\t" + "movl %%eax, %%ebx \n\t" + "imul %1, %%eax \n\t" + "imul %3, %%ebx \n\t" + "prefetchnta 32(%%eax, %0) \n\t" + "prefetcht0 32(%%ebx, %2) \n\t" + "addl %1, %%eax \n\t" + "addl %3, %%ebx \n\t" + "prefetchnta 32(%%eax, %0) \n\t" + "prefetcht0 32(%%ebx, %2) \n\t" + :: "r" (srcBlock), "r" (srcStride), "r" (dstBlock), "r" (dstStride), + "m" (x) + : "%eax", "%ebx" + ); + +#elif defined(HAVE_3DNOW) +//FIXME check if this is faster on an 3dnow chip or if its faster without the prefetch or ... +/* prefetch(srcBlock + (((x>>3)&3) + 5)*srcStride + 32); + prefetch(srcBlock + (((x>>3)&3) + 9)*srcStride + 32); + prefetchw(dstBlock + (((x>>3)&3) + 5)*dstStride + 32); + prefetchw(dstBlock + (((x>>3)&3) + 9)*dstStride + 32); +*/ +#endif + + blockCopy(dstBlock + dstStride*8, dstStride, + srcBlock + srcStride*8, srcStride, 8, mode & LEVEL_FIX); + + if(mode & LINEAR_IPOL_DEINT_FILTER) + deInterlaceInterpolateLinear(dstBlock, dstStride); + else if(mode & LINEAR_BLEND_DEINT_FILTER) + deInterlaceBlendLinear(dstBlock, dstStride); + else if(mode & MEDIAN_DEINT_FILTER) + deInterlaceMedian(dstBlock, dstStride); + else if(mode & CUBIC_IPOL_DEINT_FILTER) + deInterlaceInterpolateCubic(dstBlock, dstStride); +/* else if(mode & CUBIC_BLEND_DEINT_FILTER) + deInterlaceBlendCubic(dstBlock, dstStride); +*/ + dstBlock+=8; + srcBlock+=8; + } + memcpy(&(dst[y*dstStride]) + 8*dstStride, tempDst + 9*dstStride, 8*dstStride ); + } for(y=0; y<height; y+=BLOCK_SIZE) { @@ -3108,23 +3201,22 @@ if not than use a temporary buffer */ if(y+15 >= height) { - /* copy from line 5 to 12 of src, these will be copied with + /* copy from line 8 to 15 of src, these will be copied with blockcopy to dst later */ - memcpy(tempSrc + srcStride*5, srcBlock + srcStride*5, - srcStride*MAX(height-y-5, 0) ); + memcpy(tempSrc + srcStride*8, srcBlock + srcStride*8, + srcStride*MAX(height-y-8, 0) ); - /* duplicate last line to fill the void upto line 12 */ - if(y+12 >= height) + /* duplicate last line to fill the void upto line 15 */ + if(y+15 >= height) { int i; - for(i=height-y; i<=12; i++) + for(i=height-y; i<=15; i++) memcpy(tempSrc + srcStride*i, src + srcStride*(height-1), srcStride); } - - /* copy up to 6 lines of dst */ - memcpy(tempDst, dstBlock - dstStride, dstStride*MIN(height-y+1, 6) ); + /* copy up to 9 lines of dst */ + memcpy(tempDst, dstBlock - dstStride, dstStride*MIN(height-y+1, 9) ); dstBlock= tempDst + dstStride; srcBlock= tempSrc; } @@ -3190,7 +3282,7 @@ "movl %4, %%eax \n\t" "shrl $2, %%eax \n\t" "andl $6, %%eax \n\t" - "addl $5, %%eax \n\t" + "addl $8, %%eax \n\t" "movl %%eax, %%ebx \n\t" "imul %1, %%eax \n\t" "imul %3, %%ebx \n\t" @@ -3233,8 +3325,8 @@ } #endif - blockCopy(dstBlock + dstStride*5, dstStride, - srcBlock + srcStride*5, srcStride, 8, mode & LEVEL_FIX); + blockCopy(dstBlock + dstStride*8, dstStride, + srcBlock + srcStride*8, srcStride, 8, mode & LEVEL_FIX); if(mode & LINEAR_IPOL_DEINT_FILTER) deInterlaceInterpolateLinear(dstBlock, dstStride); @@ -3361,7 +3453,7 @@ #endif } - /* did we use a tmp buffer */ + /* did we use a tmp buffer for the last lines*/ if(y+15 >= height) { uint8_t *dstBlock= &(dst[y*dstStride]);

1 0

CVS: main configure,1.216,1.217
by pl 31 Oct '01

31 Oct '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv32215 Modified Files: configure Log Message: added macros for weirdos (irix/sunos) fixed some messages rewrite OS names if necessary (irix/cygwin) added mips known type {sdl,sdl11,gtk,gtk12,glib,glib12}-config autodetection Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.216 retrieving revision 1.217 diff -u -r1.216 -r1.217 --- configure 28 Oct 2001 22:56:44 -0000 1.216 +++ configure 31 Oct 2001 18:25:28 -0000 1.217 @@ -129,30 +129,15 @@ exit 1 } -linux() { - test "$system_name" = "Linux" - return "$?" -} -freebsd() { - test "$system_name" = "FreeBSD" - return "$?" -} -openbsd() { - test "$system_name" = "OpenBSD" - return "$?" -} -bsdos() { - test "$system_name" = "BSD/OS" - return "$?" -} -bsd() { - freebsd || openbsd || bsdos - return "$?" -} -irix64() { - test "$system_name" = "IRIX64" - return "$?" -} +linux() { test "$system_name" = "Linux" ; return "$?" ; } +sunos() { test "$system_name" = "SunOS" ; return "$?" ; } +irix() { test "$system_name" = "IRIX" ; return "$?" ; } +cygwin() { test "$system_name" = "CYGWIN" ; return "$?" ; } +freebsd() { test "$system_name" = "FreeBSD" ; return "$?" ; } +netbsd() { test "$system_name" = "NetBSD" ; return "$?" ; } +bsdos() { test "$system_name" = "BSD/OS" ; return "$?" ; } +openbsd() { test "$system_name" = "OpenBSD" ; return "$?" ; } +bsd() { freebsd || netbsd || bsdos || openbsd ; return "$?" ; } # Check how echo works in this /bin/sh @@ -215,7 +200,7 @@ --disable-sunaudio disable Sun sound support [autodetect] --disable-mad disable mad audio support [autodetect] -Miscellaneous features: +Miscellaneous options: --cc=COMPILER use this C compiler to build MPlayer [gcc] --target=PLATFORM target platform (i386-linux, arm-linux, etc) --language=xx select a language [en] @@ -326,11 +311,28 @@ # Determine our OS name and CPU architecture if test -z "$_target" ; then - system_name=`uname -s 2>&1` # name of operating system: Linux, FreeBSD, NetBSD, OpenBSD, SunOS - host_arch=`uname -p 2>&1` # host's instruction set or processor type + # OS name + system_name=`( uname -s ) 2>&1` + case "$system_name" in + Linux|FreeBSD|NetBSD|BSD/OS|OpenBSD|SunOS) + : # well-known OSes + ;; + IRIX*) + system_name=IRIX + ;; + [cC][yY][gG][wW][iI][nN]*) + system_name=CYGWIN + ;; + *) + system_name="$system_name-UNKNOWN" + ;; + esac + + # host's CPU/instruction set + host_arch=`( uname -p ) 2>&1` case "$host_arch" in - i386|sparc|ppc|alpha|arm) + i386|sparc|ppc|alpha|arm|mips) # fine, uname -p output looks good, it has returned # something this configure script recognizes ;; @@ -368,7 +370,7 @@ _confwin32= if bsd ; then _archlibs="-rdynamic -pthread" -elif test `echo $system_name | sed 's/[cC][yY][gG][wW][iI][nN].*/CYGWIN/'` = "CYGWIN" ; then +elif cygwin ; then _confcygwin="TARGET_CYGWIN=yes" _confwin32="#define WIN32" _archlibs="-lpthread" @@ -395,7 +397,6 @@ CCONF='config.h' MCONF='config.mak' CHELP='help_mp.h' -# --- Check for C compiler: if test -z "$_x11libdir" ; then for I in /usr/X11R6/lib /usr/X11/lib /usr/lib32 /usr/openwin/lib ; do @@ -432,20 +433,8 @@ _extraincdir=-I/usr/local/include fi -if test -z "$_extralibdir" ; then -_extralibdir=-L/usr/lib -fi -if test -z "$_extraincdir" ; then -_extraincdir=-I/usr/include -fi - -if test -z "$_sdlconfig" ; then - if freebsd ; then - _sdlconfig='sdl11-config' - else - _sdlconfig='sdl-config' - fi -fi +test -z "$_extralibdir" && _extralibdir=-L/usr/lib +test -z "$_extraincdir" && _extraincdir=-I/usr/include # --- @@ -632,7 +621,7 @@ done -# XXX check codecs presence +# Check for win32 codecs directory _win32libdir= if test "$_win32" = yes ; then for I in /usr/local/lib/win32 /usr/lib/win32 ; do @@ -867,12 +856,23 @@ cc_check $_extraincdir $_extralibdir -lvgagl -lvga && _svga=yes +# Checking for posix threads lib... if bsd ; then cc_check -pthread || die "Lib pthread not found." else cc_check -lpthread || die "Lib pthread not found." fi + +# Checking for SDL ... +if ( sdl-config --version ) >/dev/null 2>&1 ; then + _sdlconfig="sdl-config" +elif ( sdl11-config --version ) >/dev/null 2>&1 ; then + _sdlconfig="sdl11-config" +else + _sdlconfig=false +fi + # Atmosfear: added SDL versioncheck and autodetect; removed warnings. _sdl=no if "$_sdlconfig" --version >/dev/null 2>&1 ; then @@ -913,7 +913,7 @@ cc_check $_extraincdir $_extralibdir -ltermcap && _termcap=yes _png=no -if irix64 ; then +if irix ; then # Don't check for -lpng on irix since it has its own libpng # incompatible with the GNU libpng : @@ -1795,46 +1795,37 @@ if test "$_gui" = yes ; then # --------------- GUI begin ------------------- -test -z `which gtk-config` || _gtkconfig="gtk-config" -test -z `which gtk12-config` || _gtkconfig="gtk12-config" -test -z $_gtkconfig && die "gtk-config not found" - -test -z `which glib-config` || _glibconfig="glib-config" -test -z `which glib12-config` || _glibconfig="glib12-config" -test -z $_glibconfig && die "glib-config not found" +# Check for GTK: echo -#echo "gtk-config binary: $_gtkconfig" echo $_echo_n "Checking for gtk version ... $_echo_c" +if ( gtk-config --version ) >/dev/null 2>&1 ; then + _gtkconfig="gtk-config" +elif ( gtk12-config --version ) >/dev/null 2>&1 ; then + _gtkconfig="gtk12-config" +else + die "gtk not found (check for gtk-config or gtk12-config)" +fi _gtk=`$_gtkconfig --version 2>&1` -test -z "$_gtk" && die "gtk not found." echo "$_gtk" - -echo $_echo_n "Checking for gtk includes ... $_echo_c" _gtkinc=`$_gtkconfig --cflags 2>&1` -test -z "$_gtkinc" && die "gtk not found." -echo "done" - -echo $_echo_n "Checking for gtk libs ... $_echo_c" _gtklib=`$_gtkconfig --libs 2>&1` -test -z "$_gtklib" && die "gtk not found." -echo "done" + +# Check for GLIB echo echo $_echo_n "Checking for glib version ... $_echo_c" +if ( glib-config --version ) >/dev/null 2>&1 ; then + _glibconfig="glib-config" +elif ( glib12-config --version ) >/dev/null 2>&1 ; then + _glibconfig="glib12-config" +else + die "glib not found (check for glib-config or glib12-config)" +fi _glib=`$_glibconfig --version 2>&1` -test -z "$_glib" && die "glib not found." echo "$_glib" - -echo $_echo_n "Checking for glib includes ... $_echo_c" _glibinc=`$_glibconfig --cflags 2>&1` -test -z "$_glibinc" && die "glib not found." -echo "done" - -echo $_echo_n "Checking for glib libs ... $_echo_c" _gliblib=`$_glibconfig --libs 2>&1` -test -z "$_gliblib" && die "glib not found." -echo "done" cat > Gui/config.mak << EOF @@ -2774,7 +2765,7 @@ echo "Ok, found Win32 codecs directory at $_win32libdir." else cat <<EOF -Failed to find a WIN32 codecs dir at $_win32libdir! +Failed to find a WIN32 codecs dir! Create it and copy the DLL files there! (You can get them from your windows directory or download them from: ftp://ftp.MPlayerHQ.hu/MPlayer/releases/w32codec.zip

1 0