From 3ad8bdbd5a7308d46276a1c64ccfe6313006300d Mon Sep 17 00:00:00 2001
From: Wonsik Kim <wonsik@google.com>
Date: Fri, 15 Apr 2022 00:23:51 -0700
Subject: [PATCH] MediaCodecInfo: when explicitly specified reset default
 bitrate mode

Bug: 229146532
Test: presubmit
Change-Id: I8bf0c36f471991ab546acd9cf47a3defc13d13ff
---
 media/java/android/media/MediaCodecInfo.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java
index 77709d7d38232..5c75e47cbd195 100644
--- a/media/java/android/media/MediaCodecInfo.java
+++ b/media/java/android/media/MediaCodecInfo.java
@@ -3634,6 +3634,7 @@ public final class MediaCodecInfo {
                         .parseIntRange(info.getString("quality-range"), mQualityRange);
             }
             if (info.containsKey("feature-bitrate-modes")) {
+                mBitControl = 0;
                 for (String mode: info.getString("feature-bitrate-modes").split(",")) {
                     mBitControl |= (1 << parseBitrateMode(mode));
                 }