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

CVS: main/DOCS AUTHORS,1.17,1.18
by Berczi Gabor 31 Mar '01

31 Mar '01

Update of /cvsroot/mplayer/main/DOCS In directory usw-pr-cvs1:/tmp/cvs-serv12214/DOCS Modified Files: AUTHORS Log Message: added vo_dga to VidMode author Index: AUTHORS =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/AUTHORS,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** AUTHORS 2001/03/29 10:06:26 1.17 --- AUTHORS 2001/03/31 12:58:29 1.18 *************** *** 53,57 **** Michael Graffam: <mgraffam(a)idsi.net> ! - XF86VidMode support to vo_x11 - Video mode switching code to vo_dga --- 53,57 ---- Michael Graffam: <mgraffam(a)idsi.net> ! - XF86VidMode support to vo_x11 and vo_dga - Video mode switching code to vo_dga _______________________________________________ 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.7,1.8
by Andreas Ackermann 31 Mar '01

31 Mar '01

Update of /cvsroot/mplayer/main/libvo In directory usw-pr-cvs1:/tmp/cvs-serv12298 Modified Files: vo_dga.c Log Message: - added VidMode changing support for DGA1.0 (used code from Michael Graffam (mgraffam(a)idsi.net)) Index: vo_dga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** vo_dga.c 2001/03/30 23:12:31 1.7 --- vo_dga.c 2001/03/31 09:16:08 1.8 *************** *** 35,38 **** --- 35,41 ---- * depth!!! * o Added double buffering :-)) + * o included VidMode switching support for DGA1.0, written by Michael Graffam + * mgraffam(a)idsi.net + * */ *************** *** 48,52 **** --- 51,58 ---- #include "yuv2rgb.h" + //#undef HAVE_DGA2 + //#undef HAVE_XF86VM + LIBVO_EXTERN( dga ) *************** *** 55,58 **** --- 61,69 ---- #include <X11/extensions/xf86dga.h> + #ifdef HAVE_XF86VM + #include <X11/extensions/xf86vmode.h> + #endif + + #include "x11_common.h" *************** *** 65,70 **** }; static int vo_dga_width; // bytes per line in framebuffer ! static int vo_dga_vp_width; // visible pixels per line in framebuffer static int vo_dga_vp_height; // visible lines in framebuffer static int vo_dga_is_running = 0; --- 76,87 ---- }; + #ifdef HAVE_XF86VM + static XF86VidModeModeInfo **vo_dga_vidmodes=NULL; + #endif + + static int vo_dga_width; // bytes per line in framebuffer ! static int vo_dga_vp_width; // visible pixels per line in ! // framebuffer static int vo_dga_vp_height; // visible lines in framebuffer static int vo_dga_is_running = 0; *************** *** 285,303 **** XDGADevice *dgadevice; #endif ! ! vo_dga_is_running = 0; ! printf("vo_dga: in uninit\n"); ! XUngrabPointer (vo_dga_dpy, CurrentTime); ! XUngrabKeyboard (vo_dga_dpy, CurrentTime); #ifdef HAVE_DGA2 ! dgadevice = XDGASetMode(vo_dga_dpy, XDefaultScreen(vo_dga_dpy), 0); ! if(dgadevice != NULL){ ! XFree(dgadevice); ! } ! XDGACloseFramebuffer(vo_dga_dpy, XDefaultScreen(vo_dga_dpy)); #else ! XF86DGADirectVideo (vo_dga_dpy, XDefaultScreen(vo_dga_dpy), 0); #endif ! XCloseDisplay(vo_dga_dpy); } --- 302,335 ---- XDGADevice *dgadevice; #endif ! ! if(vo_dga_is_running){ ! vo_dga_is_running = 0; ! printf("vo_dga: in uninit\n"); ! XUngrabPointer (vo_dga_dpy, CurrentTime); ! XUngrabKeyboard (vo_dga_dpy, CurrentTime); #ifdef HAVE_DGA2 ! dgadevice = XDGASetMode(vo_dga_dpy, XDefaultScreen(vo_dga_dpy), 0); ! if(dgadevice != NULL){ ! XFree(dgadevice); ! } ! XDGACloseFramebuffer(vo_dga_dpy, XDefaultScreen(vo_dga_dpy)); #else ! XF86DGADirectVideo (vo_dga_dpy, XDefaultScreen(vo_dga_dpy), 0); ! // first disable DirectVideo and then switch mode back! ! #ifdef HAVE_XF86VM ! if (vo_dga_vidmodes != NULL ){ ! int screen; screen=XDefaultScreen( vo_dga_dpy ); ! printf("vo_dga: VidModeExt: Switching back..\n"); ! // seems some graphics adaptors need this more than once ... ! XF86VidModeSwitchToMode(vo_dga_dpy,screen,vo_dga_vidmodes[0]); ! XF86VidModeSwitchToMode(vo_dga_dpy,screen,vo_dga_vidmodes[0]); ! XF86VidModeSwitchToMode(vo_dga_dpy,screen,vo_dga_vidmodes[0]); ! XF86VidModeSwitchToMode(vo_dga_dpy,screen,vo_dga_vidmodes[0]); ! XFree(vo_dga_vidmodes); ! } ! #endif #endif ! XCloseDisplay(vo_dga_dpy); ! } } *************** *** 378,381 **** --- 410,419 ---- XDGADevice *dgadevice; #else + #ifdef HAVE_XF86VM + unsigned int vm_event, vm_error; + unsigned int vm_ver, vm_rev; + int i,j,have_vm=0; + int modecount,mX, mY, mVBI, dga_modenum; + #endif int bank, ram; #endif *************** *** 395,400 **** vo_dga_planes = (format & 0xff); ! // hack!!! here we should only get what we told in query_format() ! // but mplayer is somewhat generous about 15/16bit depth ... vo_dga_planes = vo_dga_planes == 15 ? 16 : vo_dga_planes; --- 433,439 ---- vo_dga_planes = (format & 0xff); ! // hack!!! here we should only get what we told we can handle in ! // query_format() but mplayer is somewhat generous about ! // 15/16bit depth ... vo_dga_planes = vo_dga_planes == 15 ? 16 : vo_dga_planes; *************** *** 409,412 **** --- 448,461 ---- vo_dga_bpp = (vo_dga_planes+7) >> 3; + // TODO: find out screen resolution of X-Server here and + // provide them as default values (used only in case + // DGA1.0 and no VidMode Ext or VidModeExt doesn't return + // any screens to check if video is larger than current screen) + + vo_dga_vp_width = 1280; + vo_dga_vp_height = 1024; + + + // choose a suitable mode ... *************** *** 462,473 **** #else - printf("vo_dga: DGA 1.0 compatibility code: mode switching not supported (yet)!\n"); ! // assume these values are already known at this stage some day ! // so that the following check for video <-> screen size can be done ... ! ! vo_dga_vp_width = 1280; ! vo_dga_vp_height = 1024; #endif --- 511,583 ---- #else ! #ifdef HAVE_XF86VM ! ! printf("vo_dga: DGA 1.0 compatibility code: Using XF86VidMode for mode switching!\n"); ! ! if (XF86VidModeQueryExtension(vo_dga_dpy, &vm_event, &vm_error)) { ! XF86VidModeQueryVersion(vo_dga_dpy, &vm_ver, &vm_rev); ! printf("vo_dga: XF86VidMode Extension v%i.%i\n", vm_ver, vm_rev); ! have_vm=1; ! } else { ! printf("vo_dga: XF86VidMode Extention not available.\n"); ! } ! ! #define GET_VREFRESH(dotclk, x, y)( (((dotclk)/(x))*1000)/(y) ) + if (have_vm) { + int screen; + screen=XDefaultScreen(vo_dga_dpy); + XF86VidModeGetAllModeLines(vo_dga_dpy,screen,&modecount,&vo_dga_vidmodes); + + if(vo_dga_vidmodes != NULL ){ + + mX=vo_dga_vidmodes[0]->hdisplay; + mY=vo_dga_vidmodes[0]->vdisplay; + + // TODO: calculate refreshrate from dotclock, hss, hstp, ... + mVBI = GET_VREFRESH(vo_dga_vidmodes[0]->dotclock, + vo_dga_vidmodes[0]->htotal, + vo_dga_vidmodes[0]->vtotal); + + j=0; + for (i=1; i<modecount; i++){ + printf("vo_dga: (%3d) Trying %4d x %4d @ %3d Hz @ %2d bpp ..", + i, + vo_dga_vidmodes[i]->hdisplay, + vo_dga_vidmodes[i]->vdisplay, + GET_VREFRESH(vo_dga_vidmodes[i]->dotclock, + vo_dga_vidmodes[i]->htotal, + vo_dga_vidmodes[i]->vtotal), + vo_dga_planes ); + + if ( check_mode(d_width, d_height, + vo_dga_vidmodes[i]->hdisplay, + vo_dga_vidmodes[i]->vdisplay, + GET_VREFRESH(vo_dga_vidmodes[i]->dotclock, + vo_dga_vidmodes[i]->htotal, + vo_dga_vidmodes[i]->vtotal), + &mX, &mY, &mVBI )){ + j = i; + printf(".ok!!\n"); + }else{ + printf(".no\n"); + } + } + + printf("vo_dga: Selected video mode %4d x %4d @ %3d Hz for image size %3d x %3d.\n", + mX, mY, mVBI, width, height); + }else{ + printf("vo_dga: XF86VidMode returned no screens - using current resolution.\n"); + } + dga_modenum = j; + vo_dga_vp_width = mX; + vo_dga_vp_height = mY; + } + + + #else + printf("vo_dga: Only have DGA 1.0 extension and no XF86VidMode :-(\n"); + #endif #endif *************** *** 482,485 **** --- 592,603 ---- printf("vo_dga: Sorry, video larger than viewport is not yet supported!\n"); // ugly, do something nicer in the future ... + #ifndef HAVE_DGA2 + #ifdef HAVE_XF86VM + if(vo_dga_vidmodes){ + XFree(vo_dga_vidmodes); + vo_dga_vidmodes = NULL; + } + #endif + #endif return 1; } *************** *** 503,507 **** #else ! XF86DGAGetViewPortSize(vo_dga_dpy,XDefaultScreen(vo_dga_dpy), &vo_dga_vp_width, --- 621,633 ---- #else ! ! #ifdef HAVE_XF86VM ! XF86VidModeLockModeSwitch(vo_dga_dpy,XDefaultScreen(vo_dga_dpy),0); ! // Two calls are needed to switch modes on my ATI Rage 128. Why? ! // for riva128 one call is enough! ! XF86VidModeSwitchToMode(vo_dga_dpy,XDefaultScreen(vo_dga_dpy),vo_dga_vidmodes[dga_modenum]); ! XF86VidModeSwitchToMode(vo_dga_dpy,XDefaultScreen(vo_dga_dpy),vo_dga_vidmodes[dga_modenum]); ! #endif ! XF86DGAGetViewPortSize(vo_dga_dpy,XDefaultScreen(vo_dga_dpy), &vo_dga_vp_width, *************** *** 549,557 **** ButtonPressMask,GrabModeAsync, GrabModeAsync, None, None, CurrentTime); - // TODO: chekc if mem of graphics adaptor is large enough for dbf - // set up variables for double buffering ... vo_dga_dbf_y_offset = y_off + vo_dga_src_height; --- 675,682 ---- ButtonPressMask,GrabModeAsync, GrabModeAsync, None, None, CurrentTime); // TODO: chekc if mem of graphics adaptor is large enough for dbf // set up variables for double buffering ... + // note: set vo_dga_dbf_mem_offset to NULL to disable doublebuffering vo_dga_dbf_y_offset = y_off + vo_dga_src_height; *************** *** 561,571 **** if(format ==IMGFMT_YV12 )vo_dga_dbf_mem_offset = 0; // disable doublebuffering for YV12 // now clear screen ! ! memset(vo_dga_base, 0, vo_dga_width * ! (vo_dga_vp_height + (vo_dga_dbf_mem_offset != 0 ? (vo_dga_src_height+y_off) : 0)) * ! vo_dga_bpp); ! vo_dga_is_running = 1; return 0; --- 686,701 ---- if(format ==IMGFMT_YV12 )vo_dga_dbf_mem_offset = 0; // disable doublebuffering for YV12 + + printf("vo_dga: Doublebuffering %s.\n", vo_dga_dbf_mem_offset ? "enabled" : "disabled"); // now clear screen ! { ! int size = vo_dga_width * ! (vo_dga_vp_height + (vo_dga_dbf_mem_offset != 0 ? ! (vo_dga_src_height+y_off) : 0)) * ! vo_dga_bpp; ! fprintf(stderr, "vo_dga: Before memset: %d. If mplayer exits here, you haven't enough memory for doublebuffering. I'll fix this in the future to check for amount of mem available... For now, select a lower resolution ...\n", size); ! memset(vo_dga_base, 0, size); ! } vo_dga_is_running = 1; return 0; _______________________________________________ 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.6,1.7
by Andreas Ackermann 30 Mar '01

