From: Seunghun Lee Date: Fri, 7 Dec 2018 02:06:41 +0000 (+0900) Subject: video: remove unnecessary eom enable check code. X-Git-Tag: submit/tizen/20181212.030325~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b36e03a8ecaa49beae0931eefb274f9cbaefc68e;p=platform%2Fupstream%2Fenlightenment.git video: remove unnecessary eom enable check code. external_video would be set as true when instance is created if eom is enabled. thus no need to check eom is enabled other places. It's enough to check whether external_video flag is on. Change-Id: I6d2253dd55c57dfa17a635f48d9101c003819720 --- diff --git a/src/bin/video/iface/e_video_hwc_planes.c b/src/bin/video/iface/e_video_hwc_planes.c index 678e465632..b88e7bce9a 100644 --- a/src/bin/video/iface/e_video_hwc_planes.c +++ b/src/bin/video/iface/e_video_hwc_planes.c @@ -1176,7 +1176,7 @@ _e_video_geometry_cal(E_Video_Hwc_Planes *evhp) _e_video_geometry_cal_map(evhp); - if (e_config->eom_enable == EINA_TRUE && evhp->external_video) + if (evhp->external_video) { tdm_err = tdm_output_get_mode(evhp->output, &mode); if (tdm_err != TDM_ERROR_NONE) @@ -1268,19 +1268,13 @@ _e_video_geometry_cal(E_Video_Hwc_Planes *evhp) static Eina_Bool _e_video_can_commit(E_Video_Hwc_Planes *evhp) { - if (e_config->eom_enable == EINA_TRUE) + if (!evhp->external_video) { - if (!evhp->external_video && e_output_dpms_get(evhp->e_output)) + if (e_output_dpms_get(evhp->e_output)) return EINA_FALSE; } - else - if (e_output_dpms_get(evhp->e_output)) - return EINA_FALSE; - - if (!_e_video_is_visible(evhp)) - return EINA_FALSE; - return EINA_TRUE; + return _e_video_is_visible(evhp); } static void @@ -2178,14 +2172,11 @@ _e_video_cb_ec_buffer_change(void *data, int type, void *event) if (!evhp->ec->comp_data->video_client) return ECORE_CALLBACK_PASS_ON; - if (e_config->eom_enable == EINA_TRUE) + /* skip external client buffer if its top parent is not current for eom anymore */ + if (evhp->external_video && e_eom_is_ec_external(ec)) { - /* skip external client buffer if its top parent is not current for eom anymore */ - if (evhp->external_video && e_eom_is_ec_external(ec)) - { - VWR("skip external buffer"); - return ECORE_CALLBACK_PASS_ON; - } + VWR("skip external buffer"); + return ECORE_CALLBACK_PASS_ON; } _e_video_render(evhp, __FUNCTION__); @@ -2214,7 +2205,7 @@ _e_video_cb_ec_client_show(void *data, int type, void *event) if (!evhp) return ECORE_CALLBACK_PASS_ON; VIN("client(0x%08"PRIxPTR") show: find video child(0x%08"PRIxPTR")", (Ecore_Window)e_client_util_win_get(ec), (Ecore_Window)e_client_util_win_get(video_ec)); - if(evhp->old_comp_buffer) + if (evhp->old_comp_buffer) { VIN("video already rendering.."); return ECORE_CALLBACK_PASS_ON; @@ -2222,14 +2213,11 @@ _e_video_cb_ec_client_show(void *data, int type, void *event) if (ec == e_comp_wl_topmost_parent_get(evhp->ec)) { - if (e_config->eom_enable == EINA_TRUE) + /* skip external client buffer if its top parent is not current for eom anymore */ + if (evhp->external_video && e_eom_is_ec_external(ec)) { - /* skip external client buffer if its top parent is not current for eom anymore */ - if (evhp->external_video && e_eom_is_ec_external(ec)) - { - VWR("skip external buffer"); - return ECORE_CALLBACK_PASS_ON; - } + VWR("skip external buffer"); + return ECORE_CALLBACK_PASS_ON; } VIN("video need rendering..");