commit 91cc4833c8befec65d7032b73ce214c0c444dd7c
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Thu Jun 27 11:25:58 2019 -0700
committer Pawin Vongmasa <pawin@google.com> Fri Jun 28 01:50:15 2019 -0700
tree 8a5677a1e531d0b6d8e70b796298c387f2dc5d6a
parent 2cbc7cd807382e371ad5ae71039afccb9641433c

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

media/codec2/components/vpx/C2SoftVpxEnc.cpp

diff --git a/media/codec2/components/vpx/C2SoftVpxEnc.cpp b/media/codec2/components/vpx/C2SoftVpxEnc.cpp
index 6509a88..6dab70b 100644
--- a/media/codec2/components/vpx/C2SoftVpxEnc.cpp
+++ b/media/codec2/components/vpx/C2SoftVpxEnc.cpp
@@ -127,14 +127,14 @@
     }
 
     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();