Commit fd902918 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab
Browse files

media: rkvdec: Use H264_SCALING_MATRIX only when required 



Baseline, Main and Extended profiles are specified to
not support a scaling matrix. Also, High profiles
can optionally specify a scaling matrix, using
SPS and PPS NAL units.

To meet this expectation, applications are required to
set the V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX control
and set the V4L2_H264_PPS_FLAG_SCALING_MATRIX_PRESENT
flag only when a scaling matrix is specified for a picture.

Implement this on rkvdec, which has hardware support for this
case.

Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Tested-by: default avatarJonas Karlman <jonas@kwiboo.se>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent d3951cfc

drivers/staging/media/rkvdec/rkvdec-h264.c

+7 −3
Original line number Diff line number Diff line
@@ -708,9 +708,9 @@ static void assemble_hw_pps(struct rkvdec_ctx *ctx, 
	WRITE_PPS(pps->second_chroma_qp_index_offset,

		  SECOND_CHROMA_QP_INDEX_OFFSET);



	/* always use the matrix sent from userspace */

	WRITE_PPS(1, SCALING_LIST_ENABLE_FLAG);



	WRITE_PPS(!!(pps->flags & V4L2_H264_PPS_FLAG_SCALING_MATRIX_PRESENT),

		  SCALING_LIST_ENABLE_FLAG);

	/* To be on the safe side, program the scaling matrix address */

	scaling_distance = offsetof(struct rkvdec_h264_priv_tbl, scaling_list);

	scaling_list_address = h264_ctx->priv_tbl.dma + scaling_distance;

	WRITE_PPS(scaling_list_address, SCALING_LIST_ADDRESS);
@@ -792,9 +792,13 @@ static void assemble_hw_scaling_list(struct rkvdec_ctx *ctx, 
				     struct rkvdec_h264_run *run)

{

	const struct v4l2_ctrl_h264_scaling_matrix *scaling = run->scaling_matrix;

	const struct v4l2_ctrl_h264_pps *pps = run->pps;

	struct rkvdec_h264_ctx *h264_ctx = ctx->priv;

	struct rkvdec_h264_priv_tbl *tbl = h264_ctx->priv_tbl.cpu;



	if (!(pps->flags & V4L2_H264_PPS_FLAG_SCALING_MATRIX_PRESENT))

		return;



	BUILD_BUG_ON(sizeof(tbl->scaling_list.scaling_list_4x4) !=

		     sizeof(scaling->scaling_list_4x4));

	BUILD_BUG_ON(sizeof(tbl->scaling_list.scaling_list_8x8) !=

drivers/staging/media/rkvdec/rkvdec.c

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ static const struct rkvdec_ctrl_desc rkvdec_h264_ctrl_descs[] = { 
		.cfg.id = V4L2_CID_MPEG_VIDEO_H264_PPS,

	},

	{

		.mandatory = true,

		.cfg.id = V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX,

	},

	{

CRA Git | Maintained and supported by SUSTech CRA and CCSE