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

Commit 76ef9b07 authored by Ronghua Wu's avatar Ronghua Wu Committed by Android (Google) Code Review
Browse files

Merge "media: add MediaFormat.KEY_OPERATING_RATE."

parents f42d4936 3392ce4a

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -15483,6 +15483,7 @@ package android.media { 
    field public static final java.lang.String KEY_MAX_INPUT_SIZE = "max-input-size";

    field public static final java.lang.String KEY_MAX_WIDTH = "max-width";

    field public static final java.lang.String KEY_MIME = "mime";

    field public static final java.lang.String KEY_OPERATING_RATE = "operating-rate";

    field public static final java.lang.String KEY_PRIORITY = "priority";

    field public static final java.lang.String KEY_PROFILE = "profile";

    field public static final java.lang.String KEY_PUSH_BLANK_BUFFERS_ON_STOP = "push-blank-buffers-on-shutdown";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -16693,6 +16693,7 @@ package android.media { 
    field public static final java.lang.String KEY_MAX_INPUT_SIZE = "max-input-size";

    field public static final java.lang.String KEY_MAX_WIDTH = "max-width";

    field public static final java.lang.String KEY_MIME = "mime";

    field public static final java.lang.String KEY_OPERATING_RATE = "operating-rate";

    field public static final java.lang.String KEY_PRIORITY = "priority";

    field public static final java.lang.String KEY_PROFILE = "profile";

    field public static final java.lang.String KEY_PUSH_BLANK_BUFFERS_ON_STOP = "push-blank-buffers-on-shutdown";

media/java/android/media/MediaFormat.java

+16 −0
Original line number Diff line number Diff line
@@ -438,6 +438,22 @@ public final class MediaFormat { 
     */

    public static final String KEY_PRIORITY = "priority";



    /**

     * A key describing the desired operating frame rate for video or sample rate for audio

     * that the codec will need to operate at.

     * <p>

     * The associated value is an integer or a float representing frames-per-second or

     * samples-per-second

     * <p>

     * This is used for cases like high-speed/slow-motion video capture, where the video encoder

     * format contains the target playback rate (e.g. 30fps), but the component must be able to

     * handle the high operating capture rate (e.g. 240fps).

     * <p>

     * This rate will be used by codec for resource planning and setting the operating points.

     *

     */

    public static final String KEY_OPERATING_RATE = "operating-rate";



    /**

     * A key describing the desired profile to be used by an encoder.

     * Constants are declared in {@link MediaCodecInfo.CodecProfileLevel}.