mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

API change: gst_vaapi_display_x11_new() now takes an X11 display name.

Browse source
This commit is contained in:
gb 2010-03-11 15:01:00 +00:00
parent e284e5e0d0
commit a42754e31e
5 changed files with 157 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
gst-libs/gst/vaapi/gstvaapidisplay.c
View file

@ -37,6 +37,7 @@ G_DEFINE_TYPE(GstVaapiDisplay, gst_vaapi_display, G_TYPE_OBJECT);
struct _GstVaapiDisplayPrivate { struct _GstVaapiDisplayPrivate {
VADisplay display; VADisplay display;
gboolean create_display;
VAProfile *profiles; VAProfile *profiles;
unsigned int num_profiles; unsigned int num_profiles;
VAImageFormat *image_formats; VAImageFormat *image_formats;
@ -52,9 +53,6 @@ enum {
PROP_DISPLAY PROP_DISPLAY
}; };
static void
gst_vaapi_display_set_display(GstVaapiDisplay *display, VADisplay va_display);
static void static void
filter_formats(VAImageFormat *va_formats, unsigned int *pnum_va_formats) filter_formats(VAImageFormat *va_formats, unsigned int *pnum_va_formats)
{ {
@ -146,6 +144,12 @@ gst_vaapi_display_destroy(GstVaapiDisplay *display)
vaTerminate(priv->display); vaTerminate(priv->display);
priv->display = NULL; priv->display = NULL;
} }
if (priv->create_display) {
GstVaapiDisplayClass *klass = GST_VAAPI_DISPLAY_GET_CLASS(display);
if (klass->close_display)
klass->close_display(display);
}
} }
static gboolean static gboolean
@ -156,6 +160,16 @@ gst_vaapi_display_create(GstVaapiDisplay *display)
int major_version, minor_version; int major_version, minor_version;
unsigned int i; unsigned int i;
if (!priv->display && priv->create_display) {
GstVaapiDisplayClass *klass = GST_VAAPI_DISPLAY_GET_CLASS(display);
if (klass->open_display && !klass->open_display(display))
return FALSE;
if (klass->get_display)
priv->display = klass->get_display(display);
}
if (!priv->display)
return FALSE;
status = vaInitialize(priv->display, &major_version, &minor_version); status = vaInitialize(priv->display, &major_version, &minor_version);
if (!vaapi_check_status(status, "vaInitialize()")) if (!vaapi_check_status(status, "vaInitialize()"))
return FALSE; return FALSE;
@ -244,16 +258,17 @@ gst_vaapi_display_finalize(GObject *object)
} }
static void static void
gst_vaapi_display_set_property(GObject *object, gst_vaapi_display_set_property(
guint prop_id, GObject *object,
const GValue *value, guint prop_id,
GParamSpec *pspec) const GValue *value,
GParamSpec *pspec)
{ {
GstVaapiDisplay * const display = GST_VAAPI_DISPLAY(object); GstVaapiDisplay * const display = GST_VAAPI_DISPLAY(object);
switch (prop_id) { switch (prop_id) {
case PROP_DISPLAY: case PROP_DISPLAY:
gst_vaapi_display_set_display(display, g_value_get_pointer(value)); display->priv->display = g_value_get_pointer(value);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@ -262,10 +277,12 @@ gst_vaapi_display_set_property(GObject *object,
} }
static void static void
gst_vaapi_display_get_property(GObject *object, gst_vaapi_display_get_property(
guint prop_id, GObject *object,
GValue *value, guint prop_id,
GParamSpec *pspec) GValue *value,
GParamSpec *pspec
)
{ {
GstVaapiDisplay * const display = GST_VAAPI_DISPLAY(object); GstVaapiDisplay * const display = GST_VAAPI_DISPLAY(object);
@ -279,6 +296,20 @@ gst_vaapi_display_get_property(GObject *object,
} }
} }
static void
gst_vaapi_display_constructed(GObject *object)
{
GstVaapiDisplay * const display = GST_VAAPI_DISPLAY(object);
GObjectClass *parent_class;
display->priv->create_display = display->priv->display == NULL;
gst_vaapi_display_create(display);
parent_class = G_OBJECT_CLASS(gst_vaapi_display_parent_class);
if (parent_class->constructed)
parent_class->constructed(object);
}
static void static void
gst_vaapi_display_class_init(GstVaapiDisplayClass *klass) gst_vaapi_display_class_init(GstVaapiDisplayClass *klass)
{ {
@ -291,6 +322,7 @@ gst_vaapi_display_class_init(GstVaapiDisplayClass *klass)
object_class->finalize = gst_vaapi_display_finalize; object_class->finalize = gst_vaapi_display_finalize;
object_class->set_property = gst_vaapi_display_set_property; object_class->set_property = gst_vaapi_display_set_property;
object_class->get_property = gst_vaapi_display_get_property; object_class->get_property = gst_vaapi_display_get_property;
object_class->constructed = gst_vaapi_display_constructed;
g_object_class_install_property g_object_class_install_property
(object_class, (object_class,
@ -308,6 +340,7 @@ gst_vaapi_display_init(GstVaapiDisplay *display)
display->priv = priv; display->priv = priv;
priv->display = NULL; priv->display = NULL;
priv->create_display = TRUE;
priv->profiles = 0; priv->profiles = 0;
priv->num_profiles = 0; priv->num_profiles = 0;
priv->image_formats = NULL; priv->image_formats = NULL;
@ -333,23 +366,6 @@ gst_vaapi_display_get_display(GstVaapiDisplay *display)
return display->priv->display; return display->priv->display;
} }
void
gst_vaapi_display_set_display(GstVaapiDisplay *display, VADisplay va_display)
{
GstVaapiDisplayPrivate * const priv = display->priv;
if (priv->display)
gst_vaapi_display_destroy(display);
if (va_display) {
priv->display = va_display;
if (!gst_vaapi_display_create(display)) {
gst_vaapi_display_destroy(display);
return;
}
}
}
gboolean gboolean
gst_vaapi_display_has_profile(GstVaapiDisplay *display, VAProfile profile) gst_vaapi_display_has_profile(GstVaapiDisplay *display, VAProfile profile)
{ {

6
gst-libs/gst/vaapi/gstvaapidisplay.h
View file

@ -49,7 +49,7 @@ G_BEGIN_DECLS
#define GST_VAAPI_DISPLAY_GET_CLASS(obj) \ #define GST_VAAPI_DISPLAY_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS((obj), \ (G_TYPE_INSTANCE_GET_CLASS((obj), \
GST_VAAPI_TYPE_DISPLAY, \ GST_VAAPI_TYPE_DISPLAY, \
GstVaapiDisplay)) GstVaapiDisplayClass))
typedef struct _GstVaapiDisplay GstVaapiDisplay; typedef struct _GstVaapiDisplay GstVaapiDisplay;
typedef struct _GstVaapiDisplayPrivate GstVaapiDisplayPrivate; typedef struct _GstVaapiDisplayPrivate GstVaapiDisplayPrivate;
@ -65,6 +65,10 @@ struct _GstVaapiDisplay {
struct _GstVaapiDisplayClass { struct _GstVaapiDisplayClass {
/*< private >*/ /*< private >*/
GObjectClass parent_class; GObjectClass parent_class;
gboolean (*open_display) (GstVaapiDisplay *display);
void (*close_display)(GstVaapiDisplay *display);
VADisplay (*get_display) (GstVaapiDisplay *display);
}; };
GType GType

133
gst-libs/gst/vaapi/gstvaapidisplay_x11.c
View file

@ -35,12 +35,15 @@ G_DEFINE_TYPE(GstVaapiDisplayX11,
GstVaapiDisplayX11Private)) GstVaapiDisplayX11Private))
struct _GstVaapiDisplayX11Private { struct _GstVaapiDisplayX11Private {
Display *display; gchar *display_name;
Display *x11_display;
VADisplay *va_display;
}; };
enum { enum {
PROP_0, PROP_0,
PROP_DISPLAY_NAME,
PROP_X11_DISPLAY PROP_X11_DISPLAY
}; };
@ -51,16 +54,31 @@ gst_vaapi_display_x11_finalize(GObject *object)
} }
static void static void
gst_vaapi_display_x11_set_property(GObject *object, set_display_name(GstVaapiDisplayX11 *display, const gchar *display_name)
guint prop_id, {
const GValue *value, GstVaapiDisplayX11Private * const priv = display->priv;
GParamSpec *pspec)
g_free(priv->display_name);
if (display_name)
priv->display_name = g_strdup(display_name);
else
priv->display_name = NULL;
}
static void
gst_vaapi_display_x11_set_property(
GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec
)
{ {
GstVaapiDisplayX11 * const display = GST_VAAPI_DISPLAY_X11(object); GstVaapiDisplayX11 * const display = GST_VAAPI_DISPLAY_X11(object);
switch (prop_id) { switch (prop_id) {
case PROP_X11_DISPLAY: case PROP_DISPLAY_NAME:
display->priv->display = g_value_get_pointer(value); set_display_name(display, g_value_get_string(value));
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@ -69,14 +87,19 @@ gst_vaapi_display_x11_set_property(GObject *object,
} }
static void static void
gst_vaapi_display_x11_get_property(GObject *object, gst_vaapi_display_x11_get_property(
guint prop_id, GObject *object,
GValue *value, guint prop_id,
GParamSpec *pspec) GValue *value,
GParamSpec *pspec
)
{ {
GstVaapiDisplayX11 * const display = GST_VAAPI_DISPLAY_X11(object); GstVaapiDisplayX11 * const display = GST_VAAPI_DISPLAY_X11(object);
switch (prop_id) { switch (prop_id) {
case PROP_DISPLAY_NAME:
g_value_set_string(value, display->priv->display_name);
break;
case PROP_X11_DISPLAY: case PROP_X11_DISPLAY:
g_value_set_pointer(value, gst_vaapi_display_x11_get_display(display)); g_value_set_pointer(value, gst_vaapi_display_x11_get_display(display));
break; break;
@ -86,16 +109,61 @@ gst_vaapi_display_x11_get_property(GObject *object,
} }
} }
static gboolean
gst_vaapi_display_x11_open_display(GstVaapiDisplay *display)
{
GstVaapiDisplayX11Private * const priv =
GST_VAAPI_DISPLAY_X11(display)->priv;
/* XXX: maintain an X11 display cache */
priv->x11_display = XOpenDisplay(priv->display_name);
if (!priv->x11_display)
return FALSE;
priv->va_display = vaGetDisplay(priv->x11_display);
return priv->va_display != NULL;
}
static void
gst_vaapi_display_x11_close_display(GstVaapiDisplay *display)
{
GstVaapiDisplayX11Private * const priv =
GST_VAAPI_DISPLAY_X11(display)->priv;
if (priv->x11_display) {
XCloseDisplay(priv->x11_display);
priv->x11_display = NULL;
}
if (priv->display_name) {
g_free(priv->display_name);
priv->display_name = NULL;
}
priv->va_display = NULL;
}
static VADisplay
gst_vaapi_display_x11_get_va_display(GstVaapiDisplay *display)
{
return GST_VAAPI_DISPLAY_X11(display)->priv->va_display;
}
static void static void
gst_vaapi_display_x11_class_init(GstVaapiDisplayX11Class *klass) gst_vaapi_display_x11_class_init(GstVaapiDisplayX11Class *klass)
{ {
GObjectClass * const object_class = G_OBJECT_CLASS(klass); GObjectClass * const object_class = G_OBJECT_CLASS(klass);
GstVaapiDisplayClass * const dpy_class = GST_VAAPI_DISPLAY_CLASS(klass);
g_type_class_add_private(klass, sizeof(GstVaapiDisplayX11Private)); g_type_class_add_private(klass, sizeof(GstVaapiDisplayX11Private));
object_class->finalize = gst_vaapi_display_x11_finalize; object_class->finalize = gst_vaapi_display_x11_finalize;
object_class->set_property = gst_vaapi_display_x11_set_property; object_class->set_property = gst_vaapi_display_x11_set_property;
object_class->get_property = gst_vaapi_display_x11_get_property; object_class->get_property = gst_vaapi_display_x11_get_property;
dpy_class->open_display = gst_vaapi_display_x11_open_display;
dpy_class->close_display = gst_vaapi_display_x11_close_display;
dpy_class->get_display = gst_vaapi_display_x11_get_va_display;
g_object_class_install_property g_object_class_install_property
(object_class, (object_class,
@ -103,7 +171,16 @@ gst_vaapi_display_x11_class_init(GstVaapiDisplayX11Class *klass)
g_param_spec_pointer("x11-display", g_param_spec_pointer("x11-display",
"X11 display", "X11 display",
"X11 display", "X11 display",
G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY)); G_PARAM_READABLE));
g_object_class_install_property
(object_class,
PROP_DISPLAY_NAME,
g_param_spec_string("display-name",
"X11 display name",
"X11 display name",
NULL,
G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY));
} }
static void static void
@ -111,8 +188,17 @@ gst_vaapi_display_x11_init(GstVaapiDisplayX11 *display)
{ {
GstVaapiDisplayX11Private *priv = GST_VAAPI_DISPLAY_X11_GET_PRIVATE(display); GstVaapiDisplayX11Private *priv = GST_VAAPI_DISPLAY_X11_GET_PRIVATE(display);
display->priv = priv; display->priv = priv;
priv->display = NULL; priv->x11_display = NULL;
priv->display_name = NULL;
}
GstVaapiDisplay *
gst_vaapi_display_x11_new(const gchar *display_name)
{
return g_object_new(GST_VAAPI_TYPE_DISPLAY_X11,
"display-name", display_name,
NULL);
} }
Display * Display *
@ -120,16 +206,5 @@ gst_vaapi_display_x11_get_display(GstVaapiDisplayX11 *display)
{ {
g_return_val_if_fail(GST_VAAPI_IS_DISPLAY_X11(display), NULL); g_return_val_if_fail(GST_VAAPI_IS_DISPLAY_X11(display), NULL);
return display->priv->display; return display->priv->x11_display;
}
GstVaapiDisplay *
gst_vaapi_display_x11_new(Display *x11_display)
{
g_return_val_if_fail(x11_display, NULL);
return g_object_new(GST_VAAPI_TYPE_DISPLAY_X11,
"x11-display", x11_display,
"display", vaGetDisplay(x11_display),
NULL);
} }

2
gst-libs/gst/vaapi/gstvaapidisplay_x11.h
View file

@ -70,7 +70,7 @@ GType
gst_vaapi_display_x11_get_type(void); gst_vaapi_display_x11_get_type(void);
GstVaapiDisplay * GstVaapiDisplay *
gst_vaapi_display_x11_new(Display *x11_display); gst_vaapi_display_x11_new(const gchar *display_name);
Display * Display *
gst_vaapi_display_x11_get_display(GstVaapiDisplayX11 *display); gst_vaapi_display_x11_get_display(GstVaapiDisplayX11 *display);

10
tests/examples/generic/test-display.c
View file

@ -71,17 +71,12 @@ print_caps(GstCaps *caps, const gchar *name)
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
Display *x11_display;
GstVaapiDisplay *display; GstVaapiDisplay *display;
GstCaps *caps; GstCaps *caps;
gst_init(&argc, &argv); gst_init(&argc, &argv);
x11_display = XOpenDisplay(NULL); display = gst_vaapi_display_x11_new(NULL);
if (!x11_display)
g_error("could not create X11 display");
display = gst_vaapi_display_x11_new(x11_display);
if (!display) if (!display)
g_error("could not create VA-API display"); g_error("could not create VA-API display");
@ -99,8 +94,7 @@ main(int argc, char *argv[])
print_caps(caps, "subpicture"); print_caps(caps, "subpicture");
gst_caps_unref(caps); gst_caps_unref(caps);
g_object_unref(G_OBJECT(display)); g_object_unref(display);
XCloseDisplay(x11_display);
gst_deinit(); gst_deinit();
return 0; return 0;
} }