From a030e80bdf4e63e5d091a273ca2ebe53692b1e7c Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Wed, 16 Mar 2022 17:44:21 -0700 Subject: MediaFormat: deprecate KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT Deprecate AAC-specific key KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT, whose usage can be replaced by the codec agnostic key KEY_MAX_OUTPUT_CHANNEL_COUNT. Bug: 204239218 Test: atest DecoderTestAacFormat Change-Id: Iad24e511eeee95266a4e9a7f70904968e27afc6d --- core/api/current.txt | 2 +- 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 19ffd36eb47a..eba63e40c0cf 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -22172,7 +22172,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. - *

Values larger than the number of channels in the content to decode are ignored. + *

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). *

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"; -- cgit v1.2.3-59-g8ed1b