From: Hyunil Date: Mon, 18 Dec 2017 10:30:54 +0000 (+0900) Subject: Change return type of set render rectangle for handling error X-Git-Tag: submit/tizen/20180105.085839~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d580aa9e0083a337dba5218a280754492b9b5497;p=platform%2Fcore%2Fmultimedia%2Flibmm-player.git Change return type of set render rectangle for handling error Change-Id: I4faae5d0cb9456c5297c12530801526e686bbc31 Signed-off-by: Hyunil --- diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c index f52c381..f24c4f3 100644 --- a/src/mm_player_priv.c +++ b/src/mm_player_priv.c @@ -3863,7 +3863,7 @@ __mmplayer_video_param_set_display_method(mm_player_t* player) LOGD("set video param : method %d", display_method); } -void +int __mmplayer_video_param_set_render_rectangle(mm_player_t* player) { MMHandleType attrs = 0; @@ -3878,16 +3878,16 @@ __mmplayer_video_param_set_render_rectangle(mm_player_t* player) /* check video sinkbin is created */ if (MM_ERROR_NONE != __mmplayer_video_param_check_video_sink_bin(player)) - return; + return MM_ERROR_PLAYER_INTERNAL; attrs = MMPLAYER_GET_ATTRS(player); - MMPLAYER_RETURN_IF_FAIL(attrs); + MMPLAYER_RETURN_VAL_IF_FAIL(attrs, MM_ERROR_PLAYER_INTERNAL); /* check roi mode is set */ mm_attrs_get_int_by_name(attrs, "display_method", &display_method); if (display_method != PLAYER_DISPLAY_MODE_DST_ROI) { LOGE("must be set display-geometry-method to DISP_GEO_METHOD_CUSTOM_ROI before setting render rectangle"); - return; + return MM_ERROR_PLAYER_INTERNAL; } mm_attrs_get_data_by_name(attrs, "display_overlay", &handle); @@ -3904,8 +3904,10 @@ __mmplayer_video_param_set_render_rectangle(mm_player_t* player) wl_window_x, wl_window_y, wl_window_width, wl_window_height); LOGD("set video param : render rectangle : x(%d) y(%d) width(%d) height(%d)", wl_window_x, wl_window_y, wl_window_width, wl_window_height); - + } else { + return MM_ERROR_PLAYER_INTERNAL; } + return MM_ERROR_NONE; } void __mmplayer_video_param_set_display_overlay(mm_player_t* player) @@ -3960,8 +3962,10 @@ __mmplayer_update_wayland_videosink_video_param(mm_player_t* player, char *param __mmplayer_video_param_set_display_overlay(player); if (update_all_param || !g_strcmp0(param_name, "display_method")) __mmplayer_video_param_set_display_method(player); - if (update_all_param || !g_strcmp0(param_name, "wl_window_render_x")) - __mmplayer_video_param_set_render_rectangle(player); + if (update_all_param || !g_strcmp0(param_name, "wl_window_render_x")) { + if (MM_ERROR_NONE != __mmplayer_video_param_set_render_rectangle(player)) + return MM_ERROR_PLAYER_INTERNAL; + } if (update_all_param || !g_strcmp0(param_name, "display_visible")) __mmplayer_video_param_set_display_visible(player); if (update_all_param || !g_strcmp0(param_name, "display_rotation"))