media: coda: jpeg: allow non-JPEG colorspace
authorPhilipp Zabel <p.zabel@pengutronix.de>
Fri, 29 Jun 2018 12:46:46 +0000 (08:46 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Wed, 4 Jul 2018 12:22:35 +0000 (08:22 -0400)
The hardware codec is not colorspace aware. We should trust userspace to
set the correct colorimetry information on the OUTPUT queue and mirror
the exact same setting on the CAPTURE queue.

There is no reason to restrict colorspace to JPEG for JPEG images, if
userspace injects the correct colorspace information into the JPEG
headers after encoding.

Fixes: b14ac545688d ("[media] coda: improve colorimetry handling")

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/platform/coda/coda-common.c

index 42f852c..f25f141 100644 (file)
@@ -569,8 +569,6 @@ static int coda_try_fmt(struct coda_ctx *ctx, const struct coda_codec *codec,
                                        f->fmt.pix.height * 2;
                break;
        case V4L2_PIX_FMT_JPEG:
-               f->fmt.pix.colorspace = V4L2_COLORSPACE_JPEG;
-               /* fallthrough */
        case V4L2_PIX_FMT_H264:
        case V4L2_PIX_FMT_MPEG4:
        case V4L2_PIX_FMT_MPEG2: