diff options
| author | Andreas Huber <andih@google.com> | 2012-11-14 10:24:24 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-14 10:24:24 -0800 |
| commit | 35de48317f51a1331e2c6f279c5a2e76b65469ad (patch) | |
| tree | 6961d6b46f1a61e96afa85e56fdf5a6844bba898 /media | |
| parent | e2a2fe4ef3695baf3c7dca1637373ebd968a4704 (diff) | |
| parent | d1e8f467602307090f36a899b47f5088d0bc0201 (diff) | |
| download | frameworks_base-35de48317f51a1331e2c6f279c5a2e76b65469ad.zip frameworks_base-35de48317f51a1331e2c6f279c5a2e76b65469ad.tar.gz frameworks_base-35de48317f51a1331e2c6f279c5a2e76b65469ad.tar.bz2 | |
am d1e8f467: am 99a86d06: Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio content
* commit 'd1e8f467602307090f36a899b47f5088d0bc0201':
Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio content
Diffstat (limited to 'media')
| -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"; |