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

Commit 729cb8b2 authored by Pawin Vongmasa's avatar Pawin Vongmasa Committed by android-build-merger
Browse files

Merge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev 

am: 9b1a9b4f

Change-Id: Ibdfb6f003c7467f58c9232d807d52b327e2187af
parents a17abfef 9b1a9b4f

media/java/android/media/MediaCodecInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -2749,8 +2749,8 @@ public final class MediaCodecInfo { 
                mQualityRange = Utils

                        .parseIntRange(info.getString("quality-range"), mQualityRange);

            }

            if (info.containsKey("feature-bitrate-control")) {

                for (String mode: info.getString("feature-bitrate-control").split(",")) {

            if (info.containsKey("feature-bitrate-modes")) {

                for (String mode: info.getString("feature-bitrate-modes").split(",")) {

                    mBitControl |= parseBitrateMode(mode);

                }

            }