mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Arun Iyengar via B4 Relay <devnull+aiyengar1990.gmail.com@kernel.org>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
	 Rob Herring <robh@kernel.org>,
	Krzysztof Kozlowski <krzk+dt@kernel.org>,
	 Conor Dooley <conor+dt@kernel.org>,
	Heiko Stuebner <heiko@sntech.de>,
	 Philipp Zabel <p.zabel@pengutronix.de>
Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org,
	devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	"Paul Kocialkowski" <paulk@sys-base.io>,
	"Sven Püschel" <s.pueschel@pengutronix.de>,
	"Nicolas Dufresne" <nicolas.dufresne@collabora.com>,
	"Detlev Casanova" <detlev.casanova@collabora.com>,
	"Hans Verkuil" <hverkuil@kernel.org>,
	"Jiaxing Hu" <gahing@gahingwoo.com>,
	"Arun Iyengar" <aiyengar1990@gmail.com>
Subject: [PATCH RFC 06/12] media: rockchip: rkvenc: Use MPP's moving-scene H.264 RDO tuning
Date: Tue, 10 Nov 2026 10:08:08 +0000	[thread overview]
Message-ID: <20261110-rkvenc-v1-6-ea8b47122d8c@gmail.com> (raw)
In-Reply-To: <20261110-rkvenc-v1-0-ea8b47122d8c@gmail.com>

From: Arun Iyengar <aiyengar1990@gmail.com>

The H.264 mode decision and motion search registers had the values of
MPP's still-scene tuning set. MPP keeps two sets and switches per picture
from a motion detector (hal_h264e_vepu580_tune.c): the still-scene one
biases the decision towards intra and skip blocks and toward the zero
motion vector against flicker in surveillance video; the moving-scene
one is neutral: ATF weights 16, ATR weights 20, CIME/RIME cost
multipliers 4, no anti-flicker skip or intra, zero PMV off, no CIME SAD
early exits, move lambda 8, P dead zone 341/1024, ATR QP threshold 51,
intra cost thresholds 0 and the intra chroma weights.

Use the moving-scene set for every picture, and start the RDO lambda
table one entry lower than MPP (index 5, lambda / 2^(1/3)). At a fixed QP
(22-36, 1080p60 clips) this needs 7% (animation) to 11% (natural video)
fewer bits for the same PSNR-Y than the still-scene set with MPP's
lambda.

Signed-off-by: Arun Iyengar <aiyengar1990@gmail.com>
---
 .../media/platform/rockchip/rkvenc/rkvenc-h264.c   |  3 +-
 .../platform/rockchip/rkvenc/rkvenc-vepu580.c      | 79 +++++++++++-----------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/drivers/media/platform/rockchip/rkvenc/rkvenc-h264.c b/drivers/media/platform/rockchip/rkvenc/rkvenc-h264.c
