summaryrefslogtreecommitdiffstats
path: root/drivers/media/test-drivers/vimc/vimc-capture.c
diff options
context:
space:
mode:
authorNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>2020-04-17 17:09:29 +0200
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-04-29 12:02:30 +0200
commit9a42a5ff3daccc37ae4dbcfb6ce5c5d95419740b (patch)
treebeebc31fa5bbad98b908c63c4a5e51b7f053185c /drivers/media/test-drivers/vimc/vimc-capture.c
parentb7ba9f34800aee62e1ffcd4386a421116e09f4fe (diff)
downloadlinux-stable-9a42a5ff3daccc37ae4dbcfb6ce5c5d95419740b.tar.gz
linux-stable-9a42a5ff3daccc37ae4dbcfb6ce5c5d95419740b.tar.bz2
linux-stable-9a42a5ff3daccc37ae4dbcfb6ce5c5d95419740b.zip
media: vimc: cap: Report a colorspace
The colorspace reported by a video nodes should not be V4L2_COLORSPACE_DEFAULT. Instead a default colorspace should be picked by the driver if V4L2_COLORSPACE_DEFAULT is given by userspace to {G,S,TRY}_FMT. The colorspace V4L2_COLORSPACE_SRGB is arbitrary chosen as the vimc default format to report as it's used for most webcams. Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> Acked-by: Helen Koike <helen.koike@collabora.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/media/test-drivers/vimc/vimc-capture.c')
-rw-r--r--drivers/media/test-drivers/vimc/vimc-capture.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/test-drivers/vimc/vimc-capture.c b/drivers/media/test-drivers/vimc/vimc-capture.c
index 5315c201314c..20c2f5e281bc 100644
--- a/drivers/media/test-drivers/vimc/vimc-capture.c
+++ b/drivers/media/test-drivers/vimc/vimc-capture.c
@@ -37,7 +37,7 @@ static const struct v4l2_pix_format fmt_default = {
.height = 480,
.pixelformat = V4L2_PIX_FMT_RGB24,
.field = V4L2_FIELD_NONE,
- .colorspace = V4L2_COLORSPACE_DEFAULT,
+ .colorspace = V4L2_COLORSPACE_SRGB,
};
struct vimc_cap_buffer {
@@ -107,6 +107,9 @@ static int vimc_cap_try_fmt_vid_cap(struct file *file, void *priv,
vimc_colorimetry_clamp(format);
+ if (format->colorspace == V4L2_COLORSPACE_DEFAULT)
+ format->colorspace = fmt_default.colorspace;
+
return 0;
}