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

CVS: main/DOCS CODECS,1.6,1.7
by GEREOFFY 28 Mar '01

28 Mar '01

Update of /cvsroot/mplayer/main/DOCS In directory usw-pr-cvs1:/tmp/cvs-serv22623 Modified Files: CODECS Log Message: small changes, corrections Index: CODECS =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/CODECS,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** CODECS 2001/03/28 12:33:42 1.6 --- CODECS 2001/03/28 21:58:44 1.7 *************** *** 4,8 **** If you have sample files for untested codecs, or want a new codec to be ! added, contact us! (for new codecs we need the DLL/AX file and a sample AVI) Video codecs: --- 4,8 ---- If you have sample files for untested codecs, or want a new codec to be ! added, contact us! See bellow (after the codecs listing) the details! Video codecs: *************** *** 90,93 **** --- 90,95 ---- - MPEG layer 3: (0x55) l3codeca.acm: works (or you can use the built-in 3dnow-optimized codec) + - VoxWare Metasound: (0x75) + voxmsdec.ax: works Problems: *************** *** 97,102 **** - MS-GSM: (0x31,0x32) msgsm32.acm: segfault (use built-in codec) - - VoxWare Metasound: (0x75) - voxmsdec.ax: segfault Not tested: --- 99,102 ---- *************** *** 107,110 **** --- 107,111 ---- imc32.acm: not tested (no sample file) + Extracting codecs from Win32 ============================ *************** *** 128,135 **** This is the MP3 codec. ! So, now we have all the info needed (fourcc, codec file, sample AVI), submit a ! bugreport, and upload the files to thot.banki.hu/incoming/MPlayer ! (also see DOCS/README !!!) . 2. DirectShow ~~~~~~~~~~~~~ --- 129,137 ---- This is the MP3 codec. ! So, now we have all the info needed (fourcc, codec file, sample AVI), submit ! your codec support request in mail, and upload these files to the FTP: ! ftp://thot.banki.hu/incoming/MPlayer/<codecname>/ + 2. DirectShow ~~~~~~~~~~~~~ *************** *** 152,156 **** (for ex. search for : TrueMotion) - if found (in registry), there should be a FriendlyName field, and a CLSID ! field. Write down that 16 byte of CLSID. NOTE : if searching fails, try to enable all the checkboxes.. you may have --- 154,158 ---- (for ex. search for : TrueMotion) - if found (in registry), there should be a FriendlyName field, and a CLSID ! field. Write down that 16 byte of CLSID, this is the GUID required by us. NOTE : if searching fails, try to enable all the checkboxes.. you may have *************** *** 159,165 **** So, now we have all the info needed (fourcc, GUID, codec file, sample AVI), ! submit a bugreport, and upload the files to thot.banki.hu/incoming/MPlayer ! (also see DOCS/README !!!) . ! --- 161,166 ---- So, now we have all the info needed (fourcc, GUID, codec file, sample AVI), ! submit your codec support request in mail, and upload these files to the FTP: ! ftp://thot.banki.hu/incoming/MPlayer/<codecname>/ _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main mplayer.c,1.30,1.31
by GEREOFFY 28 Mar '01

