From: Jeongmo Yang <jm80.yang@samsung.com>
Date: Thu, 6 Apr 2023 02:01:05 +0000 (+0900)
Subject: Correct V4L2 cid for some settings
X-Git-Tag: accepted/tizen/unified/20230424.185354~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a96003854b2f42fd0645cfa13109fb643c6c3ada;p=platform%2Fhal%2Fbackend%2Fcamera-v4l2.git

Correct V4L2 cid for some settings

[Version] 0.0.5
[Issue Type] Update

Change-Id: If7bb21646300d1d16a1b78356bcd6661e0c55ca1
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
---

diff --git a/packaging/hal-backend-camera-v4l2.spec b/packaging/hal-backend-camera-v4l2.spec
index 20384e8..35ca39d 100644
--- a/packaging/hal-backend-camera-v4l2.spec
+++ b/packaging/hal-backend-camera-v4l2.spec
@@ -8,7 +8,7 @@
 
 Name:       hal-backend-camera-v4l2
 Summary:    Tizen Camera Hal using generic V4L2 interface
-Version:    0.0.4
+Version:    0.0.5
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0
diff --git a/src/hal_backend_camera_v4l2.c b/src/hal_backend_camera_v4l2.c
index d7c377e..cb2917d 100644
--- a/src/hal_backend_camera_v4l2.c
+++ b/src/hal_backend_camera_v4l2.c
@@ -515,7 +515,6 @@ static void __camera_get_fps_list(int device_fd, guint32 pixel_format, int width
 		fps_list->fps[fps_count++] = ival.discrete.denominator;
 	}
 
-
 	fps_list->count = fps_count;
 }
 
@@ -2506,11 +2505,17 @@ static int __set_command(hal_camera_handle *handle, int64_t command, void *value
 		handle->focus_mode = set_value;
 		return CAMERA_ERROR_NONE;
 	case CAMERA_COMMAND_FOCUS_RANGE:
-		handle->focus_range = set_value;
-		return CAMERA_ERROR_NONE;
+		cid = V4L2_CID_AUTO_FOCUS_RANGE;
+		break;
 	case CAMERA_COMMAND_FOCUS_LEVEL:
-		handle->focus_level = set_value;
-		return CAMERA_ERROR_NONE;
+		cid = V4L2_CID_FOCUS_ABSOLUTE;
+		break;
+	case CAMERA_COMMAND_WHITE_BALANCE_TEMPERATURE:
+		cid = V4L2_CID_WHITE_BALANCE_TEMPERATURE;
+		break;
+	case CAMERA_COMMAND_GAIN:
+		cid = V4L2_CID_GAIN;
+		break;
 	default:
 		LOGE("NOT_SUPPORTED command %"PRIx64, command);
 		return CAMERA_ERROR_DEVICE_NOT_SUPPORTED;
@@ -2593,11 +2598,17 @@ int camera_v4l2_get_command(void *camera_handle, int64_t command, void **value)
 		**(int **)value = handle->focus_mode;
 		goto _GET_COMMAND_DONE;
 	case CAMERA_COMMAND_FOCUS_RANGE:
-		**(int **)value = handle->focus_range;
-		goto _GET_COMMAND_DONE;
+		cid = V4L2_CID_AUTO_FOCUS_RANGE;
+		break;
 	case CAMERA_COMMAND_FOCUS_LEVEL:
-		**(int **)value = handle->focus_level;
-		goto _GET_COMMAND_DONE;
+		cid = V4L2_CID_FOCUS_ABSOLUTE;
+		break;
+	case CAMERA_COMMAND_WHITE_BALANCE_TEMPERATURE:
+		cid = V4L2_CID_WHITE_BALANCE_TEMPERATURE;
+		break;
+	case CAMERA_COMMAND_GAIN:
+		cid = V4L2_CID_GAIN;
+		break;
 	default:
 		LOGE("Not supported command[%"PRIx64"]", command);
 		g_mutex_unlock(&handle->lock);
diff --git a/src/hal_backend_camera_v4l2_private.h b/src/hal_backend_camera_v4l2_private.h
index c6f4840..9749330 100644
--- a/src/hal_backend_camera_v4l2_private.h
+++ b/src/hal_backend_camera_v4l2_private.h
@@ -104,10 +104,8 @@ typedef struct _camera_hal_handle {
 	GMutex msg_cb_lock;
 	GCond msg_cb_cond;
 
-	/* focus */
+	/* settings */
 	gint32 focus_mode;
-	gint32 focus_range;
-	gint32 focus_level;
 
 	/* etc */
 	GMutex lock;