Commit 9ac924b9 authored Oct 21, 2020 by Jernej Skrabec Committed by Mauro Carvalho Chehab Nov 05, 2020

media: cedrus: h264: Fix check for presence of scaling matrix



If scaling matrix control is present, VPU should not use default matrix.
Fix that.

Fixes: b3a23db0 ("media: cedrus: Use H264_SCALING_MATRIX only when required")
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Acked-by: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

parent e6fcf468

drivers/staging/media/sunxi/cedrus/cedrus_h264.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -446,7 +446,7 @@ static void cedrus_set_params(struct cedrus_ctx *ctx,
		reg \|= (pps->second_chroma_qp_index_offset & 0x3f) << 16;
		reg \|= (pps->chroma_qp_index_offset & 0x3f) << 8;
		reg \|= (pps->pic_init_qp_minus26 + 26 + slice->slice_qp_delta) & 0x3f;
		if (pps->flags & V4L2_H264_PPS_FLAG_SCALING_MATRIX_PRESENT)
		if (!(pps->flags & V4L2_H264_PPS_FLAG_SCALING_MATRIX_PRESENT))
		reg \|= VE_H264_SHS_QP_SCALING_MATRIX_DEFAULT;
		cedrus_write(dev, VE_H264_SHS_QP, reg);

Admin message