diff options
Diffstat (limited to 'libgscaler/libgscaler_obj.cpp')
-rw-r--r--[-rwxr-xr-x] | libgscaler/libgscaler_obj.cpp | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/libgscaler/libgscaler_obj.cpp b/libgscaler/libgscaler_obj.cpp index 58b88e0..0dec865 100755..100644 --- a/libgscaler/libgscaler_obj.cpp +++ b/libgscaler/libgscaler_obj.cpp @@ -42,8 +42,6 @@ int CGscaler::m_gsc_output_create(void *handle, int dev_num, int out_mode) char node[32]; char devname[32]; unsigned int cap; - int i; - int fd = 0; CGscaler* gsc = GetGscaler(handle); if (gsc == NULL) { ALOGE("%s::handle == NULL() fail", __func__); @@ -181,12 +179,9 @@ int CGscaler::m_gsc_capture_create(void *handle, int dev_num, int out_mode) struct media_entity *gsc_sd_entity; struct media_entity *gsc_vd_entity; struct media_entity *sink_sd_entity; - struct media_link *links; char node[32]; char devname[32]; unsigned int cap; - int i; - int fd = 0; CGscaler* gsc = GetGscaler(handle); if (gsc == NULL) { ALOGE("%s::handle == NULL() fail", __func__); @@ -283,7 +278,6 @@ int CGscaler::m_gsc_out_stop(void *handle) { Exynos_gsc_In(); - struct v4l2_requestbuffers reqbuf; CGscaler* gsc = GetGscaler(handle); if (gsc == NULL) { ALOGE("%s::handle == NULL() fail", __func__); @@ -346,7 +340,6 @@ bool CGscaler::m_gsc_out_destroy(void *handle) { Exynos_gsc_In(); - int i; CGscaler* gsc = GetGscaler(handle); if (gsc == NULL) { ALOGE("%s::handle == NULL() fail", __func__); @@ -626,8 +619,7 @@ int CGscaler::m_gsc_m2m_stop(void *handle) /* if drm is enabled */ if (gsc->allow_drm && gsc->protection_enabled) { - unsigned int protect_id = 0; - +/* if (gsc->gsc_id == 0) protect_id = CP_PROTECT_GSC0; else if (gsc->gsc_id == 1) @@ -636,7 +628,7 @@ int CGscaler::m_gsc_m2m_stop(void *handle) protect_id = CP_PROTECT_GSC2; else if (gsc->gsc_id == 3) protect_id = CP_PROTECT_GSC3; - +*/ /* CP_Disable_Path_Protection(protect_id); */ gsc->protection_enabled = false; } @@ -787,8 +779,7 @@ int CGscaler::m_gsc_m2m_run_core(void *handle) * and power domain is kept on. */ if (is_dirty && gsc->allow_drm && is_drm) { - unsigned int protect_id = 0; - +/* if (gsc->gsc_id == 0) { protect_id = CP_PROTECT_GSC0; } else if (gsc->gsc_id == 1) { @@ -802,7 +793,7 @@ int CGscaler::m_gsc_m2m_run_core(void *handle) __func__, gsc->gsc_id); goto done; } - +*/ /* if (CP_Enable_Path_Protection(protect_id) != 0) { ALOGE("%s::CP_Enable_Path_Protection failed", __func__); goto done; @@ -1255,14 +1246,11 @@ int CGscaler::m_gsc_out_config(void *handle, struct v4l2_requestbuffers reqbuf; struct v4l2_subdev_format sd_fmt; struct v4l2_subdev_crop sd_crop; - int i; unsigned int rotate; unsigned int hflip; unsigned int vflip; - unsigned int plane_size[NUM_OF_GSC_PLANES]; bool rgb; - struct v4l2_rect dst_rect; int32_t src_color_space; int32_t dst_color_space; int32_t src_planes; @@ -1498,14 +1486,10 @@ int CGscaler::m_gsc_cap_config(void *handle, struct v4l2_requestbuffers reqbuf; struct v4l2_subdev_format sd_fmt; struct v4l2_subdev_crop sd_crop; - int i; unsigned int rotate; unsigned int hflip; unsigned int vflip; - unsigned int plane_size[NUM_OF_GSC_PLANES]; - bool rgb; - struct v4l2_rect dst_rect; int32_t src_color_space; int32_t dst_color_space; int32_t dst_planes; @@ -1522,7 +1506,6 @@ int CGscaler::m_gsc_cap_config(void *handle, dst_color_space = HAL_PIXEL_FORMAT_2_V4L2_PIX(dst_img->format); dst_planes = m_gsc_get_plane_count(dst_color_space); dst_planes = (dst_planes == -1) ? 1 : dst_planes; - rgb = get_yuv_planes(src_color_space) == -1; CGscaler::rotateValueHAL2GSC(src_img->rot, &rotate, &hflip, &vflip); if (CGscaler::m_gsc_check_src_size(&gsc->src_img.fw, @@ -2057,7 +2040,6 @@ int CGscaler::SetInputCrop(void *handle, exynos_mpp_img *src_img, exynos_mpp_img *dst_img) { struct v4l2_crop crop; - int ret = 0; CGscaler *gsc = GetGscaler(handle); if (gsc == NULL) { ALOGE("%s::handle == NULL() fail", __func__); |