1*4882a593SmuzhiyunFrom cf89234a530bd85e575b7386b30f1425e2305411 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Fri, 25 Feb 2022 17:48:58 +0800 4*4882a593SmuzhiyunSubject: [PATCH 30/33] kmssink: Support setting prefered frame syncing mode 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunTested with: 7*4882a593Smuzhiyungst-launch-1.0 videotestsrc ! kmssink sync-mode=vblank 8*4882a593Smuzhiyungst-launch-1.0 videotestsrc ! kmssink sync-mode=none 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 11*4882a593Smuzhiyun--- 12*4882a593Smuzhiyun sys/kms/gstkmssink.c | 62 +++++++++++++++++++++++++++++++++++++++----- 13*4882a593Smuzhiyun sys/kms/gstkmssink.h | 10 +++++++ 14*4882a593Smuzhiyun 2 files changed, 66 insertions(+), 6 deletions(-) 15*4882a593Smuzhiyun 16*4882a593Smuzhiyundiff --git a/sys/kms/gstkmssink.c b/sys/kms/gstkmssink.c 17*4882a593Smuzhiyunindex af80c8e..bfca332 100644 18*4882a593Smuzhiyun--- a/sys/kms/gstkmssink.c 19*4882a593Smuzhiyun+++ b/sys/kms/gstkmssink.c 20*4882a593Smuzhiyun@@ -99,11 +99,14 @@ enum 21*4882a593Smuzhiyun PROP_CONNECTOR_PROPS, 22*4882a593Smuzhiyun PROP_PLANE_PROPS, 23*4882a593Smuzhiyun PROP_FORCE_ASPECT_RATIO, 24*4882a593Smuzhiyun+ PROP_SYNC_MODE, 25*4882a593Smuzhiyun PROP_N, 26*4882a593Smuzhiyun }; 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun static GParamSpec *g_properties[PROP_N] = { NULL, }; 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun+static GstKMSSyncMode DEFAULT_SYNC_MODE = GST_KMS_SYNC_AUTO; 31*4882a593Smuzhiyun+ 32*4882a593Smuzhiyun static void 33*4882a593Smuzhiyun gst_kms_sink_set_render_rectangle (GstVideoOverlay * overlay, 34*4882a593Smuzhiyun gint x, gint y, gint width, gint height) 35*4882a593Smuzhiyun@@ -1491,7 +1494,7 @@ static gboolean 36*4882a593Smuzhiyun gst_kms_sink_sync (GstKMSSink * self) 37*4882a593Smuzhiyun { 38*4882a593Smuzhiyun gint ret; 39*4882a593Smuzhiyun- gboolean waiting; 40*4882a593Smuzhiyun+ gboolean waiting, pageflip; 41*4882a593Smuzhiyun drmEventContext evctxt = { 42*4882a593Smuzhiyun .version = DRM_EVENT_CONTEXT_VERSION, 43*4882a593Smuzhiyun .page_flip_handler = sync_handler, 44*4882a593Smuzhiyun@@ -1510,8 +1513,18 @@ gst_kms_sink_sync (GstKMSSink * self) 45*4882a593Smuzhiyun else if (self->pipe > 1) 46*4882a593Smuzhiyun vbl.request.type |= self->pipe << DRM_VBLANK_HIGH_CRTC_SHIFT; 47*4882a593Smuzhiyun 48*4882a593Smuzhiyun+ if (self->sync_mode == GST_KMS_SYNC_FLIP) { 49*4882a593Smuzhiyun+ pageflip = TRUE; 50*4882a593Smuzhiyun+ } else if (self->sync_mode == GST_KMS_SYNC_VBLANK) { 51*4882a593Smuzhiyun+ pageflip = FALSE; 52*4882a593Smuzhiyun+ } else if (self->sync_mode == GST_KMS_SYNC_AUTO) { 53*4882a593Smuzhiyun+ pageflip = self->modesetting_enabled; 54*4882a593Smuzhiyun+ } else { 55*4882a593Smuzhiyun+ return TRUE; 56*4882a593Smuzhiyun+ } 57*4882a593Smuzhiyun+ 58*4882a593Smuzhiyun waiting = TRUE; 59*4882a593Smuzhiyun- if (!self->has_async_page_flip && !self->modesetting_enabled) { 60*4882a593Smuzhiyun+ if (!pageflip) { 61*4882a593Smuzhiyun ret = drmWaitVBlank (self->fd, &vbl); 62*4882a593Smuzhiyun if (ret) 63*4882a593Smuzhiyun goto vblank_failed; 64*4882a593Smuzhiyun@@ -1916,10 +1929,12 @@ retry_set_plane: 65*4882a593Smuzhiyun } 66*4882a593Smuzhiyun 67*4882a593Smuzhiyun sync_frame: 68*4882a593Smuzhiyun- /* Wait for the previous frame to complete redraw */ 69*4882a593Smuzhiyun- if (!gst_kms_sink_sync (self)) { 70*4882a593Smuzhiyun- GST_OBJECT_UNLOCK (self); 71*4882a593Smuzhiyun- goto bail; 72*4882a593Smuzhiyun+ if (self->sync_mode != GST_KMS_SYNC_NONE) { 73*4882a593Smuzhiyun+ /* Wait for the previous frame to complete redraw */ 74*4882a593Smuzhiyun+ if (!gst_kms_sink_sync (self)) { 75*4882a593Smuzhiyun+ GST_OBJECT_UNLOCK (self); 76*4882a593Smuzhiyun+ goto bail; 77*4882a593Smuzhiyun+ } 78*4882a593Smuzhiyun } 79*4882a593Smuzhiyun 80*4882a593Smuzhiyun /* Save the rendered buffer and its metadata in case a redraw is needed */ 81*4882a593Smuzhiyun@@ -2074,6 +2089,9 @@ gst_kms_sink_set_property (GObject * object, guint prop_id, 82*4882a593Smuzhiyun case PROP_FORCE_ASPECT_RATIO: 83*4882a593Smuzhiyun sink->keep_aspect = g_value_get_boolean (value); 84*4882a593Smuzhiyun break; 85*4882a593Smuzhiyun+ case PROP_SYNC_MODE: 86*4882a593Smuzhiyun+ sink->sync_mode = g_value_get_enum (value); 87*4882a593Smuzhiyun+ break; 88*4882a593Smuzhiyun default: 89*4882a593Smuzhiyun if (!gst_video_overlay_set_property (object, PROP_N, prop_id, value)) 90*4882a593Smuzhiyun G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); 91*4882a593Smuzhiyun@@ -2130,6 +2148,9 @@ gst_kms_sink_get_property (GObject * object, guint prop_id, 92*4882a593Smuzhiyun case PROP_FORCE_ASPECT_RATIO: 93*4882a593Smuzhiyun g_value_set_boolean (value, sink->keep_aspect); 94*4882a593Smuzhiyun break; 95*4882a593Smuzhiyun+ case PROP_SYNC_MODE: 96*4882a593Smuzhiyun+ g_value_set_enum (value, sink->sync_mode); 97*4882a593Smuzhiyun+ break; 98*4882a593Smuzhiyun default: 99*4882a593Smuzhiyun G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); 100*4882a593Smuzhiyun break; 101*4882a593Smuzhiyun@@ -2161,11 +2182,31 @@ gst_kms_sink_init (GstKMSSink * sink) 102*4882a593Smuzhiyun sink->saved_zpos = -1; 103*4882a593Smuzhiyun sink->can_scale = TRUE; 104*4882a593Smuzhiyun sink->keep_aspect = TRUE; 105*4882a593Smuzhiyun+ sink->sync_mode = DEFAULT_SYNC_MODE; 106*4882a593Smuzhiyun gst_poll_fd_init (&sink->pollfd); 107*4882a593Smuzhiyun sink->poll = gst_poll_new (TRUE); 108*4882a593Smuzhiyun gst_video_info_init (&sink->vinfo); 109*4882a593Smuzhiyun } 110*4882a593Smuzhiyun 111*4882a593Smuzhiyun+#define GST_TYPE_KMS_SYNC_MODE (gst_kms_sync_mode_get_type ()) 112*4882a593Smuzhiyun+static GType 113*4882a593Smuzhiyun+gst_kms_sync_mode_get_type (void) 114*4882a593Smuzhiyun+{ 115*4882a593Smuzhiyun+ static GType mode = 0; 116*4882a593Smuzhiyun+ 117*4882a593Smuzhiyun+ if (!mode) { 118*4882a593Smuzhiyun+ static const GEnumValue modes[] = { 119*4882a593Smuzhiyun+ {GST_KMS_SYNC_AUTO, "Sync with page flip or vblank event", "auto"}, 120*4882a593Smuzhiyun+ {GST_KMS_SYNC_FLIP, "Sync with page flip event", "flip"}, 121*4882a593Smuzhiyun+ {GST_KMS_SYNC_VBLANK, "Sync with vblank event", "vblank"}, 122*4882a593Smuzhiyun+ {GST_KMS_SYNC_NONE, "Ignore syncing", "none"}, 123*4882a593Smuzhiyun+ {0, NULL, NULL} 124*4882a593Smuzhiyun+ }; 125*4882a593Smuzhiyun+ mode = g_enum_register_static ("GstKMSSyncMode", modes); 126*4882a593Smuzhiyun+ } 127*4882a593Smuzhiyun+ return mode; 128*4882a593Smuzhiyun+} 129*4882a593Smuzhiyun+ 130*4882a593Smuzhiyun static void 131*4882a593Smuzhiyun gst_kms_sink_class_init (GstKMSSinkClass * klass) 132*4882a593Smuzhiyun { 133*4882a593Smuzhiyun@@ -2335,6 +2376,15 @@ gst_kms_sink_class_init (GstKMSSinkClass * klass) 134*4882a593Smuzhiyun "When enabled, scaling will respect original aspect ratio", TRUE, 135*4882a593Smuzhiyun G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); 136*4882a593Smuzhiyun 137*4882a593Smuzhiyun+ if (g_getenv ("KMSSINK_DISABLE_VSYNC")) 138*4882a593Smuzhiyun+ DEFAULT_SYNC_MODE = GST_KMS_SYNC_NONE; 139*4882a593Smuzhiyun+ 140*4882a593Smuzhiyun+ g_properties[PROP_SYNC_MODE] = 141*4882a593Smuzhiyun+ g_param_spec_enum ("sync-mode", "Sync mode", 142*4882a593Smuzhiyun+ "Prefered frame syncing mode", 143*4882a593Smuzhiyun+ GST_TYPE_KMS_SYNC_MODE, DEFAULT_SYNC_MODE, 144*4882a593Smuzhiyun+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); 145*4882a593Smuzhiyun+ 146*4882a593Smuzhiyun g_object_class_install_properties (gobject_class, PROP_N, g_properties); 147*4882a593Smuzhiyun 148*4882a593Smuzhiyun gst_video_overlay_install_properties (gobject_class, PROP_N); 149*4882a593Smuzhiyundiff --git a/sys/kms/gstkmssink.h b/sys/kms/gstkmssink.h 150*4882a593Smuzhiyunindex ab70ec4..274351e 100644 151*4882a593Smuzhiyun--- a/sys/kms/gstkmssink.h 152*4882a593Smuzhiyun+++ b/sys/kms/gstkmssink.h 153*4882a593Smuzhiyun@@ -44,6 +44,14 @@ G_BEGIN_DECLS 154*4882a593Smuzhiyun typedef struct _GstKMSSink GstKMSSink; 155*4882a593Smuzhiyun typedef struct _GstKMSSinkClass GstKMSSinkClass; 156*4882a593Smuzhiyun 157*4882a593Smuzhiyun+typedef enum 158*4882a593Smuzhiyun+{ 159*4882a593Smuzhiyun+ GST_KMS_SYNC_AUTO = 0, 160*4882a593Smuzhiyun+ GST_KMS_SYNC_FLIP = 1, 161*4882a593Smuzhiyun+ GST_KMS_SYNC_VBLANK = 2, 162*4882a593Smuzhiyun+ GST_KMS_SYNC_NONE = 3, 163*4882a593Smuzhiyun+} GstKMSSyncMode; 164*4882a593Smuzhiyun+ 165*4882a593Smuzhiyun struct _GstKMSSink { 166*4882a593Smuzhiyun GstVideoSink videosink; 167*4882a593Smuzhiyun 168*4882a593Smuzhiyun@@ -98,6 +106,8 @@ struct _GstKMSSink { 169*4882a593Smuzhiyun guintptr window_handle; 170*4882a593Smuzhiyun 171*4882a593Smuzhiyun gboolean keep_aspect; 172*4882a593Smuzhiyun+ 173*4882a593Smuzhiyun+ GstKMSSyncMode sync_mode; 174*4882a593Smuzhiyun }; 175*4882a593Smuzhiyun 176*4882a593Smuzhiyun struct _GstKMSSinkClass { 177*4882a593Smuzhiyun-- 178*4882a593Smuzhiyun2.20.1 179*4882a593Smuzhiyun 180