mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 09:10:36 +00:00
waylandsink: improve the way the video size is passed to wlwindow and also improve the code for window creation
This commit is contained in:
parent
86930cab13
commit
bda600ed92
4 changed files with 49 additions and 35 deletions
|
@ -465,10 +465,6 @@ gst_wayland_sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
|
||||||
if (format == -1)
|
if (format == -1)
|
||||||
goto invalid_format;
|
goto invalid_format;
|
||||||
|
|
||||||
/* store the video size */
|
|
||||||
sink->video_width = info.width;
|
|
||||||
sink->video_height = info.height;
|
|
||||||
|
|
||||||
/* verify we support the requested format */
|
/* verify we support the requested format */
|
||||||
formats = sink->display->formats;
|
formats = sink->display->formats;
|
||||||
for (i = 0; i < formats->len; i++) {
|
for (i = 0; i < formats->len; i++) {
|
||||||
|
@ -490,6 +486,10 @@ gst_wayland_sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
|
||||||
if (!gst_buffer_pool_set_config (newpool, structure))
|
if (!gst_buffer_pool_set_config (newpool, structure))
|
||||||
goto config_failed;
|
goto config_failed;
|
||||||
|
|
||||||
|
/* store the video info */
|
||||||
|
sink->video_info = info;
|
||||||
|
sink->video_info_changed = TRUE;
|
||||||
|
|
||||||
gst_object_replace ((GstObject **) & sink->pool, (GstObject *) newpool);
|
gst_object_replace ((GstObject **) & sink->pool, (GstObject *) newpool);
|
||||||
gst_object_unref (newpool);
|
gst_object_unref (newpool);
|
||||||
|
|
||||||
|
@ -654,30 +654,46 @@ gst_wayland_sink_render (GstBaseSink * bsink, GstBuffer * buffer)
|
||||||
GstWlMeta *meta;
|
GstWlMeta *meta;
|
||||||
GstFlowReturn ret = GST_FLOW_OK;
|
GstFlowReturn ret = GST_FLOW_OK;
|
||||||
|
|
||||||
/* ask for window handle. do that before locking the sink, because
|
|
||||||
* set_window_handle & friends will lock it in this context */
|
|
||||||
if (!sink->window)
|
|
||||||
gst_video_overlay_prepare_window_handle (GST_VIDEO_OVERLAY (sink));
|
|
||||||
|
|
||||||
g_mutex_lock (&sink->render_lock);
|
g_mutex_lock (&sink->render_lock);
|
||||||
|
|
||||||
GST_LOG_OBJECT (sink, "render buffer %p", buffer);
|
GST_LOG_OBJECT (sink, "render buffer %p", buffer);
|
||||||
|
|
||||||
|
if (G_UNLIKELY (!sink->window)) {
|
||||||
|
/* ask for window handle. Unlock render_lock while doing that because
|
||||||
|
* set_window_handle & friends will lock it in this context */
|
||||||
|
g_mutex_unlock (&sink->render_lock);
|
||||||
|
gst_video_overlay_prepare_window_handle (GST_VIDEO_OVERLAY (sink));
|
||||||
|
g_mutex_lock (&sink->render_lock);
|
||||||
|
|
||||||
|
if (sink->window) {
|
||||||
|
/* inform the window about our caps */
|
||||||
|
gst_wl_window_set_video_info (sink->window, &sink->video_info);
|
||||||
|
} else {
|
||||||
|
/* if we were not provided a window, create one ourselves */
|
||||||
|
sink->window =
|
||||||
|
gst_wl_window_new_toplevel (sink->display, &sink->video_info);
|
||||||
|
}
|
||||||
|
sink->video_info_changed = FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
/* drop buffers until we get a frame callback */
|
/* drop buffers until we get a frame callback */
|
||||||
if (g_atomic_int_get (&sink->redraw_pending) == TRUE)
|
if (g_atomic_int_get (&sink->redraw_pending) == TRUE)
|
||||||
goto done;
|
goto done;
|
||||||
|
|
||||||
/* if we were not provided a window, create one ourselves */
|
if (G_UNLIKELY (sink->video_info_changed)) {
|
||||||
if (!sink->window) {
|
gst_wl_window_set_video_info (sink->window, &sink->video_info);
|
||||||
sink->window = gst_wl_window_new_toplevel (sink->display, sink->video_width,
|
sink->video_info_changed = FALSE;
|
||||||
sink->video_height);
|
|
||||||
} else {
|
|
||||||
gst_wl_window_set_video_size (sink->window, sink->video_width,
|
|
||||||
sink->video_height);
|
|
||||||
if (sink->window->surface_width == 0 || sink->window->surface_height == 0)
|
|
||||||
goto no_window_size;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* now that we have for sure set the video info on the window, it must have
|
||||||
|
* a valid size, otherwise this means that the application has called
|
||||||
|
* set_window_handle() without calling set_render_rectangle(), which is
|
||||||
|
* absolutely necessary for us.
|
||||||
|
*/
|
||||||
|
if (G_UNLIKELY (sink->window->surface_width == 0 ||
|
||||||
|
sink->window->surface_height == 0))
|
||||||
|
goto no_window_size;
|
||||||
|
|
||||||
meta = gst_buffer_get_wl_meta (buffer);
|
meta = gst_buffer_get_wl_meta (buffer);
|
||||||
|
|
||||||
if (meta && meta->pool->display == sink->display) {
|
if (meta && meta->pool->display == sink->display) {
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#define __GST_WAYLAND_VIDEO_SINK_H__
|
#define __GST_WAYLAND_VIDEO_SINK_H__
|
||||||
|
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
#include <gst/video/gstvideosink.h>
|
#include <gst/video/video.h>
|
||||||
|
|
||||||
#include <wayland-client.h>
|
#include <wayland-client.h>
|
||||||
|
|
||||||
|
@ -57,8 +57,8 @@ struct _GstWaylandSink
|
||||||
GstWlWindow *window;
|
GstWlWindow *window;
|
||||||
GstBufferPool *pool;
|
GstBufferPool *pool;
|
||||||
|
|
||||||
gint video_width;
|
gboolean video_info_changed;
|
||||||
gint video_height;
|
GstVideoInfo video_info;
|
||||||
|
|
||||||
gchar *display_name;
|
gchar *display_name;
|
||||||
|
|
||||||
|
|
|
@ -116,16 +116,16 @@ gst_wl_window_new_internal (GstWlDisplay * display, struct wl_surface *surface)
|
||||||
}
|
}
|
||||||
|
|
||||||
GstWlWindow *
|
GstWlWindow *
|
||||||
gst_wl_window_new_toplevel (GstWlDisplay * display, gint video_width,
|
gst_wl_window_new_toplevel (GstWlDisplay * display, GstVideoInfo * video_info)
|
||||||
gint video_height)
|
|
||||||
{
|
{
|
||||||
GstWlWindow *window;
|
GstWlWindow *window;
|
||||||
|
|
||||||
window = gst_wl_window_new_internal (display,
|
window = gst_wl_window_new_internal (display,
|
||||||
wl_compositor_create_surface (display->compositor));
|
wl_compositor_create_surface (display->compositor));
|
||||||
|
|
||||||
gst_wl_window_set_video_size (window, video_width, video_height);
|
gst_wl_window_set_video_info (window, video_info);
|
||||||
gst_wl_window_set_render_rectangle (window, 0, 0, video_width, video_height);
|
gst_wl_window_set_render_rectangle (window, 0, 0, video_info->width,
|
||||||
|
video_info->height);
|
||||||
|
|
||||||
window->shell_surface = wl_shell_get_shell_surface (display->shell,
|
window->shell_surface = wl_shell_get_shell_surface (display->shell,
|
||||||
window->surface);
|
window->surface);
|
||||||
|
@ -207,18 +207,16 @@ gst_wl_window_resize_internal (GstWlWindow * window)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
gst_wl_window_set_video_size (GstWlWindow * window, gint w, gint h)
|
gst_wl_window_set_video_info (GstWlWindow * window, GstVideoInfo * info)
|
||||||
{
|
{
|
||||||
g_return_if_fail (window != NULL);
|
g_return_if_fail (window != NULL);
|
||||||
|
|
||||||
if (w != window->video_width || h != window->video_height) {
|
window->video_width = info->width;
|
||||||
window->video_width = w;
|
window->video_height = info->height;
|
||||||
window->video_height = h;
|
|
||||||
|
|
||||||
if (window->render_rectangle.w != 0)
|
if (window->render_rectangle.w != 0)
|
||||||
gst_wl_window_resize_internal (window);
|
gst_wl_window_resize_internal (window);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
gst_wl_window_set_render_rectangle (GstWlWindow * window, gint x, gint y,
|
gst_wl_window_set_render_rectangle (GstWlWindow * window, gint x, gint y,
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#define __GST_WL_WINDOW_H__
|
#define __GST_WL_WINDOW_H__
|
||||||
|
|
||||||
#include "wldisplay.h"
|
#include "wldisplay.h"
|
||||||
#include <gst/video/gstvideosink.h>
|
#include <gst/video/video.h>
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ struct _GstWlWindowClass
|
||||||
GType gst_wl_window_get_type (void);
|
GType gst_wl_window_get_type (void);
|
||||||
|
|
||||||
GstWlWindow *gst_wl_window_new_toplevel (GstWlDisplay * display,
|
GstWlWindow *gst_wl_window_new_toplevel (GstWlDisplay * display,
|
||||||
gint video_width, gint video_height);
|
GstVideoInfo * video_info);
|
||||||
GstWlWindow *gst_wl_window_new_in_surface (GstWlDisplay * display,
|
GstWlWindow *gst_wl_window_new_in_surface (GstWlDisplay * display,
|
||||||
struct wl_surface * parent);
|
struct wl_surface * parent);
|
||||||
|
|
||||||
|
@ -71,7 +71,7 @@ struct wl_surface *gst_wl_window_get_wl_surface (GstWlWindow * window);
|
||||||
gboolean gst_wl_window_is_toplevel (GstWlWindow *window);
|
gboolean gst_wl_window_is_toplevel (GstWlWindow *window);
|
||||||
|
|
||||||
/* functions to manipulate the size on non-toplevel windows */
|
/* functions to manipulate the size on non-toplevel windows */
|
||||||
void gst_wl_window_set_video_size (GstWlWindow * window, gint w, gint h);
|
void gst_wl_window_set_video_info (GstWlWindow * window, GstVideoInfo * info);
|
||||||
void gst_wl_window_set_render_rectangle (GstWlWindow * window, gint x, gint y,
|
void gst_wl_window_set_render_rectangle (GstWlWindow * window, gint x, gint y,
|
||||||
gint w, gint h);
|
gint w, gint h);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue