Thread (16 messages) 16 messages, 4 authors, 2020-01-16

Re: [PATCH v2 2/4] media: cedrus: hevc: Add support for scaling matrix

From: Jernej Škrabec <hidden>
Date: 2020-01-16 19:49:14
Also in: linux-media, lkml 

Dne sreda, 08. januar 2020 ob 15:46:50 CET je Hans Verkuil napisal(a):
On 1/7/20 6:10 PM, Jernej Škrabec wrote:
quoted
Hi!

Dne torek, 07. januar 2020 ob 16:01:16 CET je Hans Verkuil napisal(a):
quoted
On 12/13/19 5:04 PM, Jernej Skrabec wrote:
quoted
HEVC frames may use scaling list feature. Add support for it.

Signed-off-by: Jernej Skrabec <redacted>
---

 drivers/staging/media/sunxi/cedrus/cedrus.c   |  7 ++
 drivers/staging/media/sunxi/cedrus/cedrus.h   |  1 +
 .../staging/media/sunxi/cedrus/cedrus_dec.c   |  2 +
 .../staging/media/sunxi/cedrus/cedrus_h265.c  | 70 ++++++++++++++++++-
 .../staging/media/sunxi/cedrus/cedrus_regs.h  |  2 +
 5 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c
b/drivers/staging/media/sunxi/cedrus/cedrus.c index
c6ddd46eff82..bf68bc6b20c8 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.c
@@ -116,6 +116,13 @@ static const struct cedrus_control
cedrus_controls[]
= {>

 		.codec		= CEDRUS_CODEC_H265,
 		.required	= true,
 	
 	},