28 Mar '01

Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv20903 Modified Files: mplayer.c Log Message: finished DirectShow audio code Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -r1.30 -r1.31 *** mplayer.c 2001/03/28 12:08:44 1.30 --- mplayer.c 2001/03/28 21:45:12 1.31 *************** *** 1221,1224 **** --- 1221,1231 ---- MP3_channels=avi_header.wf.nChannels; MP3_samplerate=avi_header.wf.nSamplesPerSec; + + avi_header.audio_in_minsize=2*avi_header.wf.nBlockAlign; + if(avi_header.audio_in_minsize<8192) avi_header.audio_in_minsize=8192; + a_in_buffer_size=avi_header.audio_in_minsize; + a_in_buffer=malloc(a_in_buffer_size); + a_in_buffer_len=0; + } else { printf("Could not load/initialize Win32/DirctShow AUDIO codec (missing .AX file?)\n"); *************** *** 1490,1493 **** --- 1497,1527 ---- break; } + case 7: // DirectShow + { int ret; + int len=a_buffer_size-a_buffer_len; + int size_in=0; + int size_out=0; + int srcsize=DS_AudioDecoder_GetSrcSize(len); + if(verbose>2)printf("DShow says: srcsize=%d (buffsize=%d) out_size=%d\n",srcsize,a_in_buffer_size,len); + if(srcsize>a_in_buffer_size) srcsize=a_in_buffer_size; // !!!!!! + if(a_in_buffer_len<srcsize){ + a_in_buffer_len+= + demux_read_data(d_audio,&a_in_buffer[a_in_buffer_len], + srcsize-a_in_buffer_len); + } + DS_AudioDecoder_Convert(a_in_buffer,a_in_buffer_len, + &a_buffer[a_buffer_len],len, &size_in,&size_out); + if(verbose>2)printf("DShow: audio %d -> %d converted (in_buf_len=%d of %d)\n",size_in,size_out,a_in_buffer_len,a_in_buffer_size); + if(size_in>=a_in_buffer_len){ + a_in_buffer_len=0; + } else { + a_in_buffer_len-=size_in; + memcpy(a_in_buffer,&a_in_buffer[size_in],a_in_buffer_len); + } + a_buffer_len+=size_out; + + break; + } + } } _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/loader setup_FS.c,NONE,1.1 driver.c,1.3,1.4
by GEREOFFY 28 Mar '01

28 Mar '01

