Received-SPF: pass (google.com: domain of linux-kernel+bounces-163237-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: Nas Chung <nas.chung@chipsnmedia.com>
To: mchehab@kernel.org,
	nicolas@ndufresne.ca,
	sebastian.fricke@collabora.com
Cc: linux-media@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	hverkuil@xs4all.nl,
	nas.chung@chipsnmedia.com,
	lafley.kim@chipsnmedia.com,
	b-brnich@ti.com,
	jackson.lee@chipnsmedia.com,
	"Jackson.lee" <jackson.lee@chipsnmedia.com>
Subject: [PATCH v3 1/4] media: chips-media: wave5: Support SPS/PPS generation for each IDR
Date: Tue, 30 Apr 2024 10:38:57 +0900
Message-Id: <20240430013900.187-2-nas.chung@chipsnmedia.com>
In-Reply-To: <20240430013900.187-1-nas.chung@chipsnmedia.com>
References: <20240430013900.187-1-nas.chung@chipsnmedia.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?iok2cVKdBhK8QsU1++joBvr19Pnr6n+/R9+SOMFHTF3sw6eIORboQQIQ9f3J?=
 =?us-ascii?Q?K34K6q3KgJ/+6V9Et2hOOwjr+7Ada5jvc/x4+O9W7YA0przXcsc/KyOo4jxe?=
 =?us-ascii?Q?vEt3/0RpNxOkUc2KNgQcfUCHNIQf1Jo6JSQbLamLmo/GqoRAlRUxC8kE6KgD?=
 =?us-ascii?Q?OGu0mKaTiDcd9X0Ol0WtXDYLE0riGy4t38g4eHZf064bQqe86o51peJdxEzw?=
 =?us-ascii?Q?02uLmJS+PWjTTkqDPtU0+SMe0CpWyerQtLcM8b4FwsDy5CTTyWE4YM/qWrPi?=
 =?us-ascii?Q?6hSC462tdOqgHwuwW3kWl835kvpwqSCJTZy/A99pvn2i6IEloAGs+V7xUPdS?=
 =?us-ascii?Q?PHaprAAaN2XAO7fKvxyzj32UC8ZG5Wx5ZKK0xApDBPNcrWCOiEOqmDNdZSib?=
 =?us-ascii?Q?Guu5gN/H3Atg/gr48p5JjrbrFM2tzLmVRDH9EXEN5Jr7USWrCC+9VOgdTdnM?=
 =?us-ascii?Q?ISqEp9d+dLK8Oj8ZaobG0dF5bVwppM7uwPzwEd5lidVzifpKvyaJ3Dck/Og3?=
 =?us-ascii?Q?ZClY+0ywcus4TZ20vA8lYPqklSU3ecIe2LrPFNFVsalN7w0rQUHUBxXM855M?=
 =?us-ascii?Q?pkKCXVhqxzCEbP0hpNrT5weGRmSg0oJhGTrIHZeWOxCFqxx5QpwNYus2CgyD?=
 =?us-ascii?Q?A/YTGiUxeKfow4aqoc7SZRTlxQscmyCbKlhax1iZlS83uOihWY4u7eyueWXG?=
 =?us-ascii?Q?UrLjjT4CoJFEig/wxeA+KKRl2EqYako9ftNU4JKGAaGoggCOj/RQeserXcTP?=
 =?us-ascii?Q?18acxpvtPhOXlxJeWZ6G/o04IJqcwhIMfHIBAF6aFOJJFavDBe4RRsEC7Guq?=
 =?us-ascii?Q?/V2euhk3QexQA4Rf1TTvbtg6yi/y6HEmeavuW4DOYTg+Ja7t8kydoX9xdHQw?=
 =?us-ascii?Q?j4KwBImR/ojBLGzjqXLIS+SM9njEzkXKAI/k0+RPxAqc7wR777dTZcoapBEb?=
 =?us-ascii?Q?8Ikwk6TnIvFUhKtA9KVBu2mkwB4MJ3TSuJMznVxYFYm4gTQG2L71VoiVaRtn?=
 =?us-ascii?Q?QhOFzM81MsAWYCVv5eQgnd4P3VXHTcYiK1p77LbEtAACm41r3rEOSCBv1YCl?=
 =?us-ascii?Q?53FsfgE4xaLm8r41DMFGvKge/r+Qynh2bP7Mdz5ut4omBFWTmpNgoH7gxsoa?=
 =?us-ascii?Q?ZON751Tpw+m34BNEzkZZX7uZ7PJfg8CgUSgIxbF+V9ZG1KB5UnJVxl17u7UN?=
 =?us-ascii?Q?6ZdgTJ4AoDu5Xg64qsGL7ZDu2zJT6HtTTXaGVJOJNg01Q6K6dgePcpe7hsd2?=
 =?us-ascii?Q?rAW4qX17GS40TiCylg9ZwbIdOu6pn14ZqK+kqFJzbSvLwWNOY4Q+Jpxc2MgF?=
 =?us-ascii?Q?doiLkt4bj/BGoJMs5QhjUX4Bzgu3pIaYQMwsO2yLAPTG7XM6upyUaTtprBJT?=
 =?us-ascii?Q?nfZfJAOXDFISj0N+6oIEJzAdTCff0gSOhJG3Pii8T1Hie7EEgd2ZAqjbzl0V?=
 =?us-ascii?Q?DVDGtVI5d3S4MsrDWVMsnLJ3z7UsEqI9R0G/cy6qjbSB3L+TdIJuCJlRP6Ot?=
 =?us-ascii?Q?SAqCrOX29/2T1ahZbsPrNr9Qaic5Zebkm29+FAlj7sl4GfXHZe3qU/mUI7dJ?=
 =?us-ascii?Q?9WXxMr9pOHzcYSVRvV2vLzZDvskCPDrUSJb8XJsaV1fHqrCtZWGUUvbeQIrh?=
 =?us-ascii?Q?sw=3D=3D?=
X-OriginatorOrg: chipsnmedia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ade7885d-d6f2-4338-9178-08dc68b654ef
X-MS-Exchange-CrossTenant-AuthSource: SL2P216MB1246.KORP216.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2024 01:39:09.9531
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4d70c8e9-142b-4389-b7f2-fa8a3c68c467
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: slShTY3Qkt0MTk6lFdd9BsIJL48p4MlLuvDVIwXqCbUAOzsUqLdW8EzntozaULnpA96JoyUagIjSei+SpGewu09RtKN+GuOhMkSEjR50Gqk=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SL2P216MB2195

From: "Jackson.lee" <jackson.lee@chipsnmedia.com>

Provide a control to toggle (0 = off / 1 = on), whether the SPS and
PPS are generated for every IDR.

Signed-off-by: Jackson.lee <jackson.lee@chipsnmedia.com>
Signed-off-by: Nas Chung <nas.chung@chipsnmedia.com>
---
 .../platform/chips-media/wave5/wave5-hw.c     | 19 +++++++++++++++----
 .../chips-media/wave5/wave5-vpu-enc.c         |  7 +++++++
 .../platform/chips-media/wave5/wave5-vpuapi.h |  1 +
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/drivers/media/platform/chips-media/wave5/wave5-hw.c b/drivers/media/platform/chips-media/wave5/wave5-hw.c
index 2d82791f575e..fff6e66b66e4 100644
--- a/drivers/media/platform/chips-media/wave5/wave5-hw.c
+++ b/drivers/media/platform/chips-media/wave5/wave5-hw.c
@@ -23,6 +23,15 @@
 #define FEATURE_AVC_ENCODER		BIT(1)
 #define FEATURE_HEVC_ENCODER		BIT(0)
 
+#define ENC_AVC_INTRA_IDR_PARAM_MASK	0x7ff
+#define ENC_AVC_INTRA_PERIOD_SHIFT		6
+#define ENC_AVC_IDR_PERIOD_SHIFT		17
+#define ENC_AVC_FORCED_IDR_HEADER_SHIFT		28
+
+#define ENC_HEVC_INTRA_QP_SHIFT			3
+#define ENC_HEVC_FORCED_IDR_HEADER_SHIFT	9
+#define ENC_HEVC_INTRA_PERIOD_SHIFT		16
+
 /* Decoder support fields */
 #define FEATURE_AVC_DECODER		BIT(3)
 #define FEATURE_HEVC_DECODER		BIT(2)
@@ -1601,12 +1610,14 @@ int wave5_vpu_enc_init_seq(struct vpu_instance *inst)
 
 	if (inst->std == W_AVC_ENC)
 		vpu_write_reg(inst->dev, W5_CMD_ENC_SEQ_INTRA_PARAM, p_param->intra_qp |
-				((p_param->intra_period & 0x7ff) << 6) |
-				((p_param->avc_idr_period & 0x7ff) << 17));
+				((p_param->intra_period & ENC_AVC_INTRA_IDR_PARAM_MASK) << ENC_AVC_INTRA_PERIOD_SHIFT) |
+				((p_param->avc_idr_period & ENC_AVC_INTRA_IDR_PARAM_MASK) << ENC_AVC_IDR_PERIOD_SHIFT) |
+				(p_param->forced_idr_header_enable << ENC_AVC_FORCED_IDR_HEADER_SHIFT));
 	else if (inst->std == W_HEVC_ENC)
 		vpu_write_reg(inst->dev, W5_CMD_ENC_SEQ_INTRA_PARAM,
-			      p_param->decoding_refresh_type | (p_param->intra_qp << 3) |
-				(p_param->intra_period << 16));
+			      p_param->decoding_refresh_type | (p_param->intra_qp << ENC_HEVC_INTRA_QP_SHIFT) |
+			      (p_param->forced_idr_header_enable << ENC_HEVC_FORCED_IDR_HEADER_SHIFT) |
+			      (p_param->intra_period << ENC_HEVC_INTRA_PERIOD_SHIFT));
 
 	reg_val = (p_param->rdo_skip << 2) |
 		(p_param->lambda_scaling_enable << 3) |
diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
index a45a2f699000..a23908011a39 100644
--- a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
+++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
@@ -1061,6 +1061,9 @@ static int wave5_vpu_enc_s_ctrl(struct v4l2_ctrl *ctrl)
 	case V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE:
 		inst->enc_param.entropy_coding_mode = ctrl->val;
 		break;
+	case V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR:
+		inst->enc_param.forced_idr_header_enable = ctrl->val;
+		break;
 	case V4L2_CID_MIN_BUFFERS_FOR_OUTPUT:
 		break;
 	default:
@@ -1219,6 +1222,7 @@ static void wave5_set_enc_openparam(struct enc_open_param *open_param,
 		else
 			open_param->wave_param.intra_refresh_arg = num_ctu_row;
 	}
+	open_param->wave_param.forced_idr_header_enable = input.forced_idr_header_enable;
 }
 
 static int initialize_sequence(struct vpu_instance *inst)
@@ -1701,6 +1705,9 @@ static int wave5_vpu_open_enc(struct file *filp)
 			  0, 1, 1, 0);
 	v4l2_ctrl_new_std(v4l2_ctrl_hdl, &wave5_vpu_enc_ctrl_ops,
 			  V4L2_CID_MIN_BUFFERS_FOR_OUTPUT, 1, 32, 1, 1);
+	v4l2_ctrl_new_std(v4l2_ctrl_hdl, &wave5_vpu_enc_ctrl_ops,
+			  V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR,
+			  0, 1, 1, 0);
 
 	if (v4l2_ctrl_hdl->error) {
 		ret = -ENODEV;
diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h
index edc50450ddb8..554c40b2e002 100644
--- a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h
+++ b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h
@@ -566,6 +566,7 @@ struct enc_wave_param {
 	u32 lambda_scaling_enable: 1; /* enable lambda scaling using custom GOP */
 	u32 transform8x8_enable: 1; /* enable 8x8 intra prediction and 8x8 transform */
 	u32 mb_level_rc_enable: 1; /* enable MB-level rate control */
+	u32 forced_idr_header_enable: 1; /* enable header encoding before IDR frame */
 };
 
 struct enc_open_param {
-- 
2.43.0