diff options
| author | Andreas Huber <andih@google.com> | 2013-08-19 08:45:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-19 08:45:24 -0700 |
| commit | 2a3c822316e48612d8bf5825429d2d958e73e14a (patch) | |
| tree | be62feeafa16599c20d10619716cde1cbeba63ff | |
| parent | 22982e84a68f6c28d4bf4b52ad9dec7932f37a62 (diff) | |
| parent | df959eea70faa91757aa9d7e8f77468125f67e00 (diff) | |
| download | frameworks_base-2a3c822316e48612d8bf5825429d2d958e73e14a.zip frameworks_base-2a3c822316e48612d8bf5825429d2d958e73e14a.tar.gz frameworks_base-2a3c822316e48612d8bf5825429d2d958e73e14a.tar.bz2 | |
am df959eea: am e79ba154: Merge "Expose KEY_REPEAT_PREVIOUS_FRAME_AFTER and KEY_PUSH_BLANK_BUFFERS_ON_STOP" into klp-dev
* commit 'df959eea70faa91757aa9d7e8f77468125f67e00':
Expose KEY_REPEAT_PREVIOUS_FRAME_AFTER and KEY_PUSH_BLANK_BUFFERS_ON_STOP
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | media/java/android/media/MediaFormat.java | 20 |
2 files changed, 22 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 22e3517..4fb2fb9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12628,6 +12628,8 @@ package android.media { field public static final java.lang.String KEY_LANGUAGE = "language"; field public static final java.lang.String KEY_MAX_INPUT_SIZE = "max-input-size"; field public static final java.lang.String KEY_MIME = "mime"; + field public static final java.lang.String KEY_PUSH_BLANK_BUFFERS_ON_STOP = "push-blank-buffers-on-shutdown"; + field public static final java.lang.String KEY_REPEAT_PREVIOUS_FRAME_AFTER = "repeat-previous-frame-after"; field public static final java.lang.String KEY_SAMPLE_RATE = "sample-rate"; field public static final java.lang.String KEY_WIDTH = "width"; } diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index 278d661..949a42c 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -44,6 +44,8 @@ import java.util.Map; * 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_REPEAT_PREVIOUS_FRAME_AFTER}</td><td>Long</td><td><b>video encoder in surface-mode only</b></td></tr> + * <tr><td>{@link #KEY_PUSH_BLANK_BUFFERS_ON_STOP}</td><td>Integer(1)</td><td><b>video decoder rendering to a surface only</b></td></tr> * </table> * * Audio formats have the following keys: @@ -143,6 +145,24 @@ public final class MediaFormat { public static final String KEY_SLICE_HEIGHT = "slice-height"; /** + * Applies only when configuring a video encoder in "surface-input" mode. + * The associated value is a long and gives the time in microseconds + * after which the frame previously submitted to the encoder will be + * repeated (once) if no new frame became available since. + */ + public static final String KEY_REPEAT_PREVIOUS_FRAME_AFTER + = "repeat-previous-frame-after"; + + /** + * If specified when configuring a video decoder rendering to a surface, + * causes the decoder to output "blank", i.e. black frames to the surface + * when stopped to clear out any previously displayed contents. + * The associated value is an integer of value 1. + */ + public static final String KEY_PUSH_BLANK_BUFFERS_ON_STOP + = "push-blank-buffers-on-shutdown"; + + /** * A key describing the duration (in microseconds) of the content. * The associated value is a long. */ |