add checking of invalid param at roi api and change return value about evas renderer...

Change-Id: I180f6b2db4a1fda481169f1ac5da7503657c33c0

diff --git a/packaging/capi-media-player.spec b/packaging/capi-media-player.spec
index 14a5229..73b003b 100644 (file)
--- a/packaging/capi-media-player.spec
+++ b/packaging/capi-media-player.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-player
 Summary:    A Media Player API
-Version:    0.3.18
+Version:    0.3.19
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/player.c b/src/player.c
index 44c1695..cf77518 100644 (file)
--- a/src/player.c
+++ b/src/player.c
@@ -1852,8 +1852,10 @@ int player_start(player_h player)
 #ifdef TIZEN_FEATURE_EVAS_RENDERER
        if (EVAS_HANDLE(pc)) {
                ret = mm_evas_renderer_update_param(EVAS_HANDLE(pc));
-               if (ret != PLAYER_ERROR_NONE)
-                       return ret;
+               if (ret != MM_ERROR_NONE) {
+                       LOGE("mm_evas_renderer_update_param err 0x%x", ret);
+                       return PLAYER_ERROR_INVALID_OPERATION;
+               }
        }
 #endif
        player_msg_send(api, pc, ret_buf, ret);
@@ -2150,8 +2152,10 @@ int player_set_display(player_h player, player_display_type_e type, player_displ
                                        if (mm_evas_renderer_destroy(&EVAS_HANDLE(pc)) != MM_ERROR_NONE)
                                                LOGW("fail to unset evas client");
                                }
-                               if (mm_evas_renderer_create(&EVAS_HANDLE(pc), obj) != MM_ERROR_NONE)
+                               if (mm_evas_renderer_create(&EVAS_HANDLE(pc), obj) != MM_ERROR_NONE) {
                                        LOGW("fail to set evas client");
+                                       /* FIXME : need to handle error case */
+                               }
 
                                if (player_set_media_packet_video_frame_decoded_cb(player, mm_evas_renderer_write, (void *)EVAS_HANDLE(pc)) != PLAYER_ERROR_NONE)
                                        LOGW("fail to set decoded callback");
@@ -2183,7 +2187,8 @@ int player_set_display_mode(player_h player, player_display_mode_e mode)
 #ifdef TIZEN_FEATURE_EVAS_RENDERER
        if (EVAS_HANDLE(pc)) {
                ret = mm_evas_renderer_set_geometry(EVAS_HANDLE(pc), mode);
-               return ret;
+               /* FIXME: need to handle error code from evas */
+               return PLAYER_ERROR_NONE;
        }
 #endif
        player_msg_send1(api, pc, ret_buf, ret, INT, mode);
@@ -2206,7 +2211,8 @@ int player_get_display_mode(player_h player, player_display_mode_e * pmode)
        if (EVAS_HANDLE(pc)) {
                ret = mm_evas_renderer_get_geometry(EVAS_HANDLE(pc), &mode);
                *pmode = (player_display_mode_e) mode;
-               return ret;
+               /* FIXME: need to handle error code from evas */
+               return PLAYER_ERROR_NONE;
        }
 #endif
        player_msg_send(api, pc, ret_buf, ret);
@@ -2223,6 +2229,8 @@ int player_get_display_mode(player_h player, player_display_mode_e * pmode)
 int player_set_display_roi_area(player_h player, int x, int y, int width, int height)
 {
        PLAYER_INSTANCE_CHECK(player);
+       PLAYER_CHECK_CONDITION(width > 0 && height > 0, PLAYER_ERROR_INVALID_PARAMETER, "PLAYER_ERROR_INVALID_PARAMETER");
+
        int ret = PLAYER_ERROR_NONE;
        muse_player_api_e api = MUSE_PLAYER_API_SET_DISPLAY_ROI_AREA;
        player_cli_s *pc = (player_cli_s *) player;
@@ -2231,10 +2239,12 @@ int player_set_display_roi_area(player_h player, int x, int y, int width, int he
        char *wl_win_msg = (char *)&wl_win;
 
        LOGD("ENTER");
+
 #ifdef TIZEN_FEATURE_EVAS_RENDERER
        if (EVAS_HANDLE(pc)) {
                ret = mm_evas_renderer_set_roi_area(EVAS_HANDLE(pc), x, y, width, height);
-               return ret;
+               /* FIXME: need to handle error code from evas */
+               return PLAYER_ERROR_NONE;
        }
 #endif
        wl_win.wl_window_x = x;
@@ -2275,7 +2285,8 @@ int player_set_display_rotation(player_h player, player_display_rotation_e rotat
 #ifdef TIZEN_FEATURE_EVAS_RENDERER
        if (EVAS_HANDLE(pc)) {
                ret = mm_evas_renderer_set_rotation(EVAS_HANDLE(pc), rotation);
-               return ret;
+               /* FIXME: need to handle error code from evas */
+               return PLAYER_ERROR_NONE;
        }
 #endif
        player_msg_send1(api, pc, ret_buf, ret, INT, rotation);
@@ -2298,7 +2309,8 @@ int player_get_display_rotation(player_h player, player_display_rotation_e * pro
        if (EVAS_HANDLE(pc)) {
                ret = mm_evas_renderer_get_rotation(EVAS_HANDLE(pc), &rotation);
                *protation = (player_display_rotation_e) rotation;
-               return ret;
+               /* FIXME: need to handle error code from evas */
+               return PLAYER_ERROR_NONE;
        }
 #endif
        player_msg_send(api, pc, ret_buf, ret);
@@ -2323,7 +2335,8 @@ int player_set_display_visible(player_h player, bool visible)
 #ifdef TIZEN_FEATURE_EVAS_RENDERER
        if (EVAS_HANDLE(pc)) {
                ret = mm_evas_renderer_set_visible(EVAS_HANDLE(pc), visible);
-               return ret;
+               /* FIXME: need to handle error code from evas */
+               return PLAYER_ERROR_NONE;
        }
 #endif
        player_msg_send1(api, pc, ret_buf, ret, INT, visible);
@@ -2351,7 +2364,9 @@ int player_is_display_visible(player_h player, bool * pvisible)
                        *pvisible = TRUE;
                else
                        *pvisible = FALSE;
-               return ret;
+
+               /* FIXME: need to handle error code from evas */
+               return PLAYER_ERROR_NONE;
        }
 #endif
        player_msg_send(api, pc, ret_buf, ret);