Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6324f6af authored by Fyodor Kyslov's avatar Fyodor Kyslov Committed by Automerger Merge Worker
Browse files

AV1Enc: Fixing VBR quality issue am: 90d99d6f 

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



Change-Id: I2bb506ddb49e5c8974171699b9620b15fb2ffd5e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dada212b 90d99d6f

media/codec2/components/aom/C2SoftAomEnc.cpp

+11 −5
Original line number Diff line number Diff line
@@ -542,15 +542,15 @@ status_t C2SoftAomEnc::initEncoder() { 
    mCodecConfiguration->kf_max_dist = 3000;

    // Encoder determines optimal key frame placement automatically.

    mCodecConfiguration->kf_mode = AOM_KF_AUTO;

    // Initial value of the buffer level in ms.

    mCodecConfiguration->rc_buf_initial_sz = 500;

    // Amount of data that the encoder should try to maintain in ms.

    mCodecConfiguration->rc_buf_optimal_sz = 600;

    // The amount of data that may be buffered by the decoding

    // application in ms.

    mCodecConfiguration->rc_buf_sz = 1000;



    if (mBitrateControlMode == AOM_CBR) {

        // Initial value of the buffer level in ms.

        mCodecConfiguration->rc_buf_initial_sz = 500;

        // Amount of data that the encoder should try to maintain in ms.

        mCodecConfiguration->rc_buf_optimal_sz = 600;

        // Maximum amount of bits that can be subtracted from the target

        // bitrate - expressed as percentage of the target bitrate.

        mCodecConfiguration->rc_undershoot_pct = 100;
@@ -563,7 +563,7 @@ status_t C2SoftAomEnc::initEncoder() { 
        mCodecConfiguration->rc_undershoot_pct = 100;

        // Maximum amount of bits that can be added to the target

        // bitrate - expressed as percentage of the target bitrate.

        mCodecConfiguration->rc_overshoot_pct = 25;

        mCodecConfiguration->rc_overshoot_pct = 100;

    }



    if (mIntf->getSyncFramePeriod() >= 0) {
@@ -576,6 +576,12 @@ status_t C2SoftAomEnc::initEncoder() { 
    }

    if (mMaxQuantizer > 0) {

        mCodecConfiguration->rc_max_quantizer = mMaxQuantizer;

    } else {

        if (mBitrateControlMode == AOM_VBR) {

            // For VBR we are limiting MaxQP to 52 (down 11 steps) to maintain quality

            // 52 comes from experiments done on libaom standalone app

            mCodecConfiguration->rc_max_quantizer = 52;

        }

    }



    mCodecContext = new aom_codec_ctx_t;