From nobody Thu Apr 2 21:31:09 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1BC55C07E9D for ; Tue, 27 Sep 2022 03:16:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231465AbiI0DQO (ORCPT ); Mon, 26 Sep 2022 23:16:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231429AbiI0DPq (ORCPT ); Mon, 26 Sep 2022 23:15:46 -0400 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2062.outbound.protection.outlook.com [40.107.105.62]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3050AD995; Mon, 26 Sep 2022 20:13:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bC5bjBl6UWwuoCC9IzjjHScvFMBOKigEVDifyRoGyDAh382r5CQj+VJWR8bqIqilejCEfL9R1Z6rSu77s0Gh2TIexCaz5BfGbXcByMGxVsNIP2St3lQUVbi159emS2Dk/bUtqjW2T8bKv4zMN0ByUMqeiuMjH/hsNshICnb4leXGoJYqupQfdUji43+5cCPUpijpXM+ww3lEEUjnBNZyxYvnBI7izGcU/XCYB66hWQUkuY3y+3nzULwSbEgEPm5F+EwJG/p68k0jR8qZwJzWVq0elPaENi7emqe7Rne8czPNox4zmPSwwus6AIEPFQ35EoTv0xhUkJRo4yRG3zKcZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zqzZ8eo+NYfjKPl2QjVNGSsa+gs+Pm1SG8PuslkOlq0=; b=eAF4XEug35BZ+irbE8gQlmq4Khobo4P9X5nZ5nTUCI3E/DZGNfltThQfF2fuAlsG7kpjqQO2QH6oq5NzHh+ijLolgvliL2MviZRTOoJxA6Tr1bbK55av2RO0b+P5/pVYhFpq/C8M+oTL8Lh+Ndnnc6O6P58kYfQYygvvk/U1qQn/L0rELoLiz29x/ufP6j8DtKS0pDiYEM+8T9PFO/Zrff/C3jgu7po7yDfH/JwI4yLe0XDfWpDXWH5csfZpN07N/G7ZkCZ0jKLlm6mg1bGn8nyygBemtcHI2BLbnzmDyo5fGDkNQJydPRMOT2AjyuzWaqbSWamPtrbN0KIthAlbng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zqzZ8eo+NYfjKPl2QjVNGSsa+gs+Pm1SG8PuslkOlq0=; b=kLF4gUspVhbnOBCMWZjQyGb5/7J3BY6L6qRGFVcHaUdfaE+LsyqSSyVMPdvQw0YmW2NRQo92OU7TBZ+ZWo+VcCkMb6BhOdnHUyo7dqja461+rlrzV3rafUYLOhWxPayHocWt5TnLI0pBY75pPLKBqtwjphnKXxCX5EvhtkUnnq0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB6341.eurprd04.prod.outlook.com (2603:10a6:20b:d8::14) by AM9PR04MB8811.eurprd04.prod.outlook.com (2603:10a6:20b:40a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.26; Tue, 27 Sep 2022 03:13:45 +0000 Received: from AM6PR04MB6341.eurprd04.prod.outlook.com ([fe80::4550:e439:2389:be53]) by AM6PR04MB6341.eurprd04.prod.outlook.com ([fe80::4550:e439:2389:be53%5]) with mapi id 15.20.5654.026; Tue, 27 Sep 2022 03:13:45 +0000 From: Ming Qian To: mchehab@kernel.org, mirela.rabulea@oss.nxp.com, hverkuil-cisco@xs4all.nl Cc: shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, xiahong.bao@nxp.com, linux-imx@nxp.com, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 1/2] media: imx-jpeg: Implement g_selection and s_selection Date: Tue, 27 Sep 2022 11:12:16 +0800 Message-Id: <8a97ec549df3a8a6df7e52bf7174d91bdacb4ddc.1664247957.git.ming.qian@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0035.apcprd01.prod.exchangelabs.com (2603:1096:4:192::13) To AM6PR04MB6341.eurprd04.prod.outlook.com (2603:10a6:20b:d8::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB6341:EE_|AM9PR04MB8811:EE_ X-MS-Office365-Filtering-Correlation-Id: f3a85095-7c70-403e-f6e1-08daa0364973 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: beDmoIqsjUHuGsCyhQXbq5bbeCQSjDYQxz9HiKQUc1yn7cQ6rBdD55G83cbPoeccinipk1NubWZrbdNQM9lzbZLZWkaoifH8nJzwgVipK7eQ3NYf5b9cUkgSf8O7NPWj2WXTPmImjtNWyM/VHLUNj8xgYHkuzpc9uOwZZuBI3SHCuMy7esnmfY4bVth8Sh4SfCnnTMc4ujAEjIyJ02YtkX7Thv45nPrUWtGzZtWoHeRR2fnxjX0N9EzYUBOMNhJYPsdSv6Rilp4mmHFXzvZh5A1uoXH9d55sYExkMdjwIe4SWACmoGyGqp0FB43143qutcUaYr0Wf33i3NvqMLiqo6fJ4ERC8CxpDSbgnEfdHBjfLqyJH3r3gqtjTE8U7lfy5XxeSat7mEyiQDmWphG9/C37ovXep0EpwQI2+TLjZGrewfF6bNny1yJBmRBYHP47oqrUwki53IuBeSC5C3yFQ1RGeO4lclW0Mvjb/lOz9zBie5TWd0yWZnGRm49secZluxKOIlpYwOfYQATVybqbE79W/yh60mEKQOeBu1IDr4CzwuO6LbrpPTBwtOkXwiYAxZxCWnYxkD7OkBi7mmMIN066L00q0aN81Ov7CrM7UaKN3cVD61RXgSz3OE2wCwivbXmZ/fLU+L5mOBrEhEgbWQwNxQzopONrPV+9V25ASJX3TBXanDgM1RJHFsdlR0fdftebE+3GI2QgTcf4KlSBrHyouemU8Fg4mQTwY8eixxIlvtScJ9H8gWX7grj6bnHYCH8b4jIv5NQVC2a3s+tmRg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB6341.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(39860400002)(136003)(366004)(396003)(346002)(376002)(451199015)(186003)(2616005)(83380400001)(38100700002)(38350700002)(86362001)(44832011)(30864003)(5660300002)(66476007)(66556008)(66946007)(8936002)(41300700001)(2906002)(7416002)(6666004)(478600001)(6506007)(8676002)(26005)(52116002)(4326008)(316002)(6512007)(6486002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?arPaXVZk017QTcEuh0PBvpSeuK6KqWcBFUNSzt61EIfEeeUkyiNfOAZ+ppuc?= =?us-ascii?Q?3R61U+LHELoC709ESkoAWeGECa1HYzYT3q242t8rvQdOXuYo54I22CiZvi0z?= =?us-ascii?Q?GsqOh1HzQv/zvVFmfLXuD2DdvfxSlGIVukIqYUSNB0UufJXOZwOMQlfS1qdC?= =?us-ascii?Q?Efk/jUS2Zdm8G4gXa1spRE3ozgxN1oVzSCiNGVHPpPRof93p0SUaFBe6d+GP?= =?us-ascii?Q?FYMlhn3e5Gnif8ZijxNX9h6tPC/SL2khXRjQ0P7EvogN2www7vmc6kX7Fqn7?= =?us-ascii?Q?LihqXopiyDg4Me6I7eZ+bucN6SUzU9HWJj0gwYaoatwn0o9ZjcEtOeIUUv/d?= =?us-ascii?Q?mn8d48kAcC1D68W+nIZnQ3A91cPangzfXAolrwGsKs7S1lsLhhgRYEwUPDAX?= =?us-ascii?Q?+uqqGggP+Q5zbfSgXfwmzotY/+qpT3nHHnkPf1jM4FWlx1vyP6kZjAm87SCX?= =?us-ascii?Q?XwqCUXywC9ziSbCqU4iS0jNsLBVVtBMcrE5E8zoeosIAK56b0bOn2IrbG3J9?= =?us-ascii?Q?5TxfSsoV3MKeL1Gs2F9CITMBvtdkqIDPvPBmuIwtfcwH2ShASRNuVIVEJc0R?= =?us-ascii?Q?LjLWogY1Ywdt7zZMZIUK51BFLym4uPaQwWGhwVBRx9G2TXPUVi7TOCPuPkQl?= =?us-ascii?Q?FMeBWMOijP2B2rkfswk8kGZpnRn/BEf1BsOEbVGFZ8EPI1Ru3WCwTiY0R7YL?= =?us-ascii?Q?z1CySyDlVCnBwQQw42/PEaVqHVx6bxaoiwktkcPEo5W5w/eIoVgISKmYGn9c?= =?us-ascii?Q?xJRH8JQRlB4YZTGtv54Ms2JlienuVQhReBfH0Y8QcupKGo3W+T280TtEBMYn?= =?us-ascii?Q?eyQtoz8Y2evTyspHurdLkVuQf9+uSWe0eXXv3KMk9CVOzREsV4o5fENf+0qc?= =?us-ascii?Q?5+QzvfWAmyMKbkaa/wKLKpYWseViPhB36xEIEGUCBAQ3W9F6aNhWor30m7qq?= =?us-ascii?Q?6z2NxA5wuW5jlaRo2i1L9t42yoFr5F8/cnzyjhpx24RucToJYw7D7vu7Qya5?= =?us-ascii?Q?d5kynThgDO19KV25a5V6ZHLLPMzJv+YArxHjL4qmyCo7EWkCgOS9eGaEHIlv?= =?us-ascii?Q?4cASTbMizZOcYBkHgVbXePaldXNyGq/qLgQI06s+FHSvBYOmqPQ4V9LxGD6i?= =?us-ascii?Q?U6cH6VAGULzih2KsH17rMSrk7Go+/ISsp6mYPouC/XTRzVCQUfTKqBwL46HA?= =?us-ascii?Q?I0DqGHMmqTU1sBni5yrXuDu/DUtRxTH4ctbRjxA8S1bfbRwhmSbyso5rSF0a?= =?us-ascii?Q?Q/E9EY/uPt0EdQcF55xOvbWsb12XeHxPrz+DHYPrBbbkQaSIP2xpI1qiuecd?= =?us-ascii?Q?xbvuusLVYOsp7YshzdEmdIbMKDExhJiXsT7iagXosJ4kGTvEFyJ96JbGfVbP?= =?us-ascii?Q?LfS624YcPCVRCd18/Q51f2STcyw7n5whTc3KAuXQG3DCieNWAQfxLOmQzckE?= =?us-ascii?Q?dy87c4NROV00AuK+0c+5+ElCqIW0+FiD1xUyZsy66x2bLa2CUv/X7XhpYMGm?= =?us-ascii?Q?J6x8SCu+O19+d+rs/Vme/rQbKc7lHjgdBafyYcDedRRBHhbgJ1IQioEPSOMW?= =?us-ascii?Q?n9RB9BKlRjfA3gT0vObTIbOTThr5HpNidop6egBR?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3a85095-7c70-403e-f6e1-08daa0364973 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2022 03:13:45.0486 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 052/XbApEqSuaJvLwBSCevUlBM8VMfx67nQvWK4wt5vYy1otCGOiziu4e7ulCzXqqiaJPEzRNi+UXzJwI6qgcg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8811 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The codec can support any image size WxH, with arbitrary W (image width) and H (image height) dimensions. But it requires buffer alignment, so driver can report the aligned resolution through the g_fmt, and report the actual resolution through the g_selection. For encoder, it even support to encode a smaller jpeg than the original picture through s_selection api. For the decoder, we do not support cropping a portion smaller than the original picture, due to hardware limitations (wrapper side). Fixes: 9e7aa76cdb02 ("media: imx-jpeg: Align upwards buffer size") Signed-off-by: Ming Qian Reviewed-by: Mirela Rabulea Tested-by: Mirela Rabulea --- .../media/platform/nxp/imx-jpeg/mxc-jpeg.c | 327 +++++++++++------- .../media/platform/nxp/imx-jpeg/mxc-jpeg.h | 1 + 2 files changed, 208 insertions(+), 120 deletions(-) diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media= /platform/nxp/imx-jpeg/mxc-jpeg.c index ec13394bdddd..1bbf560a6341 100644 --- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c +++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c @@ -924,8 +924,8 @@ static void mxc_jpeg_config_enc_desc(struct vb2_buffer = *out_buf, jpeg->slot_data[slot].cfg_stream_size =3D mxc_jpeg_setup_cfg_stream(cfg_stream_vaddr, q_data->fmt->fourcc, - q_data->w, - q_data->h); + q_data->crop.width, + q_data->crop.height); =20 /* chain the config descriptor with the encoding descriptor */ cfg_desc->next_descpt_ptr =3D desc_handle | MXC_NXT_DESCPT_EN; @@ -942,11 +942,13 @@ static void mxc_jpeg_config_enc_desc(struct vb2_buffe= r *out_buf, desc->next_descpt_ptr =3D 0; /* end of chain */ =20 /* use adjusted resolution for CAST IP job */ - w =3D q_data->w_adjusted; - h =3D q_data->h_adjusted; + w =3D q_data->crop.width; + h =3D q_data->crop.height; + v4l_bound_align_image(&w, w, MXC_JPEG_MAX_WIDTH, q_data->fmt->h_align, + &h, h, MXC_JPEG_MAX_HEIGHT, q_data->fmt->v_align, 0); mxc_jpeg_set_res(desc, w, h); - mxc_jpeg_set_line_pitch(desc, w * (q_data->fmt->depth / 8)); - mxc_jpeg_set_bufsize(desc, desc->line_pitch * h); + mxc_jpeg_set_line_pitch(desc, q_data->bytesperline[0]); + mxc_jpeg_set_bufsize(desc, ALIGN(vb2_plane_size(dst_buf, 0), 1024)); img_fmt =3D mxc_jpeg_fourcc_to_imgfmt(q_data->fmt->fourcc); if (img_fmt =3D=3D MXC_JPEG_INVALID) dev_err(jpeg->dev, "No valid image format detected\n"); @@ -995,6 +997,10 @@ static bool mxc_jpeg_source_change(struct mxc_jpeg_ctx= *ctx, q_data_cap->fmt =3D jpeg_src_buf->fmt; q_data_cap->w_adjusted =3D q_data_cap->w; q_data_cap->h_adjusted =3D q_data_cap->h; + q_data_cap->crop.left =3D 0; + q_data_cap->crop.top =3D 0; + q_data_cap->crop.width =3D jpeg_src_buf->w; + q_data_cap->crop.height =3D jpeg_src_buf->h; =20 /* * align up the resolution for CAST IP, @@ -1007,7 +1013,7 @@ static bool mxc_jpeg_source_change(struct mxc_jpeg_ct= x *ctx, &q_data_cap->h_adjusted, q_data_cap->h_adjusted, /* adjust up */ MXC_JPEG_MAX_HEIGHT, - 0, + q_data_cap->fmt->v_align, 0); =20 /* setup bytesperline/sizeimage for capture queue */ @@ -1016,6 +1022,7 @@ static bool mxc_jpeg_source_change(struct mxc_jpeg_ct= x *ctx, notify_src_chg(ctx); ctx->source_change =3D 1; } + return ctx->source_change ? true : false; } =20 @@ -1201,30 +1208,18 @@ static int mxc_jpeg_queue_setup(struct vb2_queue *q, { struct mxc_jpeg_ctx *ctx =3D vb2_get_drv_priv(q); struct mxc_jpeg_q_data *q_data =3D NULL; - struct mxc_jpeg_q_data tmp_q; int i; =20 q_data =3D mxc_jpeg_get_q_data(ctx, q->type); if (!q_data) return -EINVAL; =20 - tmp_q.fmt =3D q_data->fmt; - tmp_q.w =3D q_data->w_adjusted; - tmp_q.h =3D q_data->h_adjusted; - for (i =3D 0; i < MXC_JPEG_MAX_PLANES; i++) { - tmp_q.bytesperline[i] =3D q_data->bytesperline[i]; - tmp_q.sizeimage[i] =3D q_data->sizeimage[i]; - } - mxc_jpeg_sizeimage(&tmp_q); - for (i =3D 0; i < MXC_JPEG_MAX_PLANES; i++) - tmp_q.sizeimage[i] =3D max(tmp_q.sizeimage[i], q_data->sizeimage[i]); - /* Handle CREATE_BUFS situation - *nplanes !=3D 0 */ if (*nplanes) { if (*nplanes !=3D q_data->fmt->colplanes) return -EINVAL; for (i =3D 0; i < *nplanes; i++) { - if (sizes[i] < tmp_q.sizeimage[i]) + if (sizes[i] < q_data->sizeimage[i]) return -EINVAL; } return 0; @@ -1233,7 +1228,7 @@ static int mxc_jpeg_queue_setup(struct vb2_queue *q, /* Handle REQBUFS situation */ *nplanes =3D q_data->fmt->colplanes; for (i =3D 0; i < *nplanes; i++) - sizes[i] =3D tmp_q.sizeimage[i]; + sizes[i] =3D q_data->sizeimage[i]; =20 return 0; } @@ -1366,17 +1361,17 @@ static void mxc_jpeg_bytesperline(struct mxc_jpeg_q= _data *q, u32 precision) * applies to the first plane and is divided by the same factor * as the width field for the other planes */ - q->bytesperline[0] =3D q->w * DIV_ROUND_UP(precision, 8); + q->bytesperline[0] =3D q->w_adjusted * DIV_ROUND_UP(precision, 8); q->bytesperline[1] =3D q->bytesperline[0]; } else if (q->fmt->subsampling =3D=3D V4L2_JPEG_CHROMA_SUBSAMPLING_422) { - q->bytesperline[0] =3D q->w * DIV_ROUND_UP(precision, 8) * 2; + q->bytesperline[0] =3D q->w_adjusted * DIV_ROUND_UP(precision, 8) * 2; q->bytesperline[1] =3D 0; } else if (q->fmt->subsampling =3D=3D V4L2_JPEG_CHROMA_SUBSAMPLING_444) { - q->bytesperline[0] =3D q->w * DIV_ROUND_UP(precision, 8) * q->fmt->nc; + q->bytesperline[0] =3D q->w_adjusted * DIV_ROUND_UP(precision, 8) * q->f= mt->nc; q->bytesperline[1] =3D 0; } else { /* grayscale */ - q->bytesperline[0] =3D q->w * DIV_ROUND_UP(precision, 8); + q->bytesperline[0] =3D q->w_adjusted * DIV_ROUND_UP(precision, 8); q->bytesperline[1] =3D 0; } } @@ -1395,7 +1390,7 @@ static void mxc_jpeg_sizeimage(struct mxc_jpeg_q_data= *q) /* jpeg stream size must be multiple of 1K */ q->sizeimage[0] =3D ALIGN(q->sizeimage[0], 1024); } else { - q->sizeimage[0] =3D q->bytesperline[0] * q->h; + q->sizeimage[0] =3D q->bytesperline[0] * q->h_adjusted; q->sizeimage[1] =3D 0; if (q->fmt->fourcc =3D=3D V4L2_PIX_FMT_NV12M) q->sizeimage[1] =3D q->sizeimage[0] / 2; @@ -1619,6 +1614,10 @@ static void mxc_jpeg_set_default_params(struct mxc_j= peg_ctx *ctx) q[i]->h =3D MXC_JPEG_DEFAULT_HEIGHT; q[i]->w_adjusted =3D MXC_JPEG_DEFAULT_WIDTH; q[i]->h_adjusted =3D MXC_JPEG_DEFAULT_HEIGHT; + q[i]->crop.left =3D 0; + q[i]->crop.top =3D 0; + q[i]->crop.width =3D MXC_JPEG_DEFAULT_WIDTH; + q[i]->crop.height =3D MXC_JPEG_DEFAULT_HEIGHT; mxc_jpeg_bytesperline(q[i], q[i]->fmt->precision); mxc_jpeg_sizeimage(q[i]); } @@ -1786,55 +1785,84 @@ static int mxc_jpeg_enum_fmt_vid_out(struct file *f= ile, void *priv, return 0; } =20 -static int mxc_jpeg_try_fmt(struct v4l2_format *f, const struct mxc_jpeg_f= mt *fmt, - struct mxc_jpeg_ctx *ctx, int q_type) +static u32 mxc_jpeg_get_fmt_type(struct mxc_jpeg_ctx *ctx, u32 type) +{ + if (ctx->mxc_jpeg->mode =3D=3D MXC_JPEG_DECODE) + return V4L2_TYPE_IS_OUTPUT(type) ? MXC_JPEG_FMT_TYPE_ENC : MXC_JPEG_FMT_= TYPE_RAW; + else + return V4L2_TYPE_IS_CAPTURE(type) ? MXC_JPEG_FMT_TYPE_ENC : MXC_JPEG_FMT= _TYPE_RAW; +} + +static u32 mxc_jpeg_get_default_fourcc(struct mxc_jpeg_ctx *ctx, u32 type) { + if (ctx->mxc_jpeg->mode =3D=3D MXC_JPEG_DECODE) + return V4L2_TYPE_IS_OUTPUT(type) ? V4L2_PIX_FMT_JPEG : MXC_JPEG_DEFAULT_= PFMT; + else + return V4L2_TYPE_IS_CAPTURE(type) ? V4L2_PIX_FMT_JPEG : MXC_JPEG_DEFAULT= _PFMT; +} + +static int mxc_jpeg_try_fmt(struct v4l2_format *f, + struct mxc_jpeg_ctx *ctx, struct mxc_jpeg_q_data *q_data) +{ + const struct mxc_jpeg_fmt *fmt; struct v4l2_pix_format_mplane *pix_mp =3D &f->fmt.pix_mp; struct v4l2_plane_pix_format *pfmt; + u32 fourcc =3D f->fmt.pix_mp.pixelformat; u32 w =3D (pix_mp->width < MXC_JPEG_MAX_WIDTH) ? pix_mp->width : MXC_JPEG_MAX_WIDTH; u32 h =3D (pix_mp->height < MXC_JPEG_MAX_HEIGHT) ? pix_mp->height : MXC_JPEG_MAX_HEIGHT; int i; - struct mxc_jpeg_q_data tmp_q; + + fmt =3D mxc_jpeg_find_format(ctx, fourcc); + if (!fmt || fmt->flags !=3D mxc_jpeg_get_fmt_type(ctx, f->type)) { + dev_warn(ctx->mxc_jpeg->dev, "Format not supported: %c%c%c%c, use the de= fault.\n", + (fourcc & 0xff), + (fourcc >> 8) & 0xff, + (fourcc >> 16) & 0xff, + (fourcc >> 24) & 0xff); + fourcc =3D mxc_jpeg_get_default_fourcc(ctx, f->type); + fmt =3D mxc_jpeg_find_format(ctx, fourcc); + if (!fmt) + return -EINVAL; + f->fmt.pix_mp.pixelformat =3D fourcc; + } + q_data->fmt =3D fmt; =20 memset(pix_mp->reserved, 0, sizeof(pix_mp->reserved)); pix_mp->field =3D V4L2_FIELD_NONE; pix_mp->num_planes =3D fmt->colplanes; pix_mp->pixelformat =3D fmt->fourcc; =20 - pix_mp->width =3D w; - pix_mp->height =3D h; - v4l_bound_align_image(&w, + q_data->w =3D w; + q_data->h =3D h; + q_data->w_adjusted =3D w; + q_data->h_adjusted =3D h; + v4l_bound_align_image(&q_data->w_adjusted, w, /* adjust upwards*/ MXC_JPEG_MAX_WIDTH, fmt->h_align, - &h, + &q_data->h_adjusted, h, /* adjust upwards*/ MXC_JPEG_MAX_HEIGHT, - 0, + fmt->v_align, 0); - - /* get user input into the tmp_q */ - tmp_q.w =3D w; - tmp_q.h =3D h; - tmp_q.fmt =3D fmt; for (i =3D 0; i < pix_mp->num_planes; i++) { pfmt =3D &pix_mp->plane_fmt[i]; - tmp_q.bytesperline[i] =3D pfmt->bytesperline; - tmp_q.sizeimage[i] =3D pfmt->sizeimage; + q_data->bytesperline[i] =3D pfmt->bytesperline; + q_data->sizeimage[i] =3D pfmt->sizeimage; } =20 - /* calculate bytesperline & sizeimage into the tmp_q */ - mxc_jpeg_bytesperline(&tmp_q, fmt->precision); - mxc_jpeg_sizeimage(&tmp_q); + /* calculate bytesperline & sizeimage */ + mxc_jpeg_bytesperline(q_data, fmt->precision); + mxc_jpeg_sizeimage(q_data); =20 /* adjust user format according to our calculations */ for (i =3D 0; i < pix_mp->num_planes; i++) { pfmt =3D &pix_mp->plane_fmt[i]; memset(pfmt->reserved, 0, sizeof(pfmt->reserved)); - pfmt->bytesperline =3D tmp_q.bytesperline[i]; - pfmt->sizeimage =3D tmp_q.sizeimage[i]; + pfmt->bytesperline =3D q_data->bytesperline[i]; + pfmt->sizeimage =3D q_data->sizeimage[i]; } =20 /* fix colorspace information to sRGB for both output & capture */ @@ -1848,6 +1876,16 @@ static int mxc_jpeg_try_fmt(struct v4l2_format *f, c= onst struct mxc_jpeg_fmt *fm */ pix_mp->quantization =3D V4L2_QUANTIZATION_FULL_RANGE; =20 + if (fmt->flags =3D=3D MXC_JPEG_FMT_TYPE_RAW) { + q_data->crop.left =3D 0; + q_data->crop.top =3D 0; + q_data->crop.width =3D q_data->w; + q_data->crop.height =3D q_data->h; + } + + pix_mp->width =3D q_data->w_adjusted; + pix_mp->height =3D q_data->h_adjusted; + return 0; } =20 @@ -1857,29 +1895,14 @@ static int mxc_jpeg_try_fmt_vid_cap(struct file *fi= le, void *priv, struct mxc_jpeg_ctx *ctx =3D mxc_jpeg_fh_to_ctx(priv); struct mxc_jpeg_dev *jpeg =3D ctx->mxc_jpeg; struct device *dev =3D jpeg->dev; - const struct mxc_jpeg_fmt *fmt; - u32 fourcc =3D f->fmt.pix_mp.pixelformat; - - int q_type =3D (jpeg->mode =3D=3D MXC_JPEG_DECODE) ? - MXC_JPEG_FMT_TYPE_RAW : MXC_JPEG_FMT_TYPE_ENC; + struct mxc_jpeg_q_data tmp_q; =20 if (!V4L2_TYPE_IS_MULTIPLANAR(f->type)) { dev_err(dev, "TRY_FMT with Invalid type: %d\n", f->type); return -EINVAL; } =20 - fmt =3D mxc_jpeg_find_format(ctx, fourcc); - if (!fmt || fmt->flags !=3D q_type) { - dev_warn(dev, "Format not supported: %c%c%c%c, use the default.\n", - (fourcc & 0xff), - (fourcc >> 8) & 0xff, - (fourcc >> 16) & 0xff, - (fourcc >> 24) & 0xff); - f->fmt.pix_mp.pixelformat =3D (jpeg->mode =3D=3D MXC_JPEG_DECODE) ? - MXC_JPEG_DEFAULT_PFMT : V4L2_PIX_FMT_JPEG; - fmt =3D mxc_jpeg_find_format(ctx, f->fmt.pix_mp.pixelformat); - } - return mxc_jpeg_try_fmt(f, fmt, ctx, q_type); + return mxc_jpeg_try_fmt(f, ctx, &tmp_q); } =20 static int mxc_jpeg_try_fmt_vid_out(struct file *file, void *priv, @@ -1888,88 +1911,55 @@ static int mxc_jpeg_try_fmt_vid_out(struct file *fi= le, void *priv, struct mxc_jpeg_ctx *ctx =3D mxc_jpeg_fh_to_ctx(priv); struct mxc_jpeg_dev *jpeg =3D ctx->mxc_jpeg; struct device *dev =3D jpeg->dev; - const struct mxc_jpeg_fmt *fmt; - u32 fourcc =3D f->fmt.pix_mp.pixelformat; - - int q_type =3D (jpeg->mode =3D=3D MXC_JPEG_ENCODE) ? - MXC_JPEG_FMT_TYPE_RAW : MXC_JPEG_FMT_TYPE_ENC; + struct mxc_jpeg_q_data tmp_q; =20 if (!V4L2_TYPE_IS_MULTIPLANAR(f->type)) { dev_err(dev, "TRY_FMT with Invalid type: %d\n", f->type); return -EINVAL; } =20 - fmt =3D mxc_jpeg_find_format(ctx, fourcc); - if (!fmt || fmt->flags !=3D q_type) { - dev_warn(dev, "Format not supported: %c%c%c%c, use the default.\n", - (fourcc & 0xff), - (fourcc >> 8) & 0xff, - (fourcc >> 16) & 0xff, - (fourcc >> 24) & 0xff); - f->fmt.pix_mp.pixelformat =3D (jpeg->mode =3D=3D MXC_JPEG_ENCODE) ? - MXC_JPEG_DEFAULT_PFMT : V4L2_PIX_FMT_JPEG; - fmt =3D mxc_jpeg_find_format(ctx, f->fmt.pix_mp.pixelformat); - } - return mxc_jpeg_try_fmt(f, fmt, ctx, q_type); + return mxc_jpeg_try_fmt(f, ctx, &tmp_q); +} + +static void mxc_jpeg_s_parsed_fmt(struct mxc_jpeg_ctx *ctx, struct v4l2_fo= rmat *f) +{ + struct v4l2_pix_format_mplane *pix_mp =3D &f->fmt.pix_mp; + struct mxc_jpeg_q_data *q_data_cap; + + if (ctx->mxc_jpeg->mode !=3D MXC_JPEG_DECODE || !V4L2_TYPE_IS_CAPTURE(f->= type)) + return; + if (!ctx->header_parsed) + return; + + q_data_cap =3D mxc_jpeg_get_q_data(ctx, f->type); + pix_mp->pixelformat =3D q_data_cap->fmt->fourcc; + pix_mp->width =3D q_data_cap->w; + pix_mp->height =3D q_data_cap->h; } =20 static int mxc_jpeg_s_fmt(struct mxc_jpeg_ctx *ctx, struct v4l2_format *f) { struct vb2_queue *vq; - struct mxc_jpeg_q_data *q_data =3D NULL; - struct v4l2_pix_format_mplane *pix_mp =3D &f->fmt.pix_mp; struct mxc_jpeg_dev *jpeg =3D ctx->mxc_jpeg; - int i; =20 vq =3D v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type); if (!vq) return -EINVAL; =20 - q_data =3D mxc_jpeg_get_q_data(ctx, f->type); - if (vb2_is_busy(vq)) { v4l2_err(&jpeg->v4l2_dev, "queue busy\n"); return -EBUSY; } =20 - q_data->fmt =3D mxc_jpeg_find_format(ctx, pix_mp->pixelformat); - q_data->w =3D pix_mp->width; - q_data->h =3D pix_mp->height; - - q_data->w_adjusted =3D q_data->w; - q_data->h_adjusted =3D q_data->h; - /* - * align up the resolution for CAST IP, - * but leave the buffer resolution unchanged - */ - v4l_bound_align_image(&q_data->w_adjusted, - q_data->w_adjusted, /* adjust upwards */ - MXC_JPEG_MAX_WIDTH, - q_data->fmt->h_align, - &q_data->h_adjusted, - q_data->h_adjusted, /* adjust upwards */ - MXC_JPEG_MAX_HEIGHT, - q_data->fmt->v_align, - 0); - - for (i =3D 0; i < pix_mp->num_planes; i++) { - q_data->bytesperline[i] =3D pix_mp->plane_fmt[i].bytesperline; - q_data->sizeimage[i] =3D pix_mp->plane_fmt[i].sizeimage; - } + mxc_jpeg_s_parsed_fmt(ctx, f); =20 - return 0; + return mxc_jpeg_try_fmt(f, ctx, mxc_jpeg_get_q_data(ctx, f->type)); } =20 static int mxc_jpeg_s_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f) { - int ret; - - ret =3D mxc_jpeg_try_fmt_vid_cap(file, priv, f); - if (ret) - return ret; - return mxc_jpeg_s_fmt(mxc_jpeg_fh_to_ctx(priv), f); } =20 @@ -1983,10 +1973,6 @@ static int mxc_jpeg_s_fmt_vid_out(struct file *file,= void *priv, enum v4l2_buf_type cap_type =3D V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; struct v4l2_format fc; =20 - ret =3D mxc_jpeg_try_fmt_vid_out(file, priv, f); - if (ret) - return ret; - ret =3D mxc_jpeg_s_fmt(mxc_jpeg_fh_to_ctx(priv), f); if (ret) return ret; @@ -2032,6 +2018,10 @@ static int mxc_jpeg_g_fmt_vid(struct file *file, voi= d *priv, pix_mp->width =3D q_data->w; pix_mp->height =3D q_data->h; pix_mp->field =3D V4L2_FIELD_NONE; + if (q_data->fmt->flags =3D=3D MXC_JPEG_FMT_TYPE_RAW) { + pix_mp->width =3D q_data->w_adjusted; + pix_mp->height =3D q_data->h_adjusted; + } =20 /* fix colorspace information to sRGB for both output & capture */ pix_mp->colorspace =3D V4L2_COLORSPACE_SRGB; @@ -2048,6 +2038,100 @@ static int mxc_jpeg_g_fmt_vid(struct file *file, vo= id *priv, return 0; } =20 +static int mxc_jpeg_dec_g_selection(struct file *file, void *fh, struct v4= l2_selection *s) +{ + struct mxc_jpeg_ctx *ctx =3D mxc_jpeg_fh_to_ctx(fh); + struct mxc_jpeg_q_data *q_data_cap; + + if (s->type !=3D V4L2_BUF_TYPE_VIDEO_CAPTURE && s->type !=3D V4L2_BUF_TYP= E_VIDEO_CAPTURE_MPLANE) + return -EINVAL; + + q_data_cap =3D mxc_jpeg_get_q_data(ctx, s->type); + + switch (s->target) { + case V4L2_SEL_TGT_COMPOSE: + case V4L2_SEL_TGT_COMPOSE_DEFAULT: + s->r =3D q_data_cap->crop; + break; + case V4L2_SEL_TGT_COMPOSE_PADDED: + case V4L2_SEL_TGT_COMPOSE_BOUNDS: + s->r.left =3D 0; + s->r.top =3D 0; + s->r.width =3D q_data_cap->w_adjusted; + s->r.height =3D q_data_cap->h_adjusted; + break; + default: + return -EINVAL; + } + + return 0; +} + +static int mxc_jpeg_enc_g_selection(struct file *file, void *fh, struct v4= l2_selection *s) +{ + struct mxc_jpeg_ctx *ctx =3D mxc_jpeg_fh_to_ctx(fh); + struct mxc_jpeg_q_data *q_data_out; + + if (s->type !=3D V4L2_BUF_TYPE_VIDEO_OUTPUT && s->type !=3D V4L2_BUF_TYPE= _VIDEO_OUTPUT_MPLANE) + return -EINVAL; + + q_data_out =3D mxc_jpeg_get_q_data(ctx, s->type); + + switch (s->target) { + case V4L2_SEL_TGT_CROP_DEFAULT: + case V4L2_SEL_TGT_CROP_BOUNDS: + s->r.left =3D 0; + s->r.top =3D 0; + s->r.width =3D q_data_out->w; + s->r.height =3D q_data_out->h; + break; + case V4L2_SEL_TGT_CROP: + s->r =3D q_data_out->crop; + break; + default: + return -EINVAL; + } + + return 0; +} + +static int mxc_jpeg_g_selection(struct file *file, void *fh, struct v4l2_s= election *s) +{ + struct mxc_jpeg_ctx *ctx =3D mxc_jpeg_fh_to_ctx(fh); + + if (ctx->mxc_jpeg->mode =3D=3D MXC_JPEG_DECODE) + return mxc_jpeg_dec_g_selection(file, fh, s); + else + return mxc_jpeg_enc_g_selection(file, fh, s); +} + +static int mxc_jpeg_s_selection(struct file *file, void *fh, struct v4l2_s= election *s) +{ + struct mxc_jpeg_ctx *ctx =3D mxc_jpeg_fh_to_ctx(fh); + struct mxc_jpeg_q_data *q_data_out; + + if (ctx->mxc_jpeg->mode !=3D MXC_JPEG_ENCODE) + return -ENOTTY; + + if (s->type !=3D V4L2_BUF_TYPE_VIDEO_OUTPUT && s->type !=3D V4L2_BUF_TYPE= _VIDEO_OUTPUT_MPLANE) + return -EINVAL; + if (s->target !=3D V4L2_SEL_TGT_CROP) + return -EINVAL; + + q_data_out =3D mxc_jpeg_get_q_data(ctx, s->type); + if (s->r.left || s->r.top) + return -EINVAL; + if (s->r.width > q_data_out->w || s->r.height > q_data_out->h) + return -EINVAL; + + q_data_out->crop.left =3D 0; + q_data_out->crop.top =3D 0; + q_data_out->crop.width =3D s->r.width; + q_data_out->crop.height =3D s->r.height; + + return 0; +} + static int mxc_jpeg_subscribe_event(struct v4l2_fh *fh, const struct v4l2_event_subscription *sub) { @@ -2077,6 +2161,9 @@ static const struct v4l2_ioctl_ops mxc_jpeg_ioctl_ops= =3D { .vidioc_g_fmt_vid_cap_mplane =3D mxc_jpeg_g_fmt_vid, .vidioc_g_fmt_vid_out_mplane =3D mxc_jpeg_g_fmt_vid, =20 + .vidioc_g_selection =3D mxc_jpeg_g_selection, + .vidioc_s_selection =3D mxc_jpeg_s_selection, + .vidioc_subscribe_event =3D mxc_jpeg_subscribe_event, .vidioc_unsubscribe_event =3D v4l2_event_unsubscribe, =20 diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h b/drivers/media= /platform/nxp/imx-jpeg/mxc-jpeg.h index 8104ee4a3b7a..f75dfc89ff6d 100644 --- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h +++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h @@ -84,6 +84,7 @@ struct mxc_jpeg_q_data { int h; int h_adjusted; unsigned int sequence; + struct v4l2_rect crop; }; =20 struct mxc_jpeg_ctx { --=20 2.37.1