Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MediaFormat: codec-agnostic key for max number of output channels" into sc-v2-dev am: d159eccc3c

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

Change-Id: I2e098e9f0893fed5868d1082af0782f4af9c3709
This commit is contained in:
TreeHugger Robot
2021-10-16 03:09:46 +00:00
committed by Automerger Merge Worker
parent 5e9b4cb84b d159eccc3c
commit 6b50a648d7
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -22599,6 +22599,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_FPS_TO_ENCODER = "max-fps-to-encoder";
field public static final String KEY_MAX_HEIGHT = "max-height"; 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_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_PTS_GAP_TO_ENCODER = "max-pts-gap-to-encoder"; 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_MAX_WIDTH = "max-width";
field public static final String KEY_MIME = "mime"; field public static final String KEY_MIME = "mime";

13
media/java/android/media/MediaFormat.java
View File

@@ -682,6 +682,19 @@ public final class MediaFormat {
*/ */
public static final String KEY_CHANNEL_MASK = "channel-mask"; public static final String KEY_CHANNEL_MASK = "channel-mask";
/**
* A key describing the maximum number of channels that can be output by an audio decoder.
* 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 behave like the number
* of channels in the content (if applicable), for instance passing 99 for a 5.1 audio stream
* behaves like passing 6.
* <p>This key is only used during decoding.
*/
public static final String KEY_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. * A key describing the number of frames to trim from the start of the decoded audio stream.
* The associated value is an integer. * The associated value is an integer.