From: Sylwester Nawrocki <s.nawrocki@samsung.com>
To: linux-media@vger.kernel.org
Cc: linux-samsung-soc@vger.kernel.org, j.anaszewski@samsung.com,
Sylwester Nawrocki <s.nawrocki@samsung.com>
Subject: [PATCH v3 6/9] s5p-jpeg: Assure proper crop rectangle initialization
Date: Fri, 25 Jul 2014 16:20:50 +0200 [thread overview]
Message-ID: <1406298053-30184-7-git-send-email-s.nawrocki@samsung.com> (raw)
In-Reply-To: <1406298053-30184-1-git-send-email-s.nawrocki@samsung.com>
From: Jacek Anaszewski <j.anaszewski@samsung.com>
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>
---
drivers/media/platform/s5p-jpeg/jpeg-core.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index d11357f..3e3d94d 100644
--- 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;
--
1.7.9.5
next prev parent reply other threads:[~2014-07-25 14:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-25 14:20 [PATCH v3 0/9] Support for Exynos3250 SoC in the s5p-jpeg driver Sylwester Nawrocki
2014-07-25 14:20 ` [PATCH v3 1/9] [media] s5p-jpeg: Document sclk-jpeg clock for Exynos3250 SoC Sylwester Nawrocki
2014-07-25 14:20 ` [PATCH v3 2/9] s5p-jpeg: Add support " Sylwester Nawrocki
2014-07-25 14:20 ` [PATCH v3 3/9] s5p-jpeg: return error immediately after get_byte fails Sylwester Nawrocki
2014-07-25 14:20 ` [PATCH v3 4/9] s5p-jpeg: Adjust jpeg_bound_align_image to Exynos3250 needs Sylwester Nawrocki
2014-07-25 14:20 ` [PATCH v3 5/9] s5p-jpeg: fix g_selection op Sylwester Nawrocki
2014-07-25 14:20 ` Sylwester Nawrocki [this message]
2014-07-25 14:20 ` [PATCH v3 7/9] s5p-jpeg: Prevent erroneous downscaling for Exynos3250 SoC Sylwester Nawrocki
2014-07-25 14:20 ` [PATCH v3 8/9] s5p-jpeg: add chroma subsampling adjustment for Exynos3250 Sylwester Nawrocki
2014-07-25 14:20 ` [PATCH v3 9/9] ARM: dts: exynos3250: add JPEG codec device node Sylwester Nawrocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1406298053-30184-7-git-send-email-s.nawrocki@samsung.com \
--to=s.nawrocki@samsung.com \
--cc=j.anaszewski@samsung.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.