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

CVS: main configure,1.120,1.121
by Atmosfear 29 Jul '01

29 Jul '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv27379 Modified Files: configure Log Message: Fixed override of --with-sdl-config. Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- configure 29 Jul 2001 16:22:29 -0000 1.120 +++ configure 29 Jul 2001 17:02:59 -0000 1.121 @@ -343,7 +343,7 @@ _extralibdir=-L/usr/local/lib _extraincdir=-I/usr/local/include -if [ "$system_name" = "FreeBSD" ]; then +if [ x"$_sdlconfig" = x"" -a "$system_name" = "FreeBSD" ]; then _sdlconfig='sdl11-config' else _sdlconfig='sdl-config'

1 0

CVS: main help_mp.h,1.18,1.19
by Arpi of Ize 29 Jul '01

29 Jul '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv26547 Modified Files: help_mp.h Log Message: removed email Index: help_mp.h =================================================================== RCS file: /cvsroot/mplayer/main/help_mp.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- help_mp.h 23 Jun 2001 20:04:59 -0000 1.18 +++ help_mp.h 29 Jul 2001 16:50:07 -0000 1.19 @@ -1,6 +1,6 @@ static char* banner_text= "\n\n" -"MPlayer " VERSION "(C) 2000-2001 Arpad Gereoffy <arpi(a)thot.banki.hu>\n" +"MPlayer " VERSION "(C) 2000-2001 Arpad Gereoffy (see DOCS/AUTHORS)\n" "\n"; static char help_text[]=

1 0

CVS: main/DOCS AUTHORS,1.47,1.48
by Arpi of Ize 29 Jul '01

29 Jul '01

Update of /cvsroot/mplayer/main/DOCS In directory mplayer:/var/tmp.root/cvs-serv26465 Modified Files: AUTHORS Log Message: note about lists Index: AUTHORS =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/AUTHORS,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- AUTHORS 19 Jul 2001 22:02:06 -0000 1.47 +++ AUTHORS 29 Jul 2001 16:49:06 -0000 1.48 @@ -3,6 +3,7 @@ NOTE: Do *NOT* send bugreports, help & feature requests directly to the authors! ===== Read DOCS/BUGREPORTS and subscribe to mplayer-users mailing lists. + Patches & devel stuff should be sent to the mplayer-dev-eng mailing list. ========================== The MPlayer project: ===============================

1 0

CVS: main/loader registry.c,1.6,1.7 win32.c,1.15,1.16
by Arpi of Ize 29 Jul '01

29 Jul '01

Update of /cvsroot/mplayer/main/loader In directory mplayer:/var/tmp.root/cvs-serv26170 Modified Files: registry.c win32.c Log Message: partial avifile-CVS merge Index: registry.c =================================================================== RCS file: /cvsroot/mplayer/main/loader/registry.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- registry.c 12 Jul 2001 15:27:47 -0000 1.6 +++ registry.c 29 Jul 2001 16:44:37 -0000 1.7 @@ -405,13 +405,43 @@ // return 0; } else - if (status) *status=REG_OPENED_EXISTING_KEY; + { + // this is a hack as I don't know how RegEnumValueA works + if (strstr(fullname, "zlib") || strstr(fullname, "mszh")) + return 1; + if (status) *status=REG_OPENED_EXISTING_KEY; + } t=insert_handle(generate_handle(), fullname); *newkey=t->handle; free(fullname); return 0; } + +long RegEnumValueA(HKEY hkey, DWORD index, LPSTR value, LPDWORD val_count, + LPDWORD reserved, LPDWORD type, LPBYTE data, LPDWORD count) +{ + // have no idea how this should work + //printf("Reg Enum 0x%x %d %p %d data: %p %d %d >%s<\n", hkey, index, value, *val_count, data, *count, reg_size, data); + { + reg_handle_t* t = find_handle(hkey); + if (t) + { + struct reg_value* v=find_value_by_name(t->name); + *count = v->len; + memcpy(data, v->value, *count); + *val_count = v->len; + memcpy(value, v->value, *val_count); + if (type) + *type = v->type; + //printf("Found handle %s\n", v->name); + return 0; + } + } + + return -1; +} + long RegSetValueExA(long key, const char* name, long v1, long v2, const void* data, long size) { struct reg_value* t; Index: win32.c =================================================================== RCS file: /cvsroot/mplayer/main/loader/win32.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- win32.c 12 Jul 2001 15:27:47 -0000 1.15 +++ win32.c 29 Jul 2001 16:44:37 -0000 1.16 @@ -43,6 +43,9 @@ #include <loader.h> #include <com.h> +long RegEnumValueA(HKEY hkey, DWORD index, LPSTR value, LPDWORD val_count, + LPDWORD reserved, LPDWORD type, LPBYTE data, LPDWORD count); + char* def_path=WIN32_PATH; static void do_cpuid(unsigned int *regs) @@ -1664,14 +1667,12 @@ // printf("LoadLibrary wants: %s/%s\n", def_path, name); if(strncmp(name, "c:\\windows\\", 11)==0)name+=11; + if(strncmp(name, ".\\", 2)==0) name += 2; if(name[0]!='/') { strcpy(qq, def_path); strcat(qq, "/"); - if(strncmp(name, ".\\", 2)==0) - strcat(qq, name+2); - else - strcat(qq, name); + strcat(qq, name); } printf("Loading DLL: %s", qq);fflush(stdout); // printf("Entering LoadLibraryA(%s)\n", name); @@ -2011,7 +2012,7 @@ int WINAPI expIsBadStringPtrA(const char* string, int nchars) { - int result; + int result=0; // if(string==0)result=1; else result=0; // dbgprintf("IsBadStringPtrW(0x%x, %d) => %d", string, nchars, result); // if(string)wch_print(string); @@ -2447,8 +2448,11 @@ // printf("RegEnumValueA(%x,%ld,%p,%p,%p,%p,%p,%p)\n", // hkey, index, value, val_count, reserved, type, data, count ); +// return -1; + + return RegEnumValueA(hkey, index, value, val_count, + reserved, type, data, count); - return -1; }

1 0

CVS: main/libvo x11_common.c,1.26,1.27
by Arpi of Ize 29 Jul '01

29 Jul '01

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv25935 Modified Files: x11_common.c Log Message: new -fsmode flag: 0x8 enables XSetTransientForHint Index: x11_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- x11_common.c 19 Jul 2001 18:47:22 -0000 1.26 +++ x11_common.c 29 Jul 2001 16:40:32 -0000 1.27 @@ -195,6 +195,10 @@ // XMapWindow(vo_Display], w); } + if(vo_fsmode&8){ + XSetTransientForHint (vo_Display, w, RootWindow(vo_Display,mScreen)); + } + vo_MotifHints=XInternAtom( vo_Display,"_MOTIF_WM_HINTS",0 ); if ( vo_MotifHints != None ) {

1 0

CVS: main cfg-mplayer.h,1.70,1.71
by Arpi of Ize 29 Jul '01

29 Jul '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv25480 Modified Files: cfg-mplayer.h Log Message: -fsmode range extended Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- cfg-mplayer.h 22 Jul 2001 09:46:54 -0000 1.70 +++ cfg-mplayer.h 29 Jul 2001 16:31:37 -0000 1.71 @@ -169,7 +169,7 @@ {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0}, {"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32}, - {"fsmode", &vo_fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 7}, + {"fsmode", &vo_fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 15}, {"double", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 0, 1}, {"nodouble", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 1, 0}, #ifdef HAVE_LIRC

1 0

CVS: main configure,1.119,1.120
by Atmosfear 29 Jul '01

29 Jul '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv24815 Modified Files: configure Log Message: Fixed check for mmx2 extensions. Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- configure 29 Jul 2001 13:24:23 -0000 1.119 +++ configure 29 Jul 2001 16:22:29 -0000 1.120 @@ -1283,7 +1283,7 @@ if extcheck $_mmx "mmx" "emms" ; then _mmx=no ; fi if extcheck $_3dnow "3dnow" "femms" ; then _3dnow=no ; fi if extcheck $_3dnowex "3dnowex" "pswapd %%mm0, %%mm0" ; then _3dnowex=no ; fi -if extcheck $_mmx2 "mmx2" "movntq %%mm0, (%%eax)" ; then _mmx2=no ; fi +if extcheck $_mmx2 "mmx2" "sfence" ; then _mmx2=no ; fi if extcheck $_sse "sse" "xorps %%xmm0, %%xmm0" ; then _sse=no ; fi #if extcheck $_sse2 "sse2" "xorpd %%xmm0, %%xmm0" ; then _sse2=no ; fi rm -f $TMPS $TMPO $TMPC

1 0

CVS: main configure,1.118,1.119
by Atmosfear 29 Jul '01

29 Jul '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv16892 Modified Files: configure Log Message: Display detected OS and arch. Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- configure 28 Jul 2001 21:35:55 -0000 1.118 +++ configure 29 Jul 2001 13:24:23 -0000 1.119 @@ -275,6 +275,9 @@ host_arch=`echo $_target | cut -d '-' -f 1` fi +echo "Detected operating system: $system_name" +echo "Detected host architecture: $host_arch" + # Determine OS dependent libs if [ "$system_name" = "FreeBSD" ]; then

1 0

CVS: main/loader pe_image.c,1.3,1.4
by J�rgen Keil 29 Jul '01

29 Jul '01

Update of /cvsroot/mplayer/main/loader In directory mplayer:/var/tmp.root/cvs-serv9536 Modified Files: pe_image.c Log Message: Pre-allocate some stack space to work around a problem with DLL alloca() code on a linux kernel. Index: pe_image.c =================================================================== RCS file: /cvsroot/mplayer/main/loader/pe_image.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pe_image.c 12 Jul 2001 15:27:47 -0000 1.3 +++ pe_image.c 29 Jul 2001 10:17:53 -0000 1.4 @@ -884,19 +884,23 @@ * due to the PROCESS_Create stuff. */ -#if 0 /* - * so this is a dirty hack. - * Why do we need it? - * - * Disable it for now, let's see if it breaks something + * This is a dirty hack. + * The win32 DLLs contain an alloca routine, that first probes the soon + * to be allocated new memory *below* the current stack pointer in 4KByte + * increments. After the mem probing below the current %esp, the stack + * pointer is finally decremented to make room for the "alloca"ed memory. + * Maybe the probing code is intended to extend the stack on a windows box. + * Anyway, the linux kernel does *not* extend the stack by simply accessing + * memory below %esp; it segfaults. + * The extend_stack_for_dll_alloca() routine just preallocates a big chunk + * of memory on the stack, for use by the DLLs alloca routine. */ -static void This_Is_Dirty_Hack(void) +static void extend_stack_for_dll_alloca(void) { void* mem=alloca(0x20000); *(int*)mem=0x1234; } -#endif /* Called if the library is loaded or freed. @@ -939,9 +943,7 @@ break; } TRACE("for %s\n", wm->filename); -#if 0 - This_Is_Dirty_Hack(); -#endif + extend_stack_for_dll_alloca(); retv = entry( wm->module, type, lpReserved ); }

1 0

CVS: main mplayer.c,1.193,1.194 dec_audio.c,1.24,1.25 dec_video.c,1.12,1.13 codec-cfg.h,1.10,1.11
by Arpi of Ize 29 Jul '01