30 Mar '01

Update of /cvsroot/mplayer/main/libvo In directory usw-pr-cvs1:/tmp/cvs-serv29578 Modified Files: vo_dga.c Log Message: - added double buffering :-) Index: vo_dga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** vo_dga.c 2001/03/30 22:09:38 1.6 --- vo_dga.c 2001/03/30 23:12:31 1.7 *************** *** 30,33 **** --- 30,38 ---- * movies things could be different, but I was too lazy to implement * it ... + * o you may define VO_DGA_FORCE_DEPTH to the depth you desire + * if you don't like the choice the driver makes + * Beware: unless you can use DGA2.0 this has to be your X Servers + * depth!!! + * o Added double buffering :-)) */ *************** *** 43,46 **** --- 48,52 ---- #include "yuv2rgb.h" + //#undef HAVE_DGA2 LIBVO_EXTERN( dga ) *************** *** 68,72 **** static int vo_dga_src_offset=0; // offset in src static int vo_dga_vp_offset=0; // offset in dest ! static int vo_dga_bytes_per_line; // longwords per line to copy static int vo_dga_src_skip; // bytes to skip after copying one line // (not supported yet) in src --- 74,78 ---- static int vo_dga_src_offset=0; // offset in src static int vo_dga_vp_offset=0; // offset in dest ! static int vo_dga_bytes_per_line; // bytes per line to copy static int vo_dga_src_skip; // bytes to skip after copying one line // (not supported yet) in src *************** *** 76,79 **** --- 82,92 ---- static int vo_dga_planes; // bits per pixel on screen + static int vo_dga_dbf_mem_offset; // offset in bytes for alternative + // framebuffer (0 if dbf is not + // possible) + static int vo_dga_dbf_y_offset; // y offset (in scanlines) + static int + vo_dga_dbf_current; // current buffer (0 or 1) + static unsigned char *vo_dga_base; static Display *vo_dga_dpy; *************** *** 117,129 **** char *s, *d; ! if( vo_dga_src_format==IMGFMT_YV12 ){ ! // We'll never reach this point, because YV12 codecs always ! // calls draw_slice ! printf("vo_dga: draw_frame() doesn't support IMGFMT_YV12 (yet?)\n"); ! }else{ ! s = *src; ! d = (&((char *)vo_dga_base)[vo_dga_vp_offset]); ! rep_movsl(d, s, lpl, vo_dga_vp_skip, numlines ); ! } return 0; --- 130,136 ---- char *s, *d; ! s = *src; ! d = (&((char *)vo_dga_base)[vo_dga_vp_offset + vo_dga_dbf_current * vo_dga_dbf_mem_offset]); ! rep_movsl(d, s, lpl, vo_dga_vp_skip, numlines ); return 0; *************** *** 140,143 **** --- 147,164 ---- static void flip_page( void ){ + + + if(vo_dga_dbf_mem_offset != 0){ + + #ifdef HAVE_DGA2 + XDGASetViewport (vo_dga_dpy, XDefaultScreen(vo_dga_dpy), + 0, vo_dga_dbf_current * vo_dga_dbf_y_offset, + XDGAFlipRetrace); + #else + XF86DGASetViewPort (vo_dga_dpy, XDefaultScreen(vo_dga_dpy), + 0, vo_dga_dbf_current * vo_dga_dbf_y_offset); + #endif + vo_dga_dbf_current = 1 - vo_dga_dbf_current; + } check_events(); } *************** *** 227,230 **** --- 248,255 ---- } #endif + #ifdef VO_DGA_FORCE_DEPTH + dga_depths = 1<<(VO_DGA_FORCE_DEPTH-1); + #endif + dga_depths_init = 1; *************** *** 278,335 **** - #if 0 - if ( - (modelines[i].viewportWidth >= X) && - (modelines[i].viewportHeight >= Y) && - ( - // prefer a better resolution either in X or in Y - // as long as the other dimension is at least the same - // - // hmm ... MAYBE it would be more clever to focus on the - // x-resolution; I had 712x400 and 640x480 and the movie - // was 640x360; 640x480 would be the 'right thing' here - // but since 712x400 was queried first I got this one. - // I think there should be a cmd-line switch to let the - // user choose the mode he likes ... (acki2) - - ( - ((modelines[i].viewportWidth < mX) && - !(modelines[i].viewportHeight > mY)) || - ((modelines[i].viewportHeight < mY) && - !(modelines[i].viewportWidth > mX)) - ) - // but if we get an identical resolution choose - // the one with the lower refreshrate (saves bandwidth !!!) - // as long as it's above 50 Hz (acki2 on 30/3/2001) - || - ( - (modelines[i].viewportWidth == mX) && - (modelines[i].viewportHeight == mY) && - ( - ( - modelines[i].verticalRefresh >= mVBI && mVBI < 50 - ) - || - ( - mVBI >= 50 && - modelines[i].verticalRefresh < mVBI && - modelines[i].verticalRefresh >= 50 - ) - ) - ) - ) - ) - { - mX=modelines[i].viewportWidth; - mY=modelines[i].viewportHeight; - mVBI = modelines[i].verticalRefresh; - j=i; - printf(".ok!!\n"); - }else{ - printf(".no\n"); - } - #endif - - //---------------------------------------------------------- --- 303,306 ---- *************** *** 578,585 **** ButtonPressMask,GrabModeAsync, GrabModeAsync, None, None, CurrentTime); ! // now clear screen ! memset(vo_dga_base, 0, vo_dga_width * vo_dga_vp_height * vo_dga_bpp); vo_dga_is_running = 1; --- 549,570 ---- ButtonPressMask,GrabModeAsync, GrabModeAsync, None, None, CurrentTime); ! ! // TODO: chekc if mem of graphics adaptor is large enough for dbf ! ! ! // set up variables for double buffering ... ! ! vo_dga_dbf_y_offset = y_off + vo_dga_src_height; ! vo_dga_dbf_mem_offset = vo_dga_width * vo_dga_bpp * vo_dga_dbf_y_offset; ! vo_dga_dbf_current = 0; ! ! if(format ==IMGFMT_YV12 )vo_dga_dbf_mem_offset = 0; ! // disable doublebuffering for YV12 ! // now clear screen ! memset(vo_dga_base, 0, vo_dga_width * ! (vo_dga_vp_height + (vo_dga_dbf_mem_offset != 0 ? (vo_dga_src_height+y_off) : 0)) * ! vo_dga_bpp); vo_dga_is_running = 1; _______________________________________________ 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.5,1.6
by Andreas Ackermann 30 Mar '01

