commit 887f63e4d4efb80ba0dabfb287f00338da9cb4cc
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Oct 21 20:04:07 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 21 20:04:07 2024 +0000
tree c9e2b64b5cfa2327541dde201022f0044d380143
parent e108058a32be6d14eb1a88d4c639d219271d73a5
parent e58ae2915643fd115532e1fb31dbe90dc0c266fe

Merge "C2SoftAomEnc: set AOME_SET_MAX_INTRA_BITRATE_PCT" into main am: e58ae29156

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3305826

Change-Id: I4be41e6363d7fe6b1e3cd8585ab2f73103ebf7b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/codec2/components/aom/C2SoftAomEnc.cpp

diff --git a/media/codec2/components/aom/C2SoftAomEnc.cpp b/media/codec2/components/aom/C2SoftAomEnc.cpp
index 722b13a..93009c4 100644
--- a/media/codec2/components/aom/C2SoftAomEnc.cpp
+++ b/media/codec2/components/aom/C2SoftAomEnc.cpp
@@ -466,6 +466,7 @@
 
 aom_codec_err_t C2SoftAomEnc::setupCodecParameters() {
     aom_codec_err_t codec_return = AOM_CODEC_OK;
+    const int maxIntraBitratePct = mBitrateControlMode == AOM_CBR ? 300 : 450;
 
     codec_return = aom_codec_control(mCodecContext, AV1E_SET_TARGET_SEQ_LEVEL_IDX, mAV1EncLevel);
     if (codec_return != AOM_CODEC_OK) goto BailOut;
@@ -492,6 +493,10 @@
     codec_return = aom_codec_control(mCodecContext, AV1E_SET_AQ_MODE, 3);
     if (codec_return != AOM_CODEC_OK) goto BailOut;
 
+    codec_return = aom_codec_control(mCodecContext, AOME_SET_MAX_INTRA_BITRATE_PCT,
+                                     maxIntraBitratePct);
+    if (codec_return != AOM_CODEC_OK) goto BailOut;
+
     codec_return = aom_codec_control(mCodecContext, AV1E_SET_COEFF_COST_UPD_FREQ, 3);
     if (codec_return != AOM_CODEC_OK) goto BailOut;