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 v2 3/5] media: imx-jpeg: Propagate the output frame size to the capture side
Date:   Fri, 18 Mar 2022 16:16:53 +0800
Message-Id: <18af657bba31a7aa49a23e9952884beba7cd4f04.1647590462.git.ming.qian@nxp.com>
In-Reply-To: <cover.1647590462.git.ming.qian@nxp.com>
References: <cover.1647590462.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?P6AAu/kzcpPYzDbRZTfnv4X/90VEaUqlu65BKy/W0MGYH0uG0V5EzBsVy0M5?=
 =?us-ascii?Q?Mz5urNLfZOxQKzfaacTIyLYXjX8URNDLmmlfZ+sqhIMq/u8Qn9ZaYrbNKvsU?=
 =?us-ascii?Q?ALaOFY9nu0qOKtYP6ST9epIHvt2MF26P7axtb79OLp14nyH5ZGKtqUTkYviZ?=
 =?us-ascii?Q?CvKcVa0rJBOVKgNQm0ToKqplxrloJQB6XQjB0ziLSj63bOYaeZ0KLVjxo1FP?=
 =?us-ascii?Q?ETXowobOop755WLCS3+KEOsjUf2iFHKM96GpW4Cd/wq0+XK59+H8hft0p3Pd?=
 =?us-ascii?Q?2K3krLjpRUt5+GfKgNBlA4WO3PPCY7vZnpnqiXRdSMeHVL1WOFBgL98mt4bB?=
 =?us-ascii?Q?0s+qrSPA9e5mNWBTX+UheA3uN1hCZJW5XS29UNPCComf5OOqwJTogcJvJjg7?=
 =?us-ascii?Q?IlnNcIJxG97dcmd/Cj7JB4KbCLTGxloZm+ed6lpcgzF0rL/qQ3DnGCtHxSnq?=
 =?us-ascii?Q?SAQzaoORQfdAXVZvB7MgqLWat55C0lVz5ivu9B3QXqZpoThHsF0KcfEGqorO?=
 =?us-ascii?Q?PnWxF9PXQHfmfwRjxmrDxZ993qDSA11r1ruZQfFVua8Jj2aO8ipo+y/2d7xq?=
 =?us-ascii?Q?IV968eJhwe33tBq9wt2k/AYGcRny3yOCWqtOjs/eMqi8F2a5wMz7LUr0m4F0?=
 =?us-ascii?Q?7C8xXuVCL5k1JtPnRjMRO1BIMfdHnR1DKiRU7/1la5afLT+xcUgX5ov1uDUM?=
 =?us-ascii?Q?Jkt3bRDDRTcTbBEV/PVKzWC8Y2a3tSzhQXxThpXexloSyUbsHhf348m0kyJP?=
 =?us-ascii?Q?kp4LwEC0l5lhhX/FFiamOwUnaM8Wbc585h2de09RRr7c1iOOlC01dHVEKpwb?=
 =?us-ascii?Q?ff40OT1IBe32NcFC0OUNGNFg75CIdahd01Jke80mcTK4uZMaCN33vvagexBl?=
 =?us-ascii?Q?uhv7WZqrjCNPmcZuOr3mMrC0QDQNZnYmmJiMMUoVka358iXJiUamlRiUw7hq?=
 =?us-ascii?Q?rnyYgWB1ZTTq5U37oVhw67qpQlJMndf2vKQjoTLHTNoUBoKTQSn9Md1XSIFT?=
 =?us-ascii?Q?jcJZCDVyq4bauloVgi/tlJ2v5Kz1nYqC0KX8OWdO3uUqhzCKCjYxniJ8lvWS?=
 =?us-ascii?Q?AkomAhldrkNh11YNpHCEihfp/XCroaLabD3ydL+NQQKipzVIxaXGaChEXz71?=
 =?us-ascii?Q?AC6Rh9ebBVc2b4UeWWiMg4zSgxDYZcbXVtURT/Z/Ka5vlAxInELomsyEd7Nb?=
 =?us-ascii?Q?F3O3vO0BDPTHJyDSPXwIFBjN6QVS+dfwC4VJr9F6sC9KewjyNiU5VRl2Mo8d?=
 =?us-ascii?Q?d+Jkdu7a85LHGmW9JavcWFNwt4y1VpbOHfgEPvopsCCv+hJ8dUr4cP6lObWv?=
 =?us-ascii?Q?Z1SKoPbd97pd7AIgPsaE4gbM6V3MHDai9zGKlxu+sMJcC7Fhp4mTx7TccVvl?=
 =?us-ascii?Q?xJGHJinNl84v9sd5gXBRatBkz5yDZ1FLrI8QLc5vNEGnJGEN1cBUQWa6kDpI?=
 =?us-ascii?Q?sBTaVoluTgvp9GwDX5aqiMZG5T16/G1P?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e5fed04f-46d2-4259-eb1a-08da08b7c914
X-MS-Exchange-CrossTenant-AuthSource: DB8PR04MB6346.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Mar 2022 08:17:47.3850
 (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: cbvkUMDKUt6kRVZuIUl3dR63LOep27OBZbHsCgP6iNG3uOD7vTnpI0pVP1p9us2Z6Hn8IcH8iHpBw71gmNHRCg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6285
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    | 25 ++++++++++++++++++-
 1 file changed, 24 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..d2110731346b 100644
--- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
+++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
@@ -1831,12 +1831,35 @@ 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;
+
+	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);
+	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