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

Commit 3e59f30c authored by Santiago Seifert's avatar Santiago Seifert Committed by Android (Google) Code Review
Browse files

Merge "MediaFormat: Add ENCODER_DELAY and ENCODER_PADDING"

parents 96c4ee05 8095a83b

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -25367,6 +25367,8 @@ package android.media { 
    field public static final String KEY_COMPLEXITY = "complexity";

    field public static final String KEY_CREATE_INPUT_SURFACE_SUSPENDED = "create-input-buffers-suspended";

    field public static final String KEY_DURATION = "durationUs";

    field public static final String KEY_ENCODER_DELAY = "encoder-delay";

    field public static final String KEY_ENCODER_PADDING = "encoder-padding";

    field public static final String KEY_FLAC_COMPRESSION_LEVEL = "flac-compression-level";

    field public static final String KEY_FRAME_RATE = "frame-rate";

    field public static final String KEY_GRID_COLUMNS = "grid-cols";

media/java/android/media/MediaFormat.java

+14 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ import java.util.stream.Collectors; 
 * <tr><td>{@link #KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT}</td><td>Integer</td><td><b>decoder-only</b>, optional, if content is AAC audio, specifies the maximum number of channels the decoder outputs.</td></tr>

 * <tr><td>{@link #KEY_AAC_DRC_EFFECT_TYPE}</td><td>Integer</td><td><b>decoder-only</b>, optional, if content is AAC audio, specifies the MPEG-D DRC effect type to use.</td></tr>

 * <tr><td>{@link #KEY_CHANNEL_MASK}</td><td>Integer</td><td>optional, a mask of audio channel assignments</td></tr>

 * <tr><td>{@link #KEY_ENCODER_DELAY}</td><td>Integer</td><td>optional, the number of frames to trim from the start of the decoded audio stream.</td></tr>

 * <tr><td>{@link #KEY_ENCODER_PADDING}</td><td>Integer</td><td>optional, the number of frames to trim from the end of the decoded audio stream.</td></tr>

 * <tr><td>{@link #KEY_FLAC_COMPRESSION_LEVEL}</td><td>Integer</td><td><b>encoder-only</b>, optional, if content is FLAC audio, specifies the desired compression level.</td></tr>

 * </table>

 *
@@ -568,6 +570,18 @@ public final class MediaFormat { 
     */

    public static final String KEY_CHANNEL_MASK = "channel-mask";



    /**

     * A key describing the number of frames to trim from the start of the decoded audio stream.

     * The associated value is an integer.

     */

    public static final String KEY_ENCODER_DELAY = "encoder-delay";



    /**

     * A key describing the number of frames to trim from the end of the decoded audio stream.

     * The associated value is an integer.

     */

    public static final String KEY_ENCODER_PADDING = "encoder-padding";



    /**

     * A key describing the AAC profile to be used (AAC audio formats only).

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