summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJacob Chen <jacob2.chen@rock-chips.com>2018-01-04 08:54:04 +0800
committerTao Huang <huangtao@rock-chips.com>2018-01-05 17:57:22 +0800
commit839b765c64ece34aa7a9a302426d3b78ecd1edc7 (patch)
tree690c636f6c8a98440e1dfa597a0bdd52305ede2c /drivers
parent0fb7758438b10c35d8ab91e92170574c5b352a4d (diff)
FROMLIST: media: videodev2.h, v4l2-ioctl: add rkisp1 meta buffer format
Add the Rockchip ISP1 specific processing parameter format V4L2_META_FMT_RK_ISP1_PARAMS and metadata format V4L2_META_FMT_RK_ISP1_STAT_3A for 3A. Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com> Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com> BUG=b:36227021 TEST=Camera works on Scarlet with the whole series (am from https://patchwork.linuxtv.org/patch/46247/) Conflicts: drivers/media/v4l2-core/v4l2-ioctl.c Change-Id: I9ede55b68c075e54cefb11edecf5ef68b5452ec4 Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/v4l2-core/v4l2-ioctl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index a0caa6b72afa..1ff095eade40 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1257,6 +1257,8 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
case V4L2_SDR_FMT_CS8: descr = "Complex S8"; break;
case V4L2_SDR_FMT_CS14LE: descr = "Complex S14LE"; break;
case V4L2_SDR_FMT_RU12LE: descr = "Real U12LE"; break;
+ case V4L2_META_FMT_RK_ISP1_PARAMS: descr = "Rockchip ISP1 3A params"; break;
+ case V4L2_META_FMT_RK_ISP1_STAT_3A: descr = "Rockchip ISP1 3A statistics"; break;
default:
/* Compressed formats */