diff options
author | Andreas Huber <andih@google.com> | 2012-11-14 09:16:59 -0800 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2012-11-14 09:16:59 -0800 |
commit | 99a86d06333b0ff668f6c0d0294d1f72c7a40d8e (patch) | |
tree | 07fc063e881b9bed27fcd4928ac0ec9a282c2044 /media/java | |
parent | faa38a08d5998e32dcfe21e084076cbbb64ca0ea (diff) | |
download | frameworks_base-99a86d06333b0ff668f6c0d0294d1f72c7a40d8e.zip frameworks_base-99a86d06333b0ff668f6c0d0294d1f72c7a40d8e.tar.gz frameworks_base-99a86d06333b0ff668f6c0d0294d1f72c7a40d8e.tar.bz2 |
Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio content
and cannot be used to configure the _encoder_ to emit ADTS content.
Change-Id: I47177099b204027b726b2c7ec9b93be6835d88f6
related-to-bug: 7542186
Diffstat (limited to 'media/java')
-rw-r--r-- | media/java/android/media/MediaFormat.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index 4414191..169502b 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -50,7 +50,7 @@ import java.util.Map; * <tr><th>Name</th><th>Value Type</th><th>Description</th></tr> * <tr><td>{@link #KEY_CHANNEL_COUNT}</td><td>Integer</td><td></td></tr> * <tr><td>{@link #KEY_SAMPLE_RATE}</td><td>Integer</td><td></td></tr> - * <tr><td>{@link #KEY_IS_ADTS}</td><td>Integer</td><td>optional, if content is AAC audio, setting this key to 1 indicates that each audio frame is prefixed by the ADTS header.</td></tr> + * <tr><td>{@link #KEY_IS_ADTS}</td><td>Integer</td><td>optional, if <em>decoding</em> AAC audio content, setting this key to 1 indicates that each audio frame is prefixed by the ADTS header.</td></tr> * <tr><td>{@link #KEY_AAC_PROFILE}</td><td>Integer</td><td><b>encoder-only</b>, optional, if content is AAC audio, specifies the desired profile.</td></tr> * <tr><td>{@link #KEY_CHANNEL_MASK}</td><td>Integer</td><td>A mask of audio channel assignments</td></tr> * <tr><td>{@link #KEY_FLAC_COMPRESSION_LEVEL}</td><td>Integer</td><td><b>encoder-only</b>, optional, if content is FLAC audio, specifies the desired compression level.</td></tr> @@ -140,6 +140,8 @@ public final class MediaFormat { * A key mapping to a value of 1 if the content is AAC audio and * audio frames are prefixed with an ADTS header. * The associated value is an integer (0 or 1). + * This key is only supported when _decoding_ content, it cannot + * be used to configure an encoder to emit ADTS output. */ public static final String KEY_IS_ADTS = "is-adts"; |