RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

respect -vf dsize etc. also for -rootwin, just like vo_xv does. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27935 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2008-11-15 22:48:41 +00:00
parent afa2147441
commit 554ce917df
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libvo/vo_x11.c
View File

@ -454,12 +454,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
} }
getMyXImage(); getMyXImage();
if (!WinID)
{
vo_dwidth = vo_screenwidth;
vo_dheight = vo_screenheight;
}
while (fmte->mpfmt) { while (fmte->mpfmt) {
int depth = IMGFMT_RGB_DEPTH(fmte->mpfmt); int depth = IMGFMT_RGB_DEPTH(fmte->mpfmt);
/* bits_per_pixel in X seems to be set to 16 for 15 bit formats /* bits_per_pixel in X seems to be set to 16 for 15 bit formats
@ -529,22 +523,26 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
static void Display_Image(XImage * myximage, uint8_t * ImageData) static void Display_Image(XImage * myximage, uint8_t * ImageData)
{ {
int x = (vo_dwidth - dst_width) / 2;
int y = (vo_dheight - myximage->height) / 2;
if (WinID == 0) {
x = vo_dx;
y = vo_dy;
}
myximage->data += out_offset; myximage->data += out_offset;
#ifdef HAVE_SHM #ifdef HAVE_SHM
if (Shmem_Flag) if (Shmem_Flag)
{ {
XShmPutImage(mDisplay, vo_window, vo_gc, myximage, XShmPutImage(mDisplay, vo_window, vo_gc, myximage,
0, 0, 0, 0,
(vo_dwidth - dst_width) / 2, x, y, dst_width,
(vo_dheight - myximage->height) / 2, dst_width,
myximage->height, True); myximage->height, True);
} else } else
#endif #endif
{ {
XPutImage(mDisplay, vo_window, vo_gc, myximage, XPutImage(mDisplay, vo_window, vo_gc, myximage,
0, 0, 0, 0,
(vo_dwidth - dst_width) / 2, x, y, dst_width,
(vo_dheight - myximage->height) / 2, dst_width,
myximage->height); myximage->height);
} }
myximage->data -= out_offset; myximage->data -= out_offset;