diff options
| author | Andreas Huber <andih@google.com> | 2012-12-05 11:12:26 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-12-05 14:28:22 -0800 |
| commit | 4df82703a7274876c03e65f7baf643f1ed55d29c (patch) | |
| tree | eeecc3d8ab7551cca3b5e4feca6d70241effe30e /media/java | |
| parent | 7b0855715bc6cb14e3ca67d815915d2172f0bc12 (diff) | |
| download | frameworks_base-4df82703a7274876c03e65f7baf643f1ed55d29c.zip frameworks_base-4df82703a7274876c03e65f7baf643f1ed55d29c.tar.gz frameworks_base-4df82703a7274876c03e65f7baf643f1ed55d29c.tar.bz2 | |
Make it clear that non-optional MediaFormat keys are required
Also mark KEY_CHANNEL_MASK optional.
Change-Id: I569087f564dc60a89b15a3440a9b1c538927f610
related-to-bug: 7623602
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaFormat.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index 169502b..a2eb8d9 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -26,7 +26,7 @@ import java.util.Map; * * The format of the media data is specified as string/value pairs. * - * Keys common to all formats: + * Keys common to all formats, <b>all keys not marked optional are mandatory</b>: * * <table> * <tr><th>Name</th><th>Value Type</th><th>Description</th></tr> @@ -52,7 +52,7 @@ import java.util.Map; * <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 <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_CHANNEL_MASK}</td><td>Integer</td><td>optional, 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> * </table> * |