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

Commit e2c7e2ad authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Add compression level key for FLAC encoding" into jb-dev

parents 2c2864f6 08fb063f

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11261,6 +11261,7 @@ package android.media { 
    field public static final java.lang.String KEY_CHANNEL_MASK = "channel-mask";

    field public static final java.lang.String KEY_COLOR_FORMAT = "color-format";

    field public static final java.lang.String KEY_DURATION = "durationUs";

    field public static final java.lang.String KEY_FLAC_COMPRESSION_LEVEL = "flac-compression-level";

    field public static final java.lang.String KEY_FRAME_RATE = "frame-rate";

    field public static final java.lang.String KEY_HEIGHT = "height";

    field public static final java.lang.String KEY_IS_ADTS = "is-adts";

media/java/android/media/MediaFormat.java

+8 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import java.util.Map; 
 * <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_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>

 * </table>

 *

 */
@@ -155,6 +156,13 @@ public final class MediaFormat { 
     */

    public static final String KEY_AAC_PROFILE = "aac-profile";



    /**

     * A key describing the FLAC compression level to be used (FLAC audio format only).

     * The associated value is an integer ranging from 0 (fastest, least compression)

     * to 8 (slowest, most compression).

     */

    public static final String KEY_FLAC_COMPRESSION_LEVEL = "flac-compression-level";



    /* package private */ MediaFormat(Map<String, Object> map) {

        mMap = map;

    }