From patchwork Fri Jul 25 14:20:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 25044 X-Patchwork-Delegate: sylvester.nawrocki@gmail.com Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1XAgNK-0003GQ-68; Fri, 25 Jul 2014 16:21:34 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-6) with esmtp id 1XAgNI-0001CY-3f; Fri, 25 Jul 2014 16:21:33 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760502AbaGYOV3 (ORCPT + 1 other); Fri, 25 Jul 2014 10:21:29 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:61852 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760469AbaGYOV2 (ORCPT ); Fri, 25 Jul 2014 10:21:28 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N9900MOBUJRIA30@mailout4.samsung.com>; Fri, 25 Jul 2014 23:21:27 +0900 (KST) X-AuditID: cbfee61a-f79e46d00000134f-6d-53d267e70e55 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id B4.1E.04943.7E762D35; Fri, 25 Jul 2014 23:21:27 +0900 (KST) Received: from amdc1344.digital.local ([106.116.147.32]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N99004WBUIW3L00@mmp2.samsung.com>; Fri, 25 Jul 2014 23:21:27 +0900 (KST) From: Sylwester Nawrocki To: linux-media@vger.kernel.org Cc: linux-samsung-soc@vger.kernel.org, j.anaszewski@samsung.com, Sylwester Nawrocki Subject: [PATCH v3 6/9] s5p-jpeg: Assure proper crop rectangle initialization Date: Fri, 25 Jul 2014 16:20:50 +0200 Message-id: <1406298053-30184-7-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1406298053-30184-1-git-send-email-s.nawrocki@samsung.com> References: <1406298053-30184-1-git-send-email-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPJMWRmVeSWpSXmKPExsVy+t9jQd3n6ZeCDY43i1v0Xn3OaNGzYSur xYzz+5gsDr9pZ3Vg8ejbsorR4/MmuQCmKC6blNSczLLUIn27BK6M1zOOsRfs4K5YcZGngfEo ZxcjB4eEgInE0Rd5XYycQKaYxIV769lAbCGB6YwS9/8LQdgdTBJvtsWB2GwChhK9R/sYQWwR AXmJJ703wOqZBfIkvn56zgQyUljAV2LvFLByFgFViQX9D5lAbF4BN4kv8zqYILYqSMyZZANi cgq4SxyaZgWxyE1i9dK3TBMYeRcwMqxiFE0tSC4oTkrPNdQrTswtLs1L10vOz93ECA6GZ1I7 GFc2WBxiFOBgVOLh7ai/GCzEmlhWXJl7iFGCg1lJhNco/lKwEG9KYmVValF+fFFpTmrxIUZp DhYlcd4DrdaBQgLpiSWp2ampBalFMFkmDk6pBsaurSVdzP9D36u8cztX5NC2uX+1h7B7vuKr afl/V/tNd1u2PPb61MvFW43WR89eMs3DrjLON9PfZ/352+o1wa/Pzd6hw67AlST4WDelXJtb fJ5ex5zDa1S7RR7c0DVV+PD1c9zeJQ43ny2Zcf/61pBvu/yZuR1OK0SpP3kgwbvx27+O+woi F34qsRRnJBpqMRcVJwIAWKvnlAICAAA= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.7.25.141520 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1600_1699 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' From: Jacek Anaszewski Assure proper crop_rect initialization in case the user space doesn't call S_SELECTION ioctl. Signed-off-by: Jacek Anaszewski Signed-off-by: Sylwester Nawrocki --- drivers/media/platform/s5p-jpeg/jpeg-core.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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;