Attachment 16218 Details for Bug 12825 – A possible fix

[patch] A possible fix

0001-randr12-xv-manual-overlay-clipping-for-randr12-se.patch (text/plain), 1.84 KB, created by Stuart Bennett on 2008-04-28 09:12:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stuart Bennett

Created: 2008-04-28 09:12:20 UTC

Size: 1.84 KB

patch

obsolete

>From de6e205545ecbc045ee06a471bff545164742a26 Mon Sep 17 00:00:00 2001
>From: Stuart Bennett <sb476@cam.ac.uk>
>Date: Mon, 28 Apr 2008 16:51:01 +0100
>Subject: [PATCH] randr12, xv: manual overlay clipping for randr12 (see #12825)
>
>---
> src/nv_video.c |   25 ++++++++++++++++++++++++-
> 1 files changed, 24 insertions(+), 1 deletions(-)
>
>diff --git a/src/nv_video.c b/src/nv_video.c
>index e4df83d..48f65e3 100644
>--- a/src/nv_video.c
>+++ b/src/nv_video.c
>@@ -749,6 +749,26 @@ static int NV_set_dimensions(ScrnInfoPtr pScrn, int action_flags, INT32 * xa, IN
>     dstBox->y1 = *drw_y;
>     dstBox->y2 = *drw_y + *drw_h;
> 
>+	/* In randr 1.2 mode VIDEO_CLIP_TO_VIEWPORT is broken (hence it is not
>+	 * set in the overlay adapter flags) since pScrn->frame{X,Y}1 do not get
>+	 * updated. Hence manual clipping against the CRTC dimensions
>+	 */
>+	if (pNv->randr12_enable && action_flags & USE_OVERLAY) {
>+		xf86CrtcPtr crtc = XF86_CRTC_CONFIG_PTR(pScrn)->crtc
>+					[((NVPortPrivPtr)GET_OVERLAY_PRIVATE(pNv))->overlayCRTC];
>+		RegionRec VPReg;
>+		BoxRec VPBox;
>+
>+		VPBox.x1 = crtc->x;
>+		VPBox.y1 = crtc->y;
>+		VPBox.x2 = crtc->x + crtc->mode.HDisplay;
>+		VPBox.y2 = crtc->y + crtc->mode.VDisplay;
>+
>+		REGION_INIT(pScreen, &VPReg, &VPBox, 1);
>+		REGION_INTERSECT(pScreen, clipBoxes, clipBoxes, &VPReg);
>+		REGION_UNINIT(pScreen, &VPReg);
>+	}
>+
>     if (!xf86XVClipVideoHelper(dstBox, xa, xb, ya, yb, clipBoxes,
> 		width, height))
> 	return -1;
>@@ -1722,7 +1742,10 @@ NVSetupOverlayVideoAdapter(ScreenPtr pScreen)
> 	}
> 
> 	adapt->type		= XvWindowMask | XvInputMask | XvImageMask;
>-	adapt->flags		= VIDEO_OVERLAID_IMAGES|VIDEO_CLIP_TO_VIEWPORT;
>+	if (pNv->randr12_enable)
>+		adapt->flags		= VIDEO_OVERLAID_IMAGES;
>+	else
>+		adapt->flags		= VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;
> 	adapt->name		= "NV Video Overlay";
> 	adapt->nEncodings	= 1;
> 	adapt->pEncodings	= &DummyEncoding;
>-- 
>1.5.4.4
>

Actions: View | Splinter Review

Attachments on bug 12825: 12070 | 12071 | 12072 | 12073 | 13801 | 14124 | 16218

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.