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

vo_xv: allocate Xv images with aligned stride 

This is required, as the Xv image is directly used for rendering OSD and
taking screenshots. These involve libswscale, which wants aligned
strides.

There doesn't seem to be an easy way to request aligned strides from Xv.
Simply request an image with an aligned width, which usually results in
an aligned stride. The padding border remains invisible.

One caveat is that if padding is added, there might be scaling artifacts
on the right pixel border of the screen. This is at least the case with
nvidia binary drivers. Since we consider vo_xv a sensible choice only on
crappy/slow hardware, performance is more important than quality.
This commit is contained in:
wm4 2012-11-22 19:37:20 +01:00
parent 1d3179a5f1
commit 74f416fd2d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
video/out/vo_xv.c
View File

@ -239,11 +239,12 @@ static void allocate_xvimage(struct vo *vo, int foo)
ctx->Shmem_Flag = 0; ctx->Shmem_Flag = 0;
mp_tmsg(MSGT_VO, MSGL_INFO, "[VO_XV] Shared memory not supported\nReverting to normal Xv.\n"); mp_tmsg(MSGT_VO, MSGL_INFO, "[VO_XV] Shared memory not supported\nReverting to normal Xv.\n");
} }
int aligned_w = FFALIGN(ctx->image_width, 16);
if (ctx->Shmem_Flag) { if (ctx->Shmem_Flag) {
ctx->xvimage[foo] = ctx->xvimage[foo] =
(XvImage *) XvShmCreateImage(x11->display, x11->xv_port, (XvImage *) XvShmCreateImage(x11->display, x11->xv_port,
ctx->xv_format, NULL, ctx->xv_format, NULL,
ctx->image_width, ctx->image_height, aligned_w, ctx->image_height,
&ctx->Shminfo[foo]); &ctx->Shminfo[foo]);
ctx->Shminfo[foo].shmid = shmget(IPC_PRIVATE, ctx->Shminfo[foo].shmid = shmget(IPC_PRIVATE,
@ -262,7 +263,7 @@ static void allocate_xvimage(struct vo *vo, int foo)
{ {
ctx->xvimage[foo] = ctx->xvimage[foo] =
(XvImage *) XvCreateImage(x11->display, x11->xv_port, (XvImage *) XvCreateImage(x11->display, x11->xv_port,
ctx->xv_format, NULL, ctx->image_width, ctx->xv_format, NULL, aligned_w,
ctx->image_height); ctx->image_height);
ctx->xvimage[foo]->data = malloc(ctx->xvimage[foo]->data_size); ctx->xvimage[foo]->data = malloc(ctx->xvimage[foo]->data_size);
XSync(x11->display, False); XSync(x11->display, False);
@ -318,8 +319,8 @@ static struct mp_image get_xv_buffer(struct vo *vo, int buf_index)
XvImage *xv_image = ctx->xvimage[buf_index]; XvImage *xv_image = ctx->xvimage[buf_index];
struct mp_image img = {0}; struct mp_image img = {0};
img.w = img.width = xv_image->width; img.w = img.width = ctx->image_width;
img.h = img.height = xv_image->height; img.h = img.height = ctx->image_height;
mp_image_setfmt(&img, ctx->image_format); mp_image_setfmt(&img, ctx->image_format);
bool swapuv = ctx->image_format == IMGFMT_YV12; bool swapuv = ctx->image_format == IMGFMT_YV12;