commit 6faf61938b22ca862131dd10e50b8d48b556b7ee
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Mar 19 02:08:14 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 19 02:08:14 2024 +0000
tree cc3db0f656364c7db9bf624257f1a072b3d57fdd
parent afc36e913bd67af0288ce0e661d09006f1691fd0
parent 6c6901dd15a44c70a92cb6ea41e7a3386bcf60b1

Merge "C2SoftAomEnc: Enable VBR support in av1 encoder" into main

media/codec2/components/aom/C2SoftAomEnc.cpp

diff --git a/media/codec2/components/aom/C2SoftAomEnc.cpp b/media/codec2/components/aom/C2SoftAomEnc.cpp
index 7c9d3e8..128e16e 100644
--- a/media/codec2/components/aom/C2SoftAomEnc.cpp
+++ b/media/codec2/components/aom/C2SoftAomEnc.cpp
@@ -605,7 +605,7 @@
     mCodecConfiguration->g_timebase.den = 1000000;
     // rc_target_bitrate is in kbps, mBitrate in bps
     mCodecConfiguration->rc_target_bitrate = (mBitrate->value + 500) / 1000;
-    mCodecConfiguration->rc_end_usage = mBitrateControlMode == AOM_Q ? AOM_Q : AOM_CBR;
+    mCodecConfiguration->rc_end_usage = mBitrateControlMode;
     // Disable frame drop - not allowed in MediaCodec now.
     mCodecConfiguration->rc_dropframe_thresh = 0;
     // Disable lagged encoding.