30 Mar '01

Update of /cvsroot/mplayer/main/libvo In directory usw-pr-cvs1:/tmp/cvs-serv20243 Modified Files: vo_dga.c Log Message: - 32/16 bit mode swtiching with DGA2.0 - now use only DGA2.0 API when DGA2.0 is available Index: vo_dga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** vo_dga.c 2001/03/30 17:16:56 1.5 --- vo_dga.c 2001/03/30 22:09:38 1.6 *************** *** 16,20 **** --- 16,33 ---- * o covers only common video card formats * o works only on intel architectures + * + * 30/02/2001 * + * o query_format(): with DGA 2.0 it returns all depths it supports + * (even 16 when running 32 and vice versa) + * Checks for (hopefully!) compatible RGBmasks in 15/16 bit modes + * o added some more criterions for resolution switching + * o cleanup + * o with DGA2.0 present, ONLY DGA2.0 functions are used + * o for 15/16 modes ONLY RGB 555 is supported, since the divx-codec + * happens to map the data this way. If your graphics card supports + * this, you're well off and may use these modes; for mpeg + * movies things could be different, but I was too lazy to implement + * it ... */ *************** *** 25,30 **** #include <string.h> - - //#include "linux/keycodes.h" #include "config.h" #include "video_out.h" --- 38,41 ---- *************** *** 32,35 **** --- 43,47 ---- #include "yuv2rgb.h" + LIBVO_EXTERN( dga ) *************** *** 62,65 **** --- 74,78 ---- static int vo_dga_lines; // num of lines to copy static int vo_dga_src_format; + static int vo_dga_planes; // bits per pixel on screen static unsigned char *vo_dga_base; *************** *** 159,170 **** static uint32_t query_format( uint32_t format ) { ! printf("vo_dga: query_format\n"); ! if( !vo_init() ) return 0; // Can't open X11 ! printf("Format: %lx\n", format); if( format==IMGFMT_YV12 ) return 1; if( ( format&IMGFMT_BGR_MASK )==IMGFMT_BGR && ! ( format&0xFF )==vo_depthonscreen ) return 1; return 0; } --- 172,251 ---- static uint32_t query_format( uint32_t format ) { ! ! #ifdef HAVE_DGA2 ! XDGAMode *modelines; ! int modecount; ! Display *qdisp; ! #endif ! ! int i,k,dummy; ! static int dga_depths_init = 0; ! static int dga_depths = 0; // each bit that is set represents ! // a depth the X-Server is capable ! // of displaying ! ! ! if( !vo_init() ) return 0; // Can't open X11 ! ! if(dga_depths_init == 0){ ! #ifdef HAVE_DGA2 ! ! if((qdisp = XOpenDisplay(0))==NULL){ ! printf("vo_dga: Can't open display!\n"); ! return 0; ! } ! modelines=XDGAQueryModes(qdisp, XDefaultScreen(qdisp),&modecount); ! for(i=0; i< modecount; i++){ ! if( ( (modelines[i].bitsPerPixel == 15 || ! modelines[i].bitsPerPixel == 16) && ! modelines[i].redMask == 0x7c00 && ! modelines[i].greenMask == 0x03e0 && ! modelines[i].blueMask == 0x001f ! ) || ! ( modelines[i].bitsPerPixel != 15 && ! modelines[i].bitsPerPixel != 16 ! ) ! ) ! { ! for(k=0, dummy=1; k<modelines[i].bitsPerPixel-1; k++)dummy <<=1; ! dga_depths |= dummy; ! } ! ! } ! XCloseDisplay(qdisp); ! ! #else + for(k=0, dummy=1; k<vo_depthonscreen-1; k++)dummy <<=1; + dga_depths |= dummy; + // hope this shift is ok; heard that on some systems only up to 8 digits + // may be shifted at a time. SIGH! It IS so. + // test for RGB masks !!!! (if depthonscreen != 24 or 32 !!!) + if( !(vo_depthonscreen == 24 || vo_depthonscreen == 32 ) ){ + printf("vo_dga: You're running 15/16 bit X Server; your hardware might use unsuitable RGB-mask!\n"); + } + #endif + dga_depths_init = 1; + + if( dga_depths == 0){ + printf("vo_dga: Sorry, there seems to be no suitable depth available!\n"); + printf(" Try running X in 24 or 32 bit mode!!!\n"); + return 0; + }else{ + for(i=0, dummy=1; i< 32; i++){ + if(dummy& dga_depths){ + printf("vo_dga: may use %2d bits per pixel\n", i+1); + } + dummy <<= 1; + } + } + } if( format==IMGFMT_YV12 ) return 1; + for(k=0, dummy=1; k<(format&0xFF)-1; k++)dummy<<=1; + if( ( format&IMGFMT_BGR_MASK )==IMGFMT_BGR && ! ( dummy & dga_depths )) return 1; ! return 0; } *************** *** 176,244 **** { vo_dga_is_running = 0; printf("vo_dga: in uninit\n"); XUngrabPointer (vo_dga_dpy, CurrentTime); XUngrabKeyboard (vo_dga_dpy, CurrentTime); XF86DGADirectVideo (vo_dga_dpy, XDefaultScreen(vo_dga_dpy), 0); XCloseDisplay(vo_dga_dpy); } - //--------------------------------------------------------- - - static uint32_t init( uint32_t width, uint32_t height, - uint32_t d_width,uint32_t d_height, - uint32_t fullscreen,char *title,uint32_t format ) - { - - int bank, ram; - int x_off, y_off; - - #ifdef HAVE_DGA2 - // needed to change DGA video mode - int modecount,mX, mY, mVBI, i,j; - int X,Y; - XDGAMode *modelines=NULL; - XDGADevice *dgadevice; - #endif - - if( vo_dga_is_running )return -1; - - if( !vo_init() ){ - printf("vo_dga: vo_init() failed!\n"); - return 0; - } - - if((vo_dga_dpy = XOpenDisplay(0))==NULL) - { - printf ("vo_dga: Can't open display\n"); - return 1; - } ! #ifdef HAVE_DGA2 ! // Code to change the video mode added by Michael Graffam ! // mgraffam(a)idsi.net ! if (modelines==NULL) ! modelines=XDGAQueryModes(vo_dga_dpy, XDefaultScreen(vo_dga_dpy),&modecount); ! ! mX=modelines[0].imageWidth; ! mY=modelines[0].imageHeight; ! mVBI = modelines[0].verticalRefresh; ! X=d_width; Y=d_height; ! ! printf("vo_dga: Using DGA 2.0 mode changing support\n"); ! j=0; ! // offbyone-error !!! i<=modecount is WRONG !!! ! for (i=1; i<modecount; i++) ! { ! if( modelines[i].bitsPerPixel == vo_depthonscreen && ! modelines[i].maxViewportX) ! { ! printf("vo_dga: (%3d) Trying %4d x %4d @ %3d Hz @ %2d bpp ..", ! i, ! modelines[i].viewportWidth, ! modelines[i].viewportHeight, ! (unsigned int) modelines[i].verticalRefresh, ! modelines[i].bitsPerPixel ); ! if ( (modelines[i].viewportWidth >= X) && --- 257,282 ---- { + #ifdef HAVE_DGA2 + XDGADevice *dgadevice; + #endif + vo_dga_is_running = 0; printf("vo_dga: in uninit\n"); XUngrabPointer (vo_dga_dpy, CurrentTime); XUngrabKeyboard (vo_dga_dpy, CurrentTime); + #ifdef HAVE_DGA2 + dgadevice = XDGASetMode(vo_dga_dpy, XDefaultScreen(vo_dga_dpy), 0); + if(dgadevice != NULL){ + XFree(dgadevice); + } + XDGACloseFramebuffer(vo_dga_dpy, XDefaultScreen(vo_dga_dpy)); + #else XF86DGADirectVideo (vo_dga_dpy, XDefaultScreen(vo_dga_dpy), 0); + #endif XCloseDisplay(vo_dga_dpy); } ! #if 0 if ( (modelines[i].viewportWidth >= X) && *************** *** 291,311 **** printf(".no\n"); } } } - X=(modelines[j].imageWidth-mX)/2; - Y=(modelines[j].imageHeight-mY)/2; printf("vo_dga: Selected video mode %4d x %4d @ %3d Hz for image size %3d x %3d.\n", mX, mY, mVBI, width, height); ! XF86DGASetViewPort (vo_dga_dpy, XDefaultScreen(vo_dga_dpy), X,Y); ! dgadevice=XDGASetMode(vo_dga_dpy, XDefaultScreen(vo_dga_dpy), modelines[j].num); XDGASync(vo_dga_dpy, XDefaultScreen(vo_dga_dpy)); ! 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), --- 329,535 ---- printf(".no\n"); } + #endif + + + //---------------------------------------------------------- + + int check_mode( int x, int y, + int new_x, int new_y, int new_vbi, + int *old_x, int *old_y, int *old_vbi){ + + if ( + (new_x >= x) && + (new_y >= y) && + ( + // prefer a better resolution either in X or in Y + // as long as the other dimension is at least the same + // + // hmm ... MAYBE it would be more clever to focus on the + // x-resolution; I had 712x400 and 640x480 and the movie + // was 640x360; 640x480 would be the 'right thing' here + // but since 712x400 was queried first I got this one. + // I think there should be a cmd-line switch to let the + // user choose the mode he likes ... (acki2) + + ( + ((new_x < *old_x) && + !(new_y > *old_y)) || + ((new_y < *old_y) && + !(new_x > *old_x)) + ) + // but if we get an identical resolution choose + // the one with the lower refreshrate (saves bandwidth !!!) + // as long as it's above 50 Hz (acki2 on 30/3/2001) + || + ( + (new_x == *old_x) && + (new_y == *old_y) && + ( + ( + new_vbi >= *old_vbi && *old_vbi < 50 + ) + || + ( + *old_vbi >= 50 && + new_vbi < *old_vbi && + new_vbi >= 50 + ) + ) + ) + ) + ) + { + *old_x = new_x; + *old_y = new_y; + *old_vbi = new_vbi; + return 1; + }else{ + return 0; } + } + + + + //--------------------------------------------------------- + + static uint32_t init( uint32_t width, uint32_t height, + uint32_t d_width,uint32_t d_height, + uint32_t fullscreen,char *title,uint32_t format ) + { + + int x_off, y_off; + + #ifdef HAVE_DGA2 + // needed to change DGA video mode + int modecount,mX, mY, mVBI, i,j; + int dga_modenum; + XDGAMode *modelines=NULL; + XDGADevice *dgadevice; + #else + int bank, ram; + #endif + + if( vo_dga_is_running )return -1; + + + if( !vo_init() ){ + printf("vo_dga: vo_init() failed!\n"); + return 0; + } + + if (format == IMGFMT_YV12 ){ + vo_dga_planes = vo_depthonscreen; + vo_dga_planes = vo_dga_planes == 15 ? 16 : vo_dga_planes; + }else{ + vo_dga_planes = (format & 0xff); + + // hack!!! here we should only get what we told in query_format() + // but mplayer is somewhat generous about 15/16bit depth ... + + vo_dga_planes = vo_dga_planes == 15 ? 16 : vo_dga_planes; + } + + if((vo_dga_dpy = XOpenDisplay(0))==NULL) + { + printf ("vo_dga: Can't open display\n"); + return 1; + } + + vo_dga_bpp = (vo_dga_planes+7) >> 3; + + // choose a suitable mode ... + + #ifdef HAVE_DGA2 + // Code to change the video mode added by Michael Graffam + // mgraffam(a)idsi.net + if (modelines==NULL) + modelines=XDGAQueryModes(vo_dga_dpy, XDefaultScreen(vo_dga_dpy),&modecount); + + mX=modelines[0].imageWidth; + mY=modelines[0].imageHeight; + mVBI = modelines[0].verticalRefresh; + + + printf("vo_dga: Using DGA 2.0 mode changing support\n"); + j=0; + // offbyone-error !!! i<=modecount is WRONG !!! + for (i=1; i<modecount; i++) + { + if( modelines[i].bitsPerPixel == vo_dga_planes) + { + printf("vo_dga: (%3d) Trying %4d x %4d @ %3d Hz @ %2d bpp ..", + i, + modelines[i].viewportWidth, + modelines[i].viewportHeight, + (unsigned int) modelines[i].verticalRefresh, + modelines[i].bitsPerPixel ); + + if ( check_mode(d_width, d_height, + modelines[i].viewportWidth, + modelines[i].viewportHeight, + (unsigned) modelines[i].verticalRefresh, + &mX, &mY, &mVBI )) + { + j = i; + printf(".ok!!\n"); + }else{ + printf(".no\n"); + } + } } printf("vo_dga: Selected video mode %4d x %4d @ %3d Hz for image size %3d x %3d.\n", mX, mY, mVBI, width, height); + + vo_dga_vp_width =mX; + vo_dga_vp_height = mY; + vo_dga_width = modelines[j].bytesPerScanline / vo_dga_bpp; + dga_modenum = modelines[j].num; + + XFree(modelines); + modelines = NULL; + + #else ! printf("vo_dga: DGA 1.0 compatibility code: mode switching not supported (yet)!\n"); ! ! // assume these values are already known at this stage some day ! // so that the following check for video <-> screen size can be done ... ! ! vo_dga_vp_width = 1280; ! vo_dga_vp_height = 1024; ! ! #endif ! ! ! vo_dga_src_format = format; ! vo_dga_src_width = width; ! vo_dga_src_height = height; ! ! if(vo_dga_src_width > vo_dga_vp_width || ! vo_dga_src_height > vo_dga_vp_height) ! { ! printf("vo_dga: Sorry, video larger than viewport is not yet supported!\n"); ! // ugly, do something nicer in the future ... ! return 1; ! } ! ! // now lets start the DGA thing ! ! #ifdef HAVE_DGA2 ! ! if (!XDGAOpenFramebuffer(vo_dga_dpy, XDefaultScreen(vo_dga_dpy))){ ! printf("vo_dga: Framebuffer mapping failed!!!\n"); ! XCloseDisplay(vo_dga_dpy); ! return 1; ! } ! dgadevice=XDGASetMode(vo_dga_dpy, XDefaultScreen(vo_dga_dpy), dga_modenum); XDGASync(vo_dga_dpy, XDefaultScreen(vo_dga_dpy)); ! vo_dga_base = dgadevice->data; XFree(dgadevice); ! ! XDGASetViewport (vo_dga_dpy, XDefaultScreen(vo_dga_dpy), 0, 0, XDGAFlipRetrace); ! #else XF86DGAGetViewPortSize(vo_dga_dpy,XDefaultScreen(vo_dga_dpy), *************** *** 316,351 **** (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 ) - yuv2rgb_init( vo_depthonscreen, MODE_RGB ); ! vo_dga_src_format = format; ! vo_dga_src_width = width; ! vo_dga_src_height = height; ! vo_dga_bpp = (vo_depthonscreen+7) >> 3; printf("vo_dga: bytes/line: %d, screen res: %dx%d, depth: %d, base: %08x, bpp: %d\n", vo_dga_width, vo_dga_vp_width, ! vo_dga_vp_height, vo_depthonscreen, vo_dga_base, vo_dga_bpp); - printf("vo_dga: video res: %dx%d\n", vo_dga_src_width, vo_dga_src_height); - if(vo_dga_src_width > vo_dga_vp_width || - vo_dga_src_height > vo_dga_vp_height){ - printf("vo_dga: Sorry, video larger than viewport is not yet supported!\n"); - // ugly, do something nicer in the future ... - return 1; - } - x_off = (vo_dga_vp_width - vo_dga_src_width)>>1; y_off = (vo_dga_vp_height - vo_dga_src_height)>>1; - - vo_dga_bytes_per_line = vo_dga_src_width * vo_dga_bpp; // todo - vo_dga_lines = vo_dga_src_height; // todo vo_dga_src_offset = 0; --- 540,566 ---- (char **)&vo_dga_base, &vo_dga_width, &bank, &ram); ! XF86DGADirectVideo (vo_dga_dpy, XDefaultScreen(vo_dga_dpy), ! XF86DGADirectGraphics | XF86DGADirectMouse | ! XF86DGADirectKeyb); ! XF86DGASetViewPort (vo_dga_dpy, XDefaultScreen(vo_dga_dpy), 0, 0); + #endif // do some more checkings here ... ! if( format==IMGFMT_YV12 ) ! yuv2rgb_init( vo_dga_planes == 16 ? 15 : vo_dga_planes , MODE_RGB ); printf("vo_dga: bytes/line: %d, screen res: %dx%d, depth: %d, base: %08x, bpp: %d\n", vo_dga_width, vo_dga_vp_width, ! vo_dga_vp_height, vo_dga_planes, vo_dga_base, vo_dga_bpp); x_off = (vo_dga_vp_width - vo_dga_src_width)>>1; y_off = (vo_dga_vp_height - vo_dga_src_height)>>1; + vo_dga_bytes_per_line = vo_dga_src_width * vo_dga_bpp; + vo_dga_lines = vo_dga_src_height; vo_dga_src_offset = 0; *************** *** 357,364 **** vo_dga_vp_offset, vo_dga_vp_skip, vo_dga_bytes_per_line); - - XF86DGADirectVideo (vo_dga_dpy, XDefaultScreen(vo_dga_dpy), - XF86DGADirectGraphics | XF86DGADirectMouse | - XF86DGADirectKeyb); XGrabKeyboard (vo_dga_dpy, DefaultRootWindow(vo_dga_dpy), True, --- 572,575 ---- _______________________________________________ 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.4,1.5
by Andreas Ackermann 30 Mar '01

30 Mar '01

Update of /cvsroot/mplayer/main/libvo In directory usw-pr-cvs1:/tmp/cvs-serv1141 Modified Files: vo_dga.c Log Message: Source cleanup. Improved resolution selection (I think :-)). Index: vo_dga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** vo_dga.c 2001/03/28 19:58:45 1.4 --- vo_dga.c 2001/03/30 17:16:56 1.5 *************** *** 9,12 **** --- 9,14 ---- * <acki(a)acki-netz.de> * + * Sourceforge username: acki2 + * * note well: * *************** *** 24,28 **** ! #include "linux/keycodes.h" #include "config.h" #include "video_out.h" --- 26,30 ---- ! //#include "linux/keycodes.h" #include "config.h" #include "video_out.h" *************** *** 53,62 **** static int vo_dga_bpp; // bytes per pixel in framebuffer static int vo_dga_src_offset=0; // offset in src ! static int vo_dga_vp_offset=0; // offset in dest static int vo_dga_bytes_per_line; // longwords per line to copy static int vo_dga_src_skip; // bytes to skip after copying one line ! // (not supported yet) in src ! static int vo_dga_vp_skip; // dto. for dest ! static int vo_dga_lines; // num of lines to copy static int vo_dga_src_format; --- 55,64 ---- static int vo_dga_bpp; // bytes per pixel in framebuffer static int vo_dga_src_offset=0; // offset in src ! static int vo_dga_vp_offset=0; // offset in dest static int vo_dga_bytes_per_line; // longwords per line to copy static int vo_dga_src_skip; // bytes to skip after copying one line ! // (not supported yet) in src ! static int vo_dga_vp_skip; // dto. for dest ! static int vo_dga_lines; // num of lines to copy static int vo_dga_src_format; *************** *** 64,76 **** static Display *vo_dga_dpy; ! #include "mmx.h" - #if defined (HAVE_SSE) || defined (HAVE_3DNOW) - #define movntq "movntq" // use this for processors that have SSE or 3Dnow - #else - #define movntq "movq" // for MMX-only processors - #endif - #define rep_movsl(dest, src, numwords, d_add, count) \ --- 66,78 ---- static Display *vo_dga_dpy; + //--------------------------------------------------------- ! // I had tried to work with mmx/3dnow copy code but ! // there was not much speed gain and I didn't know ! // how to save the FPU/mmx registers - so the copy ! // code interferred with sound output ... ! // removed the leftovers ! // acki2 on 30/3/2001 #define rep_movsl(dest, src, numwords, d_add, count) \ *************** *** 87,153 **** " \ : \ ! : "a" (d_add), "b" (count), "S" (src), "D" (dest), "d" (numwords) \ : "memory" ) - #if 0 - : "S" (src), "D" (dest), "c" (numwords) \ - movq (%%eax), %%mm0 \n\t \ - add $64, %%edx \n\t \ - movq 8(%%eax), %%mm1 \n\t \ - add $64, %%eax \n\t \ - movq -48(%%eax), %%mm2 \n\t \ - movq %%mm0, -64(%%edx) \n\t \ - movq -40(%%eax), %%mm3 \n\t \ - movq %%mm1, -56(%%edx) \n\t \ - movq -32(%%eax), %%mm4 \n\t \ - movq %%mm2, -48(%%edx) \n\t \ - movq -24(%%eax), %%mm5 \n\t \ - movq %%mm3, -40(%%edx) \n\t \ - movq -16(%%eax), %%mm6 \n\t \ - movq %%mm4, -32(%%edx) \n\t \ - movq -8(%%eax), %%mm7 \n\t \ - movq %%mm5, -24(%%edx) \n\t \ - movq %%mm6, -16(%%edx) \n\t \ - dec %%ecx \n\t \ - movq %%mm7, -8(%%edx) \n\t \ - jnz xfer \n\t \ ! #endif - #define mmx_movsl(dest, src, numwords) \ - __asm__ __volatile__( \ - " \ - \n\t \ - xfer: \n\t \ - movq (%%eax), %%mm0 \n\t \ - add $64, %%edx \n\t \ - movq 8(%%eax), %%mm1 \n\t \ - add $64, %%eax \n\t \ - movq -48(%%eax), %%mm2 \n\t \ - movq %%mm0, -64(%%edx) \n\t \ - movq -40(%%eax), %%mm3 \n\t \ - movq %%mm1, -56(%%edx) \n\t \ - movq -32(%%eax), %%mm4 \n\t \ - movq %%mm2, -48(%%edx) \n\t \ - movq -24(%%eax), %%mm5 \n\t \ - movq %%mm3, -40(%%edx) \n\t \ - movq -16(%%eax), %%mm6 \n\t \ - movq %%mm4, -32(%%edx) \n\t \ - movq -8(%%eax), %%mm7 \n\t \ - movq %%mm5, -24(%%edx) \n\t \ - movq %%mm6, -16(%%edx) \n\t \ - dec %%ecx \n\t \ - movq %%mm7, -8(%%edx) \n\t \ - jnz xfer \n\t \ - \ - " \ - : \ - : "a" (src), "d" (dest), "c" (numwords) \ - : "memory" ) - - // src <= eax - // dst <= edx - // num <= ecx - static uint32_t draw_frame( uint8_t *src[] ){ --- 89,99 ---- " \ : \ ! : "a" (d_add), "b" (count), "S" (src), "D" (dest), \ ! "d" (numwords) \ : "memory" ) ! //--------------------------------------------------------- static uint32_t draw_frame( uint8_t *src[] ){ *************** *** 159,163 **** if( vo_dga_src_format==IMGFMT_YV12 ){ ! // We'll never reach this point, because YV12 codecs always calls draw_slice printf("vo_dga: draw_frame() doesn't support IMGFMT_YV12 (yet?)\n"); }else{ --- 105,110 ---- if( vo_dga_src_format==IMGFMT_YV12 ){ ! // We'll never reach this point, because YV12 codecs always ! // calls draw_slice printf("vo_dga: draw_frame() doesn't support IMGFMT_YV12 (yet?)\n"); }else{ *************** *** 170,189 **** } static void check_events(void) { ! int e=vo_x11_check_events(vo_dga_dpy); } ! static void flip_page( void ){ ! check_events(); ! // printf("vo_dga: In flippage\n"); } static uint32_t draw_slice( uint8_t *src[],int stride[], int w,int h,int x,int y ) { - // printf("vo_dga: draw_slice() not implemented (yet?)\n"); - yuv2rgb( vo_dga_base + vo_dga_vp_offset + (vo_dga_width * y +x) * vo_dga_bpp, --- 117,138 ---- } + //--------------------------------------------------------- + static void check_events(void) { ! int e=vo_x11_check_events(vo_dga_dpy); } ! //--------------------------------------------------------- + static void flip_page( void ){ + check_events(); } + //--------------------------------------------------------- + static uint32_t draw_slice( uint8_t *src[],int stride[], int w,int h,int x,int y ) { yuv2rgb( vo_dga_base + vo_dga_vp_offset + (vo_dga_width * y +x) * vo_dga_bpp, *************** *** 191,208 **** w,h, vo_dga_width * vo_dga_bpp, stride[0],stride[1] ); - return 0; - - return 0; }; ! static void Terminate_Display_Process( void ){ printf("vo_dga: Terminating display process\n"); } static const vo_info_t* get_info( void ) { return &vo_info; } static uint32_t query_format( uint32_t format ) { --- 140,160 ---- w,h, vo_dga_width * vo_dga_bpp, stride[0],stride[1] ); return 0; }; ! //--------------------------------------------------------- ! + static void Terminate_Display_Process( void ){ printf("vo_dga: Terminating display process\n"); } + //--------------------------------------------------------- + static const vo_info_t* get_info( void ) { return &vo_info; } + //--------------------------------------------------------- + static uint32_t query_format( uint32_t format ) { *************** *** 218,221 **** --- 170,174 ---- } + //--------------------------------------------------------- static void *************** *** 230,236 **** XCloseDisplay(vo_dga_dpy); } - - static uint32_t init( uint32_t width, uint32_t height, --- 183,188 ---- XCloseDisplay(vo_dga_dpy); } + //--------------------------------------------------------- static uint32_t init( uint32_t width, uint32_t height, *************** *** 244,250 **** #ifdef HAVE_DGA2 // needed to change DGA video mode ! int modecount,mX, mY, i,j; int X,Y; ! XDGAMode *modelines=NULL; XDGADevice *dgadevice; #endif --- 196,202 ---- #ifdef HAVE_DGA2 // needed to change DGA video mode ! int modecount,mX, mY, mVBI, i,j; int X,Y; ! XDGAMode *modelines=NULL; XDGADevice *dgadevice; #endif *************** *** 271,295 **** mX=modelines[0].imageWidth; mY=modelines[0].imageHeight; X=d_width; Y=d_height; j=0; ! for (i=1; i<=modecount; i++) { ! if ( (modelines[i].bitsPerPixel == vo_depthonscreen) && ! (modelines[i].maxViewportX) && ! (modelines[i].viewportWidth >= X) && ! (modelines[i].viewportHeight >= Y) && ! (modelines[i].viewportWidth < mX) && ! (modelines[i].viewportHeight < mY) ) ! { mX=modelines[i].viewportWidth; mY=modelines[i].viewportHeight; j=i; ! } ! } 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); XF86DGASetViewPort (vo_dga_dpy, XDefaultScreen(vo_dga_dpy), X,Y); --- 223,300 ---- mX=modelines[0].imageWidth; mY=modelines[0].imageHeight; + mVBI = modelines[0].verticalRefresh; X=d_width; Y=d_height; + printf("vo_dga: Using DGA 2.0 mode changing support\n"); j=0; ! // offbyone-error !!! i<=modecount is WRONG !!! ! for (i=1; i<modecount; i++) { ! if( modelines[i].bitsPerPixel == vo_depthonscreen && ! modelines[i].maxViewportX) ! { ! printf("vo_dga: (%3d) Trying %4d x %4d @ %3d Hz @ %2d bpp ..", ! i, ! modelines[i].viewportWidth, ! modelines[i].viewportHeight, ! (unsigned int) modelines[i].verticalRefresh, ! modelines[i].bitsPerPixel ); ! ! if ( ! (modelines[i].viewportWidth >= X) && ! (modelines[i].viewportHeight >= Y) && ! ( ! // prefer a better resolution either in X or in Y ! // as long as the other dimension is at least the same ! // ! // hmm ... MAYBE it would be more clever to focus on the ! // x-resolution; I had 712x400 and 640x480 and the movie ! // was 640x360; 640x480 would be the 'right thing' here ! // but since 712x400 was queried first I got this one. ! // I think there should be a cmd-line switch to let the ! // user choose the mode he likes ... (acki2) ! ! ( ! ((modelines[i].viewportWidth < mX) && ! !(modelines[i].viewportHeight > mY)) || ! ((modelines[i].viewportHeight < mY) && ! !(modelines[i].viewportWidth > mX)) ! ) ! // but if we get an identical resolution choose ! // the one with the lower refreshrate (saves bandwidth !!!) ! // as long as it's above 50 Hz (acki2 on 30/3/2001) ! || ! ( ! (modelines[i].viewportWidth == mX) && ! (modelines[i].viewportHeight == mY) && ! ( ! ( ! modelines[i].verticalRefresh >= mVBI && mVBI < 50 ! ) ! || ! ( ! mVBI >= 50 && ! modelines[i].verticalRefresh < mVBI && ! modelines[i].verticalRefresh >= 50 ! ) ! ) ! ) ! ) ! ) ! { mX=modelines[i].viewportWidth; mY=modelines[i].viewportHeight; + mVBI = modelines[i].verticalRefresh; j=i; ! printf(".ok!!\n"); ! }else{ ! printf(".no\n"); ! } ! } ! } X=(modelines[j].imageWidth-mX)/2; Y=(modelines[j].imageHeight-mY)/2; ! printf("vo_dga: Selected video mode %4d x %4d @ %3d Hz for image size %3d x %3d.\n", ! mX, mY, mVBI, width, height); XF86DGASetViewPort (vo_dga_dpy, XDefaultScreen(vo_dga_dpy), X,Y); *************** *** 301,316 **** // 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 --- 306,321 ---- // 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 *************** *** 370,431 **** return 0; } - - #if 0 - int vo_dga_query_event(void){ - - XEvent myevent; - char text[10]; - KeySym mykey; - int retval = 0; - int i; - - if( vo_dga_is_running ){ - if(XPending(vo_dga_dpy)>0) - { - XNextEvent(vo_dga_dpy, &myevent); - switch (myevent.type) - { - case ButtonPress: - /* Reaktion auf Knopfdruck ---> Textausgabe an der - Mauscursorposition */ - - retval = 'q'; - break; - case KeyPress: - /* Reaktion auf Tastendruck --> Testen ob Taste == "q", - falls ja: Programmende */ - i=XLookupString(&myevent, text, 10, &mykey, 0); - - if (mykey&0xff00 != 0) mykey=mykey&0x00ff + 256; - - switch ( mykey ) - { - case wsLeft: retval=KEY_LEFT; break; - case wsRight: retval=KEY_RIGHT; break; - case wsUp: retval=KEY_UP; break; - case wsDown: retval=KEY_DOWN; break; - case wsSpace: retval=' '; break; - case wsEscape: retval=KEY_ESC; break; - case wsEnter: retval=KEY_ENTER; break; - case wsq: - case wsQ: retval='q'; break; - case wsp: - case wsP: retval='p'; break; - case wsMinus: - case wsGrayMinus: retval='-'; break; - case wsPlus: - case wsGrayPlus: retval='+'; break; - } - break; - } - } - } - return retval; - } - #endif - - - - --- 375,382 ---- return 0; } + //--------------------------------------------------------- + // deleted the old vo_dga_query_event() routine 'cause it is obsolete + // since using check_events() + // acki2 on 30/3/2001 _______________________________________________ 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.33,1.34
by Szabolcs Berecz 30 Mar '01

