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

Commit b8f4c0e6 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "media: add CBR_FD video encoding bitrate mode" into sc-dev

parents c296c468 5c0e40dc

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -21845,6 +21845,7 @@ package android.media { 
    method public android.util.Range<java.lang.Integer> getQualityRange();

    method public boolean isBitrateModeSupported(int);

    field public static final int BITRATE_MODE_CBR = 2; // 0x2

    field public static final int BITRATE_MODE_CBR_FD = 3; // 0x3

    field public static final int BITRATE_MODE_CQ = 0; // 0x0

    field public static final int BITRATE_MODE_VBR = 1; // 0x1

  }

media/java/android/media/MediaCodecInfo.java

+4 −1
Original line number Diff line number Diff line
@@ -3434,11 +3434,14 @@ public final class MediaCodecInfo { 
        public static final int BITRATE_MODE_VBR = 1;

        /** Constant bitrate mode */

        public static final int BITRATE_MODE_CBR = 2;

        /** Constant bitrate mode with frame drops */

        public static final int BITRATE_MODE_CBR_FD =  3;



        private static final Feature[] bitrates = new Feature[] {

            new Feature("VBR", BITRATE_MODE_VBR, true),

            new Feature("CBR", BITRATE_MODE_CBR, false),

            new Feature("CQ",  BITRATE_MODE_CQ,  false)

            new Feature("CQ",  BITRATE_MODE_CQ,  false),

            new Feature("CBR-FD", BITRATE_MODE_CBR_FD, false)

        };



        private static int parseBitrateMode(String mode) {