]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[media] s5p-jpeg: Remove superfluous call to the jpeg_bound_align_image function
authorJacek Anaszewski <j.anaszewski@samsung.com>
Mon, 25 Nov 2013 09:58:11 +0000 (06:58 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Wed, 18 Dec 2013 08:12:45 +0000 (06:12 -0200)
Aligning capture queue image dimensions while enqueuing output
queue doesn't make a sense as the S_FMT ioctl might have not
been called for the capture queue until that moment, whereas
it is required to know capture format as the type of alignment
heavily depends on it.

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 c5b7d926dff84c25a72d82ab5bc72f870e63b37b..c5b6873eca7136d8e46eb07f58baa359c710f33d 100644 (file)
@@ -1089,13 +1089,6 @@ static void s5p_jpeg_buf_queue(struct vb2_buffer *vb)
                q_data = &ctx->cap_q;
                q_data->w = tmp.w;
                q_data->h = tmp.h;
-
-               jpeg_bound_align_image(&q_data->w, S5P_JPEG_MIN_WIDTH,
-                                      S5P_JPEG_MAX_WIDTH, q_data->fmt->h_align,
-                                      &q_data->h, S5P_JPEG_MIN_HEIGHT,
-                                      S5P_JPEG_MAX_HEIGHT, q_data->fmt->v_align
-                                     );
-               q_data->size = q_data->w * q_data->h * q_data->fmt->depth >> 3;
        }
 
        v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb);