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

works with no adaptors 

Debug the early code to make work when the host has no video adaptors
This commit is contained in:
Dodji Seketeli 2007-07-21 18:22:20 +02:00 committed by Dodji Seketeli
parent 50ff2377ca
commit 1e8f8b36a5
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ EphyrHostXVQueryAdaptors (EphyrHostXVAdaptorArray **a_adaptors)
goto out ; goto out ;
ret = XvQueryAdaptors (hostx_get_display (), ret = XvQueryAdaptors (hostx_get_display (),
DefaultRootWindow (hostx_get_display), DefaultRootWindow (hostx_get_display ()),
&result->nb_adaptors, &result->nb_adaptors,
&result->adaptors) ; &result->adaptors) ;
if (ret != Success) { if (ret != Success) {

22
hw/kdrive/ephyr/ephyrvideo.c
View File

@ -145,7 +145,7 @@ EphyrXVPrivNew (void)
EPHYR_LOG_ERROR ("failed to query the host x for xv properties\n") ; EPHYR_LOG_ERROR ("failed to query the host x for xv properties\n") ;
goto error ; goto error ;
} }
if (EphyrXVPrivSetAdaptorsHooks (xv_priv)) { if (!EphyrXVPrivSetAdaptorsHooks (xv_priv)) {
EPHYR_LOG_ERROR ("failed to set xv_priv hooks\n") ; EPHYR_LOG_ERROR ("failed to set xv_priv hooks\n") ;
goto error ; goto error ;
} }
@ -232,7 +232,7 @@ EphyrXVPrivQueryHostAdaptors (EphyrXVPriv *a_this)
EphyrHostEncoding *encodings=NULL ; EphyrHostEncoding *encodings=NULL ;
EphyrHostAttribute *attributes=NULL ; EphyrHostAttribute *attributes=NULL ;
EphyrHostImageFormat *image_formats=NULL ; EphyrHostImageFormat *image_formats=NULL ;
int num_video_formats=0, base_port_id=0, num_attributes=0, num_formats=0, res=0, i=0 ; int num_video_formats=0, base_port_id=0, num_attributes=0, num_formats=0, i=0 ;
unsigned num_encodings=0 ; unsigned num_encodings=0 ;
Bool is_ok = FALSE ; Bool is_ok = FALSE ;
@ -240,22 +240,26 @@ EphyrXVPrivQueryHostAdaptors (EphyrXVPriv *a_this)
EPHYR_LOG ("enter\n") ; EPHYR_LOG ("enter\n") ;
if (!EphyrHostXVQueryAdaptors (&a_this->host_adaptors) || !a_this->host_adaptors) { if (!EphyrHostXVQueryAdaptors (&a_this->host_adaptors)) {
EPHYR_LOG_ERROR ("failed to query host adaptors: %d\n", res) ; EPHYR_LOG_ERROR ("failed to query host adaptors\n") ;
goto out ; goto out ;
} }
a_this->num_adaptors = EphyrHostXVAdaptorArrayGetSize (a_this->host_adaptors) ; if (a_this->host_adaptors)
a_this->num_adaptors = EphyrHostXVAdaptorArrayGetSize (a_this->host_adaptors) ;
if (a_this->num_adaptors < 0) { if (a_this->num_adaptors < 0) {
EPHYR_LOG_ERROR ("failed to get number of host adaptors\n") ; EPHYR_LOG_ERROR ("failed to get number of host adaptors\n") ;
goto out ; goto out ;
} }
EPHYR_LOG ("host has %d adaptors\n", a_this->num_adaptors) ;
/* /*
* copy what we can from adaptors into a_this->adaptors * copy what we can from adaptors into a_this->adaptors
*/ */
a_this->adaptors = xcalloc (a_this->num_adaptors, sizeof (KdVideoAdaptorRec)) ; if (a_this->num_adaptors) {
if (!a_this->host_adaptors) { a_this->adaptors = xcalloc (a_this->num_adaptors, sizeof (KdVideoAdaptorRec)) ;
EPHYR_LOG_ERROR ("failed to create internal adaptors\n") ; if (!a_this->adaptors) {
goto out ; EPHYR_LOG_ERROR ("failed to create internal adaptors\n") ;
goto out ;
}
} }
for (i=0; i < a_this->num_adaptors; i++) { for (i=0; i < a_this->num_adaptors; i++) {
int j=0 ; int j=0 ;