diff --git a/api/current.txt b/api/current.txt index 7d655cc6dfee7..35759560ceaa8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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"; diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index df77c9e8e98ee..4414191be531e 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -53,6 +53,7 @@ import java.util.Map; * {@link #KEY_IS_ADTS}Integeroptional, if content is AAC audio, setting this key to 1 indicates that each audio frame is prefixed by the ADTS header. * {@link #KEY_AAC_PROFILE}Integerencoder-only, optional, if content is AAC audio, specifies the desired profile. * {@link #KEY_CHANNEL_MASK}IntegerA mask of audio channel assignments + * {@link #KEY_FLAC_COMPRESSION_LEVEL}Integerencoder-only, optional, if content is FLAC audio, specifies the desired compression level. * * */ @@ -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 map) { mMap = map; }