index 227d341d060b..665c54278029 100644
--- a/drivers/media/platform/rockchip/rkvenc/rkvenc-h264.c
+++ b/drivers/media/platform/rockchip/rkvenc/rkvenc-h264.c
@@ -333,8 +333,7 @@ static void rkvenc_h264_setup_syntax(struct rkvenc_core *core,
 	rkvenc_set(core, VEPU580_H264_SYNT_REFM2, 0);
 
 	val = VEPU580_RDO_CFG_INTER_4X4 | VEPU580_RDO_CFG_CHRM_SPCL |
-	      VEPU580_RDO_CFG_CCWA_E | VEPU580_RDO_CFG_ATR_E |
-	      VEPU580_RDO_CFG_ATF_INTRA_E;
+	      VEPU580_RDO_CFG_CCWA_E | VEPU580_RDO_CFG_ATR_E;
 	if (sps->profile_idc == RKVENC_H264_PROFILE_BASELINE &&
 	    sps->level_idc <= 30)
 		val |= VEPU580_RDO_CFG_RECT_SIZE;
diff --git a/drivers/media/platform/rockchip/rkvenc/rkvenc-vepu580.c b/drivers/media/platform/rockchip/rkvenc/rkvenc-vepu580.c
index 86703dc659f6..f14d5ae0b7f7 100644
--- a/drivers/media/platform/rockchip/rkvenc/rkvenc-vepu580.c
+++ b/drivers/media/platform/rockchip/rkvenc/rkvenc-vepu580.c
@@ -336,12 +336,18 @@ void vepu580_setup_h264_tuning(struct rkvenc_dev *rkvenc,
 	const s8 *aq_step = intra ? vepu580_aq_step_i : vepu580_aq_step_p;
 	unsigned int i;
 
-	/* Intra prediction cost / mode decision */
-	rkvenc_set(core, VEPU580_IPRD_CSTS,
-		   FIELD_PREP(VEPU580_IPRD_CSTS_VTHD_Y, 9) |
-		   FIELD_PREP(VEPU580_IPRD_CSTS_VTHD_C, 63));
+	/*
+	 * MPP has two H.264 tuning sets and picks one per picture from a
+	 * motion detector: one for still scenes (surveillance cameras), which
+	 * biases the mode decision towards intra and skip blocks against
+	 * flicker, and a neutral one for moving content. The neutral one is
+	 * used for every picture: at the same QP it needs 7-11% fewer bits
+	 * for the same PSNR on moving clips. With it the intra prediction
+	 * cost thresholds are 0 and the chroma weights start at entry 0.
+	 */
+	rkvenc_set(core, VEPU580_IPRD_CSTS, 0);
 
-	vepu580_setup_klut(core, intra);
+	vepu580_setup_klut(core, true);
 
 	rkvenc_set(core, VEPU580_MADI_CFG, FIELD_PREP(VEPU580_MADI_CFG_MADI_THD, 25));
 	rkvenc_set(core, VEPU580_MD_SAD_THD, pack4(4, 9, 15, 0));
@@ -363,23 +369,23 @@ void vepu580_setup_h264_tuning(struct rkvenc_dev *rkvenc,
 	rkvenc_set(core, VEPU580_LVL16_INTRA_CST_THD1, pack2x12(9, 36));
 	rkvenc_set(core, VEPU580_LVL8_INTRA_CST_THD0, pack2x12(1, 4));
 	rkvenc_set(core, VEPU580_LVL8_INTRA_CST_THD1, pack2x12(9, 36));
-	rkvenc_set(core, VEPU580_LVL16_INTRA_UL_CST_THD, 0);
+	rkvenc_set(core, VEPU580_LVL16_INTRA_UL_CST_THD, 2501);
 	rkvenc_set(core, VEPU580_LVL32_INTRA_CST_WGT0, pack4(48, 60, 40, 48));
 	rkvenc_set(core, VEPU580_LVL32_INTRA_CST_WGT1, pack4(48, 60, 40, 48));
 	rkvenc_set(core, VEPU580_LVL16_INTRA_CST_WGT0, pack4(48, 60, 40, 48));
 	rkvenc_set(core, VEPU580_LVL16_INTRA_CST_WGT1, pack4(36, 42, 28, 32));
 
-	/* Quantisation dead zone: 683/1024 (I) or 583/1024, 171/1024 (P) */
+	/* Quantisation dead zone: 683/1024 (I) or 583/1024, 341/1024 (P) */
 	rkvenc_set(core, VEPU580_RDO_QUANT,
 		   FIELD_PREP(VEPU580_RDO_QUANT_F_BIAS_I, intra ? 683 : 583) |
-		   FIELD_PREP(VEPU580_RDO_QUANT_F_BIAS_P, 171));
+		   FIELD_PREP(VEPU580_RDO_QUANT_F_BIAS_P, 341));
 
 	/* Adaptive transform (H.264 only) */
 	if (intra) {
 		rkvenc_set(core, VEPU580_ATR_THD0, pack2x12(1, 4));
 		rkvenc_set(core, VEPU580_ATR_THD1,
 			   FIELD_PREP(VEPU580_ATR_THD1_THD2, 36) |
-			   FIELD_PREP(VEPU580_ATR_THD1_THDQP, 45));
+			   FIELD_PREP(VEPU580_ATR_THD1_THDQP, 51));
 		rkvenc_set(core, VEPU580_LVL16_ATR_WGT, pack4(16, 16, 16, 0));
 		rkvenc_set(core, VEPU580_LVL8_ATR_WGT, pack4(22, 21, 20, 0));
 		rkvenc_set(core, VEPU580_LVL4_ATR_WGT, pack4(20, 18, 16, 0));
@@ -387,19 +393,15 @@ void vepu580_setup_h264_tuning(struct rkvenc_dev *rkvenc,
 		rkvenc_set(core, VEPU580_ATR_THD0, pack2x12(4, 16));
 		rkvenc_set(core, VEPU580_ATR_THD1,
 			   FIELD_PREP(VEPU580_ATR_THD1_THD2, 81) |
-			   FIELD_PREP(VEPU580_ATR_THD1_THDQP, 45));
-		rkvenc_set(core, VEPU580_LVL16_ATR_WGT, pack4(22, 19, 16, 0));
-		rkvenc_set(core, VEPU580_LVL8_ATR_WGT, pack4(22, 19, 18, 0));
-		rkvenc_set(core, VEPU580_LVL4_ATR_WGT, pack4(22, 19, 16, 0));
+			   FIELD_PREP(VEPU580_ATR_THD1_THDQP, 51));
+		rkvenc_set(core, VEPU580_LVL16_ATR_WGT, pack4(20, 20, 20, 0));
+		rkvenc_set(core, VEPU580_LVL8_ATR_WGT, pack4(20, 20, 20, 0));
+		rkvenc_set(core, VEPU580_LVL4_ATR_WGT, pack4(20, 20, 20, 0));
 	}
 
-	/*
-	 * Motion search quality / cost multipliers. Where MPP's tuning differs
-	 * per scene mode, the values of its default (non-IPC) mode are used.
-	 */
+	/* Motion search quality / cost multipliers (neutral set) */
 	rkvenc_set(core, VEPU580_CIME_SQI_CFG,
 		   VEPU580_CIME_SQI_CFG_SAD_BIG_BLOCK |
-		   VEPU580_CIME_SQI_CFG_PMV_SET_ZERO |
 		   FIELD_PREP(VEPU580_CIME_SQI_CFG_PMV_NUM, 3));
 	rkvenc_set(core, VEPU580_CIME_SQI_THD,
 		   FIELD_PREP(VEPU580_CIME_SQI_THD_MVD_TH0, 32) |
@@ -407,49 +409,48 @@ void vepu580_setup_h264_tuning(struct rkvenc_dev *rkvenc,
 		   FIELD_PREP(VEPU580_CIME_SQI_THD_MVD_TH2, 128));
 	rkvenc_set(core, VEPU580_CIME_SQI_MULTI0,
 		   FIELD_PREP(VEPU580_CIME_SQI_MULTI_LO, 4) |
-		   FIELD_PREP(VEPU580_CIME_SQI_MULTI_HI, 7));
+		   FIELD_PREP(VEPU580_CIME_SQI_MULTI_HI, 4));
 	rkvenc_set(core, VEPU580_CIME_SQI_MULTI1,
-		   FIELD_PREP(VEPU580_CIME_SQI_MULTI_LO, 20) |
-		   FIELD_PREP(VEPU580_CIME_SQI_MULTI_HI, 20));
+		   FIELD_PREP(VEPU580_CIME_SQI_MULTI_LO, 4) |
+		   FIELD_PREP(VEPU580_CIME_SQI_MULTI_HI, 4));
 	rkvenc_set(core, VEPU580_RIME_SQI_THD,
-		   FIELD_PREP(VEPU580_RIME_SQI_THD_CIME_SAD_TH0, 50) |
 		   FIELD_PREP(VEPU580_RIME_SQI_THD_MVD_TH0, 3) |
 		   FIELD_PREP(VEPU580_RIME_SQI_THD_MVD_TH1, 8));
 	rkvenc_set(core, VEPU580_RIME_SQI_MULTI,
 		   FIELD_PREP(VEPU580_RIME_SQI_MULTI0, 4) |
-		   FIELD_PREP(VEPU580_RIME_SQI_MULTI1, 16) |
-		   FIELD_PREP(VEPU580_RIME_SQI_MULTI2, 64));
-	rkvenc_set(core, VEPU580_FME_SQI_THD0,
-		   FIELD_PREP(VEPU580_FME_SQI_THD0_PU16_TH, 2));
+		   FIELD_PREP(VEPU580_RIME_SQI_MULTI1, 4) |
+		   FIELD_PREP(VEPU580_RIME_SQI_MULTI2, 4));
+	rkvenc_set(core, VEPU580_FME_SQI_THD0, 0);
 	rkvenc_set(core, VEPU580_FME_SQI_THD1,
-		   FIELD_PREP(VEPU580_FME_SQI_THD1_MOVE_LAMBDA, 1));
+		   FIELD_PREP(VEPU580_FME_SQI_THD1_MOVE_LAMBDA, 8));
 
