diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/MediaFormat.java | 18 |
2 files changed, 18 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 0361c7d..167216f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -14991,6 +14991,7 @@ package android.media { field public static final java.lang.String KEY_AAC_SBR_MODE = "aac-sbr-mode"; field public static final java.lang.String KEY_BITRATE_MODE = "bitrate-mode"; field public static final java.lang.String KEY_BIT_RATE = "bitrate"; + field public static final java.lang.String KEY_CAPTURE_RATE = "capture-rate"; field public static final java.lang.String KEY_CHANNEL_COUNT = "channel-count"; field public static final java.lang.String KEY_CHANNEL_MASK = "channel-mask"; field public static final java.lang.String KEY_COLOR_FORMAT = "color-format"; diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index a95348f..a1ccf60 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -43,7 +43,8 @@ import java.util.Map; * <tr><td>{@link #KEY_COLOR_FORMAT}</td><td>Integer</td><td>set by the user * for encoders, readable in the output format of decoders</b></td></tr> * <tr><td>{@link #KEY_FRAME_RATE}</td><td>Integer or Float</td><td><b>encoder-only</b></td></tr> - * <tr><td>{@link #KEY_I_FRAME_INTERVAL}</td><td>Integer</td><td><b>encoder-only</b></td></tr> + * <tr><td>{@link #KEY_CAPTURE_RATE}</td><td>Integer</td><td></td></tr> +* <tr><td>{@link #KEY_I_FRAME_INTERVAL}</td><td>Integer</td><td><b>encoder-only</b></td></tr> * <tr><td>{@link #KEY_MAX_WIDTH}</td><td>Integer</td><td><b>decoder-only</b>, optional, max-resolution width</td></tr> * <tr><td>{@link #KEY_MAX_HEIGHT}</td><td>Integer</td><td><b>decoder-only</b>, optional, max-resolution height</td></tr> * <tr><td>{@link #KEY_REPEAT_PREVIOUS_FRAME_AFTER}</td><td>Long</td><td><b>video encoder in surface-mode only</b></td></tr> @@ -206,6 +207,21 @@ public final class MediaFormat { public static final String KEY_FRAME_RATE = "frame-rate"; /** + * A key describing the capture rate of a video format in frames/sec. + * <p> + * When capture rate is different than the frame rate, it means that the + * video is acquired at a different rate than the playback, which produces + * slow motion or timelapse effect during playback. Application can use the + * value of this key to tell the relative speed ratio between capture and + * playback rates when the video was recorded. + * </p> + * <p> + * The associated value is an integer or a float. + * </p> + */ + public static final String KEY_CAPTURE_RATE = "capture-rate"; + + /** * A key describing the frequency of I frames expressed in secs * between I frames. * The associated value is an integer. |