| commit | e188b7aa2854fd8640ccb3dfc2f2e96b04600623 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Mar 19 02:32:07 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 19 02:32:07 2024 +0000 |
| tree | cc3db0f656364c7db9bf624257f1a072b3d57fdd | |
| parent | 78b8ec6c40bcf7905b01a892fb4d567ac77a5634 [diff] | |
| parent | 6faf61938b22ca862131dd10e50b8d48b556b7ee [diff] |
Merge "C2SoftAomEnc: Enable VBR support in av1 encoder" into main am: 6faf61938b Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2997378 Change-Id: I6c640d31a4b67198d0f9381f408b0b5eeef7cc27 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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.