diff options
16 files changed, 7 insertions, 36 deletions
diff --git a/include/exynos_gscaler.h b/include/exynos_gscaler.h index 38b57a4..9bb8266 100755..100644 --- a/include/exynos_gscaler.h +++ b/include/exynos_gscaler.h @@ -60,8 +60,8 @@ extern "C" { #define Exynos_gsc_In() Exynos_Log(EXYNOS_DEV_LOG_DEBUG, EXYNOS_GSC_LOG_TAG, "%s In , Line: %d", __FUNCTION__, __LINE__) #define Exynos_gsc_Out() Exynos_Log(EXYNOS_DEV_LOG_DEBUG, EXYNOS_GSC_LOG_TAG, "%s Out , Line: %d", __FUNCTION__, __LINE__) #else -#define Exynos_gsc_In() ((void *)0) -#define Exynos_gsc_Out() ((void *)0) +#define Exynos_gsc_In() +#define Exynos_gsc_Out() #endif typedef struct { diff --git a/libgscaler/libgscaler.cpp b/libgscaler/libgscaler.cpp index 3c4cc24..d621bc7 100755..100644 --- a/libgscaler/libgscaler.cpp +++ b/libgscaler/libgscaler.cpp @@ -50,9 +50,6 @@ void *exynos_gsc_create_exclusive( int out_mode, int allow_drm) { - int i = 0; - int op_id = 0; - unsigned int total_sleep_time = 0; int ret = 0; Exynos_gsc_In(); @@ -141,7 +138,6 @@ void exynos_gsc_destroy(void *handle) { Exynos_gsc_In(); - int i = 0; CGscaler* gsc = GetGscaler(handle); if (gsc == NULL) { ALOGE("%s::handle == NULL() fail", __func__); @@ -483,11 +479,6 @@ int exynos_gsc_run_exclusive(void *handle, void *exynos_gsc_create_blend_exclusive(int dev_num, int mode, int out_mode, int allow_drm) { - int i = 0; - int op_id = 0; - unsigned int total_sleep_time = 0; - int ret = 0; - Exynos_gsc_In(); if ((dev_num < 0) || (dev_num >= HW_SCAL_MAX)) { @@ -609,8 +600,6 @@ int exynos_gsc_free_and_close(void *handle) Exynos_gsc_In(); struct v4l2_requestbuffers reqbuf; - struct v4l2_buffer buf; - struct v4l2_plane planes[NUM_OF_GSC_PLANES]; int ret = 0; CGscaler* gsc = GetGscaler(handle); if (gsc == NULL) { 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__); diff --git a/libgscaler/libgscaler_obj.h b/libgscaler/libgscaler_obj.h index e36e397..e4dd23f 100755..100644 --- a/libgscaler/libgscaler_obj.h +++ b/libgscaler/libgscaler_obj.h @@ -187,7 +187,7 @@ public: __InitMembers(__mode, __out_mode, __gsc_id, __allow_drm); } - ~CGscaler() + virtual ~CGscaler() { ALOGD("%s", __func__); } diff --git a/libswconverter/csc_BGRA8888_to_RGBA8888_NEON.s b/libswconverter/csc_BGRA8888_to_RGBA8888_NEON.s index 0f4b45b..0f4b45b 100755..100644 --- a/libswconverter/csc_BGRA8888_to_RGBA8888_NEON.s +++ b/libswconverter/csc_BGRA8888_to_RGBA8888_NEON.s diff --git a/libswconverter/csc_BGRA8888_to_YUV420SP_NEON.s b/libswconverter/csc_BGRA8888_to_YUV420SP_NEON.s index 956f553..956f553 100755..100644 --- a/libswconverter/csc_BGRA8888_to_YUV420SP_NEON.s +++ b/libswconverter/csc_BGRA8888_to_YUV420SP_NEON.s diff --git a/libswconverter/csc_RGBA8888_to_YUV420SP_NEON.s b/libswconverter/csc_RGBA8888_to_YUV420SP_NEON.s index 92c2d58..92c2d58 100755..100644 --- a/libswconverter/csc_RGBA8888_to_YUV420SP_NEON.s +++ b/libswconverter/csc_RGBA8888_to_YUV420SP_NEON.s diff --git a/libswconverter/csc_interleave_memcpy_neon.s b/libswconverter/csc_interleave_memcpy_neon.s index 1ab25b6..1ab25b6 100755..100644 --- a/libswconverter/csc_interleave_memcpy_neon.s +++ b/libswconverter/csc_interleave_memcpy_neon.s diff --git a/libswconverter/csc_linear_to_tiled_crop_neon.s b/libswconverter/csc_linear_to_tiled_crop_neon.s index 8f59826..8f59826 100755..100644 --- a/libswconverter/csc_linear_to_tiled_crop_neon.s +++ b/libswconverter/csc_linear_to_tiled_crop_neon.s diff --git a/libswconverter/csc_linear_to_tiled_interleave_crop_neon.s b/libswconverter/csc_linear_to_tiled_interleave_crop_neon.s index 33a31da..33a31da 100755..100644 --- a/libswconverter/csc_linear_to_tiled_interleave_crop_neon.s +++ b/libswconverter/csc_linear_to_tiled_interleave_crop_neon.s diff --git a/libswconverter/csc_tiled_to_linear_crop_neon.s b/libswconverter/csc_tiled_to_linear_crop_neon.s index 9cb81b5..9cb81b5 100755..100644 --- a/libswconverter/csc_tiled_to_linear_crop_neon.s +++ b/libswconverter/csc_tiled_to_linear_crop_neon.s diff --git a/libswconverter/csc_tiled_to_linear_deinterleave_crop_neon.s b/libswconverter/csc_tiled_to_linear_deinterleave_crop_neon.s index cdd101e..cdd101e 100755..100644 --- a/libswconverter/csc_tiled_to_linear_deinterleave_crop_neon.s +++ b/libswconverter/csc_tiled_to_linear_deinterleave_crop_neon.s diff --git a/libswconverter/csc_tiled_to_linear_uv_deinterleave_neon.s b/libswconverter/csc_tiled_to_linear_uv_deinterleave_neon.s index b4d5084..b4d5084 100755..100644 --- a/libswconverter/csc_tiled_to_linear_uv_deinterleave_neon.s +++ b/libswconverter/csc_tiled_to_linear_uv_deinterleave_neon.s diff --git a/libswconverter/csc_tiled_to_linear_uv_neon.s b/libswconverter/csc_tiled_to_linear_uv_neon.s index c90d1f3..c90d1f3 100755..100644 --- a/libswconverter/csc_tiled_to_linear_uv_neon.s +++ b/libswconverter/csc_tiled_to_linear_uv_neon.s diff --git a/libswconverter/csc_tiled_to_linear_y_neon.s b/libswconverter/csc_tiled_to_linear_y_neon.s index 3cdf092..3cdf092 100755..100644 --- a/libswconverter/csc_tiled_to_linear_y_neon.s +++ b/libswconverter/csc_tiled_to_linear_y_neon.s diff --git a/libswconverter/swconvertor.c b/libswconverter/swconvertor.c index b3330fe..b3330fe 100755..100644 --- a/libswconverter/swconvertor.c +++ b/libswconverter/swconvertor.c |