mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

wayland: implement display ::get_size*() hooks.

Browse source
This commit is contained in:
Gwenole Beauchesne 2012-07-27 14:27:05 +02:00
parent 511cc95a44
commit 4401ada22a
3 changed files with 86 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
gst-libs/gst/vaapi/gstvaapidisplay_wayland.c
View file

@ -223,6 +223,35 @@ gst_vaapi_display_wayland_constructed(GObject *object)
parent_class->constructed(object);
}
static void
output_handle_geometry(void *data, struct wl_output *output,
int x, int y, int physical_width, int physical_height,
int subpixel, const char *make, const char *model,
int transform)
{
GstVaapiDisplayWaylandPrivate * const priv = data;
priv->phys_width = physical_width;
priv->phys_height = physical_height;
}
static void
output_handle_mode(void *data, struct wl_output *wl_output,
uint32_t flags, int width, int height, int refresh)
{
GstVaapiDisplayWaylandPrivate * const priv = data;
if (flags & WL_OUTPUT_MODE_CURRENT) {
priv->width = width;
priv->height = height;
}
}
static const struct wl_output_listener output_listener = {
output_handle_geometry,
output_handle_mode,
};
static void
display_handle_global(
struct wl_display *display,
@ -238,6 +267,10 @@ display_handle_global(
priv->compositor = wl_display_bind(display, id, &wl_compositor_interface);
else if (strcmp(interface, "wl_shell") == 0)
priv->shell = wl_display_bind(display, id, &wl_shell_interface);
else if (strcmp(interface, "wl_output") == 0) {
priv->output = wl_display_bind(display, id, &wl_output_interface);
wl_output_add_listener(priv->output, &output_listener, priv);
}
}
static int
@ -337,6 +370,46 @@ gst_vaapi_display_wayland_get_display_info(
return TRUE;
}
static void
gst_vaapi_display_wayland_get_size(
GstVaapiDisplay *display,
guint *pwidth,
guint *pheight
)
{
GstVaapiDisplayWaylandPrivate * const priv =
GST_VAAPI_DISPLAY_WAYLAND(display)->priv;
if (!priv->output)
return;
if (pwidth)
*pwidth = priv->width;
if (pheight)
*pheight = priv->height;
}
static void
gst_vaapi_display_wayland_get_size_mm(
GstVaapiDisplay *display,
guint *pwidth,
guint *pheight
)
{
GstVaapiDisplayWaylandPrivate * const priv =
GST_VAAPI_DISPLAY_WAYLAND(display)->priv;
if (!priv->output)
return;
if (pwidth)
*pwidth = priv->phys_width;
if (pheight)
*pheight = priv->phys_height;
}
static void
gst_vaapi_display_wayland_class_init(GstVaapiDisplayWaylandClass * klass)
{
@ -353,6 +426,8 @@ gst_vaapi_display_wayland_class_init(GstVaapiDisplayWaylandClass * klass)
dpy_class->open_display = gst_vaapi_display_wayland_open_display;
dpy_class->close_display = gst_vaapi_display_wayland_close_display;
dpy_class->get_display = gst_vaapi_display_wayland_get_display_info;
dpy_class->get_size = gst_vaapi_display_wayland_get_size;
dpy_class->get_size_mm = gst_vaapi_display_wayland_get_size_mm;
/**
* GstVaapiDisplayWayland:wayland-display:
@ -387,7 +462,7 @@ gst_vaapi_display_wayland_class_init(GstVaapiDisplayWaylandClass * klass)
static void
gst_vaapi_display_wayland_init(GstVaapiDisplayWayland *display)
{
GstVaapiDisplayWaylandPrivate *priv =
GstVaapiDisplayWaylandPrivate * const priv =
GST_VAAPI_DISPLAY_WAYLAND_GET_PRIVATE(display);
display->priv = priv;
@ -396,6 +471,11 @@ gst_vaapi_display_wayland_init(GstVaapiDisplayWayland *display)
priv->wl_display = NULL;
priv->compositor = NULL;
priv->shell = NULL;
priv->output = NULL;
priv->width = 0;
priv->height = 0;
priv->phys_width = 0;
priv->phys_height = 0;
priv->event_fd = -1;
priv->event_mask = 0;
}

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

@ -50,6 +50,11 @@ struct _GstVaapiDisplayWaylandPrivate {
struct wl_display *wl_display;
struct wl_compositor *compositor;
struct wl_shell *shell;
struct wl_output *output;
guint width;
guint height;
guint phys_width;
guint phys_height;
gint event_fd;
guint32 event_mask;
guint create_display : 1;

10
gst/vaapi/gstvaapisink.c
View file

@ -488,16 +488,6 @@ gst_vaapisink_set_caps(GstBaseSink *base_sink, GstCaps *caps)
sink->video_width = video_width;
sink->video_height = video_height;
#if USE_WAYLAND
/* XXX: fix GstVaapiDisplayWayland::get_size() */
if (sink->display_type == GST_VAAPI_DISPLAY_TYPE_WAYLAND) {
sink->window_width = video_width;
sink->window_height = video_height;
return gst_vaapisink_ensure_window(sink,
sink->window_width, sink->window_height);
}
#endif
gst_video_parse_caps_pixel_aspect_ratio(caps, &video_par_n, &video_par_d);
sink->video_par_n = video_par_n;
sink->video_par_d = video_par_d;