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

Commit 91cc4833 authored by Harish Mahendrakar's avatar Harish Mahendrakar Committed by Pawin Vongmasa
Browse files

C2SoftVpxEnc: Make VPX_VBR as default mode 

Use VPX_VBR as default bitrate mode instead of VPX_CBR

VideoEncoderDecoderTest in CTS doesn't set bitrate mode and
VPX_CBR mode shows encoding artifacts when running that test

Test: cts-tradefed run cts -m CtsVideoTestCases  -t \
 android.video.cts.VideoEncoderDecoderTest#testAvcGoog0Qual0640x0360
Bug: 135891350

Change-Id: I488273113b4d5cf4ae2f4b8208fcebdd095aa6f5
parent 2cbc7cd8

media/codec2/components/vpx/C2SoftVpxEnc.cpp

+5 −5
Original line number Diff line number Diff line
@@ -127,13 +127,13 @@ status_t C2SoftVpxEnc::initEncoder() { 
    }



    switch (mBitrateMode->value) {

        case C2Config::BITRATE_VARIABLE:

            mBitrateControlMode = VPX_VBR;

            break;

        case C2Config::BITRATE_CONST:

        default:

            mBitrateControlMode = VPX_CBR;

            break;

        case C2Config::BITRATE_VARIABLE:

        [[fallthrough]];

        default:

            mBitrateControlMode = VPX_VBR;

            break;

    }

media/codec2/components/vpx/C2SoftVpxEnc.h

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ class C2SoftVpxEnc::IntfImpl : public SimpleInterface<void>::BaseParams { 
        addParameter(

            DefineParam(mBitrateMode, C2_PARAMKEY_BITRATE_MODE)

                .withDefault(new C2StreamBitrateModeTuning::output(

                        0u, C2Config::BITRATE_CONST))

                        0u, C2Config::BITRATE_VARIABLE))

                .withFields({

                    C2F(mBitrateMode, value).oneOf({

                        C2Config::BITRATE_CONST, C2Config::BITRATE_VARIABLE })