change buffer type from tdm_buffer to tbm_surface

[platform/core/uifw/libtdm.git] / src / tdm_display.c

diff --git a/src/tdm_display.c b/src/tdm_display.c
index 52ae2e3..862c3d4 100644 (file)
--- a/src/tdm_display.c
+++ b/src/tdm_display.c
@@ -142,7 +142,8 @@ tdm_display_get_pp_available_formats(tdm_display *dpy, const tbm_format **format
 }
 
 EXTERN tdm_error
-tdm_display_get_pp_available_size(tdm_display *dpy, int *min_w, int *min_h, int *max_w, int *max_h, int *preferred_align)
+tdm_display_get_pp_available_size(tdm_display *dpy, int *min_w, int *min_h,
+                                  int *max_w, int *max_h, int *preferred_align)
 {
     DISPLAY_FUNC_ENTRY();
 
@@ -225,7 +226,7 @@ tdm_display_get_output_count(tdm_display *dpy, int *count)
 }
 
 
-EXTERN const tdm_output*
+EXTERN tdm_output*
 tdm_display_get_output(tdm_display *dpy, int index, tdm_error *error)
 {
     tdm_private_output *private_output = NULL;
@@ -244,7 +245,7 @@ tdm_display_get_output(tdm_display *dpy, int index, tdm_error *error)
         if (i == index)
         {
             pthread_mutex_unlock(&private_display->lock);
-            return (const tdm_output*)private_output;
+            return private_output;
         }
         i++;
     }
@@ -376,7 +377,7 @@ tdm_output_get_layer_count(tdm_output *output, int *count)
 }
 
 
-EXTERN const tdm_layer*
+EXTERN tdm_layer*
 tdm_output_get_layer(tdm_output *output, int index, tdm_error *error)
 {
     tdm_private_layer *private_layer = NULL;
@@ -441,7 +442,8 @@ tdm_output_get_available_modes(tdm_output *output, const tdm_output_mode **modes
 }
 
 EXTERN tdm_error
-tdm_output_get_available_size(tdm_output *output, int *min_w, int *min_h, int *max_w, int *max_h, int *preferred_align)
+tdm_output_get_available_size(tdm_output *output, int *min_w, int *min_h,
+                              int *max_w, int *max_h, int *preferred_align)
 {
     OUTPUT_FUNC_ENTRY();
 
@@ -527,7 +529,7 @@ tdm_output_set_property(tdm_output *output, unsigned int id, tdm_value value)
         return TDM_ERROR_NONE;
     }
 
-    ret = func_display->output_set_property(private_output->output, id, value);
+    ret = func_display->output_set_property(private_output->output_backend, id, value);
 
     pthread_mutex_unlock(&private_display->lock);
 
@@ -552,7 +554,7 @@ tdm_output_get_property(tdm_output *output, unsigned int id, tdm_value *value)
         return TDM_ERROR_NONE;
     }
 
-    ret = func_display->output_get_property(private_output->output, id, value);
+    ret = func_display->output_get_property(private_output->output_backend, id, value);
 
     pthread_mutex_unlock(&private_display->lock);
 
@@ -560,69 +562,73 @@ tdm_output_get_property(tdm_output *output, unsigned int id, tdm_value *value)
 }
 
 static void
