From 0680995b18adceee47cd2985eabfb4cfce8c5ff7 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Thu, 28 Sep 2023 17:23:59 +0200 Subject: [PATCH] gallium/auxiliary/vl: Scale dst_rect x0/y0 when rendering chroma plane This fixes incorrect chroma plane position when x0/y0 is not zero. Fixes: 001358a97cc ("vl/compositor: add a new function for YUV deint") Acked-by: Thong Thai Part-of: (cherry picked from commit 35b0ccd8554e8b46833cb5b57be91e6201754a4f) --- .pick_status.json | 2 +- src/gallium/auxiliary/vl/vl_compositor.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 69ce723..8493a1d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -404,7 +404,7 @@ "description": "gallium/auxiliary/vl: Scale dst_rect x0/y0 when rendering chroma plane", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "001358a97cce456d948bb57842ca099a73c10b06", "notes": null diff --git a/src/gallium/auxiliary/vl/vl_compositor.c b/src/gallium/auxiliary/vl/vl_compositor.c index 91a10a6..4d791f1 100644 --- a/src/gallium/auxiliary/vl/vl_compositor.c +++ b/src/gallium/auxiliary/vl/vl_compositor.c @@ -691,6 +691,8 @@ vl_compositor_yuv_deint_full(struct vl_compositor_state *s, vl_compositor_render(s, c, dst_surfaces[0], NULL, false); if (dst_rect) { + dst_rect->x0 /= 2; + dst_rect->y0 /= 2; dst_rect->x1 /= 2; dst_rect->y1 /= 2; } @@ -727,6 +729,8 @@ vl_compositor_convert_rgb_to_yuv(struct vl_compositor_state *s, vl_compositor_render(s, c, dst_surfaces[0], NULL, false); if (dst_rect) { + dst_rect->x0 /= 2; + dst_rect->y0 /= 2; dst_rect->x1 /= 2; dst_rect->y1 /= 2; } -- 2.7.4