-	/* RDO lambda, intra prediction weights stay zero for H.264 */
+	/*
+	 * RDO lambda, intra prediction weights stay zero for H.264. MPP
+	 * starts at entry 6 (its lambda_idx); entry 5, one 2^(1/3) step
+	 * lower, saves 3-4% of the bits at the same PSNR.
+	 */
 	for (i = 0; i < 52; i++)
-		rkvenc_set(core, VEPU580_RDO_WGTA_QP(i), vepu580_h264_lambda[i + 6]);
+		rkvenc_set(core, VEPU580_RDO_WGTA_QP(i), vepu580_h264_lambda[i + 5]);
 
-	/* RDO intra / skip thresholds and weights */
-	rkvenc_set(core, VEPU580_RDO_SQI_CFG, VEPU580_RDO_SQI_CFG_ATF_PSKIP_EN);
+	/* RDO intra / skip thresholds and weights; no anti-flicker skips */
+	rkvenc_set(core, VEPU580_RDO_SQI_CFG, 0);
 	rkvenc_set(core, VEPU580_RDO_INTRA_CIME_THD0, pack2x12(28, 44));
 	rkvenc_set(core, VEPU580_RDO_INTRA_CIME_THD1, pack2x12(72, 0));
 	rkvenc_set(core, VEPU580_RDO_INTRA_VAR_THD(0), pack2x12(25, 64));
 	rkvenc_set(core, VEPU580_RDO_INTRA_VAR_THD(1), pack2x12(25, 64));
 	rkvenc_set(core, VEPU580_RDO_INTRA_VAR_THD(2), pack2x12(70, 100));
 	rkvenc_set(core, VEPU580_RDO_INTRA_VAR_THD(3), pack2x12(70, 100));