+	{
+		.cfg = {
+			.id	=
V4L2_CID_MPEG_VIDEO_HEVC_SCALING_MATRIX,
quoted
quoted
+		},
+		.codec		= CEDRUS_CODEC_H265,
+		.required	= true,
Should this be true? This means that existing applications are now
suddenly required to always pass the scaling matrix for every buffer.

Especially since the commit log says: 'HEVC frames *may* use scaling list
feature', indicating that this is an optional feature.
True. Can you fix this when applying if this is the only issue?
I realized that after changing this to false, you also need to document
what happens if you do NOT set this control in the request.

Does it fall back to default values? It looks like the HEVC spec defines
some defaults (if I understand it correctly).
This control is needed only when V4L2_HEVC_SPS_FLAG_SCALING_LIST_ENABLED is 
set. If flag is set but control is not provided, then it doesn't really matter 
if default values or old values of control are used, image will be incorrectly 
decoded anyway. I think it's more important that buffer is marked with 
VB2_BUF_STATE_ERROR in such case.

Best regards,
Jernej

Regards,

	Hans
quoted
Best regards,
Jernej
quoted
Regards,

	Hans
quoted
+	},

 	{
 	
 		.cfg = {
 		
 			.id	=
V4L2_CID_MPEG_VIDEO_HEVC_DECODE_MODE,
quoted
quoted
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h
b/drivers/staging/media/sunxi/cedrus/cedrus.h index
96765555ab8a..d945f4f0ff2d 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus.h
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.h
@@ -73,6 +73,7 @@ struct cedrus_h265_run {

 	const struct v4l2_ctrl_hevc_sps			*sps;
 	const struct v4l2_ctrl_hevc_pps			*pps;
 	const struct v4l2_ctrl_hevc_slice_params	*slice_params;

+	const struct v4l2_ctrl_hevc_scaling_matrix
*scaling_matrix;
quoted
quoted
 };
 
 struct cedrus_run {

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_dec.c
b/drivers/staging/media/sunxi/cedrus/cedrus_dec.c index
4a2fc33a1d79..327ed6c264dc 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_dec.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_dec.c
@@ -66,6 +66,8 @@ void cedrus_device_run(void *priv)

 			V4L2_CID_MPEG_VIDEO_HEVC_PPS);
 		
 		run.h265.slice_params = cedrus_find_control_data(ctx,
 		
 			V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS);

+		run.h265.scaling_matrix = cedrus_find_control_data(ctx,
+			V4L2_CID_MPEG_VIDEO_HEVC_SCALING_MATRIX);

 		break;
 	
 	default:
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c index
6945dc74e1d7..888bfd5ca224 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
@@ -220,6 +220,69 @@ static void cedrus_h265_pred_weight_write(struct
cedrus_dev *dev,>

 	}
 
 }

+static void cedrus_h265_write_scaling_list(struct cedrus_ctx *ctx,
+					   struct cedrus_run
*run)
quoted
quoted
+{
+	const struct v4l2_ctrl_hevc_scaling_matrix *scaling;
+	struct cedrus_dev *dev = ctx->dev;
+	u32 i, j, k, val;
+
+	scaling = run->h265.scaling_matrix;
+
+	cedrus_write(dev, VE_DEC_H265_SCALING_LIST_DC_COEF0,
+		     (scaling->scaling_list_dc_coef_32x32[1] << 24) |
+		     (scaling->scaling_list_dc_coef_32x32[0] << 16) |
+		     (scaling->scaling_list_dc_coef_16x16[1] << 8) |
+		     (scaling->scaling_list_dc_coef_16x16[0] << 0));
+
+	cedrus_write(dev, VE_DEC_H265_SCALING_LIST_DC_COEF1,
+		     (scaling->scaling_list_dc_coef_16x16[5] << 24) |
+		     (scaling->scaling_list_dc_coef_16x16[4] << 16) |
+		     (scaling->scaling_list_dc_coef_16x16[3] << 8) |
+		     (scaling->scaling_list_dc_coef_16x16[2] << 0));
+
+	cedrus_h265_sram_write_offset(dev,
VE_DEC_H265_SRAM_OFFSET_SCALING_LISTS); +
+	for (i = 0; i < 6; i++)
+		for (j = 0; j < 8; j++)
+			for (k = 0; k < 8; k += 4) {
+				val = ((u32)scaling-
scaling_list_8x8[i][j + (k + 3) * 8] << 24) |
quoted
+				      ((u32)scaling-
scaling_list_8x8[i][j + (k + 2) * 8] << 16) |
quoted
+				      ((u32)scaling-
scaling_list_8x8[i][j + (k + 1) * 8] << 8) |
quoted
+				      scaling-
scaling_list_8x8[i][j + k * 8];
quoted
+				cedrus_write(dev,
VE_DEC_H265_SRAM_DATA, val);
quoted
quoted
+			}
+
+	for (i = 0; i < 2; i++)
+		for (j = 0; j < 8; j++)
+			for (k = 0; k < 8; k += 4) {
+				val = ((u32)scaling-
scaling_list_32x32[i][j + (k + 3) * 8] << 24) |
quoted
+				      ((u32)scaling-
scaling_list_32x32[i][j + (k + 2) * 8] << 16) |
quoted
+				      ((u32)scaling-
scaling_list_32x32[i][j + (k + 1) * 8] << 8) |
quoted
+				      scaling-
scaling_list_32x32[i][j + k * 8];
quoted
+				cedrus_write(dev,
VE_DEC_H265_SRAM_DATA, val);
quoted
quoted
+			}
+
+	for (i = 0; i < 6; i++)
+		for (j = 0; j < 8; j++)
+			for (k = 0; k < 8; k += 4) {
+				val = ((u32)scaling-
scaling_list_16x16[i][j + (k + 3) * 8] << 24) |
quoted
+				      ((u32)scaling-
scaling_list_16x16[i][j + (k + 2) * 8] << 16) |
quoted
+				      ((u32)scaling-
scaling_list_16x16[i][j + (k + 1) * 8] << 8) |
quoted
+				      scaling-
scaling_list_16x16[i][j + k * 8];
quoted
+				cedrus_write(dev,
VE_DEC_H265_SRAM_DATA, val);
quoted
quoted
+			}
+
+	for (i = 0; i < 6; i++)
+		for (j = 0; j < 4; j++) {
+			val = ((u32)scaling->scaling_list_4x4[i][j +
12] << 24) |
quoted
quoted
+			      ((u32)scaling->scaling_list_4x4[i][j +
8] << 16) |
quoted
quoted
+			      ((u32)scaling->scaling_list_4x4[i][j +
4] << 8) |
quoted
quoted
+			      scaling->scaling_list_4x4[i][j];
+			cedrus_write(dev, VE_DEC_H265_SRAM_DATA,
val);
quoted
quoted
+		}
+}
+

 static void cedrus_h265_setup(struct cedrus_ctx *ctx,
 
 			      struct cedrus_run *run)
 
 {

@@ -499,7 +562,12 @@ static void cedrus_h265_setup(struct cedrus_ctx
*ctx,

 	/* Scaling list. */

-	reg = VE_DEC_H265_SCALING_LIST_CTRL0_DEFAULT;
+	if (sps->flags & V4L2_HEVC_SPS_FLAG_SCALING_LIST_ENABLED) {
+		cedrus_h265_write_scaling_list(ctx, run);
+		reg = VE_DEC_H265_SCALING_LIST_CTRL0_FLAG_ENABLED;
+	} else {
+		reg = VE_DEC_H265_SCALING_LIST_CTRL0_DEFAULT;
+	}

 	cedrus_write(dev, VE_DEC_H265_SCALING_LIST_CTRL0, reg);
 	
 	/* Neightbor information address. */

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_regs.h
b/drivers/staging/media/sunxi/cedrus/cedrus_regs.h index
7beb03d3bb39..0d9449fe2b28 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_regs.h
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_regs.h
@@ -492,6 +492,8 @@

 #define VE_DEC_H265_ENTRY_POINT_OFFSET_ADDR	(VE_ENGINE_DEC_H265 +
0x64)
quoted
quoted
 #define VE_DEC_H265_TILE_START_CTB		(VE_ENGINE_DEC_H265 +
0x68)
quoted
quoted
 #define VE_DEC_H265_TILE_END_CTB		(VE_ENGINE_DEC_H265 +
0x6c)
quoted
quoted
+#define VE_DEC_H265_SCALING_LIST_DC_COEF0	(VE_ENGINE_DEC_H265 +
0x78)
quoted
quoted
+#define VE_DEC_H265_SCALING_LIST_DC_COEF1	(VE_ENGINE_DEC_H265 +
0x7c)
quoted
quoted
 #define VE_DEC_H265_LOW_ADDR			
(VE_ENGINE_DEC_H265 +
quoted
0x80)




_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help