waylandsink : Add new flag to fix bug about flush buffer

[platform/upstream/gstreamer.git] / ext / wayland / gstwaylandsink.c

diff --git a/ext/wayland/gstwaylandsink.c b/ext/wayland/gstwaylandsink.c
index bec1875..99d8b67 100755 (executable)
--- a/ext/wayland/gstwaylandsink.c
+++ b/ext/wayland/gstwaylandsink.c
@@ -42,7 +42,7 @@
 #endif
 
 #include "gstwaylandsink.h"
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
 #include <mm_types.h>
 #include "tizen-wlvideoformat.h"
 #endif
@@ -58,7 +58,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
 #define GST_APP_EVENT_FLUSH_BUFFER_NAME "application/flush-buffer"
 
 #define GST_TYPE_WAYLANDSINK_DISPLAY_GEOMETRY_METHOD (gst_waylandsink_display_geometry_method_get_type())
@@ -135,7 +135,7 @@ gst_waylandsink_flip_get_type (void)
 enum
 {
   SIGNAL_0,
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
   SIGNAL_HANDOFF,
   SIGNAL_PREROLL_HANDOFF,
 #endif
@@ -147,7 +147,7 @@ enum
 {
   PROP_0,
   PROP_DISPLAY,
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
   PROP_SIGNAL_HANDOFFS,
   PROP_USE_GAPLESS,
   PROP_KEEP_CAMERA_PREVIEW,
@@ -184,7 +184,7 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE
         ("{ BGRx, BGRA, RGBx, xBGR, xRGB, RGBA, ABGR, ARGB, RGB, BGR, "
             "RGB16, BGR16, YUY2, YVYU, UYVY, AYUV, NV12, NV21, NV16, "
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
             "SN12, ST12, "
 #endif
             "YUV9, YVU9, Y41B, I420, YV12, Y42B, v308 }"))
@@ -228,7 +228,7 @@ static void gst_wayland_sink_waylandvideo_init (GstWaylandVideoInterface *
     iface);
 static void gst_wayland_sink_begin_geometry_change (GstWaylandVideo * video);
 static void gst_wayland_sink_end_geometry_change (GstWaylandVideo * video);
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
 static gboolean gst_wayland_sink_event (GstBaseSink * bsink, GstEvent * event);
 static void gst_wayland_sink_update_window_geometry (GstWaylandSink * sink);
 static void render_last_buffer (GstWaylandSink * sink);
@@ -279,7 +279,7 @@ gst_wayland_sink_class_init (GstWaylandSinkClass * klass)
   gstbasesink_class->propose_allocation =
       GST_DEBUG_FUNCPTR (gst_wayland_sink_propose_allocation);
   gstbasesink_class->render = GST_DEBUG_FUNCPTR (gst_wayland_sink_render);
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
   gstbasesink_class->event = GST_DEBUG_FUNCPTR (gst_wayland_sink_event);
 #endif
 
@@ -288,7 +288,7 @@ gst_wayland_sink_class_init (GstWaylandSinkClass * klass)
           "display name to connect to, if not supplied via the GstContext",
           NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
   g_object_class_install_property (gobject_class, PROP_KEEP_CAMERA_PREVIEW,
       g_param_spec_boolean ("keep-camera-preview", "use flush buffer mechanism",
           "Last tbm buffer is copied and returned to camerasrc immediately "
@@ -475,8 +475,9 @@ static void
 gst_wayland_sink_init (GstWaylandSink * sink)
 {
   FUNCTION;
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
   sink->signal_handoffs = FALSE;
+  sink->request_camera_flush_buf = FALSE;
   sink->keep_camera_preview = FALSE;
   sink->got_costum_event = FALSE;
   sink->USE_TBM = TRUE;
@@ -497,7 +498,7 @@ gst_wayland_sink_init (GstWaylandSink * sink)
   g_mutex_init (&sink->render_lock);
 }
 
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
 static void
 gst_wayland_sink_stop_video (GstWaylandSink * sink)
 {
@@ -526,7 +527,7 @@ gst_wayland_sink_need_to_make_flush_buffer (GstWaylandSink * sink)
   g_return_val_if_fail (sink->display != NULL, FALSE);
 
   if ((gst_wayland_sink_check_use_gapless (sink))
-      || sink->keep_camera_preview || sink->display->flush_request) {
+      || sink->request_camera_flush_buf || sink->display->flush_request) {
     sink->display->flush_request = TRUE;
     return TRUE;
   }
@@ -730,6 +731,7 @@ gst_wayland_sink_get_mm_video_buf_info (GstWaylandSink * sink,
     GST_DEBUG ("TBM bo %p %p", mm_video_buf->handle.bo[0],
         mm_video_buf->handle.bo[1]);
     display->native_video_size = 0;
+    display->flush_request = 0;
     display->flush_request = mm_video_buf->flush_request;
     GST_DEBUG ("flush_request value is %d", display->flush_request);
 #ifdef USE_WL_FLUSH_BUFFER
@@ -798,7 +800,7 @@ gst_wayland_sink_get_property (GObject * object,
       g_value_set_string (value, sink->display_name);
       GST_OBJECT_UNLOCK (sink);
       break;
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
     case PROP_KEEP_CAMERA_PREVIEW:
       g_value_set_boolean (value, sink->keep_camera_preview);
       break;
@@ -888,7 +890,7 @@ gst_wayland_sink_set_property (GObject * object,
       sink->display_name = g_value_dup_string (value);
       GST_OBJECT_UNLOCK (sink);
       break;
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
     case PROP_SIGNAL_HANDOFFS:
       sink->signal_handoffs = g_value_get_boolean (value);
       GST_LOG ("set signal_handoffs(%d)", sink->signal_handoffs);
@@ -1104,7 +1106,7 @@ gst_wayland_sink_set_property (GObject * object,
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
   if (sink->video_info_changed && sink->window) {
     gst_wl_window_set_video_info_change (sink->window, TRUE);
     if (GST_STATE (sink) == GST_STATE_PAUSED)
@@ -1140,7 +1142,7 @@ gst_wayland_sink_finalize (GObject * object)
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
 static gboolean
 gst_wayland_sink_event (GstBaseSink * bsink, GstEvent * event)
 {
@@ -1194,7 +1196,7 @@ gst_wayland_sink_set_display_from_context (GstWaylandSink * sink,
         ("Failed to use the external wayland display: '%s'", error->message));
     g_error_free (error);
   }
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
   sink->display->USE_TBM = sink->USE_TBM;
 #endif
 }
@@ -1244,7 +1246,7 @@ gst_wayland_sink_find_display (GstWaylandSink * sink)
           g_error_free (error);
           ret = FALSE;
         }
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
         if (sink->display)
           sink->display->USE_TBM = sink->USE_TBM;
 #endif
@@ -1290,12 +1292,14 @@ gst_wayland_sink_change_state (GstElement * element, GstStateChange transition)
       break;
     case GST_STATE_CHANGE_PAUSED_TO_READY:
       GST_LOG ("WAYLANDSINK TRANSITION: PAUSED_TO_READY");
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
       if (sink->keep_camera_preview) {
         if (sink->window) {
           if (!gst_wl_window_is_toplevel (sink->window)) {
             GstBaseSink *bsink = GST_BASE_SINK (element);
+            sink->request_camera_flush_buf = TRUE;
             gst_wayland_sink_keep_camera_preview (bsink);
+            sink->request_camera_flush_buf = FALSE;
             break;
           }
         }
@@ -1352,7 +1356,7 @@ gst_wayland_sink_set_context (GstElement * element, GstContext * context)
       gst_wayland_sink_set_display_from_context (sink, context);
     else {
       GST_WARNING_OBJECT (element, "changing display handle is not supported");
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
       g_mutex_unlock (&sink->display_lock);
       return;
 #endif
@@ -1382,14 +1386,14 @@ gst_wayland_sink_get_caps (GstBaseSink * bsink, GstCaps * filter)
     GValue value = G_VALUE_INIT;
     GArray *formats;
     gint i;
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
     uint32_t tbm_fmt;
 #endif
     enum wl_shm_format fmt;
 
     g_value_init (&list, GST_TYPE_LIST);
     g_value_init (&value, G_TYPE_STRING);
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
     if (sink->display->USE_TBM)
       formats = sink->display->tbm_formats;
     else                        /* SHM */
@@ -1397,7 +1401,7 @@ gst_wayland_sink_get_caps (GstBaseSink * bsink, GstCaps * filter)
       formats = sink->display->formats;
 
     for (i = 0; i < formats->len; i++) {
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
       if (sink->USE_TBM) {
         tbm_fmt = g_array_index (formats, uint32_t, i);
         g_value_set_string (&value, gst_wl_tbm_format_to_string (tbm_fmt));
@@ -1455,7 +1459,7 @@ gst_wayland_sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
   GstWaylandSink *sink;
   GstBufferPool *newpool;
   GstVideoInfo info;
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
   uint32_t tbm_format = -1;
 #endif
   enum wl_shm_format format = -1;
@@ -1474,7 +1478,7 @@ gst_wayland_sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
   /* extract info from caps */
   if (!gst_video_info_from_caps (&info, caps))
     goto invalid_format;
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
   if (sink->USE_TBM) {
     tbm_format =
         gst_video_format_to_wl_tbm_format (GST_VIDEO_INFO_FORMAT (&info));
@@ -1493,7 +1497,7 @@ gst_wayland_sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
 #endif
 
   /* verify we support the requested format */
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
   if (sink->display->USE_TBM) {
     GST_LOG ("USE TBM FORMAT");
     formats = sink->display->tbm_formats;
@@ -1520,7 +1524,10 @@ gst_wayland_sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
   if (i >= formats->len)
     goto unsupported_format;
 
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+  /* init value for set source */
+  sink->crop_x = sink->crop_y = sink->crop_w = sink->crop_h = 0;
+
   if (sink->USE_TBM) {
     if (GST_VIDEO_INFO_FORMAT (&info) == GST_VIDEO_FORMAT_SN12 ||
         GST_VIDEO_INFO_FORMAT (&info) == GST_VIDEO_FORMAT_ST12) {
@@ -1576,7 +1583,7 @@ gst_wayland_sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
     gst_object_replace ((GstObject **) & sink->pool, (GstObject *) newpool);
     gst_object_unref (newpool);
   }
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
   if (sink->window)
     gst_wayland_sink_update_window_geometry (sink);
 #endif
@@ -1612,7 +1619,7 @@ invalid_format:
   }
 unsupported_format:
   {
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
     if (sink->USE_TBM)
       GST_DEBUG_OBJECT (sink, "Format %s is not available on the display",
           gst_wl_tbm_format_to_string (tbm_format));
@@ -1644,7 +1651,7 @@ gst_wayland_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
   GstWaylandSink *sink = GST_WAYLAND_SINK (bsink);
   GstStructure *config;
   guint size, min_bufs, max_bufs;
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
   gboolean need_pool;
   GstCaps *caps;
   FUNCTION;
@@ -1677,7 +1684,7 @@ gst_wayland_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
 static GstFlowReturn
 gst_wayland_sink_preroll (GstBaseSink * bsink, GstBuffer * buffer)
 {
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
   GstWaylandSink *sink = GST_WAYLAND_SINK (bsink);
   FUNCTION;
 
@@ -1712,7 +1719,7 @@ static const struct wl_callback_listener frame_callback_listener = {
   frame_redraw_callback
 };
 
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
 static void
 gst_wayland_sink_update_window_geometry (GstWaylandSink * sink)
 {
@@ -1755,7 +1762,7 @@ render_last_buffer (GstWaylandSink * sink)
   struct wl_surface *surface;
   struct wl_callback *callback;
   FUNCTION;
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
   g_return_if_fail (sink->last_buffer != NULL);
   g_return_if_fail (sink->window != NULL);
 #endif
@@ -1775,7 +1782,7 @@ render_last_buffer (GstWaylandSink * sink)
   wl_callback_add_listener (callback, &frame_callback_listener, sink);
 
   if (G_UNLIKELY (sink->video_info_changed)) {
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
     gst_wl_window_set_video_info_change (sink->window, TRUE);
 #endif
     info = &sink->video_info;
@@ -1810,7 +1817,7 @@ gst_wayland_sink_render (GstBaseSink * bsink, GstBuffer * buffer)
       sink->window =
           gst_wl_window_new_toplevel (sink->display, &sink->video_info);
     }
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
     gst_wayland_sink_update_window_geometry (sink);
 #endif
   }
@@ -1827,17 +1834,17 @@ gst_wayland_sink_render (GstBaseSink * bsink, GstBuffer * buffer)
       && !gst_wayland_sink_check_use_gapless (sink))
     goto done;
 
-#ifndef GST_WLSINK_ENHANCEMENT  /* for tizen view_port, we don't know window size */
+#ifndef TIZEN_FEATURE_WLSINK_ENHANCEMENT        /* for tizen view_port, we don't know window size */
   /* make sure that the application has called set_render_rectangle() */
   if (G_UNLIKELY (sink->window->render_rectangle.w == 0))
     goto no_window_size;
 #endif
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
 
   wlbuffer = gst_buffer_get_wl_buffer (buffer);
   if (G_LIKELY (wlbuffer && wlbuffer->display == sink->display)
       && !(gst_wayland_sink_check_use_gapless (sink))
-      && !sink->keep_camera_preview) {
+      && !sink->request_camera_flush_buf) {
     GST_LOG_OBJECT (sink, "buffer %p has a wl_buffer from our display, " "writing directly", buffer);   //buffer is from our  pool and have wl_buffer
     GST_LOG ("wl_buffer (%p)", wlbuffer->wlbuffer);
     to_render = buffer;
@@ -1894,7 +1901,7 @@ gst_wayland_sink_render (GstBaseSink * bsink, GstBuffer * buffer)
         /* last_buffer from gaplasee have wlbuffer */
         if (G_UNLIKELY (!wlbuffer)
             || (gst_wayland_sink_check_use_gapless (sink))
-            || sink->keep_camera_preview) {
+            || sink->request_camera_flush_buf) {
           wbuf =
               gst_wl_shm_memory_construct_wl_buffer (mem, sink->display,
               &sink->video_info);
@@ -1969,7 +1976,7 @@ gst_wayland_sink_render (GstBaseSink * bsink, GstBuffer * buffer)
     if ((G_UNLIKELY (buffer == sink->last_buffer)
             && !(gst_wayland_sink_check_use_gapless (sink)))
         || (G_UNLIKELY (buffer == sink->last_buffer)
-            && !sink->keep_camera_preview)) {
+            && !sink->request_camera_flush_buf)) {
       GST_LOG_OBJECT (sink, "Buffer already being rendered");
       goto done;
     }
@@ -2088,9 +2095,9 @@ gst_wayland_sink_render (GstBaseSink * bsink, GstBuffer * buffer)
 
   goto done;
 
-#endif /* GST_WLSINK_ENHANCEMENT */
+#endif /* TIZEN_FEATURE_WLSINK_ENHANCEMENT */
 
-#ifndef GST_WLSINK_ENHANCEMENT
+#ifndef TIZEN_FEATURE_WLSINK_ENHANCEMENT
 no_window_size:
   {
     GST_ELEMENT_ERROR (sink, RESOURCE, WRITE,
@@ -2130,13 +2137,13 @@ gst_wayland_sink_videooverlay_init (GstVideoOverlayInterface * iface)
   iface->set_window_handle = gst_wayland_sink_set_window_handle;
   iface->set_render_rectangle = gst_wayland_sink_set_render_rectangle;
   iface->expose = gst_wayland_sink_expose;
-#ifdef GST_WLSINK_ENHANCEMENT   /* use  unique_id */
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT /* use  unique_id */
   iface->set_wl_window_wl_surface_id =
       gst_wayland_sink_set_wl_window_wl_surface_id;
 #endif
 }
 
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
 /* use  unique_id */
 static void
 gst_wayland_sink_set_wl_window_wl_surface_id (GstVideoOverlay * overlay,
@@ -2182,7 +2189,7 @@ gst_wayland_sink_set_window_handle (GstVideoOverlay * overlay, guintptr handle)
 
   g_return_if_fail (sink != NULL);
 
-#ifdef GST_WLSINK_ENHANCEMENT   /* use  unique_id */
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT /* use  unique_id */
   if (sink->window != NULL) {
     GST_WARNING_OBJECT (sink, "changing window handle is not supported");
     return;