]> Pileus Git - ~andy/linux/commitdiff
[media] s5p-jpeg: Synchronize V4L2_CID_JPEG_CHROMA_SUBSAMPLING control value
authorJacek Anaszewski <j.anaszewski@samsung.com>
Thu, 21 Nov 2013 16:33:52 +0000 (13:33 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Wed, 18 Dec 2013 13:50:01 +0000 (11:50 -0200)
When output queue fourcc is set to any flavour of YUV,
the V4L2_CID_JPEG_CHROMA_SUBSAMPLING control value as
well as its in-driver cached counterpart have to be
updated with the subsampling property of the format
so as to be able to provide correct information to the
user space and preclude setting an illegal subsampling
mode for Exynos4x12 encoder.

Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/platform/s5p-jpeg/jpeg-core.c

index 3d5d99446d78b8edb780ad49cc1a28a287579016..ea9cf737201b6524b02697c42237e1fc63084b0c 100644 (file)
@@ -1094,6 +1094,7 @@ static int s5p_jpeg_s_fmt(struct s5p_jpeg_ctx *ct, struct v4l2_format *f)
        struct vb2_queue *vq;
        struct s5p_jpeg_q_data *q_data = NULL;
        struct v4l2_pix_format *pix = &f->fmt.pix;
+       struct v4l2_ctrl *ctrl_subs;
        unsigned int f_type;
 
        vq = v4l2_m2m_get_vq(ct->fh.m2m_ctx, f->type);
@@ -1119,6 +1120,13 @@ static int s5p_jpeg_s_fmt(struct s5p_jpeg_ctx *ct, struct v4l2_format *f)
        else
                q_data->size = pix->sizeimage;
 
+       if (f_type == FMT_TYPE_OUTPUT) {
+               ctrl_subs = v4l2_ctrl_find(&ct->ctrl_handler,
+                                       V4L2_CID_JPEG_CHROMA_SUBSAMPLING);
+               if (ctrl_subs)
+                       v4l2_ctrl_s_ctrl(ctrl_subs, q_data->fmt->subsampling);
+       }
+
        return 0;
 }