30 Mar '01

Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv24075 Modified Files: mplayer.c Log Message: fbdev dependency fix Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -r1.33 -r1.34 *** mplayer.c 2001/03/30 03:07:45 1.33 --- mplayer.c 2001/03/30 10:16:54 1.34 *************** *** 75,79 **** --- 75,81 ---- #endif + #ifdef HAVE_FBDEV extern char *fb_dev_name; + #endif extern int vo_screenwidth; _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main subreader.c,NONE,1.1 subreader.h,NONE,1.1 mplayer.c,1.32,1.33 cfg-mplayer.h,1.10,1.11
by GEREOFFY 30 Mar '01

30 Mar '01

Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv4835 Modified Files: mplayer.c cfg-mplayer.h Added Files: subreader.c subreader.h Log Message: subtitles (.sub files) support --- NEW FILE --- /* * Subtitle reader with format autodetection * Mier nem muxik realloccal!?!?! - nekem muxik :) * * Written by laaz * Some code cleanup & realloc() by A'rpi/ESP-team */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include "subreader.h" #define ERR (void *)-1 int sub_uses_time=0; int sub_errs=0; int sub_num=0; // number of subtitle structs int sub_format=-1; // 0 for microdvd, 1 for SubRip, 2 for the third format char *sub_readtext(char *source, char **dest) { int len=0; char *p; for (p=source;*p!='\r' && *p!='\n' && *p!='|'; p++,len++); *dest= (char *)malloc (len+1); if (!dest) {return ERR;} strncpy(*dest, source, len); (*dest)[len]=0; while (*p=='\r' || *p=='\n' || *p=='|') p++; if (*p) return p; // not-last text field else return NULL; // last text field } subtitle *sub_read_line_microdvd(FILE *fd,subtitle *current) { char line[1001]; char line2[1001]; char *p, *next; int i; bzero (current, sizeof(current)); do { if (!fgets (line, 1000, fd)) return NULL; } while (*line=='\n' || *line == '\r' || !*line); if (sscanf (line, "{%i}{%i}%s", &(current->start), &(current->end),line2) <2) {return ERR;} p=line; while (*p++!='}'); while (*p++!='}'); next=p, i=0; while ((next =sub_readtext (next, &(current->text[i])))) { if (current->text[i]==ERR || current->text[i]==ERR) {return ERR;} i++; if (i>SUB_MAX_TEXT) { printf ("Too many lines in a subtitle\n");return ERR;} } current->lines=i+1; return current; } subtitle *sub_read_line_subrip(FILE *fd, subtitle *current) { char line[1001]; int a1,a2,a3,a4,b1,b2,b3,b4; char *p=NULL, *q=NULL; int len; bzero (current, sizeof(current)); while (!current->text[0]) { if (!fgets (line, 1000, fd)) return NULL; if (sscanf (line, "%i:%i:%i.%i,%i:%i:%i.%i",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4) < 8) continue; current->start = a1*360000+a2*6000+a3*100+a4; current->end = b1*360000+b2*6000+b3*100+b4; if (!fgets (line, 1000, fd)) return NULL; p=q=line; for (current->lines=1; current->lines < SUB_MAX_TEXT; current->lines++) { for (q=p,len=0; *p && *p!='\r' && *p!='\n' && strncmp(p,"[br]",4); p++,len++); current->text[current->lines-1]=(char *)malloc (len+1); if (!current->text[current->lines-1]) return ERR; strncpy (current->text[current->lines-1], q, len); if (!*p || *p=='\r' || *p=='\n') break; while (*p++!=']'); } } return current; } subtitle *sub_read_line_third(FILE *fd,subtitle *current) { char line[1001]; int a1,a2,a3,a4,b1,b2,b3,b4; char *p=NULL; int i,len; bzero (current, sizeof(current)); while (!current->text[0]) { if (!fgets (line, 1000, fd)) return NULL; if ((len=sscanf (line, "%i:%i:%i,%i --> %i:%i:%i,%i",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) continue; current->start = a1*360000+a2*6000+a3*100+a4/10; current->end = b1*360000+b2*6000+b3*100+b4/10; for (i=0; i<SUB_MAX_TEXT;) { if (!fgets (line, 1000, fd)) return NULL; len=0; for (p=line; *p!='\n' && *p!='\r' && *p; p++,len++); if (len) { current->text[i]=(char *)malloc (len+1); if (!current->text[i]) return ERR; strncpy (current->text[i], line, len); i++; } else { break; } } current->lines=i; } return current; } int sub_autodetect (FILE *fd) { char line[1001]; int i,j=0; // char *p; while (1) { j++; if (!fgets (line, 1000, fd)) return -1; // if (sscanf (line, "{%i}{%i}", &i, &i, p)==2) // ha valaki tudja miert 2, mondja mar el nekem ;) if (sscanf (line, "{%i}{%i}", &i, &i)==2) // ha valaki tudja miert 2, mondja mar el nekem ;) {sub_uses_time=0;return 0;} if (sscanf (line, "%i:%i:%i.%i,%i:%i:%i.%i", &i, &i, &i, &i, &i, &i, &i, &i)==8) {sub_uses_time=1;return 1;} if (sscanf (line, "%i:%i:%i,%i --> %i:%i:%i,%i", &i, &i, &i, &i, &i, &i, &i, &i)==8) {sub_uses_time=1;return 2;} if (j>100) return -1; // too many bad lines or bad coder } } subtitle* sub_read_file (char *filename) { FILE *fd; int n_max; subtitle *first; subtitle * (*func[3])(FILE *fd,subtitle *dest)= { sub_read_line_microdvd, sub_read_line_subrip, sub_read_line_third }; fd=fopen (filename, "r"); if (!fd) return NULL; sub_format=sub_autodetect (fd); if (sub_format==-1) {printf ("SUB: Could not determine file format\n");return NULL;} printf ("SUB: Detected subtitle file format: %i\n",sub_format); rewind (fd); sub_num=0;n_max=32; first=(subtitle *)malloc(n_max*sizeof(subtitle)); if(!first) return NULL; while(1){ subtitle *sub; if(sub_num>=n_max){ n_max+=16; first=realloc(first,n_max*sizeof(subtitle)); } sub=func[sub_format](fd,&first[sub_num]); if(!sub) break; // EOF if(sub==ERR) ++sub_errs; else ++sub_num; // Error vs. Valid } fclose(fd); // printf ("SUB: Subtitle format %s time.\n", sub_uses_time?"uses":"doesn't use"); printf ("SUB: Read %i subtitles, %i errors.\n", sub_num, sub_errs); return first; } #if 0 int main(int argc, char **argv) { // for testing int i,j; subtitle *subs; subtitle *egysub; if(argc<2){ printf("\nUsage: subreader filename.sub\n\n"); exit(1); } subs=sub_get_subtitles(argv[1]); if(!subs){ printf("Couldn't load file... let's write a bugreport :)\n"); exit(1); } for(j=0;j<sub_num;j++){ egysub=&subs[j]; printf ("%i line%c (%i-%i) ", egysub->lines, (1==egysub->lines)?' ':'s', egysub->start, egysub->end); for (i=0; i<egysub->lines; i++) { printf ("%s%s",egysub->text[i], i==egysub->lines-1?"":" <BREAK> "); } printf ("\n"); } printf ("Subtitle format %s time.\n", sub_uses_time?"uses":"doesn't use"); printf ("Read %i subtitles, %i errors.\n", sub_num, sub_errs); return 0; } #endif --- NEW FILE --- extern int sub_uses_time; extern int sub_errs; extern int sub_num; // number of subtitle structs extern int sub_format; // 0 for microdvd, 1 for SubRip, 2 for the third format #define SUB_MAX_TEXT 5 typedef struct { int lines; unsigned long start; unsigned long end; char *text[SUB_MAX_TEXT]; } subtitle; subtitle* sub_read_file (char *filename); Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -r1.32 -r1.33 *** mplayer.c 2001/03/28 22:45:57 1.32 --- mplayer.c 2001/03/30 03:07:45 1.33 *************** *** 38,41 **** --- 38,43 ---- #include "cfg-mplayer-def.h" + #include "subreader.h" + #include "libvo/video_out.h" #include "libvo/sub.h" *************** *** 95,98 **** --- 97,134 ---- static int verbose=0; + //**************************************************************************// + // .SUB + //**************************************************************************// + + static current_sub=0; + + static subtitle* subtitles=NULL; + + void find_sub(unsigned long key){ + int i,j; + if(current_sub<0 || current_sub>=sub_num) current_sub=0; + vo_sub=&subtitles[current_sub]; + if(key>=vo_sub->start && key<=vo_sub->end) return; // OK! + // use logarithmic search: + i=0;j=sub_num-1; + // printf("Searching %d in %d..%d\n",key,subtitles[i].start,subtitles[j].end); + while(j>=i){ + current_sub=(i+j+1)/2; + if(key<subtitles[current_sub].start) + j=current_sub-1; + else + if(key>subtitles[current_sub].end) + i=current_sub+1; + else break; // found! + } + vo_sub=&subtitles[current_sub]; + if(key>=vo_sub->start && key<=vo_sub->end) return; // OK! + vo_sub=NULL; // no sub here + } + + //**************************************************************************// + // Config file + //**************************************************************************// + static int cfg_inc_verbose(struct config *conf){ ++verbose; *************** *** 419,422 **** --- 455,461 ---- char *font_name=NULL; float font_factor=0.75; + char *sub_name=NULL; + float sub_delay=0; + float sub_fps=0; #include "cfg-mplayer.h" *************** *** 473,476 **** --- 512,525 ---- } + // check .sub + if(sub_name){ + subtitles=sub_read_file(sub_name); + if(!subtitles) printf("Can't load subtitles: %s\n",font_name); + } else { + // try default: + subtitles=sub_read_file(get_path("default.sub")); + } + + // check video_out driver name: if(!video_driver) *************** *** 2311,2314 **** --- 2360,2369 ---- // for(i=1;i<=11;i++) osd_text_buffer[10+i]=i;osd_text_buffer[10+i]=0; vo_osd_text=osd_text_buffer; + + // find sub + if(subtitles){ + if(sub_fps==0) sub_fps=default_fps; + find_sub(sub_uses_time?(100*(v_pts+sub_delay)):((v_pts+sub_delay)*sub_fps)); // FIXME! frame counter... + } } Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** cfg-mplayer.h 2001/03/28 12:08:44 1.10 --- cfg-mplayer.h 2001/03/30 03:07:45 1.11 *************** *** 14,17 **** --- 14,20 ---- #endif {"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0}, + {"sub", &sub_name, CONF_TYPE_STRING, 0, 0, 0}, + {"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0}, + {"subfps", &sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0}, {"font", &font_name, CONF_TYPE_STRING, 0, 0, 0}, {"ffactor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0}, _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main Makefile.No-DS,NONE,1.1 Makefile,1.9,1.10
by GEREOFFY 30 Mar '01

