1*4882a593SmuzhiyunFrom 4e8110b82110e56818337b000bcebe10f88f6eb6 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Mon, 8 Nov 2021 18:45:00 +0800 4*4882a593SmuzhiyunSubject: [PATCH 23/33] waylandsink: Support frame-sync mode 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSet env "WAYLANDSINK_SYNC_FRAME" to enable frame syncing. 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 9*4882a593Smuzhiyun--- 10*4882a593Smuzhiyun ext/wayland/gstwaylandsink.c | 9 +++++++++ 11*4882a593Smuzhiyun ext/wayland/gstwaylandsink.h | 1 + 12*4882a593Smuzhiyun 2 files changed, 10 insertions(+) 13*4882a593Smuzhiyun 14*4882a593Smuzhiyundiff --git a/ext/wayland/gstwaylandsink.c b/ext/wayland/gstwaylandsink.c 15*4882a593Smuzhiyunindex 24fd7bd..07bfec0 100644 16*4882a593Smuzhiyun--- a/ext/wayland/gstwaylandsink.c 17*4882a593Smuzhiyun+++ b/ext/wayland/gstwaylandsink.c 18*4882a593Smuzhiyun@@ -284,6 +284,7 @@ gst_wayland_sink_init (GstWaylandSink * sink) 19*4882a593Smuzhiyun { 20*4882a593Smuzhiyun g_mutex_init (&sink->display_lock); 21*4882a593Smuzhiyun g_mutex_init (&sink->render_lock); 22*4882a593Smuzhiyun+ g_cond_init (&sink->redraw_cond); 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun sink->window_handle = 1; 25*4882a593Smuzhiyun sink->layer = GST_WL_WINDOW_LAYER_NORMAL; 26*4882a593Smuzhiyun@@ -439,6 +440,7 @@ gst_wayland_sink_finalize (GObject * object) 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun g_mutex_clear (&sink->display_lock); 29*4882a593Smuzhiyun g_mutex_clear (&sink->render_lock); 30*4882a593Smuzhiyun+ g_cond_clear (&sink->redraw_cond); 31*4882a593Smuzhiyun 32*4882a593Smuzhiyun G_OBJECT_CLASS (parent_class)->finalize (object); 33*4882a593Smuzhiyun } 34*4882a593Smuzhiyun@@ -783,6 +785,7 @@ frame_redraw_callback (void *data, struct wl_callback *callback, uint32_t time) 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun g_mutex_lock (&sink->render_lock); 37*4882a593Smuzhiyun sink->redraw_pending = FALSE; 38*4882a593Smuzhiyun+ g_cond_signal (&sink->redraw_cond); 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun if (sink->callback) { 41*4882a593Smuzhiyun wl_callback_destroy (callback); 42*4882a593Smuzhiyun@@ -819,6 +822,11 @@ render_last_buffer (GstWaylandSink * sink, gboolean redraw) 43*4882a593Smuzhiyun } 44*4882a593Smuzhiyun sink->window->fill_mode = sink->fill_mode; 45*4882a593Smuzhiyun gst_wl_window_render (sink->window, wlbuffer, info); 46*4882a593Smuzhiyun+ 47*4882a593Smuzhiyun+ if (g_getenv ("WAYLANDSINK_SYNC_FRAME")) { 48*4882a593Smuzhiyun+ while (sink->redraw_pending) 49*4882a593Smuzhiyun+ g_cond_wait (&sink->redraw_cond, &sink->render_lock); 50*4882a593Smuzhiyun+ } 51*4882a593Smuzhiyun } 52*4882a593Smuzhiyun 53*4882a593Smuzhiyun static void 54*4882a593Smuzhiyun@@ -1019,6 +1027,7 @@ render: 55*4882a593Smuzhiyun 56*4882a593Smuzhiyun if (buffer != to_render) 57*4882a593Smuzhiyun gst_buffer_unref (to_render); 58*4882a593Smuzhiyun+ 59*4882a593Smuzhiyun goto done; 60*4882a593Smuzhiyun 61*4882a593Smuzhiyun no_window_size: 62*4882a593Smuzhiyundiff --git a/ext/wayland/gstwaylandsink.h b/ext/wayland/gstwaylandsink.h 63*4882a593Smuzhiyunindex 6fd77e8..1f70f76 100644 64*4882a593Smuzhiyun--- a/ext/wayland/gstwaylandsink.h 65*4882a593Smuzhiyun+++ b/ext/wayland/gstwaylandsink.h 66*4882a593Smuzhiyun@@ -71,6 +71,7 @@ struct _GstWaylandSink 67*4882a593Smuzhiyun gboolean resend_info; 68*4882a593Smuzhiyun gboolean redraw_pending; 69*4882a593Smuzhiyun GMutex render_lock; 70*4882a593Smuzhiyun+ GCond redraw_cond; 71*4882a593Smuzhiyun GstBuffer *last_buffer; 72*4882a593Smuzhiyun GstVideoRectangle render_rectangle; 73*4882a593Smuzhiyun 74*4882a593Smuzhiyun-- 75*4882a593Smuzhiyun2.20.1 76*4882a593Smuzhiyun 77