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,
        xiahong.bao@nxp.com, eagle.zhou@nxp.com, tao.jiang_2@nxp.com,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org
Subject: [PATCH] media: amphion: drop repeated codec data for vc1g format
Date:   Fri, 14 Apr 2023 09:55:43 +0800
Message-Id: <20230414015543.6580-2-ming.qian@nxp.com>
In-Reply-To: <20230414015543.6580-1-ming.qian@nxp.com>
References: <20230414015543.6580-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?6Zp/Wn5Rj33p/LePTPrh0yDX/wpLZw5G3bbGOxp9hBx9RHtSVVTfRrE3Cw0s?=
 =?us-ascii?Q?meF9kt1kUGl2PyRbTjCsyurAy+1pruQMIhNZp5JbbrdYjaddC5AhjVbXj3Ot?=
 =?us-ascii?Q?ebD4mmAIxnyL9XLq4u1pd5YZIGsLexw7/ijkdQOpX+VsYY4zq4gxwae7BVoX?=
 =?us-ascii?Q?mXzXi2tt2jbDzOPx3YESpToqAmxJhgP4xQk1M27Fias88F/sYn0Y5p9wb2+B?=
 =?us-ascii?Q?g30rZ7pcSRCysbtniioR8iv6HnTyg9QW33aIKHpQpvkQF0nqdq4BIpMKUeyo?=
 =?us-ascii?Q?tZltGD8glyYfuPHDK0pgUMjyQMFS0bHg25HpDbGxrq+ZyO6biyFMU8u+ksBt?=
 =?us-ascii?Q?dNILP416oVnFX7ysR7utqMoJadLzS5a4GIAnVI7iJ3H7jy60SkfkzpuhO9K1?=
 =?us-ascii?Q?DdxZBqIigqb3i56daHMbvCj79+hEnU4hY0FrWaJOCeO3j/WP9MiLzCdNOx8C?=
 =?us-ascii?Q?s83SJlgLm2EfFDhJG7eCzoBs6QC0INHsVRQz5ehfngJZHLcNX68mNI739GBF?=
 =?us-ascii?Q?sq/vLG+lz+iL4pSZbxcu1yzc53h3PQ85PiAaEQomIGbAGveudDZDcWjeTwFm?=
 =?us-ascii?Q?oLDqqbxayIRR6NBmXWUeT/pmpAaM52fm+J1XxAWndzx5RrQxVovUQqMoatKI?=
 =?us-ascii?Q?D/zSOE6AcDq8k2AFb6l2TNCQJjEtJTMaqTgZM5uhu2SN6gXNImuX2fUkl2C4?=
 =?us-ascii?Q?NoJKqqHiyhOaDbHAy1VyDo6b06pSP8FTdICOvf2pIDQFjOSm5qM9TfTCj28N?=
 =?us-ascii?Q?v4+HTxM2Z6zjcBxR0dwOK5sw4t2R4VdVgh41o2fiMD5wZWkBlyHXE75ECZtL?=
 =?us-ascii?Q?pJV2iWp3Fucctu7Gq6JU8Serd2gqx4Z0uVkSlki8E1y3hPfZnnZqMZ2zQDMA?=
 =?us-ascii?Q?hfkUpn4brw5Pf0s4QtU3aBCv+cqgqOw+EdtmT2owUk7s0bHqQVJ5GlyWgOrT?=
 =?us-ascii?Q?KvjG2edypofonMcqi1xhHIlJ1VlQknLfULeSC+GuM0vKvzydWm0LfnSphKs8?=
 =?us-ascii?Q?cT1yApQdRUOOBbUu0R6WwnjjGNzSIl2/i8Gyi3jXSYcuxwmUE/8LruIJLqS7?=
 =?us-ascii?Q?giGX5aIrtcZglQjY/XyyENZAVicRmeejTFcAZMHCtptw8i1+AGjbsieX5t/K?=
 =?us-ascii?Q?k40iyJNPxpdB1xtHXTrcKKI6KDQVTRe+QHe0N6ktwd4dZvqM4l+hbspECegY?=
 =?us-ascii?Q?QYuL3rKHYwLmqa2+euigjztrao+h4U6kklZDReCMcwO6Fw8tJZEw4XkYGQ0X?=
 =?us-ascii?Q?Q7ZJIazc2a/oNfyvgvIjc0DzsZGu2h+EYGO9eyG0bym0Z+x91LA8kEg8dCxE?=
 =?us-ascii?Q?0g30wo2yzU6bjN/j6gsj7Mti5GVvHNrE3hASZLQCzH8MRha9t2ucKoolc6xk?=
 =?us-ascii?Q?xXSq2+1GyJr5HCxzgieXmzgkozbPWBYF/7X5taMmyAd97PxF/jZEmLh94rDB?=
 =?us-ascii?Q?w0a1C3nMHEfZ7guQhorm0PDlHBwFrB7ixkHQUXf8gQglEcic+Vtm31ilSb7x?=
 =?us-ascii?Q?TingUf7FmQX7e1tYSMMtXb4rsOIqk7QF4Mk69TZbDPYsWo5bcCPzVVfMnZKJ?=
 =?us-ascii?Q?1N1eyALQbb7TrER0jKj63rigZxGMoE7anmXcjUaI?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 983b9f94-7382-4d6e-6d8c-08db3c8b6c68
X-MS-Exchange-CrossTenant-AuthSource: DB8PR04MB6346.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2023 01:56:12.6196
 (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: RBTVlkROdYGhpezfNs6E+w8vcbkk9Wmk0QBfCE9alte9qcJkkl4KIqslNeln7fZy7dpkhmTaUSk8XRGlfYzkiw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9342
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 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 format V4L2_PIX_FMT_VC1_ANNEX_G,
the separate codec data is required only once.
The repeated codec data may introduce some decoding error.
so drop the repeated codec data.

It's amphion vpu's limitation

Fixes: e670f5d672ef ("media: amphion: only insert the first sequence startcode for vc1l format")
Signed-off-by: Ming Qian <ming.qian@nxp.com>
Tested-by: xiahong.bao <xiahong.bao@nxp.com>
---
 drivers/media/platform/amphion/vpu_malone.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/media/platform/amphion/vpu_malone.c b/drivers/media/platform/amphion/vpu_malone.c
index e96994437429..c1d6606ad7e5 100644
--- a/drivers/media/platform/amphion/vpu_malone.c
+++ b/drivers/media/platform/amphion/vpu_malone.c
@@ -1313,6 +1313,15 @@ static int vpu_malone_insert_scode_pic(struct malone_scode_t *scode, u32 codec_i
 	return sizeof(hdr);
 }
 
+static int vpu_malone_insert_scode_vc1_g_seq(struct malone_scode_t *scode)
+{
+	if (!scode->inst->total_input_count)
+		return 0;
+	if (vpu_vb_is_codecconfig(to_vb2_v4l2_buffer(scode->vb)))
+		scode->need_data = 0;
+	return 0;
+}
+
 static int vpu_malone_insert_scode_vc1_g_pic(struct malone_scode_t *scode)
 {
 	struct vb2_v4l2_buffer *vbuf;
@@ -1460,6 +1469,7 @@ static const struct malone_scode_handler scode_handlers[] = {
 	},
 	{
 		.pixelformat = V4L2_PIX_FMT_VC1_ANNEX_G,
+		.insert_scode_seq = vpu_malone_insert_scode_vc1_g_seq,
 		.insert_scode_pic = vpu_malone_insert_scode_vc1_g_pic,
 	},
 	{
-- 
2.38.1