diff options
| author | 2012-12-05 11:12:26 -0800 | |
|---|---|---|
| committer | 2012-12-05 11:12:26 -0800 | |
| commit | 08067d376eae087bfaf8fdb66b5983106f98ac25 (patch) | |
| tree | 01a3c1caf0473365b396c0a60339de2108e546e9 | |
| parent | e81f55bae83559a39778fdd6a3e0b031c65dc8f9 (diff) | |
Make it clear that non-optional MediaFormat keys are required
Also mark KEY_CHANNEL_MASK optional.
Change-Id: I569087f564dc60a89b15a3440a9b1c538927f610
| -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 169502b68162..a2eb8d99ee2f 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> * |