From 5f03a4ae3f85ce2f074f7d1e5ecf3df277f2aab1 Mon Sep 17 00:00:00 2001 From: acki2 Date: Fri, 13 Apr 2001 18:49:59 +0000 Subject: - completely rewrote depth switching - support for -bpp (needs at least mplayer.c 1.53 and cfg-mplayer.h 1.18 and latest stuff from libvo to work) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@393 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_dga.c | 460 +++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 296 insertions(+), 164 deletions(-) (limited to 'libvo') diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c index 9f60c51e1a..fa2af226aa 100644 --- a/libvo/vo_dga.c +++ b/libvo/vo_dga.c @@ -14,11 +14,21 @@ * * note well: * - * o this is alpha - * o covers only common video card formats - * o works only on intel architectures + * - covers only common video card formats i.e. + * BGR_16_15_555 + * BGR_16_16_565 + * BGR_24_24_888 + * BGR_32_24_888 + * + * - works only on x86 architectures * * $Log$ + * Revision 1.11 2001/04/13 18:49:59 acki2 + * - completely rewrote depth switching + * - support for -bpp + * (needs at least mplayer.c 1.53 and cfg-mplayer.h 1.18 and latest stuff from + * libvo to work) + * * Revision 1.10 2001/04/01 22:01:28 acki2 * - still more debug output to be able to fix 15/16 bpp problem * @@ -52,7 +62,9 @@ * */ -//#define VO_DGA_FORCE_DEPTH 32 +//#define VO_DGA_DBG 1 +//#undef HAVE_DGA2 +//#undef HAVE_XF86VM #include #include @@ -63,11 +75,6 @@ #include "video_out_internal.h" #include "yuv2rgb.h" - -//#undef HAVE_DGA2 -//#undef HAVE_XF86VM - - LIBVO_EXTERN( dga ) #include @@ -82,19 +89,108 @@ LIBVO_EXTERN( dga ) static vo_info_t vo_info = { - "DGA ( Direct Graphic Access )", + "DGA ( Direct Graphic Access, V1.0+XF86VidModeExtension and V2.0)", "dga", "Andreas Ackermann ", "" }; + +//------------------------------------------------------------------ + + +#define BITSPP (vo_dga_modes[vo_dga_active_mode].vdm_bitspp) +#define BYTESPP (vo_dga_modes[vo_dga_active_mode].vdm_bytespp) + +struct vd_modes { + int vdm_mplayer_depth; + int vdm_supported; + int vdm_depth; + int vdm_bitspp; + int vdm_bytespp; + int vdm_rmask; + int vdm_gmask; + int vdm_bmask; +}; + +//------------------------------------------------------------------ + +static struct vd_modes vo_dga_modes[] = { + + { 0, 0, 0, 0, 0, 0, 0, 0}, + { 15, 0, 15, 16, 2, 0x7c00, 0x03e0, 0x001f }, + { 16, 0, 16, 16, 2, 0xf800, 0x07e0, 0x001f }, + { 24, 0, 24, 24, 3, 0xff0000, 0x00ff00, 0x0000ff}, + { 32, 0, 24, 32, 4, 0x00ff0000, 0x0000ff00, 0x000000ff} +}; + +static int vo_dga_mode_num = sizeof(vo_dga_modes)/sizeof(struct vd_modes); + +int vd_EnableMode( int depth, int bitspp, + int rmask, int gmask, int bmask){ + int i; + for(i=1; ired_mask, + DefaultVisual(qdisp, DefaultScreen(qdisp))->green_mask, + DefaultVisual(qdisp, DefaultScreen(qdisp))->blue_mask); + if(vo_dga_XServer_mode ==0){ +#ifndef HAVE_DGA2 + vd_printf(VD_ERR, "vo_dga: Your X-Server is not running in a "); + vd_printf(VD_ERR, "resolution supported by DGA driver!\n"); +#endif + }else{ + vd_printf(VD_INFO, "vo_dga: X running at: %s\n", + vd_GetModeString(vo_dga_XServer_mode)); + } -#else - - for(k=0, dummy=1; k= x) && (new_y >= y) && @@ -416,10 +517,10 @@ int check_mode( int num, int x, int y, int bpp, *old_x = new_x; *old_y = new_y; *old_vbi = new_vbi; - printf(".ok!!\n"); + vd_printf(VD_RES, ".ok!!\n"); return 1; }else{ - printf(".no\n"); + vd_printf(VD_RES, ".no\n"); return 0; } } @@ -434,6 +535,7 @@ static uint32_t init( uint32_t width, uint32_t height, { int x_off, y_off; + int wanted_width, wanted_height; #ifdef HAVE_DGA2 // needed to change DGA video mode @@ -453,43 +555,44 @@ static uint32_t init( uint32_t width, uint32_t height, #endif if( vo_dga_is_running )return -1; - + wanted_width = d_width; + wanted_height = d_height; + + if(!wanted_height) wanted_height = height; + if(!wanted_width) wanted_width = width; + if( !vo_init() ){ - printf("vo_dga: vo_init() failed!\n"); - return 0; + vd_printf(VD_ERR, "vo_dga: vo_init() failed!\n"); + return 1; } + + if( !vo_dbpp ){ - if (format == IMGFMT_YV12 ){ - vo_dga_planes = vo_depthonscreen; - vo_dga_planes = vo_dga_planes == 15 ? 16 : vo_dga_planes; + if (format == IMGFMT_YV12){ + vo_dga_active_mode = vo_dga_XServer_mode; + }else if((format & IMGFMT_BGR_MASK) == IMGFMT_BGR){ + vo_dga_active_mode = vd_ModeValid( format & 0xff ); + } }else{ - vo_dga_planes = (format & 0xff); + vo_dga_active_mode = vd_ModeValid(vo_dbpp); + } - // 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; + if(!vo_dga_active_mode){ + vd_printf(VD_ERR, "vo_dga: unsupported video format!\n"); + return 1; } - if((vo_dga_dpy = XOpenDisplay(0))==NULL) - { - printf ("vo_dga: Can't open display\n"); + if((vo_dga_dpy = XOpenDisplay(0))==NULL){ + vd_printf (VD_ERR, "vo_dga: Can't open display\n"); return 1; } - 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; - + vo_dga_vp_width = DisplayWidth( vo_dga_dpy, DefaultScreen(vo_dga_dpy)); + vo_dga_vp_height = DisplayHeight( vo_dga_dpy, DefaultScreen(vo_dga_dpy)); + vd_printf(VD_DBG, "vo_dga: XServer res: %dx%d\n", + vo_dga_vp_width, vo_dga_vp_height); // choose a suitable mode ... @@ -499,30 +602,39 @@ static uint32_t init( uint32_t width, uint32_t height, if (modelines==NULL) modelines=XDGAQueryModes(vo_dga_dpy, XDefaultScreen(vo_dga_dpy),&modecount); - printf("vo_dga: Using DGA 2.0 mode changing support\n"); - // offbyone-error !!! i<=modecount is WRONG !!! + vd_printf(VD_INFO, + "vo_dga: DGA 2.0 available :-) Can switch resolution AND depth!\n"); for (i=0; ihdisplay, vo_dga_vidmodes[i]->vdisplay, GET_VREFRESH(vo_dga_vidmodes[i]->dotclock, @@ -559,10 +673,14 @@ static uint32_t init( uint32_t width, uint32_t height, &mX, &mY, &mVBI )) j = i; } - printf("vo_dga: Selected video mode %4d x %4d @ %3d Hz for image size %3d x %3d.\n", - mX, mY, mVBI, width, height); + vd_printf(VD_INFO, + "vo_dga: Selected video mode %4d x %4d @ %3d Hz @ depth %2d, bitspp %2d, video %3d x %3d.\n", + mX, mY, mVBI, + vo_dga_modes[vo_dga_active_mode].vdm_depth, + vo_dga_modes[vo_dga_active_mode].vdm_bitspp, + width, height); }else{ - printf("vo_dga: XF86VidMode returned no screens - using current resolution.\n"); + vd_printf(VD_INFO, "vo_dga: XF86VidMode returned no screens - using current resolution.\n"); } dga_modenum = j; vo_dga_vp_width = mX; @@ -571,18 +689,19 @@ static uint32_t init( uint32_t width, uint32_t height, #else - printf("vo_dga: Only have DGA 1.0 extension and no XF86VidMode :-(\n"); + vd_printf( VD_INFO, "vo_dga: Only have DGA 1.0 extension and no XF86VidMode :-(\n"); + vd_printf( VD_INFO, " Thus, resolution switching is NOT possible.\n"); + #endif #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"); + vd_printf( VD_ERR, "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 @@ -600,7 +719,7 @@ static uint32_t init( uint32_t width, uint32_t height, #ifdef HAVE_DGA2 if (!XDGAOpenFramebuffer(vo_dga_dpy, XDefaultScreen(vo_dga_dpy))){ - printf("vo_dga: Framebuffer mapping failed!!!\n"); + vd_printf(VD_ERR, "vo_dga: Framebuffer mapping failed!!!\n"); XCloseDisplay(vo_dga_dpy); return 1; } @@ -639,26 +758,29 @@ static uint32_t init( uint32_t width, uint32_t height, // do some more checkings here ... - if( format==IMGFMT_YV12 ) - yuv2rgb_init( vo_dga_planes == 16 ? 15 : vo_dga_planes , MODE_RGB ); + if( format==IMGFMT_YV12 ){ + yuv2rgb_init( vo_dga_modes[vo_dga_active_mode].vdm_mplayer_depth , MODE_RGB ); + vd_printf( VD_DBG, "vo_dga: Using mplayer depth %d for YV12\n", + vo_dga_modes[vo_dga_active_mode].vdm_mplayer_depth); + } - printf("vo_dga: bytes/line: %d, screen res: %dx%d, depth: %d, base: %08x, bpp: %d\n", + vd_printf(VD_DBG, "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); + vo_dga_vp_height, BYTESPP, vo_dga_base, + BITSPP); 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_bytes_per_line = vo_dga_src_width * BYTESPP; vo_dga_lines = vo_dga_src_height; vo_dga_src_offset = 0; - vo_dga_vp_offset = (y_off * vo_dga_width + x_off ) * vo_dga_bpp; + vo_dga_vp_offset = (y_off * vo_dga_width + x_off ) * BYTESPP; - vo_dga_vp_skip = (vo_dga_width - vo_dga_src_width) * vo_dga_bpp; // todo + vo_dga_vp_skip = (vo_dga_width - vo_dga_src_width) * BYTESPP; // todo - printf("vo_dga: vp_off=%d, vp_skip=%d, bpl=%d\n", + vd_printf(VD_DBG, "vo_dga: vp_off=%d, vp_skip=%d, bpl=%d\n", vo_dga_vp_offset, vo_dga_vp_skip, vo_dga_bytes_per_line); @@ -673,7 +795,7 @@ static uint32_t init( uint32_t width, uint32_t height, // note: set vo_dga_dbf_mem_offset to NULL to disable doublebuffering 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_mem_offset = vo_dga_width * BYTESPP * vo_dga_dbf_y_offset; vo_dga_dbf_current = 0; if(format ==IMGFMT_YV12 )vo_dga_dbf_mem_offset = 0; @@ -682,7 +804,7 @@ static uint32_t init( uint32_t width, uint32_t height, #ifdef HAVE_DGA2 if(vo_dga_vp_height>max_vpy_pos){ vo_dga_dbf_mem_offset = 0; - printf("vo_dga: Not enough memory for double buffering!\n"); + vd_printf(VD_INFO, "vo_dga: Not enough memory for double buffering!\n"); } #endif @@ -691,22 +813,22 @@ static uint32_t init( uint32_t width, uint32_t height, 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; + BYTESPP; #ifndef HAVE_DGA2 - printf("%d, %d\n", size, ram); + vd_printf(VD_DBG, "vo_dga: wanted size=%d, fb-size=%d\n", size, ram); if(size>ram*1024){ vo_dga_dbf_mem_offset = 0; - printf("vo_dga: Not enough memory for double buffering!\n"); - size -= (vo_dga_src_height+y_off) * vo_dga_width * vo_dga_bpp; + vd_printf(VD_INFO, "vo_dga: Not enough memory for double buffering!\n"); + size -= (vo_dga_src_height+y_off) * vo_dga_width * BYTESPP; } #endif - printf("vo_dga: Clearing framebuffer (%d bytes). If mplayer exits", size); - printf(" here, you haven't enough memory on your card.\n"); + vd_printf(VD_INFO, "vo_dga: Clearing framebuffer (%d bytes). If mplayer exits", size); + vd_printf(VD_INFO, " here, you haven't enough memory on your card.\n"); fflush(stdout); memset(vo_dga_base, 0, size); } - printf("vo_dga: Doublebuffering %s.\n", vo_dga_dbf_mem_offset ? "enabled" : "disabled"); + vd_printf(VD_INFO, "vo_dga: Doublebuffering is %s.\n", vo_dga_dbf_mem_offset ? "enabled" : "disabled"); vo_dga_is_running = 1; return 0; } @@ -716,3 +838,13 @@ static uint32_t init( uint32_t width, uint32_t height, // deleted the old vo_dga_query_event() routine 'cause it is obsolete // since using check_events() // acki2 on 30/3/2001 + + + + + + + + + + -- cgit v1.2.3