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

ephyr: Remove the host/server split for video encodings. 

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
This commit is contained in:
Eric Anholt 2013-08-22 17:00:41 -07:00
parent 28a37757e1
commit 1dcc28bcb4
3 changed files with 39 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,58 +43,6 @@
#define FALSE 0
#endif /*FALSE*/
Bool
ephyrHostXVQueryEncodings(int a_port_id,
EphyrHostEncoding ** a_encodings,
unsigned int *a_num_encodings)
{
EphyrHostEncoding *encodings = NULL;
xcb_xv_encoding_info_iterator_t encoding_info;
xcb_xv_query_encodings_cookie_t cookie;
xcb_xv_query_encodings_reply_t *reply;
unsigned int num_encodings = 0, i;
EPHYR_RETURN_VAL_IF_FAIL(a_encodings && a_num_encodings, FALSE);
cookie = xcb_xv_query_encodings(hostx_get_xcbconn(), a_port_id);
reply = xcb_xv_query_encodings_reply(hostx_get_xcbconn(), cookie, NULL);
if (!reply)
return FALSE;
num_encodings = reply->num_encodings;
encoding_info = xcb_xv_query_encodings_info_iterator(reply);
if (num_encodings) {
encodings = calloc(num_encodings, sizeof (EphyrHostEncoding));
for (i=0; i<num_encodings; i++, xcb_xv_encoding_info_next(&encoding_info)) {
encodings[i].id = encoding_info.data->encoding;
encodings[i].name = malloc(encoding_info.data->name_size + 1);
memcpy(encodings[i].name, xcb_xv_encoding_info_name(encoding_info.data), encoding_info.data->name_size);
encodings[i].name[encoding_info.data->name_size] = '\0';
encodings[i].width = encoding_info.data->width;
encodings[i].height = encoding_info.data->height;
encodings[i].rate.numerator = encoding_info.data->rate.numerator;
encodings[i].rate.denominator = encoding_info.data->rate.denominator;
}
}
free(reply);
*a_encodings = encodings;
*a_num_encodings = num_encodings;
return TRUE;
}
void
ephyrHostEncodingsDelete(EphyrHostEncoding * a_encodings, int a_num_encodings)
{
int i = 0;
if (!a_encodings)
return;
for (i = 0; i < a_num_encodings; i++) {
free(a_encodings[i].name);
a_encodings[i].name = NULL;
}
free(a_encodings);
}
Bool
ephyrHostXVQueryImageFormats(int a_port_id,
EphyrHostImageFormat ** a_formats,

22
hw/kdrive/ephyr/ephyrhostvideo.h
View File

@ -31,18 +31,6 @@
#include <xcb/xv.h>
#include <X11/Xdefs.h>
typedef struct _EphyrHostRational {
int numerator;
int denominator;
} EphyrHostRational;
typedef struct _EphyrHostEncoding {
int id;
char *name;
unsigned short width, height;
EphyrHostRational rate;
} EphyrHostEncoding;
typedef struct _EphyrHostImageFormat {
int id; /* Unique descriptor for the format */
int type; /* XvRGB, XvYUV */
@ -76,16 +64,6 @@ typedef struct {
unsigned short x1, y1, x2, y2;
} EphyrHostBox;
/*
* encoding
*/
Bool ephyrHostXVQueryEncodings(int a_port_id,
EphyrHostEncoding ** a_encodings,
unsigned int *a_num_encodings);
void ephyrHostEncodingsDelete(EphyrHostEncoding * a_encodings,
int a_num_encodings);
/*
* image format
*/

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

@ -332,24 +332,47 @@ ephyrXVPrivDelete(EphyrXVPriv * a_this)
EPHYR_LOG("leave\n");
}
static KdVideoEncodingPtr
videoEncodingDup(EphyrHostEncoding * a_encodings, int a_num_encodings)
static Bool
translate_video_encodings(KdVideoAdaptorPtr adaptor,
xcb_xv_adaptor_info_t *host_adaptor)
{
KdVideoEncodingPtr result = NULL;
int i = 0;
xcb_connection_t *conn = hostx_get_xcbconn();
int i;
xcb_xv_query_encodings_cookie_t cookie;
xcb_xv_query_encodings_reply_t *reply;
xcb_xv_encoding_info_iterator_t encoding_it;
EPHYR_RETURN_VAL_IF_FAIL(a_encodings && a_num_encodings, NULL);
cookie = xcb_xv_query_encodings(conn, host_adaptor->base_id);
reply = xcb_xv_query_encodings_reply(conn, cookie, NULL);
if (!reply)
return FALSE;
result = calloc(a_num_encodings, sizeof(KdVideoEncodingRec));
for (i = 0; i < a_num_encodings; i++) {
result[i].id = a_encodings[i].id;
result[i].name = strdup(a_encodings[i].name);
result[i].width = a_encodings[i].width;
result[i].height = a_encodings[i].height;
result[i].rate.numerator = a_encodings[i].rate.numerator;
result[i].rate.denominator = a_encodings[i].rate.denominator;
adaptor->nEncodings = reply->num_encodings;
adaptor->pEncodings = calloc(adaptor->nEncodings,
sizeof(*adaptor->pEncodings));
if (!adaptor->pEncodings) {
free(reply);
return FALSE;
}
return result;
encoding_it = xcb_xv_query_encodings_info_iterator(reply);
for (i = 0; i < adaptor->nEncodings; i++) {
xcb_xv_encoding_info_t *encoding_info = encoding_it.data;
KdVideoEncodingPtr encoding = &adaptor->pEncodings[i];
encoding->id = encoding_info->encoding;
encoding->name = strndup(xcb_xv_encoding_info_name(encoding_info),
encoding_info->name_size);
encoding->width = encoding_info->width;
encoding->height = encoding_info->height;
encoding->rate.numerator = encoding_info->rate.numerator;
encoding->rate.denominator = encoding_info->rate.denominator;
xcb_xv_encoding_info_next(&encoding_it);
}
free(reply);
return TRUE;
}
static Bool
@ -401,11 +424,9 @@ ephyrXVPrivQueryHostAdaptors(EphyrXVPriv * a_this)
{
xcb_connection_t *conn = hostx_get_xcbconn();
xcb_screen_t *xscreen = xcb_aux_get_screen(conn, hostx_get_screen());
EphyrHostEncoding *encodings = NULL;
EphyrHostImageFormat *image_formats = NULL;
int base_port_id = 0,
num_formats = 0, i = 0, port_priv_offset = 0;
unsigned num_encodings = 0;
Bool is_ok = FALSE;
xcb_generic_error_t *e = NULL;
xcb_xv_adaptor_info_iterator_t it;
@ -472,15 +493,12 @@ ephyrXVPrivQueryHostAdaptors(EphyrXVPriv * a_this)
if (!s_base_port_id)
s_base_port_id = base_port_id;
if (!ephyrHostXVQueryEncodings(base_port_id,
&encodings, &num_encodings)) {
if (!translate_video_encodings(&a_this->adaptors[i],
cur_host_adaptor)) {
EPHYR_LOG_ERROR("failed to get encodings for port port id %d,"
" adaptors %d\n", base_port_id, i);
continue;
}
a_this->adaptors[i].nEncodings = num_encodings;
a_this->adaptors[i].pEncodings =
videoEncodingDup(encodings, num_encodings);
a_this->adaptors[i].nFormats = cur_host_adaptor->num_formats;
a_this->adaptors[i].pFormats =
@ -531,10 +549,6 @@ ephyrXVPrivQueryHostAdaptors(EphyrXVPriv * a_this)
is_ok = TRUE;
out:
if (encodings) {
ephyrHostEncodingsDelete(encodings, num_encodings);
encodings = NULL;
}
EPHYR_LOG("leave\n");
return is_ok;
}