andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfree86/xv: Fix ReputImage clipping

Browse Source 
PutImage/PutStill respect the GC clip, however ReputImage does not.
PutImage/PutStill are supposed to be oneshot operations so ReputImage
should never expand the area covered by the clip, instead it should
only shrink if the window clip shrinks. So commandeer clientClip
into use by ReputImage and initially make it a copy of the original
GC composite clip. Whenever ReputImage needs reclipping update
clientClip with the newly calculated composite clip.

Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
This commit is contained in:
Ville Syrjälä 2010-11-01 20:27:25 +02:00
parent 7294236bdb
commit b4ebde23d2
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hw/xfree86/common/xf86xv.c
View File

@ -703,6 +703,27 @@ xf86XVCopyClip(
portPriv->subWindowMode = pGC->subWindowMode;
}
static void
xf86XVCopyCompositeClip(XvPortRecPrivatePtr portPriv,
GCPtr pGC,
DrawablePtr pDraw)
{
if (!portPriv->clientClip)
portPriv->clientClip = RegionCreate(NullBox, 1);
/* Keep the original GC composite clip around for ReputImage */
RegionCopy(portPriv->clientClip, pGC->pCompositeClip);
RegionTranslate(portPriv->clientClip,
-pDraw->x, -pDraw->y);
/* get rid of the old clip list */
if (portPriv->pCompositeClip && portPriv->FreeCompositeClip)
RegionDestroy(portPriv->pCompositeClip);
portPriv->pCompositeClip = pGC->pCompositeClip;
portPriv->FreeCompositeClip = FALSE;
portPriv->subWindowMode = pGC->subWindowMode;
}
static int
xf86XVRegetVideo(XvPortRecPrivatePtr portPriv)
{
@ -863,6 +884,11 @@ xf86XVReputImage(XvPortRecPrivatePtr portPriv)
xf86XVUpdateCompositeClip(portPriv);
/* the clip can get smaller over time */
RegionCopy(portPriv->clientClip, portPriv->pCompositeClip);
RegionTranslate(portPriv->clientClip,
-portPriv->pDraw->x, -portPriv->pDraw->y);
/* translate the video region to the screen */
WinBox.x1 = portPriv->pDraw->x + portPriv->drw_x;
WinBox.y1 = portPriv->pDraw->y + portPriv->drw_y;
@ -1411,6 +1437,8 @@ xf86XVPutStill(
WinBox.x2 = WinBox.x1 + drw_w;
WinBox.y2 = WinBox.y1 + drw_h;
xf86XVCopyCompositeClip(portPriv, pGC, pDraw);
RegionInit(&WinRegion, &WinBox, 1);
RegionNull(&ClipRegion);
RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);
@ -1479,6 +1507,10 @@ PUT_STILL_BAILOUT:
portPriv->isOn = XV_PENDING;
}
/* This clip was copied and only good for one shot */
if(!portPriv->FreeCompositeClip)
portPriv->pCompositeClip = NULL;
RegionUninit(&WinRegion);
RegionUninit(&ClipRegion);
@ -1700,6 +1732,8 @@ xf86XVPutImage(
if(!portPriv->pScrn->vtSema) return Success; /* Success ? */
xf86XVCopyCompositeClip(portPriv, pGC, pDraw);
WinBox.x1 = pDraw->x + drw_x;
WinBox.y1 = pDraw->y + drw_y;
WinBox.x2 = WinBox.x1 + drw_w;
@ -1776,6 +1810,10 @@ PUT_IMAGE_BAILOUT:
portPriv->isOn = XV_PENDING;
}
/* This clip was copied and only good for one shot */
if(!portPriv->FreeCompositeClip)
portPriv->pCompositeClip = NULL;
RegionUninit(&WinRegion);
RegionUninit(&ClipRegion);