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

Commit 15b00ade authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Automerger Merge Worker
Browse files

MediaFormat: fix key value for KEY_MAX_OUTPUT_CHANNEL_COUNT am: a991d6bd am: 42bf4dc5 

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

Change-Id: I3ae18c87b8db42e5cd8442d17eef7c5baff874d8
parents dc89b434 42bf4dc5

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -22672,7 +22672,7 @@ package android.media { 
    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_OUTPUT_CHANNEL_COUNT = "max-output-channel_count";

    field public static final String KEY_MAX_OUTPUT_CHANNEL_COUNT = "max-output-channel-count";

    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";

media/java/android/media/MediaFormat.java

+1 −1
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ public final class MediaFormat { 
     * <p>This key is only used during decoding.

     */

    public static final String KEY_MAX_OUTPUT_CHANNEL_COUNT =

            "max-output-channel_count";

            "max-output-channel-count";



    /**

     * A key describing the number of frames to trim from the start of the decoded audio stream.