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

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

Merge "Make KEY_MAX_PTS_GAP_TO_ENCODER and KEY_MAX_FPS_TO_ENCODER keys public"

parents c3136ab9 625f0aad

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -25009,8 +25009,10 @@ 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_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";

    field public static final String KEY_MAX_PTS_GAP_TO_ENCODER = "max-pts-gap-to-encoder";

    field public static final String KEY_MAX_WIDTH = "max-width";

    field public static final String KEY_MIME = "mime";

    field public static final String KEY_OPERATING_RATE = "operating-rate";

media/java/android/media/MediaFormat.java

+0 −2
Original line number Diff line number Diff line
@@ -470,7 +470,6 @@ public final class MediaFormat { 
     * The associated value is a float, representing the max frame rate to

     * feed the encoder at.

     *

     * @hide

     */

    public static final String KEY_MAX_FPS_TO_ENCODER

        = "max-fps-to-encoder";
@@ -495,7 +494,6 @@ public final class MediaFormat { 
     * important to ensure all frames are captured (rather than captured in the

     * correct order).

     *

     * @hide

     */

    public static final String KEY_MAX_PTS_GAP_TO_ENCODER

        = "max-pts-gap-to-encoder";