Update of /cvsroot/mplayer/main/loader In directory usw-pr-cvs1:/tmp/cvs-serv20843 Modified Files: driver.c Added Files: setup_FS.c Log Message: Setup_FS_Segment() for VoxWare audio --- NEW FILE --- #include <string.h> #include <stdlib.h> #include <errno.h> #include <fcntl.h> #include <sys/mman.h> #include <sys/types.h> #include <stdio.h> #include <unistd.h> #ifdef __linux__ #include <asm/unistd.h> #include <asm/ldt.h> #else #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) #include <machine/sysarch.h> #endif #ifdef __svr4__ #include <sys/segment.h> #include <sys/sysi86.h> /* solaris x86: add missing prototype for sysi86() */ extern int sysi86(int, void*); #define TEB_SEL_IDX NUMSYSLDTS #endif #define LDT_ENTRIES 8192 #define LDT_ENTRY_SIZE 8 #pragma pack(4) struct modify_ldt_ldt_s { unsigned int entry_number; unsigned long base_addr; unsigned int limit; unsigned int seg_32bit:1; unsigned int contents:2; unsigned int read_exec_only:1; unsigned int limit_in_pages:1; unsigned int seg_not_present:1; unsigned int useable:1; }; #define MODIFY_LDT_CONTENTS_DATA 0 #define MODIFY_LDT_CONTENTS_STACK 1 #define MODIFY_LDT_CONTENTS_CODE 2 #endif /* user level (privilege level: 3) ldt (1<<2) segment selector */ #define LDT_SEL(idx) ((idx) << 3 | 1 << 2 | 3) #ifndef TEB_SEL_IDX #define TEB_SEL_IDX 1 #endif #define TEB_SEL LDT_SEL(TEB_SEL_IDX) void setup_FS_Segment() { printf("Setup FS...");fflush(stdout); __asm__ __volatile__( "movl %0,%%eax; movw %%ax, %%fs" : : "i" (TEB_SEL) ); printf("OK!\n"); } /** * * This should be performed before we create first thread. See remarks * for write_ldt(), linux/kernel/ldt.c. * */ static void* fs_seg=NULL; #ifdef __linux__ /* XXX: why is this routine from libc redefined here? */ /* NOTE: the redefined version ignores the count param, count is hardcoded as 16 */ static int modify_ldt( int func, struct modify_ldt_ldt_s *ptr, unsigned long count ) { int res; #ifdef __PIC__ __asm__ __volatile__( "pushl %%ebx\n\t" "movl %2,%%ebx\n\t" "int $0x80\n\t" "popl %%ebx" : "=a" (res) : "0" (__NR_modify_ldt), "r" (func), "c" (ptr), "d"(16)//sizeof(*ptr) from kernel point of view :"esi" ); #else __asm__ __volatile__("int $0x80" : "=a" (res) : "0" (__NR_modify_ldt), "b" (func), "c" (ptr), "d"(16) :"esi"); #endif /* __PIC__ */ if (res >= 0) return res; errno = -res; return -1; } #endif #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) static void LDT_EntryToBytes( unsigned long *buffer, const struct modify_ldt_ldt_s *content ) { *buffer++ = ((content->base_addr & 0x0000ffff) << 16) | (content->limit & 0x0ffff); *buffer = (content->base_addr & 0xff000000) | ((content->base_addr & 0x00ff0000)>>16) | (content->limit & 0xf0000) | (content->contents << 10) | ((content->read_exec_only == 0) << 9) | ((content->seg_32bit != 0) << 22) | ((content->limit_in_pages != 0) << 23) | 0xf000; } #endif void Setup_LDT_Keeper(){ struct modify_ldt_ldt_s array; int fd; int ret; void* prev_struct; if(fs_seg) return; // already set! fd=open("/dev/zero", O_RDWR); fs_seg=mmap(NULL, getpagesize(), PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); if(fs_seg==(void*)-1) { perror("ERROR: Couldn't allocate memory for fs segment"); return; } array.base_addr=(int)fs_seg; array.entry_number=TEB_SEL_IDX; array.limit=array.base_addr+getpagesize()-1; array.seg_32bit=1; array.read_exec_only=0; array.seg_not_present=0; array.contents=MODIFY_LDT_CONTENTS_DATA; array.limit_in_pages=0; #ifdef __linux__ ret=modify_ldt(0x1, &array, sizeof(struct modify_ldt_ldt_s)); if(ret<0) { perror("install_fs"); printf("Couldn't install fs segment, expect segfault\n"); } #endif /*linux*/ #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) { unsigned long d[2]; LDT_EntryToBytes( d, &array ); ret = i386_set_ldt(array.entry_number, (union descriptor *)d, 1); if (ret < 0) { perror("install_fs"); printf("Couldn't install fs segment, expect segfault\n"); printf("Did you reconfigure the kernel with \"options USER_LDT\"?\n"); } printf("Set_LDT\n"); } #endif /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ */ #if defined(__svr4__) struct ssd ssd; ssd.sel = TEB_SEL; ssd.bo = array.base_addr; ssd.ls = array.limit - array.base_addr; ssd.acc1 = ((array.read_exec_only == 0) << 1) | (array.contents << 2) | 0xf0; /* P(resent) | DPL3 | S */ ssd.acc2 = 0x4; /* byte limit, 32-bit segment */ if (sysi86(SI86DSCR, &ssd) < 0) { perror("sysi86(SI86DSCR)"); printf("Couldn't install fs segment, expect segfault\n"); } #endif setup_FS_Segment(); prev_struct=malloc(8); *(void**)array.base_addr=prev_struct; close(fd); } void Restore_LDT_Keeper() { if(fs_seg==0) return; munmap((char*)fs_seg, getpagesize()); } Index: driver.c =================================================================== RCS file: /cvsroot/mplayer/main/loader/driver.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** driver.c 2001/03/21 21:09:36 1.3 --- driver.c 2001/03/28 21:44:26 1.4 *************** *** 99,102 **** --- 99,103 ---- { int i; + setup_FS_Segment(); if(hDriver) if(((DRVR*)hDriver)->hDriverModule) *************** *** 132,135 **** --- 133,138 ---- // char* codec_name=icopen->fccHandler; + Setup_LDT_Keeper(); + if (!(npDriver = DrvAlloc(&hDriver, &uDrvResult))) return ((HDRVR) 0); *************** *** 193,196 **** --- 196,201 ---- //TRACE("DriverProc == %X\n", npDriver->DriverProc); npDriver->dwDriverID = ++dwDrvID; + + setup_FS_Segment(); STORE_ALL; _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/loader Makefile,1.1.1.1,1.2 win32.c,1.4,1.5
by GEREOFFY 28 Mar '01

28 Mar '01

