Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Ming Qian <ming.qian@nxp.com>
To:     mchehab@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de,
        mirela.rabulea@oss.nxp.com
Cc:     hverkuil-cisco@xs4all.nl, kernel@pengutronix.de,
        festevam@gmail.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 3/5] media: imx-jpeg: Propagate the output frame size to the capture side
Date:   Wed, 23 Mar 2022 17:05:56 +0800
Message-Id: <473edd5666b24a659f651ca003add12ac9a0c2d2.1648023273.git.ming.qian@nxp.com>
In-Reply-To: <cover.1648023273.git.ming.qian@nxp.com>
References: <cover.1648023273.git.ming.qian@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?aI8nEhFAfQ/W1YZ0g5EbG+KI7WoliO4cT6nHRF6dgod0KmidmDVxSkk8jefx?=
 =?us-ascii?Q?42gCzS9bAlh8yKs/JoW2IPtwNT1qNkgAx5+5QwXQzjvt4P9Q9G0s3R02MZdJ?=
 =?us-ascii?Q?4p1e849aIHCHx13WiAV7DEemxXk7/K/0Bf7LHTpZYWYSyBHQ4BZjHVatDyeU?=
 =?us-ascii?Q?ZnghubQe7GLZHWL1E7ocPoGidD/k9f4VATqpAxncLESGZQ51ssfolu3M3NYV?=
 =?us-ascii?Q?IWpU1bABDbFceHsJgSXJ/4ttWg1IEphn/NA5rgyu8olEz1Djc0bXQY+XkeTs?=
 =?us-ascii?Q?OMudX5+2oH59ao5cHXJa/AijzsLBKGHjtXuBZk2agnCKsX8JPS2NVMCHwlLk?=
 =?us-ascii?Q?PhSIO2csjaamRLz24Bzd2xkZExYY592ELiQzXLLSqNbDsM20hJX9ZQ3U84qs?=
 =?us-ascii?Q?T/y9ooR6cZmcyP4AMS8cg4vu6cbulQ3FZTj9XdawNBqZomrmNqqQBtN15YoF?=
 =?us-ascii?Q?ivznBseVMFLLaEPHGHydGqRmzZLUbHEcHldSATZYo7MmwF/WhgOT8/7lsYnx?=
 =?us-ascii?Q?N8u4eGOvP965M7Hdw7joLljB5H0rLUv20heGPSHsOSBam7WvVbQwAP+k3OKs?=
 =?us-ascii?Q?dmpv+bHqDB9LTFGWJl5A92uuRU2iFXDxWvPTBHZRtSThHQrEfbTzSpnhNHSg?=
 =?us-ascii?Q?rVYvOjo/nhsutBLCFyP3Ksvcc8pGoTOvdr2eDu+RVxwS5lYlcBvMmxRgO66F?=
 =?us-ascii?Q?CQfEd1Wn1w7GEiBkdQt0X26xjEADhK6QNKtALPDITs+L9hA/ZvtPCFK8hKEo?=
 =?us-ascii?Q?6VpC+jZ06hPJUtoPve1VzOgvSDbHkh9FhQchlDwU58KN9DV79pCn7z7w5f5G?=
 =?us-ascii?Q?tgxuq2tup/dZuIl4yHwA/sC51EhrA+j5G2AuQCO9zoneOT+MVf2vuiQ1a5rv?=
 =?us-ascii?Q?/Gk9nI4oosiFfi+vU0gHQEIw3WfkwG+9K5zCYTeTgH/GR1Idvm4HWxKVMCDp?=
 =?us-ascii?Q?C6wY2ODAdkk6ywh17TMINgQ82xJytfQI23jgnyPewba1VOwfVy2Zqqsn0kbH?=
 =?us-ascii?Q?JiOjans49pMe6Ru1MJXNhoJDoEtX5mx0iEcctt2BfN9F2t/C7G3qTj0/zfrG?=
 =?us-ascii?Q?J3TjPRUsDyWSYmSk5OlyPiDp/6U913W2P63R7T9CGLCAFbErSWI4XJDRufle?=
 =?us-ascii?Q?tzHB4RhPlDZL9cbHCV4KQjwiDRtr7Wc9KXYUkPu3hOrTAoJSi/LwuIRtxcXL?=
 =?us-ascii?Q?qOW3TlYiuf6IJXZj98XgyLs9LT68A8Zf84Fr1jfXAiLfzx+Iz09NFgN/U965?=
 =?us-ascii?Q?4T1LZv6O2qdTldO0J4beNwjYNexJypjEwvdbSyIU6b7xskrv+IQ16uI9vipR?=
 =?us-ascii?Q?D5cW99Q+e7ube3MY7K2eGhJ6DumJUQ1VhzGRI2HS11fLXczocsbTikjuqioL?=
 =?us-ascii?Q?15RGwSVOEdY0iU3+FReMPPaCxw60/WVv1Pn7Zxa6Y29IgQZ0THVgmlqt49oi?=
 =?us-ascii?Q?wfwg2rn12/0RtIB2j13cNmQTHOJOynQU?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fea22ca5-aa25-4975-8106-08da0cac68d6
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2022 09:06:26.0705
 (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: ck0kitYGFm74Vhdl3w1LUzIFzGsRttvNusUI+YlEXYjB+p0TJ3WlH8HTUfpTJ+QuXoA+FwJaxWAlna9PG81d6g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4901
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The GStreamer v4l2videodec only ever calls S_FMT on the output side
and then expects G_FMT on the capture side to return a valid format.

Signed-off-by: Ming Qian <ming.qian@nxp.com>
---
 .../media/platform/nxp/imx-jpeg/mxc-jpeg.c    | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
index a95305639dd9..5dfa6f87871e 100644
--- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
+++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
@@ -1831,12 +1831,40 @@ static int mxc_jpeg_s_fmt_vid_out(struct file *file, void *priv,
 				  struct v4l2_format *f)
 {
 	int ret;
+	struct mxc_jpeg_ctx *ctx = mxc_jpeg_fh_to_ctx(priv);
+	struct vb2_queue *dst_vq;
+	struct mxc_jpeg_q_data *q_data_cap;
+	enum v4l2_buf_type cap_type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
+	struct v4l2_format fc;
 
 	ret = mxc_jpeg_try_fmt_vid_out(file, priv, f);
 	if (ret)
 		return ret;
 
-	return mxc_jpeg_s_fmt(mxc_jpeg_fh_to_ctx(priv), f);
+	ret = mxc_jpeg_s_fmt(mxc_jpeg_fh_to_ctx(priv), f);
+	if (ret)
+		return ret;
+
+	if (ctx->mxc_jpeg->mode != MXC_JPEG_DECODE)
+		return 0;
+
+	dst_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, cap_type);
+	if (!dst_vq)
+		return -EINVAL;
+
+	if (vb2_is_busy(dst_vq))
+		return 0;
+
+	q_data_cap = mxc_jpeg_get_q_data(ctx, cap_type);
+	if (q_data_cap->w == f->fmt.pix_mp.width && q_data_cap->h == f->fmt.pix_mp.height)
+		return 0;
+	memset(&fc, 0, sizeof(fc));
+	fc.type = cap_type;
+	fc.fmt.pix_mp.pixelformat = q_data_cap->fmt->fourcc;
+	fc.fmt.pix_mp.width = f->fmt.pix_mp.width;
+	fc.fmt.pix_mp.height = f->fmt.pix_mp.height;
+
+	return mxc_jpeg_s_fmt_vid_cap(file, priv, &fc);
 }
 
 static int mxc_jpeg_g_fmt_vid(struct file *file, void *priv,
-- 
2.33.0