30 Mar '01

Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv4771 Modified Files: Makefile Added Files: Makefile.No-DS Log Message: DShow is the default now --- NEW FILE --- # LINUX Makefile made by A'rpi / Astral # Some cleanup by LGB: * 'make -C dir' instead of 'cd dir;make;cd..' # * for loops instead of linear sequence of make directories # * some minor problems with make clean and distclean were corrected include config.mak #install... OWNER = root GROUP = root PERM = 755 PRG = mplayer PRG_HQ = mplayerHQ PRG_AVIP = aviparse PRG_TV = tvision prefix = /usr/local BINDIR = ${prefix}/bin # BINDIR = /usr/local/bin SRCS = linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c lirc_mp.c cfgparser.c OBJS = linux/getch2.o linux/timer-lx.o linux/shmem.o xa/xa_gsm.o lirc_mp.o cfgparser.o CFLAGS = $(OPTFLAGS) -Iloader -Ilibvo # -Wall A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 VO_LIBS = -Llibvo -lvo $(X_LIBS) .SUFFIXES: .c .o # .PHONY: all clean all: $(PRG) # $(PRG_AVIP) .c.o: $(CC) -c $(CFLAGS) -o $@ $< COMMONLIBS = libvo/libvo.a libac3/libac3.a mp3lib/libMP3.a loader/libloader.a: $(MAKE) -C loader libmpeg2/libmpeg2.a: $(MAKE) -C libmpeg2 libvo/libvo.a: $(MAKE) -C libvo libac3/libac3.a: $(MAKE) -C libac3 mp3lib/libMP3.a: $(MAKE) -C mp3lib opendivx/libdecore.a: $(MAKE) -C opendivx encore/libencore.a: $(MAKE) -C encore $(PRG): .depend mplayer.o $(OBJS) loader/libloader.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a $(CC) $(CFLAGS) -o $(PRG) mplayer.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Lencore -lencore -lpthread $(PRG_HQ): .depend 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): .depend 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): .depend tvision.o $(OBJS) $(COMMONLIBS) $(CC) $(CFLAGS) -o $(PRG_TV) tvision.o $(OBJS) -lm $(TERMCAP_LIB) $(VO_LIBS) install: $(PRG) install -g $(GROUP) -o $(OWNER) -m $(PERM) -s $(PRG) $(BINDIR) install -D -m 644 DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1 clean: rm -f *.o *~ $(OBJS) distclean: @for a in mp3lib libac3 libmpeg2 opendivx encore libvo loader drivers drivers/syncfb ; do $(MAKE) -C $$a distclean ; done rm -f *~ $(PRG) $(PRG_HQ) $(PRG_AVIP) $(PRG_TV) $(OBJS) *.o *.a .depend dep: depend depend: .depend @for a in mp3lib libac3 libmpeg2 libvo opendivx encore ; do $(MAKE) -C $$a dep ; done .depend: Makefile config.mak config.h makedepend -f- -- $(CFLAGS) -- mplayer.c mplayerHQ.c aviparse.c tvision.c $(SRCS) 1>.depend 2>/dev/null # # include dependency files if they exist # ifneq ($(wildcard .depend),) include .depend endif Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** Makefile 2001/03/20 22:13:05 1.9 --- Makefile 2001/03/30 03:06:46 1.10 *************** *** 1,2 **** --- 1,5 ---- + # DirectShow support (test code) + # make -f makefile.DS + # LINUX Makefile made by A'rpi / Astral # Some cleanup by LGB: * 'make -C dir' instead of 'cd dir;make;cd..' *************** *** 18,23 **** BINDIR = ${prefix}/bin # BINDIR = /usr/local/bin ! SRCS = linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c lirc_mp.c cfgparser.c ! OBJS = linux/getch2.o linux/timer-lx.o linux/shmem.o xa/xa_gsm.o lirc_mp.o cfgparser.o CFLAGS = $(OPTFLAGS) -Iloader -Ilibvo # -Wall A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 --- 21,26 ---- BINDIR = ${prefix}/bin # BINDIR = /usr/local/bin ! SRCS = subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c lirc_mp.c cfgparser.c ! OBJS = subreader.o linux/getch2.o linux/timer-lx.o linux/shmem.o xa/xa_gsm.o lirc_mp.o cfgparser.o CFLAGS = $(OPTFLAGS) -Iloader -Ilibvo # -Wall A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 *************** *** 32,36 **** .c.o: ! $(CC) -c $(CFLAGS) -o $@ $< COMMONLIBS = libvo/libvo.a libac3/libac3.a mp3lib/libMP3.a --- 35,39 ---- .c.o: ! $(CC) -c $(CFLAGS) -DUSE_DIRECTSHOW -o $@ $< COMMONLIBS = libvo/libvo.a libac3/libac3.a mp3lib/libMP3.a *************** *** 39,42 **** --- 42,48 ---- $(MAKE) -C loader + loader/DirectShow/libDS_Filter.a: + $(MAKE) -C loader/DirectShow + libmpeg2/libmpeg2.a: $(MAKE) -C libmpeg2 *************** *** 57,62 **** $(MAKE) -C encore ! $(PRG): .depend mplayer.o $(OBJS) loader/libloader.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a ! $(CC) $(CFLAGS) -o $(PRG) mplayer.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Lencore -lencore -lpthread $(PRG_HQ): .depend mplayerHQ.o $(OBJS) loader/libloader.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a --- 63,68 ---- $(MAKE) -C encore ! $(PRG): .depend mplayer.o $(OBJS) loader/libloader.a loader/DirectShow/libDS_Filter.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a ! $(CC) $(CFLAGS) -o $(PRG) mplayer.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -Lloader/DirectShow -lDS_Filter -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Lencore -lencore -lpthread -lstdc++ $(PRG_HQ): .depend mplayerHQ.o $(OBJS) loader/libloader.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a *************** *** 77,81 **** distclean: ! @for a in mp3lib libac3 libmpeg2 opendivx encore libvo loader drivers drivers/syncfb ; do $(MAKE) -C $$a distclean ; done rm -f *~ $(PRG) $(PRG_HQ) $(PRG_AVIP) $(PRG_TV) $(OBJS) *.o *.a .depend --- 83,87 ---- distclean: ! @for a in mp3lib libac3 libmpeg2 opendivx encore libvo loader loader/DirectShow drivers drivers/syncfb ; do $(MAKE) -C $$a distclean ; done rm -f *~ $(PRG) $(PRG_HQ) $(PRG_AVIP) $(PRG_TV) $(OBJS) *.o *.a .depend *************** *** 83,87 **** depend: .depend ! @for a in mp3lib libac3 libmpeg2 libvo opendivx encore ; do $(MAKE) -C $$a dep ; done .depend: Makefile config.mak config.h --- 89,93 ---- depend: .depend ! @for a in mp3lib libac3 libmpeg2 libvo opendivx encore loader/DirectShow ; do $(MAKE) -C $$a dep ; done .depend: Makefile config.mak config.h _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main Makefile.DS,1.1,NONE
by GEREOFFY 30 Mar '01

