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, hverkuil-cisco@xs4all.nl
Cc:     shawnguo@kernel.org, robh+dt@kernel.org, s.hauer@pengutronix.de,
        kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] media: amphion: only insert the first sequence startcode for vc1l format
Date:   Thu, 30 Jun 2022 09:30:41 +0800
Message-Id: <20220630013041.1251-1-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?D4A5NeBrKaGo1XNEsXw2meAV2z3iNA1P5zjweJQFxNFfs/+OaYqM6Xgt6B0K?=
 =?us-ascii?Q?g0L4J5cLGs1NYrBS2RuP7Y/btRx5lWg/r+/9J5OmCRFKslfWHHk4q3cHtuCY?=
 =?us-ascii?Q?o2JjT3WBP2ypYI/VswUO/c/prCVIVOIPpz6mPCs+VsfgTm8nA+Oo49nLUBBM?=
 =?us-ascii?Q?qvJYdFy1Riu1VVuA1EFSU0YoVIzkrMi73p9yu712g3eAH7lH7Gmsc03ZgcM4?=
 =?us-ascii?Q?o3v9JpcLLT1hOrBtzsvlf08Y+QcALlNA9bMh2XHJHi6Wta9oYsHNmMwj9TWt?=
 =?us-ascii?Q?b6ThT3lGny4HvWdnuyNyHzk31IQld1aNKe4QOCoSIG08C8IzLHwdAFhiD9lr?=
 =?us-ascii?Q?iW9n9xcplJFZtBSykuzTlnDuselsEjysv7qvvgtE8hJTUv7v8XQj8VDHcL85?=
 =?us-ascii?Q?McIB7hGwbDymzWULGY8S3gHvmhJAZzlJrmkBuZUlLeHjNLYOskFxyqsa8dSJ?=
 =?us-ascii?Q?LNVNQop/tufw6HYD7qz6UHSPYmOqYXbostaa6w4UaTB6hJmFR9rIrIupnFx6?=
 =?us-ascii?Q?SJRcm+J0qpOpNRWjF9ypC5rHdtUGYcPP4yHlq+KgywmH34nLEulrrBp2/KBy?=
 =?us-ascii?Q?Vx5Ik53XBzQoX/dRX7S3rFaqL1vi0kL08wUdlVezCNG8zjnAagviXxqzwVLn?=
 =?us-ascii?Q?AJOkgUwKyc8ncQUSjfxUtimRjfhs3iv0ZBhTt7tjuek0zQ3CTrC5H3p+qkV2?=
 =?us-ascii?Q?w+2W2Omn3F7y6M5gNToB7GgSuh6ty7hd+g687UZJoB2VmxXpcer3sGBp+VrM?=
 =?us-ascii?Q?0mgrU2GXEN6+V13hkPueuuIc1PvHo06tXT8fvBduLSbM7gOcaWloRuUb812W?=
 =?us-ascii?Q?3+60NUMp3Esca5/KHeseXe4I1+ED04ewQkN7ohRkEzdjuIdPUdXhuFg2lkah?=
 =?us-ascii?Q?5EMkH4ePSm/QjLR/YHvN9N4sM7vJvRt81uJxb16L/3M8uW7D7qgJN1TR+Hx7?=
 =?us-ascii?Q?sk84/r1dRJJBz6yROYUjDZ2T3VanJnRUCAP18O+nJtokBNgWBqheHyJ/yag4?=
 =?us-ascii?Q?aba1ydYsyBr7F5tz9gziBbPUmQfCpLCUC0S0VxEvt16g59Z/2Xk+Qs+TJQHc?=
 =?us-ascii?Q?VHpXvIkwivueY6sjFTwkdU1A0VuxDxukG+FP8ccEBQa8Sf5C2HVdSj4XpDsN?=
 =?us-ascii?Q?T1HS/d52JF/MsM4ihI2mEFbs8NGNPhwkqL2zqCouD1eYv0IWV0n80y/DUpVU?=
 =?us-ascii?Q?FL7Q0qa5XeibbOSQd58ZxWsTWm+d807xOQVI5OP2SBQvMIJlOs3pcO+UusaZ?=
 =?us-ascii?Q?qU4SaD+/2JtnnwY5A/oU2KygjNW3eMRG06yE/QmWYIFGJ5A2FCG4Mhx3uqsP?=
 =?us-ascii?Q?OrKwL9s7n/XlNIk3eFVjYjDUyeXCAp0vg+NEusEOotMeKtVF6MZpkzKfxpQf?=
 =?us-ascii?Q?eiUzQ8FpIQkNaIFbxJux9p6WqUxheYZmI+q8qaRbMzVHviBlp6tK9E1Uwy+4?=
 =?us-ascii?Q?UOJeObC61xFjvXvGcf2EIi7UDtdZYTyVh4ulX/A+3HHTgh8o6TDT6leLzpl5?=
 =?us-ascii?Q?5y61ZwrMvx+Vv+8+tt9MimbU6uTktw2ULBwZOGDUoNQhF9H3rzX0ZL5YdYhx?=
 =?us-ascii?Q?wA/3Byj8E5lV1q3GqvrIckZ1GUyMoCPH2BVddOLw?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 95442a84-b02c-416c-ee6b-08da5a382f0b
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 01:30:58.2044
 (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: 2UtQhCHSM+xMNyz/STLuhoil/ZGqlBfjS9kSaRAV48PKmKbZn1i3u/2QKWjpNTf/zRPUCusFu/9Hr9DS7bZRQw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3124
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

For some formats, the amphion vpu requires startcode
before sequence and frame, such as vc1, vp8.

But for V4L2_PIX_FMT_VC1_ANNEX_L, only the first sequence startcode
is needed, the extra startcode will cause decoding error.
So after seek, we don't need to insert the sequence startcode.

In other words, for V4L2_PIX_FMT_VC1_ANNEX_L,
the vpu doesn't support dynamic resolution change.

Fixes: 145e936380edb ("media: amphion: implement malone decoder rpc interface")
Signed-off-by: Ming Qian <ming.qian@nxp.com>
---
v2
- remove V4L2_FMT_FLAG_DYN_RESOLUTION from the format V4L2_PIX_FMT_VC1_ANNEX_L
 drivers/media/platform/amphion/vdec.c       | 2 +-
 drivers/media/platform/amphion/vpu.h        | 1 +
 drivers/media/platform/amphion/vpu_malone.c | 2 ++
 drivers/media/platform/amphion/vpu_rpc.h    | 7 ++++++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/amphion/vdec.c b/drivers/media/platform/amphion/vdec.c
index 09d4f27970ec..6eab9e711cba 100644
--- a/drivers/media/platform/amphion/vdec.c
+++ b/drivers/media/platform/amphion/vdec.c
@@ -104,7 +104,6 @@ static const struct vpu_format vdec_formats[] = {
 		.pixfmt = V4L2_PIX_FMT_VC1_ANNEX_L,
 		.num_planes = 1,
 		.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
-		.flags = V4L2_FMT_FLAG_DYN_RESOLUTION
 	},
 	{
 		.pixfmt = V4L2_PIX_FMT_MPEG2,
@@ -731,6 +730,7 @@ static void vdec_stop_done(struct vpu_inst *inst)
 	vdec->eos_received = 0;
 	vdec->is_source_changed = false;
 	vdec->source_change = 0;
+	inst->total_input_count = 0;
 	vpu_inst_unlock(inst);
 }
 
diff --git a/drivers/media/platform/amphion/vpu.h b/drivers/media/platform/amphion/vpu.h
index e56b96a7e5d3..f914de6ed81e 100644
--- a/drivers/media/platform/amphion/vpu.h
+++ b/drivers/media/platform/amphion/vpu.h
@@ -258,6 +258,7 @@ struct vpu_inst {
 	struct vpu_format cap_format;
 	u32 min_buffer_cap;
 	u32 min_buffer_out;
+	u32 total_input_count;
 
 	struct v4l2_rect crop;
 	u32 colorspace;
diff --git a/drivers/media/platform/amphion/vpu_malone.c b/drivers/media/platform/amphion/vpu_malone.c
index c62b49e85060..f4a488bf9880 100644
--- a/drivers/media/platform/amphion/vpu_malone.c
+++ b/drivers/media/platform/amphion/vpu_malone.c
@@ -1314,6 +1314,8 @@ static int vpu_malone_insert_scode_vc1_l_seq(struct malone_scode_t *scode)
 	int size = 0;
 	u8 rcv_seqhdr[MALONE_VC1_RCV_SEQ_HEADER_LEN];
 
+	if (scode->inst->total_input_count)
+		return 0;
 	scode->need_data = 0;
 
 	ret = vpu_malone_insert_scode_seq(scode, MALONE_CODEC_ID_VC1_SIMPLE, sizeof(rcv_seqhdr));
diff --git a/drivers/media/platform/amphion/vpu_rpc.h b/drivers/media/platform/amphion/vpu_rpc.h
index 25119e5e807e..7eb6f01e6ab5 100644
--- a/drivers/media/platform/amphion/vpu_rpc.h
+++ b/drivers/media/platform/amphion/vpu_rpc.h
@@ -312,11 +312,16 @@ static inline int vpu_iface_input_frame(struct vpu_inst *inst,
 					struct vb2_buffer *vb)
 {
 	struct vpu_iface_ops *ops = vpu_core_get_iface(inst->core);
+	int ret;
 
 	if (!ops || !ops->input_frame)
 		return -EINVAL;
 
-	return ops->input_frame(inst->core->iface, inst, vb);
+	ret = ops->input_frame(inst->core->iface, inst, vb);
+	if (ret < 0)
+		return ret;
+	inst->total_input_count++;
+	return ret;
 }
 
 static inline int vpu_iface_config_memory_resource(struct vpu_inst *inst,
-- 
2.36.1