-_tdm_output_cb_vblank(tdm_output *output, unsigned int sequence,
+_tdm_output_cb_vblank(tdm_output *output_backend, unsigned int sequence,
                       unsigned int tv_sec, unsigned int tv_usec, void *user_data)
 {
-    tdm_private_output *private_output;
-    tdm_private_display *private_display;
-    tdm_private_display *private_display_backend;
     tdm_private_vblank_handler *vblank_handler = user_data;
+    tdm_private_display *private_display;
+
     TDM_RETURN_IF_FAIL(vblank_handler);
 
-    private_output = vblank_handler->private_output;
-    TDM_RETURN_IF_FAIL(private_output);
+    private_display = vblank_handler->private_output->private_display;
 
-    private_display = private_output->private_display;
-    LIST_FOR_EACH_ENTRY(private_output, &private_display->output_list, link)
+    if (vblank_handler->func)
     {
-        if (private_output->output == output)
-            private_display_backend = private_output->private_display;
+        pthread_mutex_unlock(&private_display->lock);
+        vblank_handler->func(vblank_handler->private_output, sequence,
+                             tv_sec, tv_usec, vblank_handler->user_data);
+        pthread_mutex_lock(&private_display->lock);
     }
 
-    pthread_mutex_unlock(&private_display_backend->lock);
-
-    if (vblank_handler->func)
-        vblank_handler->func(vblank_handler->private_output, sequence, tv_sec, tv_usec, vblank_handler->user_data);
-
-    pthread_mutex_lock(&private_display_backend->lock);
-
     LIST_DEL(&vblank_handler->link);
     free(vblank_handler);
 }
 
 static void
-_tdm_output_cb_commit(tdm_output *output, unsigned int sequence,
+_tdm_output_cb_commit(tdm_output *output_backend, unsigned int sequence,
                       unsigned int tv_sec, unsigned int tv_usec, void *user_data)
 {
-    tdm_private_output *private_output;
-    tdm_private_display *private_display;
-    tdm_private_display *private_display_backend;
     tdm_private_commit_handler *commit_handler = user_data;
+    tdm_private_display *private_display;
+    tdm_private_output *private_output;
+    tdm_private_layer *private_layer;
+
     TDM_RETURN_IF_FAIL(commit_handler);
 
     private_output = commit_handler->private_output;
-    TDM_RETURN_IF_FAIL(private_output);
-
     private_display = private_output->private_display;
-    LIST_FOR_EACH_ENTRY(private_output, &private_display->output_list, link)
+
+    if (commit_handler->func)
     {
-        if (private_output->output == output)
-            private_display_backend = private_output->private_display;
+        pthread_mutex_unlock(&private_display->lock);
+        commit_handler->func(private_output, sequence,
+                             tv_sec, tv_usec, commit_handler->user_data);
+        pthread_mutex_lock(&private_display->lock);
     }
 
-    pthread_mutex_unlock(&private_display_backend->lock);
+    LIST_FOR_EACH_ENTRY(private_layer, &private_output->layer_list, link)
+    {
+        if (!private_layer->waiting_buffer)
+            continue;
 
-    if (commit_handler->func)
-        commit_handler->func(commit_handler->private_output, sequence, tv_sec, tv_usec, commit_handler->user_data);
+        if (private_layer->showing_buffer)
+        {
+            pthread_mutex_unlock(&private_display->lock);
+            tdm_buffer_unref_backend(private_layer->showing_buffer);
+            pthread_mutex_lock(&private_display->lock);
+        }
 
-    pthread_mutex_lock(&private_display_backend->lock);
+        private_layer->showing_buffer = private_layer->waiting_buffer;
+        private_layer->waiting_buffer = NULL;
+    }
 
     LIST_DEL(&commit_handler->link);
     free(commit_handler);
 }
 
 EXTERN tdm_error
-tdm_output_wait_vblank(tdm_output *output, int interval, int sync, tdm_output_vblank_handler func, void *user_data)
+tdm_output_wait_vblank(tdm_output *output, int interval, int sync,
+                       tdm_output_vblank_handler func, void *user_data)
 {
     tdm_func_display *func_display;
     tdm_private_vblank_handler *vblank_handler;
@@ -651,7 +657,8 @@ tdm_output_wait_vblank(tdm_output *output, int interval, int sync, tdm_output_vb
     vblank_handler->func = func;
     vblank_handler->user_data = user_data;
 
-    ret = func_display->output_wait_vblank(private_output->output, interval, sync, vblank_handler);
+    ret = func_display->output_wait_vblank(private_output->output_backend, interval,
+                                           sync, vblank_handler);
     if (ret != TDM_ERROR_NONE)
     {
         pthread_mutex_unlock(&private_display->lock);
@@ -661,7 +668,8 @@ tdm_output_wait_vblank(tdm_output *output, int interval, int sync, tdm_output_vb
     if (!private_output->regist_vblank_cb)
     {
         private_output->regist_vblank_cb = 1;
-        ret = func_display->output_set_vblank_handler(private_output->output, _tdm_output_cb_vblank);
+        ret = func_display->output_set_vblank_handler(private_output->output_backend,
+                                                      _tdm_output_cb_vblank);
     }
 
     pthread_mutex_unlock(&private_display->lock);
@@ -699,7 +707,7 @@ tdm_output_commit(tdm_output *output, int sync, tdm_output_commit_handler func,
     commit_handler->func = func;
     commit_handler->user_data = user_data;
 
-    ret = func_display->output_commit(private_output->output, sync, commit_handler);
+    ret = func_display->output_commit(private_output->output_backend, sync, commit_handler);
     if (ret != TDM_ERROR_NONE)
     {
         pthread_mutex_unlock(&private_display->lock);
@@ -709,7 +717,8 @@ tdm_output_commit(tdm_output *output, int sync, tdm_output_commit_handler func,
     if (!private_output->regist_commit_cb)
     {
         private_output->regist_commit_cb = 1;
-        ret = func_display->output_set_commit_handler(private_output->output, _tdm_output_cb_commit);
+        ret = func_display->output_set_commit_handler(private_output->output_backend,
+                                                      _tdm_output_cb_commit);
     }
 
     pthread_mutex_unlock(&private_display->lock);
@@ -718,7 +727,7 @@ tdm_output_commit(tdm_output *output, int sync, tdm_output_commit_handler func,
 }
 
 EXTERN tdm_error
-tdm_output_set_mode(tdm_output *output, tdm_output_mode *mode)
+tdm_output_set_mode(tdm_output *output, const tdm_output_mode *mode)
 {
     tdm_func_display *func_display;
     OUTPUT_FUNC_ENTRY();
@@ -735,7 +744,7 @@ tdm_output_set_mode(tdm_output *output, tdm_output_mode *mode)
         return TDM_ERROR_NONE;
     }
 
-    ret = func_display->output_set_mode(private_output->output, mode);
+    ret = func_display->output_set_mode(private_output->output_backend, mode);
 
     pthread_mutex_unlock(&private_display->lock);
 
@@ -760,7 +769,7 @@ tdm_output_get_mode(tdm_output *output, const tdm_output_mode **mode)
         return TDM_ERROR_NONE;
     }
 
-    ret = func_display->output_get_mode(private_output->output, mode);
+    ret = func_display->output_get_mode(private_output->output_backend, mode);
 
     pthread_mutex_unlock(&private_display->lock);
 
@@ -786,7 +795,7 @@ tdm_output_set_dpms(tdm_output *output, tdm_output_dpms dpms_value)
         return TDM_ERROR_NONE;
     }
 
-    ret = func_display->output_set_dpms(private_output->output, dpms_value);
+    ret = func_display->output_set_dpms(private_output->output_backend, dpms_value);
 
     pthread_mutex_unlock(&private_display->lock);
 
@@ -811,7 +820,7 @@ tdm_output_get_dpms(tdm_output *output, tdm_output_dpms *dpms_value)
         return TDM_ERROR_NONE;
     }
 
-    ret = func_display->output_get_dpms(private_output->output, dpms_value);
+    ret = func_display->output_get_dpms(private_output->output_backend, dpms_value);
 
     pthread_mutex_unlock(&private_display->lock);
 
@@ -918,7 +927,7 @@ tdm_layer_set_property(tdm_layer *layer, unsigned int id, tdm_value value)
         return TDM_ERROR_NONE;
     }
 
-    ret = func_display->layer_set_property(private_layer->layer, id, value);
+    ret = func_display->layer_set_property(private_layer->layer_backend, id, value);
 
     pthread_mutex_unlock(&private_display->lock);
 
@@ -943,7 +952,7 @@ tdm_layer_get_property(tdm_layer *layer, unsigned int id, tdm_value *value)
         return TDM_ERROR_NONE;
     }
 
-    ret = func_display->layer_get_property(private_layer->layer, id, value);
+    ret = func_display->layer_get_property(private_layer->layer_backend, id, value);
 
     pthread_mutex_unlock(&private_display->lock);
 
@@ -970,7 +979,7 @@ tdm_layer_set_info(tdm_layer *layer, tdm_info_layer *info)
         return TDM_ERROR_NONE;
     }
 
-    ret = func_display->layer_set_info(private_layer->layer, info);
+    ret = func_display->layer_set_info(private_layer->layer_backend, info);
 
     pthread_mutex_unlock(&private_display->lock);
 
@@ -995,7 +1004,7 @@ tdm_layer_get_info(tdm_layer *layer, tdm_info_layer *info)
         return TDM_ERROR_NONE;
     }
 
-    ret = func_display->layer_get_info(private_layer->layer, info);
+    ret = func_display->layer_get_info(private_layer->layer_backend, info);
 
     pthread_mutex_unlock(&private_display->lock);
 
@@ -1003,7 +1012,7 @@ tdm_layer_get_info(tdm_layer *layer, tdm_info_layer *info)
 }
 
 EXTERN tdm_error
-tdm_layer_set_buffer(tdm_layer *layer, tdm_buffer *buffer)
+tdm_layer_set_buffer(tdm_layer *layer, tbm_surface_h buffer)
 {
     tdm_func_display *func_display;
     LAYER_FUNC_ENTRY();
@@ -1022,18 +1031,16 @@ tdm_layer_set_buffer(tdm_layer *layer, tdm_buffer *buffer)
         return TDM_ERROR_NONE;
     }
 
-    if (private_layer->current_buffer)
+    if (private_layer->waiting_buffer)
     {
-        /* TODO: need to unref after next buffer is showing on screen */
-        tdm_buffer_unref_backend(private_layer->current_buffer);
-        tdm_buffer_unref(private_layer->current_buffer);
+        pthread_mutex_unlock(&private_display->lock);
+        tdm_buffer_unref_backend(private_layer->waiting_buffer);
+        pthread_mutex_lock(&private_display->lock);
     }
 
-    private_layer->current_buffer = tdm_buffer_ref(buffer, NULL);
-    tdm_buffer_ref_backend(buffer);
+    private_layer->waiting_buffer = tdm_buffer_ref_backend(buffer);
 
-    ret = func_display->layer_set_buffer(private_layer->layer,
-                                         tdm_buffer_get_surface(buffer));
+    ret = func_display->layer_set_buffer(private_layer->layer_backend, buffer);
 
     pthread_mutex_unlock(&private_display->lock);
 
@@ -1050,11 +1057,20 @@ tdm_layer_unset_buffer(tdm_layer *layer)
 
     func_display = &private_display->func_display;
 
-    if (private_layer->current_buffer)
+    if (private_layer->waiting_buffer)
+    {
+        pthread_mutex_unlock(&private_display->lock);
+        tdm_buffer_unref_backend(private_layer->waiting_buffer);
+        pthread_mutex_lock(&private_display->lock);
+        private_layer->waiting_buffer = NULL;
+    }
+
+    if (private_layer->showing_buffer)
     {
-        tdm_buffer_unref(private_layer->current_buffer);
-        tdm_buffer_unref_backend(private_layer->current_buffer);
-        private_layer->current_buffer = NULL;
+        pthread_mutex_unlock(&private_display->lock);
+        tdm_buffer_unref_backend(private_layer->showing_buffer);
+        pthread_mutex_lock(&private_display->lock);
+        private_layer->showing_buffer = NULL;
     }
 
     private_layer->usable = 1;
@@ -1065,7 +1081,7 @@ tdm_layer_unset_buffer(tdm_layer *layer)
         return TDM_ERROR_NONE;
     }
 
