1*4882a593SmuzhiyunFrom 2319581d4848e5763abe25059ad43148baa95aaf Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com>
3*4882a593SmuzhiyunDate: Tue, 28 Dec 2021 14:06:19 +0800
4*4882a593SmuzhiyunSubject: [PATCH 19/33] waylandsink: Support window alpha property
5*4882a593Smuzhiyun
6*4882a593SmuzhiyunTested with:
7*4882a593Smuzhiyungst-launch-1.0 videotestsrc ! waylandsink alpha=0.5
8*4882a593Smuzhiyun
9*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
10*4882a593Smuzhiyun---
11*4882a593Smuzhiyun ext/wayland/gstwaylandsink.c | 32 ++++++++++++++++++++++++++++++++
12*4882a593Smuzhiyun ext/wayland/gstwaylandsink.h |  1 +
13*4882a593Smuzhiyun ext/wayland/wlwindow.c       | 23 ++++++++++++++++-------
14*4882a593Smuzhiyun ext/wayland/wlwindow.h       |  1 +
15*4882a593Smuzhiyun 4 files changed, 50 insertions(+), 7 deletions(-)
16*4882a593Smuzhiyun
17*4882a593Smuzhiyundiff --git a/ext/wayland/gstwaylandsink.c b/ext/wayland/gstwaylandsink.c
18*4882a593Smuzhiyunindex 1bf4511..ff79ddf 100644
19*4882a593Smuzhiyun--- a/ext/wayland/gstwaylandsink.c
20*4882a593Smuzhiyun+++ b/ext/wayland/gstwaylandsink.c
21*4882a593Smuzhiyun@@ -65,6 +65,7 @@ enum
22*4882a593Smuzhiyun   PROP_DISPLAY,
23*4882a593Smuzhiyun   PROP_FULLSCREEN,
24*4882a593Smuzhiyun   PROP_LAYER,
25*4882a593Smuzhiyun+  PROP_ALPHA,
26*4882a593Smuzhiyun   PROP_LAST
27*4882a593Smuzhiyun };
28*4882a593Smuzhiyun
29*4882a593Smuzhiyun@@ -238,6 +239,11 @@ gst_wayland_sink_class_init (GstWaylandSinkClass * klass)
30*4882a593Smuzhiyun           GST_TYPE_WL_WINDOW_LAYER, GST_WL_WINDOW_LAYER_NORMAL,
31*4882a593Smuzhiyun           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
32*4882a593Smuzhiyun
33*4882a593Smuzhiyun+  g_object_class_install_property (gobject_class, PROP_ALPHA,
34*4882a593Smuzhiyun+      g_param_spec_double ("alpha", "Window alpha",
35*4882a593Smuzhiyun+          "Wayland window alpha", 0.0, 1.0, 1.0,
36*4882a593Smuzhiyun+          G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE | G_PARAM_STATIC_STRINGS));
37*4882a593Smuzhiyun+
38*4882a593Smuzhiyun   gst_video_overlay_install_properties (gobject_class, PROP_LAST);
39*4882a593Smuzhiyun
40*4882a593Smuzhiyun   gst_type_mark_as_plugin_api (GST_TYPE_WAYLAND_VIDEO, 0);
41*4882a593Smuzhiyun@@ -251,6 +257,7 @@ gst_wayland_sink_init (GstWaylandSink * sink)
42*4882a593Smuzhiyun
43*4882a593Smuzhiyun   sink->window_handle = 1;
44*4882a593Smuzhiyun   sink->layer = GST_WL_WINDOW_LAYER_NORMAL;
45*4882a593Smuzhiyun+  sink->alpha = 1.0;
46*4882a593Smuzhiyun }
47*4882a593Smuzhiyun
48*4882a593Smuzhiyun static void
49*4882a593Smuzhiyun@@ -277,6 +284,18 @@ gst_wayland_sink_set_layer (GstWaylandSink * sink, GstWlWindowLayer layer)
50*4882a593Smuzhiyun   g_mutex_unlock (&sink->render_lock);
51*4882a593Smuzhiyun }
52*4882a593Smuzhiyun
53*4882a593Smuzhiyun+static void
54*4882a593Smuzhiyun+gst_wayland_sink_set_alpha (GstWaylandSink * sink, gdouble alpha)
55*4882a593Smuzhiyun+{
56*4882a593Smuzhiyun+  if (alpha == sink->alpha)
57*4882a593Smuzhiyun+    return;
58*4882a593Smuzhiyun+
59*4882a593Smuzhiyun+  g_mutex_lock (&sink->render_lock);
60*4882a593Smuzhiyun+  sink->alpha = alpha;
61*4882a593Smuzhiyun+  gst_wl_window_ensure_alpha (sink->window, alpha);
62*4882a593Smuzhiyun+  g_mutex_unlock (&sink->render_lock);
63*4882a593Smuzhiyun+}
64*4882a593Smuzhiyun+
65*4882a593Smuzhiyun static void
66*4882a593Smuzhiyun gst_wayland_sink_get_property (GObject * object,
67*4882a593Smuzhiyun     guint prop_id, GValue * value, GParamSpec * pspec)
68*4882a593Smuzhiyun@@ -299,6 +318,11 @@ gst_wayland_sink_get_property (GObject * object,
69*4882a593Smuzhiyun       g_value_set_enum (value, sink->layer);
70*4882a593Smuzhiyun       GST_OBJECT_UNLOCK (sink);
71*4882a593Smuzhiyun       break;
72*4882a593Smuzhiyun+    case PROP_ALPHA:
73*4882a593Smuzhiyun+      GST_OBJECT_LOCK (sink);
74*4882a593Smuzhiyun+      g_value_set_double (value, sink->alpha);
75*4882a593Smuzhiyun+      GST_OBJECT_UNLOCK (sink);
76*4882a593Smuzhiyun+      break;
77*4882a593Smuzhiyun     default:
78*4882a593Smuzhiyun       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
79*4882a593Smuzhiyun       break;
80*4882a593Smuzhiyun@@ -327,6 +351,11 @@ gst_wayland_sink_set_property (GObject * object,
81*4882a593Smuzhiyun       gst_wayland_sink_set_layer (sink, g_value_get_enum (value));
82*4882a593Smuzhiyun       GST_OBJECT_UNLOCK (sink);
83*4882a593Smuzhiyun       break;
84*4882a593Smuzhiyun+    case PROP_ALPHA:
85*4882a593Smuzhiyun+      GST_OBJECT_LOCK (sink);
86*4882a593Smuzhiyun+      gst_wayland_sink_set_alpha (sink, g_value_get_double (value));
87*4882a593Smuzhiyun+      GST_OBJECT_UNLOCK (sink);
88*4882a593Smuzhiyun+      break;
89*4882a593Smuzhiyun     default:
90*4882a593Smuzhiyun       if (!gst_video_overlay_set_property (object, PROP_LAST, prop_id, value))
91*4882a593Smuzhiyun         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
92*4882a593Smuzhiyun@@ -783,6 +812,8 @@ gst_wayland_sink_show_frame (GstVideoSink * vsink, GstBuffer * buffer)
93*4882a593Smuzhiyun       sink->window = gst_wl_window_new_toplevel (sink->display,
94*4882a593Smuzhiyun           &sink->video_info, sink->fullscreen, sink->layer,
95*4882a593Smuzhiyun           &sink->render_lock, &sink->render_rectangle);
96*4882a593Smuzhiyun+      gst_wl_window_ensure_alpha (sink->window, sink->alpha);
97*4882a593Smuzhiyun+
98*4882a593Smuzhiyun       g_signal_connect_object (sink->window, "closed",
99*4882a593Smuzhiyun           G_CALLBACK (on_window_closed), sink, 0);
100*4882a593Smuzhiyun     }
101*4882a593Smuzhiyun@@ -1035,6 +1066,7 @@ gst_wayland_sink_set_window_handle (GstVideoOverlay * overlay, guintptr handle)
102*4882a593Smuzhiyun       } else {
103*4882a593Smuzhiyun         sink->window = gst_wl_window_new_in_surface (sink->display, surface,
104*4882a593Smuzhiyun             &sink->render_lock);
105*4882a593Smuzhiyun+        gst_wl_window_ensure_alpha (sink->window, sink->alpha);
106*4882a593Smuzhiyun
107*4882a593Smuzhiyun         if (sink->last_buffer) {
108*4882a593Smuzhiyun           /* Resend video info to force resize video surface */
109*4882a593Smuzhiyundiff --git a/ext/wayland/gstwaylandsink.h b/ext/wayland/gstwaylandsink.h
110*4882a593Smuzhiyunindex 3adddf2..f798969 100644
111*4882a593Smuzhiyun--- a/ext/wayland/gstwaylandsink.h
112*4882a593Smuzhiyun+++ b/ext/wayland/gstwaylandsink.h
113*4882a593Smuzhiyun@@ -63,6 +63,7 @@ struct _GstWaylandSink
114*4882a593Smuzhiyun   GstVideoInfo video_info;
115*4882a593Smuzhiyun   gboolean fullscreen;
116*4882a593Smuzhiyun   GstWlWindowLayer layer;
117*4882a593Smuzhiyun+  gdouble alpha;
118*4882a593Smuzhiyun
119*4882a593Smuzhiyun   gchar *display_name;
120*4882a593Smuzhiyun
121*4882a593Smuzhiyundiff --git a/ext/wayland/wlwindow.c b/ext/wayland/wlwindow.c
122*4882a593Smuzhiyunindex 7f7f3b6..58e65dd 100644
123*4882a593Smuzhiyun--- a/ext/wayland/wlwindow.c
124*4882a593Smuzhiyun+++ b/ext/wayland/wlwindow.c
125*4882a593Smuzhiyun@@ -24,6 +24,7 @@
126*4882a593Smuzhiyun #include <config.h>
127*4882a593Smuzhiyun #endif
128*4882a593Smuzhiyun
129*4882a593Smuzhiyun+#include <stdio.h>
130*4882a593Smuzhiyun #include <stdlib.h>
131*4882a593Smuzhiyun
132*4882a593Smuzhiyun #include "wlwindow.h"
133*4882a593Smuzhiyun@@ -235,19 +236,25 @@ gst_wl_window_new_internal (GstWlDisplay * display, GMutex * render_lock)
134*4882a593Smuzhiyun }
135*4882a593Smuzhiyun
136*4882a593Smuzhiyun static void
137*4882a593Smuzhiyun-gst_wl_window_set_flags (GstWlWindow * window, const char *flags)
138*4882a593Smuzhiyun+gst_wl_window_set_config (GstWlWindow * window, const char *config)
139*4882a593Smuzhiyun {
140*4882a593Smuzhiyun-  /* HACK: set window flags through title */
141*4882a593Smuzhiyun-  char s[128] = "flags=";
142*4882a593Smuzhiyun-  strcat (s, flags);
143*4882a593Smuzhiyun-
144*4882a593Smuzhiyun+  /* HACK: set window config through title */
145*4882a593Smuzhiyun   if (!window)
146*4882a593Smuzhiyun     return;
147*4882a593Smuzhiyun
148*4882a593Smuzhiyun   if (window->xdg_toplevel)
149*4882a593Smuzhiyun-    xdg_toplevel_set_title (window->xdg_toplevel, s);
150*4882a593Smuzhiyun+    xdg_toplevel_set_title (window->xdg_toplevel, config);
151*4882a593Smuzhiyun   else if (window->wl_shell_surface)
152*4882a593Smuzhiyun-    wl_shell_surface_set_title (window->wl_shell_surface, s);
153*4882a593Smuzhiyun+    wl_shell_surface_set_title (window->wl_shell_surface, config);
154*4882a593Smuzhiyun+}
155*4882a593Smuzhiyun+
156*4882a593Smuzhiyun+void
157*4882a593Smuzhiyun+gst_wl_window_ensure_alpha (GstWlWindow * window, gdouble alpha)
158*4882a593Smuzhiyun+{
159*4882a593Smuzhiyun+  char s[128];
160*4882a593Smuzhiyun+
161*4882a593Smuzhiyun+  snprintf (s, sizeof (s), "attrs=alpha:%f;", alpha);
162*4882a593Smuzhiyun+  gst_wl_window_set_config (window, s);
163*4882a593Smuzhiyun }
164*4882a593Smuzhiyun
165*4882a593Smuzhiyun void
166*4882a593Smuzhiyun@@ -268,6 +275,8 @@ gst_wl_window_ensure_layer (GstWlWindow * window, GstWlWindowLayer layer)
167*4882a593Smuzhiyun     default:
168*4882a593Smuzhiyun       return;
169*4882a593Smuzhiyun   }
170*4882a593Smuzhiyun+
171*4882a593Smuzhiyun+  gst_wl_window_set_config (window, s);
172*4882a593Smuzhiyun }
173*4882a593Smuzhiyun
174*4882a593Smuzhiyun void
175*4882a593Smuzhiyundiff --git a/ext/wayland/wlwindow.h b/ext/wayland/wlwindow.h
176*4882a593Smuzhiyunindex 97ea79e..6fb8285 100644
177*4882a593Smuzhiyun--- a/ext/wayland/wlwindow.h
178*4882a593Smuzhiyun+++ b/ext/wayland/wlwindow.h
179*4882a593Smuzhiyun@@ -87,6 +87,7 @@ typedef enum
180*4882a593Smuzhiyun   GST_WL_WINDOW_LAYER_BOTTOM = 2,
181*4882a593Smuzhiyun } GstWlWindowLayer;
182*4882a593Smuzhiyun
183*4882a593Smuzhiyun+void gst_wl_window_ensure_alpha (GstWlWindow * window, gdouble alpha);
184*4882a593Smuzhiyun void gst_wl_window_ensure_layer (GstWlWindow * window,
185*4882a593Smuzhiyun         GstWlWindowLayer layer);
186*4882a593Smuzhiyun void gst_wl_window_ensure_fullscreen (GstWlWindow * window,
187*4882a593Smuzhiyun--
188*4882a593Smuzhiyun2.20.1
189*4882a593Smuzhiyun
190