Update of /cvsroot/mplayer/main/loader In directory usw-pr-cvs1:/tmp/cvs-serv20686 Modified Files: Makefile win32.c Log Message: verbose output changed Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/loader/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** Makefile 2001/02/24 20:30:26 1.1.1.1 --- Makefile 2001/03/28 21:43:21 1.2 *************** *** 3,10 **** # Generated automatically from Makefile.in by configure. DEFINES=-rdynamic -fPIC $(WIN32_PATH) $(CDOPT) -D__WINE__ -Ddbg_printf=__vprintf \ ! -DTRACE=__vprintf ! # -DDETAILED_OUT ! LIB_OBJECTS= pe_image.o module.o \ ext.o win32.o driver.o pe_resource.o \ resource.o registry.o elfdll.o afl.o vfl.o --- 3,9 ---- # Generated automatically from Makefile.in by configure. DEFINES=-rdynamic -fPIC $(WIN32_PATH) $(CDOPT) -D__WINE__ -Ddbg_printf=__vprintf \ ! -DTRACE=__vprintf # -DDETAILED_OUT ! LIB_OBJECTS= setup_FS.o pe_image.o module.o \ ext.o win32.o driver.o pe_resource.o \ resource.o registry.o elfdll.o afl.o vfl.o Index: win32.c =================================================================== RCS file: /cvsroot/mplayer/main/loader/win32.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** win32.c 2001/03/18 02:01:32 1.4 --- win32.c 2001/03/28 21:43:21 1.5 *************** *** 139,145 **** } ! int LOADER_DEBUG=0; inline void dbgprintf(char* fmt, ...) { if(LOADER_DEBUG) { --- 139,146 ---- } ! int LOADER_DEBUG=1; inline void dbgprintf(char* fmt, ...) { + #ifdef DETAILED_OUT if(LOADER_DEBUG) { *************** *** 157,160 **** --- 158,162 ---- va_end(va); } + #endif } char export_names[500][30]={ _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/libvo video_out.c,1.8,1.9
by GEREOFFY 28 Mar '01

28 Mar '01

Update of /cvsroot/mplayer/main/libvo In directory usw-pr-cvs1:/tmp/cvs-serv5910 Modified Files: video_out.c Log Message: fbdev compile fix Index: video_out.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** video_out.c 2001/03/28 12:08:44 1.8 --- video_out.c 2001/03/28 20:14:16 1.9 *************** *** 82,90 **** &video_out_sdl, #endif &video_out_null, &video_out_odivx, &video_out_pgm, &video_out_md5, - &video_out_fbdev, NULL }; --- 82,92 ---- &video_out_sdl, #endif + #ifdef HAVE_FBDEV + &video_out_fbdev, + #endif &video_out_null, &video_out_odivx, &video_out_pgm, &video_out_md5, NULL }; _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main configure,1.12,1.13
by Michael Graffam 28 Mar '01

28 Mar '01

Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv2495 Modified Files: configure Log Message: Changes to configure to autodetect DGA 2.0 functionality, and to only use DGA video mode switching when DGA 2.0 is present Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** configure 2001/03/28 12:08:44 1.12 --- configure 2001/03/28 19:58:45 1.13 *************** *** 168,171 **** --- 168,172 ---- _xmga=no _dga=no + _dga2=no _fbdev=no _lirc=no *************** *** 394,398 **** --- 395,411 ---- # --- + # Check if DGA is 2.0 or greater cat > $TMPC << EOF + #include <stdio.h> + #include <X11/Xlib.h> + #include <X11/extensions/xf86dga.h> + int main (void) { XDGAMode mode; XDGADevice device; return 0;} + EOF + + _dga2=no + $_cc $TMPC -o $TMPO -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lXxf86dga -lXxf86vm &> /dev/null && _dga2=yes + + + cat > $TMPC << EOF #include <GL/gl.h> int main( void ) { return 0; } *************** *** 444,448 **** --enable-dga) _dga=yes ! ;; --enable-xv) _xv=yes --- 457,464 ---- --enable-dga) _dga=yes ! ;; ! --enable-dga2) ! _dga2=yes ! ;; --enable-xv) _xv=yes *************** *** 514,517 **** --- 530,536 ---- _dga=no ;; + --disable-dga2) + _dga2=no + ;; --disable-fbdev) _fbdev=no *************** *** 556,559 **** --- 575,579 ---- echo "Checking for X11 ... $_x11" echo "Checking for DGA ... $_dga" + echo "Checking for DGA 2.0 .. $_dga2" echo "Checking for Xf86VM ... $_vm" echo "Checking for FBDev ... $_fbdev" *************** *** 728,731 **** --- 748,758 ---- fi + if [ $_dga2 = yes ]; then + _dga2='#define HAVE_DGA2' + _vosrc=$_vosrc' vo_dga.c vo_fsdga.c' + else + _dga2='#undef HAVE_DGA2' + fi + if [ $_fbdev = yes ]; then _fbdev='#define HAVE_FBDEV' *************** *** 808,811 **** --- 835,839 ---- $_gl $_dga + $_dga2 $_sdldef $_3dfx _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/libvo vo_dga.c,1.3,1.4
by Michael Graffam 28 Mar '01

28 Mar '01

Update of /cvsroot/mplayer/main/libvo In directory usw-pr-cvs1:/tmp/cvs-serv2495/libvo Modified Files: vo_dga.c Log Message: Changes to configure to autodetect DGA 2.0 functionality, and to only use DGA video mode switching when DGA 2.0 is present Index: vo_dga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** vo_dga.c 2001/03/27 04:29:22 1.3 --- vo_dga.c 2001/03/28 19:58:45 1.4 *************** *** 242,249 **** int x_off, y_off; // needed to change DGA video mode ! int modecount,mX, mY, X, Y, i,j; XDGAMode *modelines=NULL; XDGADevice *dgadevice; if( vo_dga_is_running )return -1; --- 242,252 ---- int x_off, y_off; + #ifdef HAVE_DGA2 // needed to change DGA video mode ! int modecount,mX, mY, i,j; ! int X,Y; XDGAMode *modelines=NULL; XDGADevice *dgadevice; + #endif if( vo_dga_is_running )return -1; *************** *** 260,263 **** --- 263,267 ---- } + #ifdef HAVE_DGA2 // Code to change the video mode added by Michael Graffam // mgraffam(a)idsi.net *************** *** 286,289 **** --- 290,294 ---- X=(modelines[j].imageWidth-mX)/2; Y=(modelines[j].imageHeight-mY)/2; + printf("vo_dga: Using DGA 2.0 mode changing support\n"); printf("vo_dga: Selected video mode %dx%d for image size %dx%d.\n", mX, mY,width, height); *************** *** 294,306 **** XFree(modelines); XFree(dgadevice); - // end mode change code - - XF86DGAGetVideo (vo_dga_dpy, XDefaultScreen(vo_dga_dpy), - (char **)&vo_dga_base, &vo_dga_width, &bank, &ram); - - vo_dga_vp_width=modelines[j].viewportWidth; - vo_dga_vp_height=modelines[j].viewportHeight; - // do some more checkings here ... if( format==IMGFMT_YV12 ) --- 299,318 ---- XFree(modelines); XFree(dgadevice); + // end mode change code + #else + printf("vo_dga: DGA 1.0 compatibility code\n"); + #endif + + XF86DGAGetViewPortSize(vo_dga_dpy,XDefaultScreen(vo_dga_dpy), + &vo_dga_vp_width, + &vo_dga_vp_height); + + XF86DGAGetVideo (vo_dga_dpy, XDefaultScreen(vo_dga_dpy), + (char **)&vo_dga_base, &vo_dga_width, &bank, &ram); + + #ifndef HAVE_DGA2 + XF86DGASetViewPort (vo_dga_dpy, XDefaultScreen(vo_dga_dpy), 0, 0); + #endif // do some more checkings here ... if( format==IMGFMT_YV12 ) _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/DOCS MPlayer-FAQ,1.11,1.12
by Berczi Gabor 28 Mar '01

28 Mar '01

Update of /cvsroot/mplayer/main/DOCS In directory usw-pr-cvs1:/tmp/cvs-serv15396/DOCS Modified Files: MPlayer-FAQ Log Message: symlink addition Index: MPlayer-FAQ =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/MPlayer-FAQ,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** MPlayer-FAQ 2001/03/27 17:40:41 1.11 --- MPlayer-FAQ 2001/03/28 18:15:51 1.12 *************** *** 119,127 **** Q: During 'make', MPlayer complains about X11 libraries. I don't understand, I DO have X installed!? ! A: ...but you don't have the X development package installed. It's called ! XFree86-devel* under RedHat, and xlib6g-dev* under Debian. ! Also check if the /usr/X11 symlink exists (this can be a problem on ! Mandrake systems). It can be created with the 'ln -sf /usr/X11R6 /usr/X11' ! command. Your distribution may differ from the Linux Filesystem Standard. Q: I have problems playing files with ... codec. Can I use'em? --- 119,130 ---- Q: During 'make', MPlayer complains about X11 libraries. I don't understand, I DO have X installed!? ! A: ...but you don't have the X development package installed. Or not ! correctly. It's called XFree86-devel* under RedHat, and xlib6g-dev* under ! Debian. Also check if the /usr/X11 symlink exists (this can be a problem on ! Mandrake systems). It can be created with the ! $ ln -sf /usr/X11R6 /usr/X11 ! command. Also check the /usr/include/X11 link : ! $ ln -sf /usr/X11R6/include/X11 /usr/include/X11 ! Your distribution may differ from the Linux Filesystem Standard. Q: I have problems playing files with ... codec. Can I use'em? _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/libvo vo_fbdev.c,1.3,1.4
by Szabolcs Berecz 28 Mar '01

