frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86/xv: Allow xf86XVReputOrStopPort() to stop PutVideo/GetVideo ports 

Modify xf86XVReputOrStopPort() to allow stopping of all types of ports.
Will be useful later.

No functional change.

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-10-29 17:00:24 +03:00
parent 38987aae19
commit 27707ac5bd
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1007,8 +1007,20 @@ xf86XVRemovePortFromWindow(WindowPtr pWin, XvPortRecPrivatePtr portPriv)
static void static void
xf86XVReputOrStopPort(XvPortRecPrivatePtr pPriv, xf86XVReputOrStopPort(XvPortRecPrivatePtr pPriv,
WindowPtr pWin, WindowPtr pWin,
Bool AreasExposed) Bool visible)
{ {
if (!visible) {
if (pPriv->isOn == XV_ON) {
(*pPriv->AdaptorRec->StopVideo)(pPriv->pScrn, pPriv->DevPriv.ptr, FALSE);
pPriv->isOn = XV_PENDING;
}
if (!pPriv->type) /* overlaid still/image*/
xf86XVRemovePortFromWindow(pWin, pPriv);
return;
}
switch (pPriv->type) { switch (pPriv->type) {
case XvInputMask: case XvInputMask:
xf86XVReputVideo(pPriv); xf86XVReputVideo(pPriv);
@ -1019,14 +1031,6 @@ xf86XVReputOrStopPort(XvPortRecPrivatePtr pPriv,
default: /* overlaid still/image*/ default: /* overlaid still/image*/
if (pPriv->AdaptorRec->ReputImage) if (pPriv->AdaptorRec->ReputImage)
xf86XVReputImage(pPriv); xf86XVReputImage(pPriv);
else if (AreasExposed) {
if (pPriv->isOn == XV_ON) {
(*pPriv->AdaptorRec->StopVideo)(pPriv->pScrn, pPriv->DevPriv.ptr, FALSE);
pPriv->isOn = XV_PENDING;
}
xf86XVRemovePortFromWindow(pWin, pPriv);
}
break; break;
} }
} }
@ -1088,10 +1092,19 @@ xf86XVWindowExposures(WindowPtr pWin, RegionPtr reg1, RegionPtr reg2)
if (!pWin->valdata) return; if (!pWin->valdata) return;
while(WinPriv) { while(WinPriv) {
Bool visible = TRUE;
pPriv = WinPriv->PortRec; pPriv = WinPriv->PortRec;
/*
* Stop and remove still/images if areas were exposed and
* ReputImage isn't supported.
*/
if (!pPriv->type && !pPriv->AdaptorRec->ReputImage)
visible = !AreasExposed;
WinPriv = WinPriv->next; WinPriv = WinPriv->next;
xf86XVReputOrStopPort(pPriv, pWin, AreasExposed); xf86XVReputOrStopPort(pPriv, pWin, visible);
} }
} }