tizenwlsink: Support gst_tizen_wl_sink_set_roi_area() newly instead of gst_tizen_wl_s...

Change-Id: I817b558352134c3aa90a447e8cffc696b509f080
Signed-off-by: Hyunil <hyunil46.park@samsung.com>

diff --git a/tizenwlsink/src/gsttizenwlsink.c b/tizenwlsink/src/gsttizenwlsink.c
index 2502fb9..46d6fbd 100644 (file)
--- a/tizenwlsink/src/gsttizenwlsink.c
+++ b/tizenwlsink/src/gsttizenwlsink.c
@@ -219,7 +219,7 @@ static void gst_tizen_wl_sink_set_window_handle (GstVideoOverlay * overlay,
 static void
 gst_tizen_wl_sink_set_wl_window_wl_surface_id (GstVideoOverlay * overlay,
     guintptr wl_surface_id);
-static void gst_tizen_wl_sink_set_render_rectangle (GstVideoOverlay * overlay,
+static void gst_tizen_wl_sink_set_roi_area (GstVideoOverlay * overlay,
     gint x, gint y, gint w, gint h);
 static void gst_tizen_wl_sink_expose (GstVideoOverlay * overlay);
 
@@ -2365,11 +2365,12 @@ static void
 gst_tizen_wl_sink_videooverlay_init (GstVideoOverlayInterface * iface)
 {
   iface->set_window_handle = gst_tizen_wl_sink_set_window_handle;
-  iface->set_render_rectangle = gst_tizen_wl_sink_set_render_rectangle;
+  iface->set_render_rectangle = gst_tizen_wl_sink_set_roi_area;
   iface->expose = gst_tizen_wl_sink_expose;
 #ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT /* use unique_id */
   iface->set_wl_window_wl_surface_id =
       gst_tizen_wl_sink_set_wl_window_wl_surface_id;
+  iface->set_display_roi_area = gst_tizen_wl_sink_set_roi_area;
 #endif
 }
 
@@ -2460,8 +2461,8 @@ gst_tizen_wl_sink_set_window_handle (GstVideoOverlay * overlay, guintptr handle)
 }
 
 static void
-gst_tizen_wl_sink_set_render_rectangle (GstVideoOverlay * overlay,
-    gint x, gint y, gint w, gint h)
+gst_tizen_wl_sink_set_roi_area (GstVideoOverlay * overlay, gint x, gint y,
+    gint w, gint h)
 {
   GstTizenWlSink *sink = GST_TIZEN_WL_SINK (overlay);
   FUNCTION;
@@ -2473,14 +2474,14 @@ gst_tizen_wl_sink_set_render_rectangle (GstVideoOverlay * overlay,
   if (!sink->window) {
     g_mutex_unlock (&sink->render_lock);
     GST_WARNING_OBJECT (sink,
-        "set_render_rectangle called without window, ignoring");
+        "set roi area called without window, ignoring");
     return;
   }
 
   GST_WARNING_OBJECT (sink, "window geometry changed to (%d, %d) %d x %d",
       x, y, w, h);
 
-  if (gst_wl_window_set_render_rectangle (sink->window, x, y, w, h)) {
+  if (gst_wl_window_set_roi_area (sink->window, x, y, w, h)) {
     sink->video_info_changed = TRUE;
 
     if (sink->display_geometry_method == DISP_GEO_METHOD_CUSTOM_ROI

diff --git a/tizenwlsink/src/wlwindow.c b/tizenwlsink/src/wlwindow.c
index b2b934a..617282d 100644 (file)
--- a/tizenwlsink/src/wlwindow.c
+++ b/tizenwlsink/src/wlwindow.c
@@ -150,9 +150,9 @@ gst_wl_window_map_sub_surface (GstWlDisplay * display, GstWlWindow * window,
       gst_tizen_wl_shm_memory_construct_wl_buffer (gst_buffer_peek_memory (buf,
           0), display, info);
   if (G_UNLIKELY (!wlbuf)) {
-      GST_ERROR ("could not create wl_buffer");
-      gst_buffer_unref (buf);
-      return;
+    GST_ERROR ("could not create wl_buffer");
+    gst_buffer_unref (buf);
+    return;
   }
 
   gwlbuf = gst_buffer_add_wl_buffer (buf, wlbuf, display);
@@ -461,6 +461,7 @@ gst_wl_window_new_toplevel (GstWlDisplay * display, const GstVideoInfo * info,
   }
 
   /* set the initial size to be the same as the reported video size */
+
   width =
       gst_util_uint64_scale_int_round (info->width, info->par_n, info->par_d);
   gst_wl_window_set_render_rectangle (window, 0, 0, width, info->height);
@@ -605,6 +606,7 @@ gst_wl_window_resize_tizen_video_viewport (GstWlWindow * window,
     tizen_viewport_set_source (window->tizen_video_viewport,
         window->mode_crop.x, window->mode_crop.y, window->mode_crop.w,
         window->mode_crop.h);
+
     window->mode_crop.changed = FALSE;
   }
 
@@ -899,7 +901,7 @@ gst_wl_window_render (GstWlWindow * window, GstWlBuffer * buffer,
 
 #if TIZEN_FEATURE_WLSINK_ENHANCEMENT
 gboolean
-gst_wl_window_set_render_rectangle (GstWlWindow * window, gint x, gint y,
+gst_wl_window_set_roi_area (GstWlWindow * window, gint x, gint y,
     gint w, gint h)
 {
   FUNCTION;

diff --git a/tizenwlsink/src/wlwindow.h b/tizenwlsink/src/wlwindow.h
index 10c2dac..8eb3c99 100644 (file)
--- a/tizenwlsink/src/wlwindow.h
+++ b/tizenwlsink/src/wlwindow.h
@@ -149,7 +149,7 @@ gboolean gst_wl_window_is_toplevel (GstWlWindow * window);
 void gst_wl_window_render (GstWlWindow * window, GstWlBuffer * buffer,
     const GstVideoInfo * info);
 #ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
-gboolean gst_wl_window_set_render_rectangle (GstWlWindow * window, gint x, gint y,
+gboolean gst_wl_window_set_roi_area (GstWlWindow * window, gint x, gint y,
     gint w, gint h);
 void gst_wl_window_set_video_info (GstWlWindow * window,
     const GstVideoInfo * info);