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

Commit 49cf94e9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "media: rename KEY_MAX_BFRAMES to KEY_MAX_B_FRAMES"

parents 53b7e93c d18e1f34

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -25072,7 +25072,7 @@ package android.media { 
    field public static final String KEY_LANGUAGE = "language";

    field public static final String KEY_LATENCY = "latency";

    field public static final String KEY_LEVEL = "level";

    field public static final String KEY_MAX_BFRAMES = "max-bframes";

    field public static final String KEY_MAX_B_FRAMES = "max-bframes";

    field public static final String KEY_MAX_FPS_TO_ENCODER = "max-fps-to-encoder";

    field public static final String KEY_MAX_HEIGHT = "max-height";

    field public static final String KEY_MAX_INPUT_SIZE = "max-input-size";

media/java/android/media/MediaFormat.java

+1 −1
Original line number Diff line number Diff line
@@ -1060,7 +1060,7 @@ public final class MediaFormat { 
     * that no B frames are allowed. Note that non-zero value does not guarantee

     * B frames; it's up to the encoder to decide.

     */

    public static final String KEY_MAX_BFRAMES = "max-bframes";

    public static final String KEY_MAX_B_FRAMES = "max-bframes";



    /* package private */ MediaFormat(@NonNull Map<String, Object> map) {

        mMap = map;