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

Commit 6e2b382a authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "MediaCodecInfo: when explicitly specified reset default bitrate mode"... 

Merge "MediaCodecInfo: when explicitly specified reset default bitrate mode" am: 61c2096d am: 996fc3da

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2065608



Change-Id: I669731e46868d9e90139b7cd62e39d19667b48cb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f19bebfc 996fc3da

media/java/android/media/MediaCodecInfo.java

+1 −0
Original line number Diff line number Diff line
@@ -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));

                }