1*4882a593SmuzhiyunFrom e08ec38efffdff645e1eb50bc9d3bb2e847ea029 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Tue, 25 Dec 2018 16:20:35 +0800 4*4882a593SmuzhiyunSubject: [PATCH 07/41] waylandsink: Enable changing window handle 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunChanging window handle is dangerous, but we need this feature for: 7*4882a593Smuzhiyunhttps://redmine.rockchip.com.cn/issues/184629 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 10*4882a593Smuzhiyun--- 11*4882a593Smuzhiyun ext/wayland/gstwaylandsink.c | 22 ++++++++++++++++------ 12*4882a593Smuzhiyun ext/wayland/gstwaylandsink.h | 2 ++ 13*4882a593Smuzhiyun 2 files changed, 18 insertions(+), 6 deletions(-) 14*4882a593Smuzhiyun 15*4882a593Smuzhiyundiff --git a/ext/wayland/gstwaylandsink.c b/ext/wayland/gstwaylandsink.c 16*4882a593Smuzhiyunindex 0e6421f..5d2721c 100644 17*4882a593Smuzhiyun--- a/ext/wayland/gstwaylandsink.c 18*4882a593Smuzhiyun+++ b/ext/wayland/gstwaylandsink.c 19*4882a593Smuzhiyun@@ -718,9 +718,10 @@ render_last_buffer (GstWaylandSink * self, gboolean redraw) 20*4882a593Smuzhiyun self->callback = callback; 21*4882a593Smuzhiyun wl_callback_add_listener (callback, &frame_callback_listener, self); 22*4882a593Smuzhiyun 23*4882a593Smuzhiyun- if (G_UNLIKELY (self->video_info_changed && !redraw)) { 24*4882a593Smuzhiyun+ if (G_UNLIKELY ((self->video_info_changed && !redraw) || self->resend_info)) { 25*4882a593Smuzhiyun info = &self->video_info; 26*4882a593Smuzhiyun self->video_info_changed = FALSE; 27*4882a593Smuzhiyun+ self->resend_info = FALSE; 28*4882a593Smuzhiyun } 29*4882a593Smuzhiyun gst_wl_window_render (self->window, wlbuffer, info); 30*4882a593Smuzhiyun } 31*4882a593Smuzhiyun@@ -992,18 +993,21 @@ gst_wayland_sink_set_window_handle (GstVideoOverlay * overlay, guintptr handle) 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun g_return_if_fail (self != NULL); 34*4882a593Smuzhiyun 35*4882a593Smuzhiyun- if (self->window != NULL) { 36*4882a593Smuzhiyun- GST_WARNING_OBJECT (self, "changing window handle is not supported"); 37*4882a593Smuzhiyun+ if (self->window_handle == handle) 38*4882a593Smuzhiyun return; 39*4882a593Smuzhiyun- } 40*4882a593Smuzhiyun+ 41*4882a593Smuzhiyun+ self->window_handle = handle; 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun g_mutex_lock (&self->render_lock); 44*4882a593Smuzhiyun 45*4882a593Smuzhiyun+ if (self->window != NULL) { 46*4882a593Smuzhiyun+ GST_WARNING_OBJECT (self, "changing window handle is dangerous"); 47*4882a593Smuzhiyun+ g_clear_object (&self->window); 48*4882a593Smuzhiyun+ } 49*4882a593Smuzhiyun+ 50*4882a593Smuzhiyun GST_DEBUG_OBJECT (self, "Setting window handle %" GST_PTR_FORMAT, 51*4882a593Smuzhiyun (void *) handle); 52*4882a593Smuzhiyun 53*4882a593Smuzhiyun- g_clear_object (&self->window); 54*4882a593Smuzhiyun- 55*4882a593Smuzhiyun if (handle) { 56*4882a593Smuzhiyun if (G_LIKELY (gst_wayland_sink_find_display (self))) { 57*4882a593Smuzhiyun /* we cannot use our own display with an external window handle */ 58*4882a593Smuzhiyun@@ -1018,6 +1022,12 @@ gst_wayland_sink_set_window_handle (GstVideoOverlay * overlay, guintptr handle) 59*4882a593Smuzhiyun &self->render_lock); 60*4882a593Smuzhiyun gst_wl_window_set_rotate_method (self->window, 61*4882a593Smuzhiyun self->current_rotate_method); 62*4882a593Smuzhiyun+ 63*4882a593Smuzhiyun+ if (self->last_buffer) { 64*4882a593Smuzhiyun+ /* Resend video info to force resize video surface */ 65*4882a593Smuzhiyun+ self->resend_info = TRUE; 66*4882a593Smuzhiyun+ self->redraw_pending = FALSE; 67*4882a593Smuzhiyun+ } 68*4882a593Smuzhiyun } 69*4882a593Smuzhiyun } else { 70*4882a593Smuzhiyun GST_ERROR_OBJECT (self, "Failed to find display handle, " 71*4882a593Smuzhiyundiff --git a/ext/wayland/gstwaylandsink.h b/ext/wayland/gstwaylandsink.h 72*4882a593Smuzhiyunindex 3243d8c..46b5faa 100644 73*4882a593Smuzhiyun--- a/ext/wayland/gstwaylandsink.h 74*4882a593Smuzhiyun+++ b/ext/wayland/gstwaylandsink.h 75*4882a593Smuzhiyun@@ -52,6 +52,7 @@ struct _GstWaylandSink 76*4882a593Smuzhiyun GstWlWindow *window; 77*4882a593Smuzhiyun GstBufferPool *pool; 78*4882a593Smuzhiyun gboolean use_dmabuf; 79*4882a593Smuzhiyun+ guintptr window_handle; 80*4882a593Smuzhiyun 81*4882a593Smuzhiyun gboolean video_info_changed; 82*4882a593Smuzhiyun GstVideoInfo video_info; 83*4882a593Smuzhiyun@@ -59,6 +60,7 @@ struct _GstWaylandSink 84*4882a593Smuzhiyun 85*4882a593Smuzhiyun gchar *display_name; 86*4882a593Smuzhiyun 87*4882a593Smuzhiyun+ gboolean resend_info; 88*4882a593Smuzhiyun gboolean redraw_pending; 89*4882a593Smuzhiyun GMutex render_lock; 90*4882a593Smuzhiyun GstBuffer *last_buffer; 91*4882a593Smuzhiyun-- 92*4882a593Smuzhiyun2.20.1 93*4882a593Smuzhiyun 94