Merge "C2SoftVpxEnc: Make VPX_VBR as default mode" into qt-dev

am: 5b9e5ab9da Change-Id: I6a4285128c70281fa9fd958ffa0ff63cc1a92aa4
5 years ago · bb4add7fb0
parent cefdaf6690 5b9e5ab9da
commit bb4add7fb0
2 changed files with 6 additions and 6 deletions
--- a/media/codec2/components/vpx/C2SoftVpxEnc.cpp
+++ b/media/codec2/components/vpx/C2SoftVpxEnc.cpp
@ -127,14 +127,14 @@ status_t C2SoftVpxEnc::initEncoder() {
    }

    switch (mBitrateMode->value) {
-        case C2Config::BITRATE_VARIABLE:
-            mBitrateControlMode = VPX_VBR;
-            break;
        case C2Config::BITRATE_CONST:
-        default:
            mBitrateControlMode = VPX_CBR;
            break;
-        break;
+        case C2Config::BITRATE_VARIABLE:
+        [[fallthrough]];
+        default:
+            mBitrateControlMode = VPX_VBR;
+            break;
    }

    setCodecSpecificInterface();
--- a/media/codec2/components/vpx/C2SoftVpxEnc.h
+++ b/media/codec2/components/vpx/C2SoftVpxEnc.h
@ -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 })