You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
53 lines
2.1 KiB
Diff
53 lines
2.1 KiB
Diff
From 12eba72027d415bb3dfd4c8124813a322b27c793 Mon Sep 17 00:00:00 2001
|
|
From: Ricardo Ribalda Delgado <ribalda@kernel.org>
|
|
Date: Mon, 7 Oct 2019 12:06:33 -0300
|
|
Subject: [PATCH] media: add V4L2_CID_UNIT_CELL_SIZE control
|
|
|
|
Commit 61fd036d01111679b01e4b92e6bd0cdd33809aea upstream.
|
|
|
|
This control returns the unit cell size in nanometres. The struct provides
|
|
the width and the height in separated fields to take into consideration
|
|
asymmetric pixels and/or hardware binning.
|
|
This control is required for automatic calibration of sensors/cameras.
|
|
|
|
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
|
|
Signed-off-by: Ricardo Ribalda Delgado <ribalda@kernel.org>
|
|
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
|
|
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
|
|
---
|
|
drivers/media/v4l2-core/v4l2-ctrls.c | 5 +++++
|
|
include/uapi/linux/v4l2-controls.h | 1 +
|
|
2 files changed, 6 insertions(+)
|
|
|
|
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
|
|
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
|
|
@@ -995,6 +995,7 @@ const char *v4l2_ctrl_get_name(u32 id)
|
|
case V4L2_CID_AUTO_FOCUS_RANGE: return "Auto Focus, Range";
|
|
case V4L2_CID_PAN_SPEED: return "Pan, Speed";
|
|
case V4L2_CID_TILT_SPEED: return "Tilt, Speed";
|
|
+ case V4L2_CID_UNIT_CELL_SIZE: return "Unit Cell Size";
|
|
|
|
/* FM Radio Modulator controls */
|
|
/* Keep the order of the 'case's the same as in v4l2-controls.h! */
|
|
@@ -1376,6 +1377,10 @@ void v4l2_ctrl_fill(u32 id, const char *
|
|
case V4L2_CID_MPEG_VIDEO_VP8_FRAME_HEADER:
|
|
*type = V4L2_CTRL_TYPE_VP8_FRAME_HEADER;
|
|
break;
|
|
+ case V4L2_CID_UNIT_CELL_SIZE:
|
|
+ *type = V4L2_CTRL_TYPE_AREA;
|
|
+ *flags |= V4L2_CTRL_FLAG_READ_ONLY;
|
|
+ break;
|
|
default:
|
|
*type = V4L2_CTRL_TYPE_INTEGER;
|
|
break;
|
|
--- a/include/uapi/linux/v4l2-controls.h
|
|
+++ b/include/uapi/linux/v4l2-controls.h
|
|
@@ -1035,6 +1035,7 @@ enum v4l2_jpeg_chroma_subsampling {
|
|
#define V4L2_CID_TEST_PATTERN_GREENR (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 5)
|
|
#define V4L2_CID_TEST_PATTERN_BLUE (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 6)
|
|
#define V4L2_CID_TEST_PATTERN_GREENB (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 7)
|
|
+#define V4L2_CID_UNIT_CELL_SIZE (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 8)
|
|
|
|
|
|
/* Image processing controls */
|