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

Xephyr: fix Xv adaptor capability tests 

Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Julien Cristau 2010-06-25 11:34:44 +01:00 committed by Keith Packard
parent 9626eedebf
commit 433d0851cd
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/kdrive/ephyr/ephyrhostvideo.c
View File

@ -380,7 +380,8 @@ ephyrHostXVAdaptorHasPutVideo (const EphyrHostXVAdaptor *a_this,
{ {
EPHYR_RETURN_VAL_IF_FAIL (a_this && a_result, FALSE) ; EPHYR_RETURN_VAL_IF_FAIL (a_this && a_result, FALSE) ;
if (((XvAdaptorInfo*)a_this)->type & XvVideoMask & XvInputMask) if ((((XvAdaptorInfo*)a_this)->type & (XvVideoMask | XvInputMask)) ==
(XvVideoMask | XvInputMask))
*a_result = TRUE ; *a_result = TRUE ;
else else
*a_result = FALSE ; *a_result = FALSE ;
@ -391,7 +392,8 @@ Bool
ephyrHostXVAdaptorHasGetVideo (const EphyrHostXVAdaptor *a_this, ephyrHostXVAdaptorHasGetVideo (const EphyrHostXVAdaptor *a_this,
Bool *a_result) Bool *a_result)
{ {
if (((XvAdaptorInfo*)a_this)->type & XvVideoMask & XvOutputMask) if ((((XvAdaptorInfo*)a_this)->type & (XvVideoMask | XvOutputMask)) ==
(XvVideoMask | XvOutputMask))
*a_result = TRUE ; *a_result = TRUE ;
else else
*a_result = FALSE ; *a_result = FALSE ;
@ -404,7 +406,8 @@ ephyrHostXVAdaptorHasPutStill (const EphyrHostXVAdaptor *a_this,
{ {
EPHYR_RETURN_VAL_IF_FAIL (a_this && a_result, FALSE) ; EPHYR_RETURN_VAL_IF_FAIL (a_this && a_result, FALSE) ;
if (((XvAdaptorInfo*)a_this)->type & XvStillMask && XvInputMask) if ((((XvAdaptorInfo*)a_this)->type & (XvStillMask | XvInputMask)) ==
(XvStillMask | XvInputMask))
*a_result = TRUE ; *a_result = TRUE ;
else else
*a_result = FALSE ; *a_result = FALSE ;
@ -417,7 +420,8 @@ ephyrHostXVAdaptorHasGetStill (const EphyrHostXVAdaptor *a_this,
{ {
EPHYR_RETURN_VAL_IF_FAIL (a_this && a_result, FALSE) ; EPHYR_RETURN_VAL_IF_FAIL (a_this && a_result, FALSE) ;
if (((XvAdaptorInfo*)a_this)->type & XvStillMask && XvOutputMask) if ((((XvAdaptorInfo*)a_this)->type & (XvStillMask | XvOutputMask)) ==
(XvStillMask | XvOutputMask))
*a_result = TRUE ; *a_result = TRUE ;
else else
*a_result = FALSE ; *a_result = FALSE ;
@ -430,7 +434,8 @@ ephyrHostXVAdaptorHasPutImage (const EphyrHostXVAdaptor *a_this,
{ {
EPHYR_RETURN_VAL_IF_FAIL (a_this && a_result, FALSE) ; EPHYR_RETURN_VAL_IF_FAIL (a_this && a_result, FALSE) ;
if (((XvAdaptorInfo*)a_this)->type & XvImageMask && XvInputMask) if ((((XvAdaptorInfo*)a_this)->type & (XvImageMask | XvInputMask)) ==
(XvImageMask | XvInputMask))
*a_result = TRUE ; *a_result = TRUE ;
else else
*a_result = FALSE ; *a_result = FALSE ;