mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-07-07 07:05:52 +00:00
e7c9960783
If the `area_surface` got unmapped when changing to the `READY` or `NULL` state, we currently don't remap it when playback resumes and `wp_viewporter` is supported. Without `wp_viewporter` we do remap it, but rather unintentionally and also when not wanted. On Weston this has not been a big problem as it so far wrongly maps subsurfaces of unmapped surfaces anyway - i.e. only the black background was missing on resume. On other compositors and future Weston this prevents the `video_surface` to get remapped. Shuffle things around to ensure `area_surface` is mapped in the right situations and do some minor cleanup. See also https://gitlab.freedesktop.org/wayland/weston/-/issues/426 Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1483>
102 lines
3.6 KiB
C
102 lines
3.6 KiB
C
/* GStreamer Wayland video sink
|
|
*
|
|
* Copyright (C) 2014 Collabora Ltd.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Library General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Library General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Library General Public
|
|
* License along with this library; if not, write to the Free
|
|
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
* Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#ifndef __GST_WL_WINDOW_H__
|
|
#define __GST_WL_WINDOW_H__
|
|
|
|
#include "wldisplay.h"
|
|
#include "wlbuffer.h"
|
|
#include <gst/video/video.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define GST_TYPE_WL_WINDOW (gst_wl_window_get_type ())
|
|
#define GST_WL_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_WL_WINDOW, GstWlWindow))
|
|
#define GST_IS_WL_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_WL_WINDOW))
|
|
#define GST_WL_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_WL_WINDOW, GstWlWindowClass))
|
|
#define GST_IS_WL_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_WL_WINDOW))
|
|
#define GST_WL_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_WL_WINDOW, GstWlWindowClass))
|
|
|
|
typedef struct _GstWlWindow GstWlWindow;
|
|
typedef struct _GstWlWindowClass GstWlWindowClass;
|
|
|
|
struct _GstWlWindow
|
|
{
|
|
GObject parent_instance;
|
|
|
|
GMutex *render_lock;
|
|
|
|
GstWlDisplay *display;
|
|
struct wl_surface *area_surface;
|
|
struct wl_surface *area_surface_wrapper;
|
|
struct wl_subsurface *area_subsurface;
|
|
struct wp_viewport *area_viewport;
|
|
struct wl_surface *video_surface;
|
|
struct wl_surface *video_surface_wrapper;
|
|
struct wl_subsurface *video_subsurface;
|
|
struct wp_viewport *video_viewport;
|
|
struct wl_shell_surface *wl_shell_surface;
|
|
struct xdg_surface *xdg_surface;
|
|
struct xdg_toplevel *xdg_toplevel;
|
|
gboolean configured;
|
|
GCond configure_cond;
|
|
GMutex configure_mutex;
|
|
|
|
/* the size and position of the area_(sub)surface */
|
|
GstVideoRectangle render_rectangle;
|
|
|
|
/* the size and position of the video_subsurface */
|
|
GstVideoRectangle video_rectangle;
|
|
|
|
/* the size of the video in the buffers */
|
|
gint video_width, video_height;
|
|
|
|
/* when this is not set both the area_surface and the video_surface are not
|
|
* visible and certain steps should be skipped */
|
|
gboolean is_area_surface_mapped;
|
|
};
|
|
|
|
struct _GstWlWindowClass
|
|
{
|
|
GObjectClass parent_class;
|
|
};
|
|
|
|
GType gst_wl_window_get_type (void);
|
|
|
|
void gst_wl_window_ensure_fullscreen (GstWlWindow * window,
|
|
gboolean fullscreen);
|
|
GstWlWindow *gst_wl_window_new_toplevel (GstWlDisplay * display,
|
|
const GstVideoInfo * info, gboolean fullscreen, GMutex * render_lock);
|
|
GstWlWindow *gst_wl_window_new_in_surface (GstWlDisplay * display,
|
|
struct wl_surface * parent, GMutex * render_lock);
|
|
|
|
GstWlDisplay *gst_wl_window_get_display (GstWlWindow * window);
|
|
struct wl_surface *gst_wl_window_get_wl_surface (GstWlWindow * window);
|
|
gboolean gst_wl_window_is_toplevel (GstWlWindow *window);
|
|
|
|
void gst_wl_window_render (GstWlWindow * window, GstWlBuffer * buffer,
|
|
const GstVideoInfo * info);
|
|
void gst_wl_window_set_render_rectangle (GstWlWindow * window, gint x, gint y,
|
|
gint w, gint h);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __GST_WL_WINDOW_H__ */
|