Mercurial > mplayer.hg
changeset 7515:72dd0b05d562
DGA1 fix by Fredrik Noring <noring@nocrew.org>
| author | arpi |
|---|---|
| date | Fri, 27 Sep 2002 20:48:06 +0000 |
| parents | d71300143887 |
| children | 657041b7236b |
| files | libvo/vo_dga.c |
| diffstat | 1 files changed, 16 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_dga.c Fri Sep 27 20:33:09 2002 +0000 +++ b/libvo/vo_dga.c Fri Sep 27 20:48:06 2002 +0000 @@ -686,16 +686,17 @@ //--------------------------------------------------------- -static void init_video_buffers(XDGAMode *modeline, uint8_t *buffer_base, +static void init_video_buffers(uint8_t *buffer_base, + int view_port_height, + int bytes_per_scanline, + int max_view_port_y, int use_multiple_buffers) { - int bytes_per_buffer = - modeline->viewportHeight * modeline->bytesPerScanline; + int bytes_per_buffer = view_port_height * bytes_per_scanline; int i; if(use_multiple_buffers) - vo_dga_nr_video_buffers = - modeline->pixmapHeight / modeline->viewportHeight; + vo_dga_nr_video_buffers = max_view_port_y / view_port_height; else vo_dga_nr_video_buffers = 1; @@ -706,7 +707,7 @@ for(i = 0; i < vo_dga_nr_video_buffers; i++) { - vo_dga_video_buffer[i].y = i * modeline->viewportHeight; + vo_dga_video_buffer[i].y = i * view_port_height; vo_dga_video_buffer[i].data = buffer_base + i * bytes_per_buffer; @@ -730,7 +731,6 @@ XDGAMode *modelines=NULL, *modeline; XDGADevice *dgadevice; unsigned char *vo_dga_base; - int max_vpy_pos; #else #ifdef HAVE_XF86VM unsigned int vm_event, vm_error; @@ -866,7 +866,6 @@ vo_dga_width = modelines[j].bytesPerScanline / HW_MODE.vdm_bytespp ; dga_modenum = modelines[j].num; - max_vpy_pos = modelines[j].maxViewportY; modeline = modelines + j; XFree(modelines); @@ -1042,7 +1041,15 @@ ButtonPressMask,GrabModeAsync, GrabModeAsync, None, None, CurrentTime); - init_video_buffers(modeline, vo_dga_base, vo_doublebuffering); + init_video_buffers(vo_dga_base, + vo_dga_vp_height, + vo_dga_width * HW_MODE.vdm_bytespp, +#if HAVE_DGA2 + modeline->maxViewportY, +#else + vo_dga_vp_height, +#endif + vo_doublebuffering); mp_msg(MSGT_VO, MSGL_V, "vo_dga: Using %d frame buffer%s.\n", vo_dga_nr_video_buffers, vo_dga_nr_video_buffers == 1 ? "" : "s");