-	rkvenc_set(core, VEPU580_RDO_INTRA_ATF_WGT(0), pack4(22, 21, 20, 0));
-	rkvenc_set(core, VEPU580_RDO_INTRA_ATF_WGT(1), pack4(21, 20, 19, 0));
-	rkvenc_set(core, VEPU580_RDO_INTRA_ATF_WGT(2), pack4(20, 19, 18, 0));
-	rkvenc_set(core, VEPU580_RDO_INTRA_ATF_WGT(3), pack4(16, 16, 16, 0));
+	for (i = 0; i < 4; i++)
+		rkvenc_set(core, VEPU580_RDO_INTRA_ATF_WGT(i), pack4(16, 16, 16, 0));
 	rkvenc_set(core, VEPU580_RDO_SKIP_CIME_THD0, pack2x12(10, 8));
 	rkvenc_set(core, VEPU580_RDO_SKIP_CIME_THD1, pack2x12(15, 25));
 	rkvenc_set(core, VEPU580_RDO_SKIP_VAR_THD(0), pack2x12(25, 40));
 	rkvenc_set(core, VEPU580_RDO_SKIP_VAR_THD(1), pack2x12(25, 40));
 	rkvenc_set(core, VEPU580_RDO_SKIP_VAR_THD(2), pack2x12(70, 100));
 	rkvenc_set(core, VEPU580_RDO_SKIP_VAR_THD(3), pack2x12(70, 100));
