diff options
| author | 2022-03-17 14:29:49 +0000 | |
|---|---|---|
| committer | 2022-03-17 14:29:49 +0000 | |
| commit | 1b7b191bdf1788ef22ea0202a41c281ee4e80c07 (patch) | |
| tree | fe053f95bc4d5e3b362d66fc1a0396ad68a97b8e | |
| parent | 7e0c385a660ca0b6e7abd48d1d444b9c803dd6dd (diff) | |
| parent | a030e80bdf4e63e5d091a273ca2ebe53692b1e7c (diff) | |
Merge "MediaFormat: deprecate KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT" into tm-dev
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | media/java/android/media/MediaFormat.java | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 02c30e3b1722..ec63a050a727 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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"; diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index 4956dbefa240..7d3f91653cea 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -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"; |