add timeout logs (1000ms)

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

diff --git a/src/tdm_hwc_window.c b/src/tdm_hwc_window.c
index 1166e5b..40820ce 100644 (file)
--- a/src/tdm_hwc_window.c
+++ b/src/tdm_hwc_window.c
@@ -37,10 +37,7 @@
 #include "config.h"
 #endif
 
-#include "tdm.h"
-#include "tdm_backend.h"
 #include "tdm_private.h"
-#include "tdm_helper.h"
 
 #define COUNT_MAX   10
 
@@ -104,7 +101,7 @@ tdm_hwc_window_get_tbm_buffer_queue(tdm_hwc_window *hwc_window, tdm_error *error
 }
 
 EXTERN tdm_error
-tdm_hwc_window_set_zpos(tdm_hwc_window *hwc_window, uint32_t zpos)
+tdm_hwc_window_set_zpos(tdm_hwc_window *hwc_window, int32_t zpos)
 {
        tdm_func_hwc_window *func_hwc_window = NULL;
 
@@ -138,6 +135,8 @@ tdm_hwc_window_set_composition_type(tdm_hwc_window *hwc_window,
        tdm_func_hwc_window *func_hwc_window = NULL;
 
        HWC_WINDOW_FUNC_ENTRY();
+       TDM_RETURN_VAL_IF_FAIL(composition_type >= TDM_COMPOSITION_NONE, TDM_ERROR_INVALID_PARAMETER);
+       TDM_RETURN_VAL_IF_FAIL(composition_type <= TDM_COMPOSITION_VIDEO, TDM_ERROR_INVALID_PARAMETER);
 
        _pthread_mutex_lock(&private_display->lock);
 
@@ -164,6 +163,8 @@ tdm_hwc_window_set_buffer_damage(tdm_hwc_window *hwc_window, tdm_hwc_region dama
        tdm_func_hwc_window *func_hwc_window = NULL;
 
        HWC_WINDOW_FUNC_ENTRY();
+       if (damage.num_rects > 0)
+               TDM_RETURN_VAL_IF_FAIL(damage.rects != NULL, TDM_ERROR_INVALID_PARAMETER);
 
        _pthread_mutex_lock(&private_display->lock);
 
@@ -236,7 +237,7 @@ _tdm_window_dump_buffer(tdm_hwc_window *hwc_window, tbm_surface_h buffer)
        tdm_private_output *private_output = private_window->private_output;
        unsigned int pipe;
        uint32_t zpos;
-       char fname[PATH_MAX];
+       char fname[TDM_PATH_LEN];
 
        pipe = private_output->pipe;
        zpos = private_window->zpos;
@@ -293,7 +294,7 @@ tdm_hwc_window_set_buffer(tdm_hwc_window *hwc_window, tbm_surface_h buffer)
 }
 
 INTERN tdm_hwc_window *
-tdm_hwc_window_create_internal(tdm_private_output *private_output,
+tdm_hwc_window_create_internal(tdm_private_output *private_output, int is_video,
                                                                   tdm_error *error)
 {
        tdm_private_display *private_display = private_output->private_display;
@@ -304,23 +305,41 @@ tdm_hwc_window_create_internal(tdm_private_output *private_output,
 
        TDM_RETURN_VAL_IF_FAIL(TDM_MUTEX_IS_LOCKED(), NULL);
 
-       if (!func_output->output_hwc_create_window) {
-               /* LCOV_EXCL_START */
-               if (error)
-                       *error = TDM_ERROR_BAD_MODULE;
-               return NULL;
-               /* LCOV_EXCL_STOP */
-       }
+       if (!is_video) {
+               if (!func_output->output_hwc_create_window) {
+                       /* LCOV_EXCL_START */
+                       if (error)
+                               *error = TDM_ERROR_BAD_MODULE;
+                       return NULL;
+                       /* LCOV_EXCL_STOP */
+               }
 
-       hwc_window_backend = func_output->output_hwc_create_window(
+               hwc_window_backend = func_output->output_hwc_create_window(
                                                 private_output->output_backend, &ret);
-       if (ret != TDM_ERROR_NONE) {
-               if (error)
-                       *error = ret;
-               return NULL;
+               if (ret != TDM_ERROR_NONE) {
+                       if (error)
+                               *error = ret;
+                       return NULL;
+               }
+       } else {
+               if (!func_output->output_hwc_create_video_window) {
+                       /* LCOV_EXCL_START */
+                       if (error)
+                               *error = TDM_ERROR_NOT_IMPLEMENTED;
+                       return NULL;
+                       /* LCOV_EXCL_STOP */
+               }
+
+               hwc_window_backend = func_output->output_hwc_create_video_window(
+                                                private_output->output_backend, &ret);
+               if (ret != TDM_ERROR_NONE) {
+                       if (error)
+                               *error = ret;
+                       return NULL;
+               }
        }
 
-       private_hwc_window = calloc(1, sizeof(tdm_private_capture));
+       private_hwc_window = calloc(1, sizeof(tdm_private_hwc_window));
        if (!private_hwc_window) {
                /* LCOV_EXCL_START */
                TDM_ERR("failed: alloc memory");
@@ -452,38 +471,6 @@ tdm_hwc_window_video_get_capability(tdm_hwc_window *hwc_window,
 }
 
 EXTERN tdm_error
-tdm_hwc_window_video_get_supported_format(tdm_hwc_window *hwc_window,
-                                                                                 const tbm_format **formats,
-                                                                                 int *count)
-{
-       tdm_func_hwc_window *func_hwc_window = NULL;
-
-       HWC_WINDOW_FUNC_ENTRY();
-
-       TDM_RETURN_VAL_IF_FAIL(formats != NULL, TDM_ERROR_INVALID_PARAMETER);
-       TDM_RETURN_VAL_IF_FAIL(count != NULL, TDM_ERROR_INVALID_PARAMETER);
-
-       _pthread_mutex_lock(&private_display->lock);
-
-       func_hwc_window = &private_display->func_hwc_window;
-
-       if (!func_hwc_window->hwc_window_video_get_supported_format) {
-               /* LCOV_EXCL_START */
-               _pthread_mutex_unlock(&private_display->lock);
-               TDM_ERR("not implemented!!");
-               return TDM_ERROR_NOT_IMPLEMENTED;
-               /* LCOV_EXCL_STOP */
-       }
-
-       ret = func_hwc_window->hwc_window_video_get_supported_format(private_hwc_window->hwc_window_backend,
-                                                                                                                                formats, count);
-
-       _pthread_mutex_unlock(&private_display->lock);
-
-       return ret;
-}
-
-EXTERN tdm_error
 tdm_hwc_window_video_get_available_properties(tdm_hwc_window *hwc_window,
                                                                                          const tdm_prop **props, int *count)
 {