30 Mar '01

Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv4712 Removed Files: Makefile.DS Log Message: made default --- Makefile.DS DELETED --- _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main codecs.c,1.7,1.8
by GEREOFFY 30 Mar '01

30 Mar '01

Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv4515 Modified Files: codecs.c Log Message: some new codecs added - not work yet Index: codecs.c =================================================================== RCS file: /cvsroot/mplayer/main/codecs.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** codecs.c 2001/03/22 18:06:48 1.7 --- codecs.c 2001/03/30 03:04:03 1.8 *************** *** 18,21 **** --- 18,23 ---- static GUID dvsd_clsid={0xB1B77C00, 0xC3E4, 0x11CF, {0xAF, 0x79, 0x00, 0xAA, 0x00, 0xB6, 0x7A, 0x42}}; + static GUID CLSID_TM20DecompressorCF={0x4cb63e61, 0xc611, 0x11D0, + { 0x83, 0xaa, 0x00, 0x00, 0x92, 0x90, 0x01, 0x84}}; *************** *** 163,166 **** --- 165,190 ---- return "wmvds32.ax"; + case mmioFOURCC('H', 'F', 'Y', 'U'): + printf("HuffYUV\n"); + avi_header.yuv_supported=1; + return "huffyuv.dll"; + + case mmioFOURCC('Z', 'L', 'I', 'B'): + printf("ZLIB\n"); + avi_header.yuv_supported=1; + return "avizlib.dll"; + + case mmioFOURCC('M', 'S', 'Z', 'H'): + printf("MSZH\n"); + avi_header.yuv_supported=1; + return "avimszh.dll"; + + #ifdef USE_DIRECTSHOW + case mmioFOURCC('T', 'M', '2', '0'): + printf("Video in TrueMotion 2.0 format\n"); + avi_header.yuv_supported=1; + avi_header.vids_guid=&CLSID_TM20DecompressorCF; + return "tm20dec.ax"; + #endif } *************** *** 190,197 **** case 0x31://MS GSM case 0x32://MS GSM ! return "msgsm32.acm"; // segfault :( - not req. has internal now! case 0x75://VoxWare avi_header.auds_guid=&CLSID_Voxware; ! return "voxmsdec.ax"; // case 0x06://??? // return "lhacm.acm"; --- 214,221 ---- case 0x31://MS GSM case 0x32://MS GSM ! return "msgsm32.acm"; // OK after FS patch case 0x75://VoxWare avi_header.auds_guid=&CLSID_Voxware; ! return "voxmsdec.ax"; // OK after FS patch // case 0x06://??? // return "lhacm.acm"; _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0