summaryrefslogtreecommitdiff
path: root/libgscaler
diff options
context:
space:
mode:
Diffstat (limited to 'libgscaler')
-rw-r--r--[-rwxr-xr-x]libgscaler/libgscaler.cpp11
-rw-r--r--[-rwxr-xr-x]libgscaler/libgscaler_obj.cpp26
-rw-r--r--[-rwxr-xr-x]libgscaler/libgscaler_obj.h2
3 files changed, 5 insertions, 34 deletions
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__);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 14:56:36 +0000