-	rkvenc_set(core, VEPU580_RDO_SKIP_ATF_WGT(0), pack4(20, 16, 16, 16));
-	rkvenc_set(core, VEPU580_RDO_SKIP_ATF_WGT(1), pack4(16, 16, 16, 0));
-	rkvenc_set(core, VEPU580_RDO_SKIP_ATF_WGT(2), pack4(16, 16, 16, 0));
-	rkvenc_set(core, VEPU580_RDO_SKIP_ATF_WGT(3), pack4(16, 16, 16, 0));
+	rkvenc_set(core, VEPU580_RDO_SKIP_ATF_WGT(0), pack4(16, 16, 16, 16));
+	for (i = 1; i < 4; i++)
+		rkvenc_set(core, VEPU580_RDO_SKIP_ATF_WGT(i), pack4(16, 16, 16, 0));
 
 	/* Flat quantisation tables */
 	memcpy(&core->shadow[VEPU580_SCL_START / 4], rkvenc->h264_scl,

-- 
2.55.0



  parent reply	other threads:[~2026-11-10 10:08 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-10 10:08 [PATCH RFC 00/12] media: rockchip: Add a VEPU580 stateless H.264/HEVC encoder driver for the RK3588 Arun Iyengar via B4 Relay
2026-11-10 10:08 ` [PATCH RFC 01/12] dt-bindings: media: Add the Rockchip VEPU580 video encoder Arun Iyengar via B4 Relay
2026-11-10 10:08 ` [PATCH RFC 02/12] media: rockchip: Add a VEPU580 stateless video encoder driver Arun Iyengar via B4 Relay
2026-11-10 10:08 ` [PATCH RFC 03/12] media: rockchip: rkvenc: Prepare the VEPU580 helpers for a second codec Arun Iyengar via B4 Relay
2026-11-10 10:08 ` [PATCH RFC 04/12] media: rockchip: rkvenc: Add HEVC encoding Arun Iyengar via B4 Relay
2026-11-10 10:08 ` [PATCH RFC 05/12] media: rockchip: rkvenc: Don't enable adaptive QP with the row rate control Arun Iyengar via B4 Relay
2026-11-10 10:08 ` Arun Iyengar via B4 Relay [this message]
2026-11-10 10:08 ` [PATCH RFC 07/12] media: rockchip: rkvenc: Encode pictures wider than 4096 pixels Arun Iyengar via B4 Relay
2026-11-10 10:08 ` [PATCH RFC 08/12] media: rockchip: rkvenc: Encode HEVC wider than 4096 pixels in tile columns Arun Iyengar via B4 Relay
2026-11-10 10:08 ` [PATCH RFC 09/12] media: rockchip: rkvenc: Limit the QP of the HEVC I pictures to 15..51 Arun Iyengar via B4 Relay
2026-11-10 10:08 ` [PATCH RFC 10/12] media: rockchip: rkvenc: Re-encode oversized HEVC pictures Arun Iyengar via B4 Relay
2026-11-10 10:08 ` [PATCH RFC 11/12] media: rockchip: rkvenc: Offer VBR for H.264 encoding Arun Iyengar via B4 Relay
2026-11-10 10:08 ` [PATCH RFC 12/12] arm64: dts: rockchip: Add the VEPU580 encoder cores to the RK3588 Arun Iyengar via B4 Relay

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261110-rkvenc-v1-6-ea8b47122d8c@gmail.com \
    --to=devnull+aiyengar1990.gmail.com@kernel.org \
    --cc=aiyengar1990@gmail.com \
    --cc=conor+dt@kernel.org \
    --cc=detlev.casanova@collabora.com \
    --cc=devicetree@vger.kernel.org \
    --cc=gahing@gahingwoo.com \
    --cc=heiko@sntech.de \
    --cc=hverkuil@kernel.org \
    --cc=krzk+dt@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=mchehab@kernel.org \
    --cc=nicolas.dufresne@collabora.com \
    --cc=p.zabel@pengutronix.de \
    --cc=paulk@sys-base.io \
    --cc=robh@kernel.org \
    --cc=s.pueschel@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®