Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30676a70 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am bb2985aa: am 683028ca: Merge "Make it clear that non-optional MediaFormat... 

am bb2985aa: am 683028ca: Merge "Make it clear that non-optional MediaFormat keys are required" into jb-mr1.1-dev

* commit 'bb2985aa':
  Make it clear that non-optional MediaFormat keys are required
parents 7ee2f778 bb2985aa

media/java/android/media/MediaFormat.java

+2 −2
Original line number Diff line number Diff line
@@ -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>

 *