diff options
| author | Andreas Huber <andih@google.com> | 2013-08-19 15:39:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-19 15:39:29 +0000 |
| commit | e79ba1545323f067bbd22d1e89ed329f7ec1d011 (patch) | |
| tree | 4a51cb20b377e685793d0b120bc112819bb74c4c /media | |
| parent | f01f1e9b9e6b9ced969d79489619947fd5fedcbe (diff) | |
| parent | 8f4d43c3c4c419d5a652f81c5e01554f61d4caf2 (diff) | |
| download | frameworks_base-e79ba1545323f067bbd22d1e89ed329f7ec1d011.zip frameworks_base-e79ba1545323f067bbd22d1e89ed329f7ec1d011.tar.gz frameworks_base-e79ba1545323f067bbd22d1e89ed329f7ec1d011.tar.bz2 | |
Merge "Expose KEY_REPEAT_PREVIOUS_FRAME_AFTER and KEY_PUSH_BLANK_BUFFERS_ON_STOP" into klp-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/MediaFormat.java | 20 |
1 files changed, 20 insertions, 0 deletions
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. */ |