Received-SPF: pass (google.com: domain of linux-kernel+bounces-98454-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: "jackson.lee" <jackson.lee@chipsnmedia.com>
To: mchehab@kernel.org,
	nicolas@ndufresne.ca,
	sebastian.fricke@collabora.com
Cc: linux-kernel@vger.kernel.org,
	hverkuil@xs4all.nl,
	nas.chung@chipsnmedia.com,
	lafley.kim@chipsnmedia.com,
	"Jackson.lee" <jackson.lee@chipsnmedia.com>
Subject: [PATCH v2 4/4] media: chips-media: wave5: Support YUV422 raw pixel-formats on the encoder.
Date: Mon, 11 Mar 2024 13:24:42 +0900
Message-Id: <20240311042442.10755-5-jackson.lee@chipsnmedia.com>
In-Reply-To: <20240311042442.10755-1-jackson.lee@chipsnmedia.com>
References: <20240311042442.10755-1-jackson.lee@chipsnmedia.com>
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?69MZxIZpubihS06YUJ+KSh+ULbFSDGmY/T+ZGtVsTCVGBN8kyo87bTSGyfxP?=
 =?us-ascii?Q?musKBfbc9q3xDIHkLvceugLnmOemu0TN01priBwDYF8Brtp3F6q0ZxBPIQGo?=
 =?us-ascii?Q?EcGi8rnLfXJg7PO2bLQpkbup6v0xzsiyKWU/fTdT/0phg8ymRVk7fLx4KVUx?=
 =?us-ascii?Q?bo8ipEplcHohFo/fUhouE7RqZrdKjvt/V/vU5j6anKR7hwhALZ1vZwVvUcw6?=
 =?us-ascii?Q?Y2mAEqG40Nr965Bh8FrAbFxyLX4x8Yj4lyAMiTcBSZQK87atEyoOlGy31ayN?=
 =?us-ascii?Q?+n/i8i4RzjnH+aFwHlDapo1cnY9p/5NiQxTlrfFO/JsX3CbBsSYvzEVYEW9K?=
 =?us-ascii?Q?QkG96upadT/ZpSeHHrShnfw4cll0GCWm3HJwkr+/P32Pld26XcQ4i7laEDWG?=
 =?us-ascii?Q?MAwBaqALkNEtRLFDdRFpK5RRCNNMlODDR7NfwuO+rxPYxgSopYGknf/IH7lQ?=
 =?us-ascii?Q?inzZXuMuR8s5N/gbL1FnS7FS/XQQa52CYMFB9wRnDDmdRtDGatv+1cNlqGRP?=
 =?us-ascii?Q?xvFFudNeJdlWb6srZF9h1MGjhSUKa/mZQ7k3PL+ARgvq22uDX5T5eIKC9VjM?=
 =?us-ascii?Q?j9LU1oQyBsCOjGOO288CIBrBFSkn/icnT2e65Jfm3JVnMo5TuGebFqbYzCV+?=
 =?us-ascii?Q?BZ532ihfEuovNq/kBwYCBA9LUSy2CRDP48CDFqU4fsRYEXr1ytNgw+G+u6x3?=
 =?us-ascii?Q?jKgX4iLOeJwXhcxEPTiH4Lcc5/ClLSA6CYQ/ViTdyD/xSI+9a14anM7fHhkC?=
 =?us-ascii?Q?eWEOcwBqMOm+jwAanXRSqLxMM11P4fSJpJriXEjNQQ+sVx6effRD+1Ky6D1S?=
 =?us-ascii?Q?ICDV1vE3JWDBIxrHcT3FGD9t5azD2shkBeK7jA2GcfQOTB7AUsyKg2ACkvy6?=
 =?us-ascii?Q?h1HfDhz7P832l/5O6ie8bBzSHirZP+WVP2CdC986CkEui6YjJwRnTQ2/Bqdt?=
 =?us-ascii?Q?G22BEVJCv4tbpqO7jF2nWqPSBO7nPuAHjrb0jCiD7S0p6MamLsaJdfA6tjwF?=
 =?us-ascii?Q?8blfJCGCocPuxSD6MrhxfAcn92Rk6pHJLUSadgoYsflXVVNzBbgdngVwb03Z?=
 =?us-ascii?Q?R+YcNEdIX158+hvpEeN6EaUrDf8iTqGbdexzzKp+vFJbL+DH49lSt5/Druds?=
 =?us-ascii?Q?ALwbuW/qewrIKRmjCDV51S3nNJa359x0jfc1wT+VQr8DU7FiJfSnk2Bu628U?=
 =?us-ascii?Q?8rHb4KDgRSNd57btb9o0iHh0vw+7FF+PvPzYyaV9sDb8Kp1nLdVbqK+bl7Zq?=
 =?us-ascii?Q?T+cuhSaNeu807U4pj9JS7sqiz0sJQW4hcTYNP0tPUHT2RchLVH+JSmHwvAIf?=
 =?us-ascii?Q?DwRpfIoc/ZH+XVeBIptuVRtOZQ1w9NIcexzDU7h3iZ5WC+tlH5IlvqokTpRS?=
 =?us-ascii?Q?obajB/Mr0beym6hpO2PXoI7q4yR/wbwAxeM+vHwgxD9ym4mQtWYIZ5pnWcoO?=
 =?us-ascii?Q?ZqdHTXiALiy+UNkRgEX8dHj7oIP1EuGO7C7I8D0gCwbWFby/PdhlFVr9aS1H?=
 =?us-ascii?Q?BHyA1/jm7sgyy7/q8u+wYDHp1hjYFVVP0P3eu3rzsh4IOoutCDWjZc65zQn+?=
 =?us-ascii?Q?RAJgJpcz1zvPW0L7hql1SchBhyZw9MSfRkTrg/NUlw+4/exkemCI2ewh7rnh?=
 =?us-ascii?Q?Cw=3D=3D?=
X-OriginatorOrg: chipsnmedia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e0fe701f-09f0-4bf2-a7a7-08dc418333ea
X-MS-Exchange-CrossTenant-AuthSource: SE1P216MB1303.KORP216.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2024 04:24:54.8346
 (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: //HmS8UV+VBy+wRIrpjhzv7RzpDbFx+vFQoe0r6mIwF2ZmzLaPewAu671OlpU/uvJ6+68ImoQQeD4G4XLMu5dJnavQMoiZJylepY7fSddak=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU4P216MB1997

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

Add support for the YUV422P, NV16, NV61, YUV422M, NV16M, NV61M raw pixel-formats to the Wave5 encoder.
All these formats have a chroma subsampling ratio of 4:2:2 and therefore require a new image size calculation as the driver previously only handled a ratio of 4:2:0.

Signed-off-by: Jackson.lee <jackson.lee@chipsnmedia.com>
Signed-off-by: Nas Chung <nas.chung@chipsnmedia.com>
---
 .../chips-media/wave5/wave5-vpu-enc.c         | 59 +++++++++++++++++--
 1 file changed, 54 insertions(+), 5 deletions(-)

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 5a32bb138158..77657f63a169 100644
--- a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
+++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
@@ -39,6 +39,24 @@ static const struct vpu_format enc_fmt_list[FMT_TYPES][MAX_FMTS] = {
 		{
 			.v4l2_pix_fmt = V4L2_PIX_FMT_NV21M,
 		},
+		{
+			.v4l2_pix_fmt = V4L2_PIX_FMT_YUV422P,
+		},
+		{
+			.v4l2_pix_fmt = V4L2_PIX_FMT_NV16,
+		},
+		{
+			.v4l2_pix_fmt = V4L2_PIX_FMT_NV61,
+		},
+		{
+			.v4l2_pix_fmt = V4L2_PIX_FMT_YUV422M,
+		},
+		{
+			.v4l2_pix_fmt = V4L2_PIX_FMT_NV16M,
+		},
+		{
+			.v4l2_pix_fmt = V4L2_PIX_FMT_NV61M,
+		},
 	}
 };
 
@@ -101,13 +119,30 @@ static int start_encode(struct vpu_instance *inst, u32 *fail_res)
 	struct vb2_v4l2_buffer *dst_buf;
 	struct frame_buffer frame_buf;
 	struct enc_param pic_param;
-	u32 stride = ALIGN(inst->dst_fmt.width, 32);
-	u32 luma_size = (stride * inst->dst_fmt.height);
-	u32 chroma_size = ((stride / 2) * (inst->dst_fmt.height / 2));
+	u32 stride = inst->src_fmt.plane_fmt[0].bytesperline;
+	u32 luma_size = (stride * inst->src_fmt.height);
+	u32 chroma_size = 0;
 
 	memset(&pic_param, 0, sizeof(struct enc_param));
 	memset(&frame_buf, 0, sizeof(struct frame_buffer));
 
+	if (inst->src_fmt.pixelformat == V4L2_PIX_FMT_YUV420 ||
+	    inst->src_fmt.pixelformat == V4L2_PIX_FMT_YUV420M)
+		chroma_size = luma_size / 4;
+	else if (inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV12 ||
+		 inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV21 ||
+		 inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV12M ||
+		 inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV21M)
+		chroma_size = luma_size / 2;
+	else if (inst->src_fmt.pixelformat == V4L2_PIX_FMT_YUV422P ||
+		 inst->src_fmt.pixelformat == V4L2_PIX_FMT_YUV422M)
+		chroma_size = luma_size / 2;
+	else if (inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV16 ||
+		 inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV61 ||
+		 inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV16M ||
+		 inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV61M)
+		chroma_size = luma_size;
+
 	dst_buf = v4l2_m2m_next_dst_buf(m2m_ctx);
 	if (!dst_buf) {
 		dev_dbg(inst->dev->dev, "%s: No destination buffer found\n", __func__);
@@ -490,11 +525,15 @@ static int wave5_vpu_enc_s_fmt_out(struct file *file, void *fh, struct v4l2_form
 	}
 
 	if (inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV12 ||
-	    inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV12M) {
+	    inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV12M ||
+	    inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV16 ||
+	    inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV16M) {
 		inst->cbcr_interleave = true;
 		inst->nv21 = false;
 	} else if (inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV21 ||
-		   inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV21M) {
+		   inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV21M ||
+		   inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV61 ||
+		   inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV61M) {
 		inst->cbcr_interleave = true;
 		inst->nv21 = true;
 	} else {
@@ -1086,6 +1125,16 @@ static void wave5_set_enc_openparam(struct enc_open_param *open_param,
 	u32 num_ctu_row = ALIGN(inst->dst_fmt.height, 64) / 64;
 	u32 num_mb_row = ALIGN(inst->dst_fmt.height, 16) / 16;
 
+	if (inst->src_fmt.pixelformat == V4L2_PIX_FMT_YUV422P ||
+	    inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV16 ||
+	    inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV61 ||
+	    inst->src_fmt.pixelformat == V4L2_PIX_FMT_YUV422M ||
+	    inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV16M ||
+	    inst->src_fmt.pixelformat == V4L2_PIX_FMT_NV61M)
+		open_param->src_format = FORMAT_422;
+	else
+		open_param->src_format = FORMAT_420;
+
 	open_param->wave_param.gop_preset_idx = PRESET_IDX_IPP_SINGLE;
 	open_param->wave_param.hvs_qp_scale = 2;
 	open_param->wave_param.hvs_max_delta_qp = 10;
-- 
2.43.0