From patchwork Mon Jul 7 16:32:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacek Anaszewski X-Patchwork-Id: 4496321 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7D5709F390 for ; Mon, 7 Jul 2014 16:33:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AFD4A202F0 for ; Mon, 7 Jul 2014 16:33:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DCB9D202EC for ; Mon, 7 Jul 2014 16:33:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751987AbaGGQdS (ORCPT ); Mon, 7 Jul 2014 12:33:18 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:57799 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751280AbaGGQdR (ORCPT ); Mon, 7 Jul 2014 12:33:17 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N8C00HCWONGJ470@mailout3.samsung.com>; Tue, 08 Jul 2014 01:33:16 +0900 (KST) X-AuditID: cbfee61a-f79e46d00000134f-d4-53bacbcc1fb1 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id EE.14.04943.CCBCAB35; Tue, 08 Jul 2014 01:33:16 +0900 (KST) Received: from AMDC2362.DIGITAL.local ([106.120.53.23]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N8C00GK8OLKQW00@mmp2.samsung.com>; Tue, 08 Jul 2014 01:33:16 +0900 (KST) From: Jacek Anaszewski To: linux-media@vger.kernel.org Cc: kyungmin.park@samsung.com, b.zolnierkie@samsung.com, linux-samsung-soc@vger.kernel.org, Jacek Anaszewski Subject: [PATCH 5/9] s5p-jpeg: Assure proper crop rectangle initialization Date: Mon, 07 Jul 2014 18:32:06 +0200 Message-id: <1404750730-22996-6-git-send-email-j.anaszewski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1404750730-22996-1-git-send-email-j.anaszewski@samsung.com> References: <1404750730-22996-1-git-send-email-j.anaszewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJJMWRmVeSWpSXmKPExsVy+t9jQd0zp3cFG0ycJWyxccZ6Voveq88Z Lc42vWG36NmwldVixvl9TA6sHn1bVjF6fN4kF8AUxWWTkpqTWZZapG+XwJXx48RRpoJm7ooV v24zNjBO5exi5OSQEDCRePbsPjOELSZx4d56ti5GLg4hgemMEku7nrFDOO1MEvdPXmMDqWIT MJT4+eI1E4gtIiAv8aT3BlgHs0Ano8TC9g2sXYwcHMICXhL71/CA1LAIqEr8+fQSbAOvgIfE pM9nmUBKJAQUJOZMsgEJcwp4Shxe9hmsUwio5OBrywmMvAsYGVYxiqYWJBcUJ6XnGuoVJ+YW l+al6yXn525iBAfIM6kdjCsbLA4xCnAwKvHwrji4K1iINbGsuDL3EKMEB7OSCO+K5UAh3pTE yqrUovz4otKc1OJDjNIcLErivAdarQOFBNITS1KzU1MLUotgskwcnFINjI1X0jKEf9505T+w c6v1pZfzWZbnXD18zEa23OmMXNETlfSIb3OiT53ac+2mSOCpb5J869K+z/g9h+eWWc7kghrT FZ0xmir8fV8DzrtE6Gh7FC1PlXhi97nHM/DQWmlbn/0Njzdpzb3OczljunG8w4osJvZnqcFL NBOKHJfEGddUKIoz9G9ZoMRSnJFoqMVcVJwIAO8vJPcMAgAA Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Assure proper crop_rect initialization in case the user space doesn't call S_SELECTION ioctl. Signed-off-by: Jacek Anaszewski Signed-off-by: Kyungmin Park --- 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 09b59d3..2491ef8 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;