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

Commit 1b7b191b authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "MediaFormat: deprecate KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT" into tm-dev

parents 7e0c385a a030e80b

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -22190,7 +22190,7 @@ package android.media { 
    field public static final String KEY_AAC_DRC_OUTPUT_LOUDNESS = "aac-drc-output-loudness";

    field public static final String KEY_AAC_DRC_TARGET_REFERENCE_LEVEL = "aac-target-ref-level";

    field public static final String KEY_AAC_ENCODED_TARGET_LEVEL = "aac-encoded-target-level";

    field public static final String KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT = "aac-max-output-channel_count";

    field @Deprecated public static final String KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT = "aac-max-output-channel_count";

    field public static final String KEY_AAC_PROFILE = "aac-profile";

    field public static final String KEY_AAC_SBR_MODE = "aac-sbr-mode";

    field public static final String KEY_ALLOW_FRAME_DROP = "allow-frame-drop";

media/java/android/media/MediaFormat.java

+4 −1
Original line number Diff line number Diff line
@@ -793,8 +793,11 @@ public final class MediaFormat { 
     * By default, the decoder will output the same number of channels as present in the encoded

     * stream, if supported. Set this value to limit the number of output channels, and use

     * the downmix information in the stream, if available.

     * <p>Values larger than the number of channels in the content to decode are ignored.

     * <p>Values larger than the number of channels in the content to decode behave just

     * like the actual channel count of the content (e.g. passing 99 for the decoding of 5.1 content

     * will behave like using 6).

     * <p>This key is only used during decoding.

     * @deprecated Use the non-AAC-specific key {@link #KEY_MAX_OUTPUT_CHANNEL_COUNT} instead

     */

    public static final String KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT = "aac-max-output-channel_count";