Merge "MediaFormat: codec-agnostic key for max number of output channels" into sc-v2-dev (d159eccc) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -22582,6 +22582,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_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";

+13 −0

Original line number	Diff line number	Diff line
		@@ -682,6 +682,19 @@ public final class MediaFormat {
		*/
		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.
		* The associated value is an integer.