28 Mar '01

Update of /cvsroot/mplayer/main/libvo In directory usw-pr-cvs1:/tmp/cvs-serv13673 Modified Files: vo_fbdev.c Log Message: small fix Index: vo_fbdev.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** vo_fbdev.c 2001/03/28 18:01:16 1.3 --- vo_fbdev.c 2001/03/28 18:07:24 1.4 *************** *** 277,288 **** in_width, in_width / 2); } else if ((pixel_format & IMGFMT_BGR_MASK) == IMGFMT_BGR) { ! int i; ! uint8_t *dst = next_frame; ! uint8_t *s = src[0]; ! for (i = 0; i < in_height; i++) { ! memcpy(dst, s, in_width * (fb_bpp / 8)); ! dst += in_width * (fb_bpp / 8); ! s += in_width * (fb_bpp / 8); ! } } else if ((pixel_format & IMGFMT_RGB_MASK) == IMGFMT_RGB) { } --- 277,281 ---- in_width, in_width / 2); } else if ((pixel_format & IMGFMT_BGR_MASK) == IMGFMT_BGR) { ! memcpy(next_frame, src[0], in_width * in_height * (fb_bpp / 8)); } else if ((pixel_format & IMGFMT_RGB_MASK) == IMGFMT_RGB) { } _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/libvo vo_fbdev.c,1.2,1.3
by Szabolcs Berecz 28 Mar '01

28 Mar '01

Update of /cvsroot/mplayer/main/libvo In directory usw-pr-cvs1:/tmp/cvs-serv12320 Modified Files: vo_fbdev.c Log Message: works with .avi (for me :) ) Index: vo_fbdev.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** vo_fbdev.c 2001/03/28 16:35:14 1.2 --- vo_fbdev.c 2001/03/28 18:01:16 1.3 *************** *** 28,32 **** }; ! static int vt_active; static int vt_fd; --- 28,32 ---- }; ! static int vt_active = -1; static int vt_fd; *************** *** 196,201 **** return 0; printf("vo_fbdev: query_format(%#x): ", format); ! if (format & IMGFMT_BGR_MASK == IMGFMT_BGR) ! goto not_supported; switch (format) { case IMGFMT_YV12: --- 196,201 ---- return 0; printf("vo_fbdev: query_format(%#x): ", format); ! // if (format & IMGFMT_BGR_MASK == IMGFMT_BGR) ! // goto not_supported; switch (format) { case IMGFMT_YV12: *************** *** 276,289 **** in_height, in_width * (fb_bpp / 8), in_width, in_width / 2); ! } else if ((pixel_format & IMGFMT_RGB_MASK) == IMGFMT_RGB) { int i; uint8_t *dst = next_frame; uint8_t *s = src[0]; for (i = 0; i < in_height; i++) { ! memcpy(next_frame, s, in_width * (fb_bpp / 8)); ! dst += screen_width; s += in_width * (fb_bpp / 8); } ! } else { } return 0; --- 276,289 ---- in_height, in_width * (fb_bpp / 8), in_width, in_width / 2); ! } else if ((pixel_format & IMGFMT_BGR_MASK) == IMGFMT_BGR) { int i; uint8_t *dst = next_frame; uint8_t *s = src[0]; for (i = 0; i < in_height; i++) { ! memcpy(dst, s, in_width * (fb_bpp / 8)); ! dst += in_width * (fb_bpp / 8); s += in_width * (fb_bpp / 8); } ! } else if ((pixel_format & IMGFMT_RGB_MASK) == IMGFMT_RGB) { } return 0; _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0