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

Commit e79ba154 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Expose KEY_REPEAT_PREVIOUS_FRAME_AFTER and KEY_PUSH_BLANK_BUFFERS_ON_STOP" into klp-dev

parents f01f1e9b 8f4d43c3

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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";

  }

media/java/android/media/MediaFormat.java

+20 −0
Original line number Diff line number Diff line
@@ -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:
@@ -142,6 +144,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.