mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-22 10:23:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

Make GstVaapiWindow* derive from GstVaapiObject.

Browse source
This commit is contained in:
gb 2010-03-24 17:22:18 +00:00
parent 1661b0a2a7
commit 0881507989
3 changed files with 54 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
gst-libs/gst/vaapi/gstvaapiwindow.c
View file

@ -25,11 +25,12 @@
#include "config.h" #include "config.h"
#include "gstvaapiwindow.h" #include "gstvaapiwindow.h"
#include "gstvaapiobject_priv.h"
#define DEBUG 1 #define DEBUG 1
#include "gstvaapidebug.h" #include "gstvaapidebug.h"
G_DEFINE_TYPE(GstVaapiWindow, gst_vaapi_window, G_TYPE_OBJECT); G_DEFINE_TYPE(GstVaapiWindow, gst_vaapi_window, GST_VAAPI_TYPE_OBJECT);
#define GST_VAAPI_WINDOW_GET_PRIVATE(obj) \ #define GST_VAAPI_WINDOW_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE((obj), \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), \
@ -37,7 +38,6 @@ G_DEFINE_TYPE(GstVaapiWindow, gst_vaapi_window, G_TYPE_OBJECT);
GstVaapiWindowPrivate)) GstVaapiWindowPrivate))
struct _GstVaapiWindowPrivate { struct _GstVaapiWindowPrivate {
GstVaapiDisplay *display;
guint width; guint width;
guint height; guint height;
gboolean is_constructed : 1; gboolean is_constructed : 1;
@ -48,7 +48,6 @@ struct _GstVaapiWindowPrivate {
enum { enum {
PROP_0, PROP_0,
PROP_DISPLAY,
PROP_WIDTH, PROP_WIDTH,
PROP_HEIGHT, PROP_HEIGHT,
PROP_FULLSCREEN PROP_FULLSCREEN
@ -67,7 +66,11 @@ gst_vaapi_window_ensure_size(GstVaapiWindow *window)
if (klass->get_geometry) if (klass->get_geometry)
klass->get_geometry(window, NULL, NULL, &priv->width, &priv->height); klass->get_geometry(window, NULL, NULL, &priv->width, &priv->height);
gst_vaapi_display_get_size(priv->display, &display_width, &display_height); gst_vaapi_display_get_size(
GST_VAAPI_OBJECT_GET_DISPLAY(window),
&display_width,
&display_height
);
priv->is_fullscreen_changed = FALSE; priv->is_fullscreen_changed = FALSE;
priv->is_fullscreen = (priv->width == display_width && priv->is_fullscreen = (priv->width == display_width &&
priv->height == display_height); priv->height == display_height);
@ -76,14 +79,7 @@ gst_vaapi_window_ensure_size(GstVaapiWindow *window)
static void static void
gst_vaapi_window_destroy(GstVaapiWindow *window) gst_vaapi_window_destroy(GstVaapiWindow *window)
{ {
GstVaapiWindowPrivate * const priv = window->priv;
GST_VAAPI_WINDOW_GET_CLASS(window)->destroy(window); GST_VAAPI_WINDOW_GET_CLASS(window)->destroy(window);
if (priv->display) {
g_object_unref(priv->display);
priv->display = NULL;
}
} }
static gboolean static gboolean
@ -125,9 +121,6 @@ gst_vaapi_window_set_property(
GstVaapiWindow * const window = GST_VAAPI_WINDOW(object); GstVaapiWindow * const window = GST_VAAPI_WINDOW(object);
switch (prop_id) { switch (prop_id) {
case PROP_DISPLAY:
window->priv->display = g_object_ref(g_value_get_object(value));
break;
case PROP_WIDTH: case PROP_WIDTH:
gst_vaapi_window_set_width(window, g_value_get_uint(value)); gst_vaapi_window_set_width(window, g_value_get_uint(value));
break; break;
@ -154,9 +147,6 @@ gst_vaapi_window_get_property(
GstVaapiWindow * const window = GST_VAAPI_WINDOW(object); GstVaapiWindow * const window = GST_VAAPI_WINDOW(object);
switch (prop_id) { switch (prop_id) {
case PROP_DISPLAY:
g_value_set_object(value, gst_vaapi_window_get_display(window));
break;
case PROP_WIDTH: case PROP_WIDTH:
g_value_set_uint(value, gst_vaapi_window_get_width(window)); g_value_set_uint(value, gst_vaapi_window_get_width(window));
break; break;
@ -197,20 +187,6 @@ gst_vaapi_window_class_init(GstVaapiWindowClass *klass)
object_class->get_property = gst_vaapi_window_get_property; object_class->get_property = gst_vaapi_window_get_property;
object_class->constructed = gst_vaapi_window_constructed; object_class->constructed = gst_vaapi_window_constructed;
/**
* GstVaapiWindowX11:display:
*
* The #GstVaapiDisplay this window is bound to
*/
g_object_class_install_property
(object_class,
PROP_DISPLAY,
g_param_spec_object("display",
"Display",
"The GstVaapiDisplay this window is bound to",
GST_VAAPI_TYPE_DISPLAY,
G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property g_object_class_install_property
(object_class, (object_class,
PROP_WIDTH, PROP_WIDTH,
@ -245,7 +221,6 @@ gst_vaapi_window_init(GstVaapiWindow *window)
GstVaapiWindowPrivate *priv = GST_VAAPI_WINDOW_GET_PRIVATE(window); GstVaapiWindowPrivate *priv = GST_VAAPI_WINDOW_GET_PRIVATE(window);
window->priv = priv; window->priv = priv;
priv->display = NULL;
priv->width = 1; priv->width = 1;
priv->height = 1; priv->height = 1;
priv->is_constructed = FALSE; priv->is_constructed = FALSE;
@ -266,7 +241,7 @@ gst_vaapi_window_get_display(GstVaapiWindow *window)
{ {
g_return_val_if_fail(GST_VAAPI_IS_WINDOW(window), NULL); g_return_val_if_fail(GST_VAAPI_IS_WINDOW(window), NULL);
return window->priv->display; return GST_VAAPI_OBJECT_GET_DISPLAY(window);
} }
/** /**

5
gst-libs/gst/vaapi/gstvaapiwindow.h
View file

@ -23,6 +23,7 @@
#include <gst/video/gstvideosink.h> #include <gst/video/gstvideosink.h>
#include <gst/vaapi/gstvaapitypes.h> #include <gst/vaapi/gstvaapitypes.h>
#include <gst/vaapi/gstvaapiobject.h>
#include <gst/vaapi/gstvaapidisplay.h> #include <gst/vaapi/gstvaapidisplay.h>
#include <gst/vaapi/gstvaapisurface.h> #include <gst/vaapi/gstvaapisurface.h>
@ -63,7 +64,7 @@ typedef struct _GstVaapiWindowClass GstVaapiWindowClass;
*/ */
struct _GstVaapiWindow { struct _GstVaapiWindow {
/*< private >*/ /*< private >*/
GObject parent_instance; GstVaapiObject parent_instance;
GstVaapiWindowPrivate *priv; GstVaapiWindowPrivate *priv;
}; };
@ -82,7 +83,7 @@ struct _GstVaapiWindow {
*/ */
struct _GstVaapiWindowClass { struct _GstVaapiWindowClass {
/*< private >*/ /*< private >*/
GObjectClass parent_class; GstVaapiObjectClass parent_class;
/*< public >*/ /*< public >*/
gboolean (*create) (GstVaapiWindow *window, guint *width, guint *height); gboolean (*create) (GstVaapiWindow *window, guint *width, guint *height);

138
gst-libs/gst/vaapi/gstvaapiwindow_x11.c
View file

@ -44,7 +44,6 @@ G_DEFINE_TYPE(GstVaapiWindowX11, gst_vaapi_window_x11, GST_VAAPI_TYPE_WINDOW);
struct _GstVaapiWindowX11Private { struct _GstVaapiWindowX11Private {
GstVaapiDisplay *display; GstVaapiDisplay *display;
Window xid;
Atom atom_NET_WM_STATE; Atom atom_NET_WM_STATE;
Atom atom_NET_WM_STATE_FULLSCREEN; Atom atom_NET_WM_STATE_FULLSCREEN;
guint create_window : 1; guint create_window : 1;
@ -52,12 +51,6 @@ struct _GstVaapiWindowX11Private {
guint fullscreen_on_map : 1; guint fullscreen_on_map : 1;
}; };
enum {
PROP_0,
PROP_XID,
};
#define _NET_WM_STATE_REMOVE 0 /* remove/unset property */ #define _NET_WM_STATE_REMOVE 0 /* remove/unset property */
#define _NET_WM_STATE_ADD 1 /* add/set property */ #define _NET_WM_STATE_ADD 1 /* add/set property */
#define _NET_WM_STATE_TOGGLE 2 /* toggle property */ #define _NET_WM_STATE_TOGGLE 2 /* toggle property */
@ -72,7 +65,7 @@ send_wmspec_change_state(GstVaapiWindowX11 *window, Atom state, gboolean add)
memset(&xclient, 0, sizeof(xclient)); memset(&xclient, 0, sizeof(xclient));
xclient.type = ClientMessage; xclient.type = ClientMessage;
xclient.window = priv->xid; xclient.window = GST_VAAPI_OBJECT_ID(window);
xclient.message_type = priv->atom_NET_WM_STATE; xclient.message_type = priv->atom_NET_WM_STATE;
xclient.format = 32; xclient.format = 32;
@ -96,12 +89,13 @@ wait_event(GstVaapiWindow *window, int type)
{ {
GstVaapiWindowX11Private * const priv = GST_VAAPI_WINDOW_X11(window)->priv; GstVaapiWindowX11Private * const priv = GST_VAAPI_WINDOW_X11(window)->priv;
Display * const dpy = GST_VAAPI_DISPLAY_XDISPLAY(priv->display); Display * const dpy = GST_VAAPI_DISPLAY_XDISPLAY(priv->display);
const Window xid = GST_VAAPI_OBJECT_ID(window);
XEvent e; XEvent e;
Bool got_event; Bool got_event;
for (;;) { for (;;) {
GST_VAAPI_DISPLAY_LOCK(priv->display); GST_VAAPI_DISPLAY_LOCK(priv->display);
got_event = XCheckTypedWindowEvent(dpy, priv->xid, type, &e); got_event = XCheckTypedWindowEvent(dpy, xid, type, &e);
GST_VAAPI_DISPLAY_UNLOCK(priv->display); GST_VAAPI_DISPLAY_UNLOCK(priv->display);
if (got_event) if (got_event)
break; break;
@ -114,6 +108,7 @@ timed_wait_event(GstVaapiWindow *window, int type, guint64 end_time, XEvent *e)
{ {
GstVaapiWindowX11Private * const priv = GST_VAAPI_WINDOW_X11(window)->priv; GstVaapiWindowX11Private * const priv = GST_VAAPI_WINDOW_X11(window)->priv;
Display * const dpy = GST_VAAPI_DISPLAY_XDISPLAY(priv->display); Display * const dpy = GST_VAAPI_DISPLAY_XDISPLAY(priv->display);
const Window xid = GST_VAAPI_OBJECT_ID(window);
XEvent tmp_event; XEvent tmp_event;
GTimeVal now; GTimeVal now;
guint64 now_time; guint64 now_time;
@ -123,7 +118,7 @@ timed_wait_event(GstVaapiWindow *window, int type, guint64 end_time, XEvent *e)
e = &tmp_event; e = &tmp_event;
GST_VAAPI_DISPLAY_LOCK(priv->display); GST_VAAPI_DISPLAY_LOCK(priv->display);
got_event = XCheckTypedWindowEvent(dpy, priv->xid, type, e); got_event = XCheckTypedWindowEvent(dpy, xid, type, e);
GST_VAAPI_DISPLAY_UNLOCK(priv->display); GST_VAAPI_DISPLAY_UNLOCK(priv->display);
if (got_event) if (got_event)
return TRUE; return TRUE;
@ -131,7 +126,7 @@ timed_wait_event(GstVaapiWindow *window, int type, guint64 end_time, XEvent *e)
do { do {
g_usleep(10); g_usleep(10);
GST_VAAPI_DISPLAY_LOCK(priv->display); GST_VAAPI_DISPLAY_LOCK(priv->display);
got_event = XCheckTypedWindowEvent(dpy, priv->xid, type, e); got_event = XCheckTypedWindowEvent(dpy, xid, type, e);
GST_VAAPI_DISPLAY_UNLOCK(priv->display); GST_VAAPI_DISPLAY_UNLOCK(priv->display);
if (got_event) if (got_event)
return TRUE; return TRUE;
@ -146,6 +141,7 @@ gst_vaapi_window_x11_show(GstVaapiWindow *window)
{ {
GstVaapiWindowX11Private * const priv = GST_VAAPI_WINDOW_X11(window)->priv; GstVaapiWindowX11Private * const priv = GST_VAAPI_WINDOW_X11(window)->priv;
Display * const dpy = GST_VAAPI_DISPLAY_XDISPLAY(priv->display); Display * const dpy = GST_VAAPI_DISPLAY_XDISPLAY(priv->display);
const Window xid = GST_VAAPI_OBJECT_ID(window);
XWindowAttributes wattr; XWindowAttributes wattr;
gboolean has_errors; gboolean has_errors;
@ -155,11 +151,11 @@ gst_vaapi_window_x11_show(GstVaapiWindow *window)
GST_VAAPI_DISPLAY_LOCK(priv->display); GST_VAAPI_DISPLAY_LOCK(priv->display);
x11_trap_errors(); x11_trap_errors();
if (!priv->create_window) { if (!priv->create_window) {
XGetWindowAttributes(dpy, priv->xid, &wattr); XGetWindowAttributes(dpy, xid, &wattr);
if (!(wattr.your_event_mask & StructureNotifyMask)) if (!(wattr.your_event_mask & StructureNotifyMask))
XSelectInput(dpy, priv->xid, StructureNotifyMask); XSelectInput(dpy, xid, StructureNotifyMask);
} }
XMapWindow(dpy, priv->xid); XMapWindow(dpy, xid);
has_errors = x11_untrap_errors() != 0; has_errors = x11_untrap_errors() != 0;
GST_VAAPI_DISPLAY_UNLOCK(priv->display); GST_VAAPI_DISPLAY_UNLOCK(priv->display);
@ -169,7 +165,7 @@ gst_vaapi_window_x11_show(GstVaapiWindow *window)
!(wattr.your_event_mask & StructureNotifyMask)) { !(wattr.your_event_mask & StructureNotifyMask)) {
GST_VAAPI_DISPLAY_LOCK(priv->display); GST_VAAPI_DISPLAY_LOCK(priv->display);
x11_trap_errors(); x11_trap_errors();
XSelectInput(dpy, priv->xid, wattr.your_event_mask); XSelectInput(dpy, xid, wattr.your_event_mask);
has_errors = x11_untrap_errors() != 0; has_errors = x11_untrap_errors() != 0;
GST_VAAPI_DISPLAY_UNLOCK(priv->display); GST_VAAPI_DISPLAY_UNLOCK(priv->display);
} }
@ -186,6 +182,7 @@ gst_vaapi_window_x11_hide(GstVaapiWindow *window)
{ {
GstVaapiWindowX11Private * const priv = GST_VAAPI_WINDOW_X11(window)->priv; GstVaapiWindowX11Private * const priv = GST_VAAPI_WINDOW_X11(window)->priv;
Display * const dpy = GST_VAAPI_DISPLAY_XDISPLAY(priv->display); Display * const dpy = GST_VAAPI_DISPLAY_XDISPLAY(priv->display);
const Window xid = GST_VAAPI_OBJECT_ID(window);
XWindowAttributes wattr; XWindowAttributes wattr;
gboolean has_errors; gboolean has_errors;
@ -195,11 +192,11 @@ gst_vaapi_window_x11_hide(GstVaapiWindow *window)
GST_VAAPI_DISPLAY_LOCK(priv->display); GST_VAAPI_DISPLAY_LOCK(priv->display);
x11_trap_errors(); x11_trap_errors();
if (!priv->create_window) { if (!priv->create_window) {
XGetWindowAttributes(dpy, priv->xid, &wattr); XGetWindowAttributes(dpy, xid, &wattr);
if (!(wattr.your_event_mask & StructureNotifyMask)) if (!(wattr.your_event_mask & StructureNotifyMask))
XSelectInput(dpy, priv->xid, StructureNotifyMask); XSelectInput(dpy, xid, StructureNotifyMask);
} }
XUnmapWindow(dpy, priv->xid); XUnmapWindow(dpy, xid);
has_errors = x11_untrap_errors() != 0; has_errors = x11_untrap_errors() != 0;
GST_VAAPI_DISPLAY_UNLOCK(priv->display); GST_VAAPI_DISPLAY_UNLOCK(priv->display);
@ -209,7 +206,7 @@ gst_vaapi_window_x11_hide(GstVaapiWindow *window)
!(wattr.your_event_mask & StructureNotifyMask)) { !(wattr.your_event_mask & StructureNotifyMask)) {
GST_VAAPI_DISPLAY_LOCK(priv->display); GST_VAAPI_DISPLAY_LOCK(priv->display);
x11_trap_errors(); x11_trap_errors();
XSelectInput(dpy, priv->xid, wattr.your_event_mask); XSelectInput(dpy, xid, wattr.your_event_mask);
has_errors = x11_untrap_errors() != 0; has_errors = x11_untrap_errors() != 0;
GST_VAAPI_DISPLAY_UNLOCK(priv->display); GST_VAAPI_DISPLAY_UNLOCK(priv->display);
} }
@ -223,6 +220,7 @@ gst_vaapi_window_x11_create(GstVaapiWindow *window, guint *width, guint *height)
{ {
GstVaapiWindowX11Private * const priv = GST_VAAPI_WINDOW_X11(window)->priv; GstVaapiWindowX11Private * const priv = GST_VAAPI_WINDOW_X11(window)->priv;
Display * const dpy = GST_VAAPI_DISPLAY_XDISPLAY(priv->display); Display * const dpy = GST_VAAPI_DISPLAY_XDISPLAY(priv->display);
Window xid = GST_VAAPI_OBJECT_ID(window);
XWindowAttributes wattr; XWindowAttributes wattr;
Atom atoms[2]; Atom atoms[2];
gboolean ok; gboolean ok;
@ -232,11 +230,11 @@ gst_vaapi_window_x11_create(GstVaapiWindow *window, guint *width, guint *height)
"_NET_WM_STATE_FULLSCREEN", "_NET_WM_STATE_FULLSCREEN",
}; };
if (!priv->create_window && priv->xid) { if (!priv->create_window && xid) {
GST_VAAPI_DISPLAY_LOCK(priv->display); GST_VAAPI_DISPLAY_LOCK(priv->display);
XGetWindowAttributes(dpy, priv->xid, &wattr); XGetWindowAttributes(dpy, xid, &wattr);
priv->is_mapped = wattr.map_state == IsViewable; priv->is_mapped = wattr.map_state == IsViewable;
ok = x11_get_geometry(dpy, priv->xid, NULL, NULL, width, height); ok = x11_get_geometry(dpy, xid, NULL, NULL, width, height);
GST_VAAPI_DISPLAY_UNLOCK(priv->display); GST_VAAPI_DISPLAY_UNLOCK(priv->display);
return ok; return ok;
} }
@ -246,11 +244,14 @@ gst_vaapi_window_x11_create(GstVaapiWindow *window, guint *width, guint *height)
priv->atom_NET_WM_STATE = atoms[0]; priv->atom_NET_WM_STATE = atoms[0];
priv->atom_NET_WM_STATE_FULLSCREEN = atoms[1]; priv->atom_NET_WM_STATE_FULLSCREEN = atoms[1];
priv->xid = x11_create_window(dpy, *width, *height); xid = x11_create_window(dpy, *width, *height);
if (priv->xid) if (xid)
XRaiseWindow(dpy, priv->xid); XRaiseWindow(dpy, xid);
GST_VAAPI_DISPLAY_UNLOCK(priv->display); GST_VAAPI_DISPLAY_UNLOCK(priv->display);
return priv->xid != None;
GST_DEBUG("xid %" GST_VAAPI_ID_FORMAT, GST_VAAPI_ID_ARGS(xid));
GST_VAAPI_OBJECT_ID(window) = xid;
return xid != None;
} }
static void static void
@ -258,14 +259,15 @@ gst_vaapi_window_x11_destroy(GstVaapiWindow *window)
{ {
GstVaapiWindowX11Private * const priv = GST_VAAPI_WINDOW_X11(window)->priv; GstVaapiWindowX11Private * const priv = GST_VAAPI_WINDOW_X11(window)->priv;
Display * const dpy = GST_VAAPI_DISPLAY_XDISPLAY(priv->display); Display * const dpy = GST_VAAPI_DISPLAY_XDISPLAY(priv->display);
const Window xid = GST_VAAPI_OBJECT_ID(window);
if (priv->xid) { if (xid) {
if (priv->create_window) { if (priv->create_window) {
GST_VAAPI_DISPLAY_LOCK(priv->display); GST_VAAPI_DISPLAY_LOCK(priv->display);
XDestroyWindow(dpy, priv->xid); XDestroyWindow(dpy, xid);
GST_VAAPI_DISPLAY_UNLOCK(priv->display); GST_VAAPI_DISPLAY_UNLOCK(priv->display);
} }
priv->xid = None; GST_VAAPI_OBJECT_ID(window) = None;
} }
if (priv->display) { if (priv->display) {
@ -284,8 +286,9 @@ gst_vaapi_window_x11_get_geometry(
{ {
GstVaapiWindowX11Private * const priv = GST_VAAPI_WINDOW_X11(window)->priv; GstVaapiWindowX11Private * const priv = GST_VAAPI_WINDOW_X11(window)->priv;
Display * const dpy = GST_VAAPI_DISPLAY_XDISPLAY(priv->display); Display * const dpy = GST_VAAPI_DISPLAY_XDISPLAY(priv->display);
const Window xid = GST_VAAPI_OBJECT_ID(window);
return x11_get_geometry(dpy, priv->xid, px, py, pwidth, pheight); return x11_get_geometry(dpy, xid, px, py, pwidth, pheight);
} }
static gboolean static gboolean
@ -293,6 +296,7 @@ gst_vaapi_window_x11_set_fullscreen(GstVaapiWindow *window, gboolean fullscreen)
{ {
GstVaapiWindowX11Private * const priv = GST_VAAPI_WINDOW_X11(window)->priv; GstVaapiWindowX11Private * const priv = GST_VAAPI_WINDOW_X11(window)->priv;
Display * const dpy = GST_VAAPI_DISPLAY_XDISPLAY(priv->display); Display * const dpy = GST_VAAPI_DISPLAY_XDISPLAY(priv->display);
const Window xid = GST_VAAPI_OBJECT_ID(window);
XEvent e; XEvent e;
guint width, height; guint width, height;
gboolean has_errors; gboolean has_errors;
@ -307,7 +311,7 @@ gst_vaapi_window_x11_set_fullscreen(GstVaapiWindow *window, gboolean fullscreen)
XChangeProperty( XChangeProperty(
dpy, dpy,
priv->xid, xid,
priv->atom_NET_WM_STATE, XA_ATOM, 32, priv->atom_NET_WM_STATE, XA_ATOM, 32,
PropModeReplace, PropModeReplace,
(unsigned char *)&priv->atom_NET_WM_STATE_FULLSCREEN, 1 (unsigned char *)&priv->atom_NET_WM_STATE_FULLSCREEN, 1
@ -327,7 +331,7 @@ gst_vaapi_window_x11_set_fullscreen(GstVaapiWindow *window, gboolean fullscreen)
XDeleteProperty( XDeleteProperty(
dpy, dpy,
priv->xid, xid,
priv->atom_NET_WM_STATE priv->atom_NET_WM_STATE
); );
} }
@ -372,14 +376,14 @@ gst_vaapi_window_x11_resize(GstVaapiWindow *window, guint width, guint height)
GstVaapiWindowX11Private * const priv = GST_VAAPI_WINDOW_X11(window)->priv; GstVaapiWindowX11Private * const priv = GST_VAAPI_WINDOW_X11(window)->priv;
gboolean has_errors; gboolean has_errors;
if (!priv->xid) if (!GST_VAAPI_OBJECT_ID(window))
return FALSE; return FALSE;
GST_VAAPI_DISPLAY_LOCK(priv->display); GST_VAAPI_DISPLAY_LOCK(priv->display);
x11_trap_errors(); x11_trap_errors();
XResizeWindow( XResizeWindow(
GST_VAAPI_DISPLAY_XDISPLAY(priv->display), GST_VAAPI_DISPLAY_XDISPLAY(priv->display),
priv->xid, GST_VAAPI_OBJECT_ID(window),
width, width,
height height
); );
@ -413,7 +417,7 @@ gst_vaapi_window_x11_render(
status = vaPutSurface( status = vaPutSurface(
GST_VAAPI_DISPLAY_VADISPLAY(display), GST_VAAPI_DISPLAY_VADISPLAY(display),
surface_id, surface_id,
GST_VAAPI_WINDOW_X11(window)->priv->xid, GST_VAAPI_OBJECT_ID(window),
src_rect->x, src_rect->x,
src_rect->y, src_rect->y,
src_rect->width, src_rect->width,
@ -438,46 +442,6 @@ gst_vaapi_window_x11_finalize(GObject *object)
G_OBJECT_CLASS(gst_vaapi_window_x11_parent_class)->finalize(object); G_OBJECT_CLASS(gst_vaapi_window_x11_parent_class)->finalize(object);
} }
static void
gst_vaapi_window_x11_set_property(
GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec
)
{
GstVaapiWindowX11 * const window = GST_VAAPI_WINDOW_X11(object);
switch (prop_id) {
case PROP_XID:
window->priv->xid = g_value_get_uint(value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
}
}
static void
gst_vaapi_window_x11_get_property(
GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec
)
{
GstVaapiWindowX11 * const window = GST_VAAPI_WINDOW_X11(object);
switch (prop_id) {
case PROP_XID:
g_value_set_uint(value, gst_vaapi_window_x11_get_xid(window));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
}
}
static void static void
gst_vaapi_window_x11_constructed(GObject *object) gst_vaapi_window_x11_constructed(GObject *object)
{ {
@ -487,7 +451,7 @@ gst_vaapi_window_x11_constructed(GObject *object)
window->priv->display = window->priv->display =
g_object_ref(gst_vaapi_window_get_display(GST_VAAPI_WINDOW(window))); g_object_ref(gst_vaapi_window_get_display(GST_VAAPI_WINDOW(window)));
window->priv->create_window = window->priv->xid == None; window->priv->create_window = GST_VAAPI_OBJECT_ID(object) == None;
parent_class = G_OBJECT_CLASS(gst_vaapi_window_x11_parent_class); parent_class = G_OBJECT_CLASS(gst_vaapi_window_x11_parent_class);
if (parent_class->constructed) if (parent_class->constructed)
@ -503,8 +467,6 @@ gst_vaapi_window_x11_class_init(GstVaapiWindowX11Class *klass)
g_type_class_add_private(klass, sizeof(GstVaapiWindowX11Private)); g_type_class_add_private(klass, sizeof(GstVaapiWindowX11Private));
object_class->finalize = gst_vaapi_window_x11_finalize; object_class->finalize = gst_vaapi_window_x11_finalize;
object_class->set_property = gst_vaapi_window_x11_set_property;
object_class->get_property = gst_vaapi_window_x11_get_property;
object_class->constructed = gst_vaapi_window_x11_constructed; object_class->constructed = gst_vaapi_window_x11_constructed;
window_class->create = gst_vaapi_window_x11_create; window_class->create = gst_vaapi_window_x11_create;
@ -515,20 +477,6 @@ gst_vaapi_window_x11_class_init(GstVaapiWindowX11Class *klass)
window_class->set_fullscreen = gst_vaapi_window_x11_set_fullscreen; window_class->set_fullscreen = gst_vaapi_window_x11_set_fullscreen;
window_class->resize = gst_vaapi_window_x11_resize; window_class->resize = gst_vaapi_window_x11_resize;
window_class->render = gst_vaapi_window_x11_render; window_class->render = gst_vaapi_window_x11_render;
/**
* GstVaapiWindowX11:xid:
*
* The underlying X11 #Window XID.
*/
g_object_class_install_property
(object_class,
PROP_XID,
g_param_spec_uint("xid",
"X window id",
"The underlying X11 window id",
0, G_MAXUINT32, 0,
G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY));
} }
static void static void
@ -538,7 +486,6 @@ gst_vaapi_window_x11_init(GstVaapiWindowX11 *window)
window->priv = priv; window->priv = priv;
priv->display = NULL; priv->display = NULL;
priv->xid = None;
priv->create_window = TRUE; priv->create_window = TRUE;
priv->is_mapped = FALSE; priv->is_mapped = FALSE;
priv->fullscreen_on_map = FALSE; priv->fullscreen_on_map = FALSE;
@ -567,6 +514,7 @@ gst_vaapi_window_x11_new(GstVaapiDisplay *display, guint width, guint height)
return g_object_new(GST_VAAPI_TYPE_WINDOW_X11, return g_object_new(GST_VAAPI_TYPE_WINDOW_X11,
"display", display, "display", display,
"id", (GstVaapiID)None,
"width", width, "width", width,
"height", height, "height", height,
NULL); NULL);
@ -594,7 +542,7 @@ gst_vaapi_window_x11_new_with_xid(GstVaapiDisplay *display, Window xid)
return g_object_new(GST_VAAPI_TYPE_WINDOW_X11, return g_object_new(GST_VAAPI_TYPE_WINDOW_X11,
"display", display, "display", display,
"xid", xid, "id", (GstVaapiID)xid,
NULL); NULL);
} }
@ -613,5 +561,5 @@ gst_vaapi_window_x11_get_xid(GstVaapiWindowX11 *window)
{ {
g_return_val_if_fail(GST_VAAPI_WINDOW_X11(window), None); g_return_val_if_fail(GST_VAAPI_WINDOW_X11(window), None);
return window->priv->xid; return GST_VAAPI_OBJECT_ID(window);
} }