29 Jul '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv27422 Modified Files: mplayer.c dec_audio.c dec_video.c codec-cfg.h Log Message: using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x) Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.193 retrieving revision 1.194 diff -u -r1.193 -r1.194 --- mplayer.c 28 Jul 2001 22:08:38 -0000 1.193 +++ mplayer.c 29 Jul 2001 02:08:27 -0000 1.194 @@ -800,7 +800,7 @@ exit(1); } // is next line needed anymore? - atmos :: - if(!allow_dshow && sh_video->codec->driver==4) continue; // skip DShow + if(!allow_dshow && sh_video->codec->driver==VFM_DSHOW) continue; // skip DShow else if(video_codec && strcmp(sh_video->codec->name,video_codec)) continue; else if(video_family!=-1 && sh_video->codec->driver!=video_family) continue; break; @@ -1177,7 +1177,7 @@ if(grab_frames==2 && (i==0x1B3 || i==0x1B8)) grab_frames=1; if(!read_video_packet(d_video)){ eof=1; break;} // EOF //printf("read packet 0x%X, len=%d\n",i,videobuf_len); - if(sh_video->codec->driver!=1){ + if(sh_video->codec->driver!=VFM_MPEG){ // if not libmpeg2: switch(i){ case 0x1B3: header_process_sequence_header (picture, buffer);break; Index: dec_audio.c =================================================================== RCS file: /cvsroot/mplayer/main/dec_audio.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- dec_audio.c 29 Jul 2001 00:39:47 -0000 1.24 +++ dec_audio.c 29 Jul 2001 02:08:27 -0000 1.25 @@ -76,7 +76,7 @@ sh_audio->audio_out_minsize=8192;// default size, maybe not enough for Win32/ACM switch(driver){ -case 4: +case AFM_ACM: #ifndef ARCH_X86 printf("Win32/ACM audio codec unavailable on non-x86 CPU -> force nosound :(\n"); driver=0; @@ -96,7 +96,7 @@ } #endif break; -case 7: +case AFM_DSHOW: #ifndef USE_DIRECTSHOW printf("Compiled without DirectShow support -> force nosound :(\n"); driver=0; @@ -119,21 +119,21 @@ } #endif break; -case 2: -case 8: -case 5: +case AFM_PCM: +case AFM_DVDPCM: +case AFM_ALAW: // PCM, aLaw sh_audio->audio_out_minsize=2048; break; -case 3: +case AFM_AC3: // Dolby AC3 audio: sh_audio->audio_out_minsize=4*256*6; break; -case 6: +case AFM_GSM: // MS-GSM audio codec: sh_audio->audio_out_minsize=4*320; break; -case 1: +case AFM_MPEG: // MPEG Audio: sh_audio->audio_out_minsize=4608; break; @@ -157,7 +157,7 @@ switch(driver){ #ifdef ARCH_X86 -case 4: { +case AFM_ACM: { int ret=acm_decode_audio(sh_audio,sh_audio->a_buffer,4096,sh_audio->a_buffer_size); if(ret<0){ printf("ACM decoding error: %d\n",ret); @@ -167,7 +167,7 @@ break; } #endif -case 2: { +case AFM_PCM: { // AVI PCM Audio: WAVEFORMATEX *h=sh_audio->wf; sh_audio->i_bps=h->nAvgBytesPerSec; @@ -184,7 +184,7 @@ } break; } -case 8: { +case AFM_DVDPCM: { // DVD PCM Audio: sh_audio->channels=2; sh_audio->samplerate=48000; @@ -192,7 +192,7 @@ // sh_audio->pcm_bswap=1; break; } -case 3: { +case AFM_AC3: { // Dolby AC3 audio: dec_audio_sh=sh_audio; // save sh_audio for the callback: ac3_config.fill_buffer_callback = ac3_fill_buffer; @@ -218,14 +218,14 @@ } break; } -case 5: { +case AFM_ALAW: { // aLaw audio codec: sh_audio->channels=sh_audio->wf->nChannels; sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; sh_audio->i_bps=sh_audio->channels*sh_audio->samplerate; break; } -case 6: { +case AFM_GSM: { // MS-GSM audio codec: GSM_Init(); sh_audio->channels=sh_audio->wf->nChannels; @@ -236,7 +236,7 @@ sh_audio->i_bps=65*(sh_audio->channels*sh_audio->samplerate)/320; // 1:10 break; } -case 1: { +case AFM_MPEG: { // MPEG Audio: dec_audio_sh=sh_audio; // save sh_audio for the callback: #ifdef USE_FAKE_MONO @@ -279,13 +279,13 @@ int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen){ int len=-1; switch(sh_audio->codec->driver){ - case 1: // MPEG layer 2 or 3 + case AFM_MPEG: // MPEG layer 2 or 3 len=MP3_DecodeFrame(buf,-1); break; - case 2: // AVI PCM + case AFM_PCM: // AVI PCM len=demux_read_data(sh_audio->ds,buf,minlen); break; - case 8: // DVD PCM + case AFM_DVDPCM: // DVD PCM { int j; len=demux_read_data(sh_audio->ds,buf,minlen); //if(i&1){ printf("Warning! pcm_audio_size&1 !=0 (%d)\n",i);i&=~1; } @@ -297,7 +297,7 @@ } break; } - case 5: // aLaw decoder + case AFM_ALAW: // aLaw decoder { int l=demux_read_data(sh_audio->ds,buf,minlen/2); unsigned short *d=(unsigned short *) buf; unsigned char *s=buf; @@ -311,7 +311,7 @@ } break; } - case 6: // MS-GSM decoder + case AFM_GSM: // MS-GSM decoder { unsigned char buf[65]; // 65 bytes / frame if(demux_read_data(sh_audio->ds,buf,65)!=65) break; // EOF XA_MSGSM_Decoder(buf,(unsigned short *) buf); // decodes 65 byte -> 320 short @@ -319,7 +319,7 @@ len=2*320; break; } - case 3: // AC3 decoder + case AFM_AC3: // AC3 decoder //printf("{1:%d}",avi_header.idx_pos);fflush(stdout); if(!sh_audio->ac3_frame) sh_audio->ac3_frame=ac3_decode_frame(); //printf("{2:%d}",avi_header.idx_pos);fflush(stdout); @@ -331,7 +331,7 @@ //printf("{3:%d}",avi_header.idx_pos);fflush(stdout); break; #ifdef ARCH_X86 - case 4: + case AFM_ACM: // len=sh_audio->audio_out_minsize; // optimal decoded fragment size // if(len<minlen) len=minlen; else // if(len>maxlen) len=maxlen; @@ -341,7 +341,7 @@ #endif #ifdef USE_DIRECTSHOW - case 7: // DirectShow + case AFM_DSHOW: // DirectShow { int size_in=0; int size_out=0; int srcsize=DS_AudioDecoder_GetSrcSize(maxlen); @@ -372,19 +372,19 @@ void resync_audio_stream(sh_audio_t *sh_audio){ switch(sh_audio->codec->driver){ - case 1: // MPEG + case AFM_MPEG: MP3_DecodeFrame(NULL,-2); // resync MP3_DecodeFrame(NULL,-2); // resync MP3_DecodeFrame(NULL,-2); // resync break; - case 3: // AC3 + case AFM_AC3: ac3_bitstream_reset(); // reset AC3 bitstream buffer // if(verbose){ printf("Resyncing AC3 audio...");fflush(stdout);} sh_audio->ac3_frame=ac3_decode_frame(); // resync // if(verbose) printf(" OK!\n"); break; - case 4: // ACM - case 7: // DShow + case AFM_ACM: + case AFM_DSHOW: sh_audio->a_in_buffer_len=0; // reset ACM/DShow audio buffer break; } @@ -393,10 +393,10 @@ void skip_audio_frame(sh_audio_t *sh_audio){ switch(sh_audio->codec->driver){ - case 1: MP3_DecodeFrame(NULL,-2);break; // skip MPEG frame - case 3: sh_audio->ac3_frame=ac3_decode_frame();break; // skip AC3 frame - case 4: - case 7: { + case AFM_MPEG: MP3_DecodeFrame(NULL,-2);break; // skip MPEG frame + case AFM_AC3: sh_audio->ac3_frame=ac3_decode_frame();break; // skip AC3 frame + case AFM_ACM: + case AFM_DSHOW: { int skip=sh_audio->wf->nBlockAlign; if(skip<16){ skip=(sh_audio->wf->nAvgBytesPerSec/16)&(~7); @@ -405,9 +405,9 @@ demux_read_data(sh_audio->ds,NULL,skip); break; } - case 2: // AVI PCM - case 8: // DVD PCM - case 5: {// aLaw + case AFM_PCM: + case AFM_DVDPCM: + case AFM_ALAW: { int skip=sh_audio->i_bps/16; skip=skip&(~3); demux_read_data(sh_audio->ds,NULL,skip); Index: dec_video.c =================================================================== RCS file: /cvsroot/mplayer/main/dec_video.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- dec_video.c 28 Jul 2001 21:18:21 -0000 1.12 +++ dec_video.c 29 Jul 2001 02:08:27 -0000 1.13 @@ -86,7 +86,7 @@ switch(sh_video->codec->driver){ #ifdef ARCH_X86 - case 2: { + case VFM_VFW: { if(!init_video_codec(sh_video,0)) { // GUI_MSG( mplUnknowError ) // exit(1); @@ -95,7 +95,7 @@ if(verbose) printf("INFO: Win32 video codec init OK!\n"); break; } - case 6: { + case VFM_VFWEX: { if(!init_video_codec(sh_video,1)) { // GUI_MSG( mplUnknowError ) // exit(1); @@ -104,7 +104,7 @@ if(verbose) printf("INFO: Win32Ex video codec init OK!\n"); break; } - case 4: { // Win32/DirectShow + case VFM_DSHOW: { // Win32/DirectShow #ifndef USE_DIRECTSHOW fprintf(stderr,"MPlayer was compiled WITHOUT directshow support!\n"); return 0; @@ -153,13 +153,13 @@ #endif } #else /* !ARCH_X86 */ - case 2: - case 4: - case 6: + case VFM_VFW: + case VFM_DSHOW: + case VFM_VFWEX: fprintf(stderr,"MPlayer does not support win32 codecs on non-x86 platforms!\n"); return 0; #endif /* !ARCH_X86 */ - case 3: { // OpenDivX + case VFM_ODIVX: { // OpenDivX if(verbose) printf("OpenDivX video codec\n"); { DEC_PARAM dec_param; DEC_SET dec_set; @@ -178,7 +178,7 @@ if(verbose) printf("INFO: OpenDivX video codec init OK!\n"); break; } - case 7: { // DivX4Linux + case VFM_DIVX4: { // DivX4Linux #ifndef NEW_DECORE fprintf(stderr,"MPlayer was compiled WITHOUT DivX4Linux (libdivxdecore.so) support!\n"); return 0; //exit(1); @@ -213,7 +213,7 @@ break; #endif } - case 5: { // FFmpeg's libavcodec + case VFM_FFMPEG: { // FFmpeg's libavcodec #ifndef USE_LIBAVCODEC fprintf(stderr,"MPlayer was compiled WITHOUT libavcodec support!\n"); return 0; //exit(1); @@ -241,7 +241,7 @@ #endif } - case 1: { + case VFM_MPEG: { // init libmpeg2: #ifdef MPEG12_POSTPROC picture->pp_options=divx_quality; @@ -275,7 +275,7 @@ //-------------------- Decode a frame: ----------------------- switch(sh_video->codec->driver){ - case 3: { + case VFM_ODIVX: { // OpenDivX DEC_FRAME dec_frame; #ifdef NEW_DECORE @@ -317,7 +317,7 @@ break; } #ifdef NEW_DECORE - case 7: { + case VFM_DIVX4: { // DivX4Linux DEC_FRAME dec_frame; // let's decode @@ -333,14 +333,14 @@ } #endif #ifdef USE_DIRECTSHOW - case 4: { // W32/DirectShow + case VFM_DSHOW: { // W32/DirectShow if(drop_frame<2) DS_VideoDecoder_DecodeFrame(start, in_size, 0, !drop_frame); if(!drop_frame && sh_video->our_out_buffer) blit_frame=3; break; } #endif #ifdef USE_LIBAVCODEC - case 5: { // libavcodec + case VFM_FFMPEG: { // libavcodec int got_picture=0; if(drop_frame<2 && in_size>0){ int ret = avcodec_decode_video(&lavc_context, &lavc_picture, @@ -356,8 +356,8 @@ } #endif #ifdef ARCH_X86 - case 6: - case 2: + case VFM_VFWEX: + case VFM_VFW: { HRESULT ret; @@ -369,7 +369,7 @@ // sh_video->o_bih.biWidth = 1280; // ret = ICDecompress(avi_header.hic, ICDECOMPRESS_NOTKEYFRAME|(ICDECOMPRESS_HURRYUP|ICDECOMPRESS_PREROL), -if(sh_video->codec->driver==6) +if(sh_video->codec->driver==VFM_VFWEX) ret = ICDecompressEx(sh_video->hic, ( (sh_video->ds->flags&1) ? 0 : ICDECOMPRESS_NOTKEYFRAME ) | ( (drop_frame==2 && !(sh_video->ds->flags&1))?(ICDECOMPRESS_HURRYUP|ICDECOMPRESS_PREROL):0 ) , @@ -390,7 +390,7 @@ break; } #endif - case 1: + case VFM_MPEG: mpeg2_decode_data(video_out, start, start+in_size,drop_frame); if(!drop_frame) blit_frame=1; break; Index: codec-cfg.h =================================================================== RCS file: /cvsroot/mplayer/main/codec-cfg.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- codec-cfg.h 14 Apr 2001 17:53:47 -0000 1.10 +++ codec-cfg.h 29 Jul 2001 02:08:27 -0000 1.11 @@ -17,6 +17,23 @@ #define CODECS_STATUS_PROBLEMS 1 #define CODECS_STATUS_WORKING 2 +// Codec family/driver: +#define AFM_MPEG 1 +#define AFM_PCM 2 +#define AFM_AC3 3 +#define AFM_ACM 4 +#define AFM_ALAW 5 +#define AFM_GSM 6 +#define AFM_DSHOW 7 +#define AFM_DVDPCM 8 + +#define VFM_MPEG 1 +#define VFM_VFW 2 +#define VFM_ODIVX 3 +#define VFM_DSHOW 4 +#define VFM_FFMPEG 5 +#define VFM_VFWEX 6 +#define VFM_DIVX4 7 typedef struct { unsigned long f1;

1 0