[media] s5p-jpeg: Assure proper crop rectangle initialization

Assure proper crop_rect initialization in case the user space
doesn't call S_SELECTION ioctl.

Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index d11357f5fc45da87648309aaf95407664bf5610d..3e3d94dd03f86ef8fbe66a8542fdace0e56b01b5 100644 (file)
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -1367,6 +1367,21 @@ static int s5p_jpeg_s_fmt(struct s5p_jpeg_ctx *ct, struct v4l2_format *f)
                                        V4L2_CID_JPEG_CHROMA_SUBSAMPLING);
                if (ctrl_subs)
                        v4l2_ctrl_s_ctrl(ctrl_subs, q_data->fmt->subsampling);
+               ct->crop_altered = false;
+       }
+
+       /*
+        * For decoding init crop_rect with capture buffer dimmensions which
+        * contain aligned dimensions of the input JPEG image and do it only
+        * if crop rectangle hasn't been altered by the user space e.g. with
+        * S_SELECTION ioctl. For encoding assign output buffer dimensions.
+        */
+       if (!ct->crop_altered &&
+           ((ct->mode == S5P_JPEG_DECODE && f_type == FMT_TYPE_CAPTURE) ||
+            (ct->mode == S5P_JPEG_ENCODE && f_type == FMT_TYPE_OUTPUT))) {
+               ct->crop_rect.width = pix->width;
+               ct->crop_rect.height = pix->height;
+       }
        }
 
        return 0;