-    ret = func_display->layer_unset_buffer(private_layer->layer);
+    ret = func_display->layer_unset_buffer(private_layer->layer_backend);
 
     pthread_mutex_unlock(&private_display->lock);
 
@@ -1088,6 +1104,35 @@ tdm_layer_is_usable(tdm_layer *layer, unsigned int *usable)
     return ret;
 }
 
+EXTERN tdm_error
+tdm_layer_set_video_pos(tdm_layer *layer, int zpos)
+{
+    tdm_func_display *func_display;
+    LAYER_FUNC_ENTRY();
+
+    pthread_mutex_lock(&private_display->lock);
+
+    func_display = &private_display->func_display;
+
+    if (!(private_layer->caps.capabilities & TDM_LAYER_CAPABILITY_VIDEO))
+    {
+        TDM_ERR("layer is not video layer");
+        pthread_mutex_unlock(&private_display->lock);
+        return TDM_ERROR_INVALID_PARAMETER;
+    }
+
+    if (!func_display->layer_set_video_pos)
+    {
+        pthread_mutex_unlock(&private_display->lock);
+        return TDM_ERROR_NONE;
+    }
+
+    ret = func_display->layer_set_video_pos(private_layer->layer_backend, zpos);
+
+    pthread_mutex_unlock(&private_display->lock);
+
+    return ret;
+}
 
 EXTERN tdm_capture*
 tdm_layer_create_capture(tdm_layer *layer, tdm_error *error)