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

Commit cd5ca902 authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "Add KEY_NUM_SLOTS to android.media.MediaFormat" into main am: fc0bd986 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3340833



Change-Id: I741ea2f8830b167f22feb408ef243be6a9bb55e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 66c8fb09 fc0bd986

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -23754,6 +23754,7 @@ package android.media { 
    field public static final String KEY_MPEGH_COMPATIBLE_SETS = "mpegh-compatible-sets";

    field public static final String KEY_MPEGH_PROFILE_LEVEL_INDICATION = "mpegh-profile-level-indication";

    field public static final String KEY_MPEGH_REFERENCE_CHANNEL_LAYOUT = "mpegh-reference-channel-layout";

    field @FlaggedApi("android.media.codec.num_input_slots") public static final String KEY_NUM_SLOTS = "num-slots";

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

    field public static final String KEY_OUTPUT_REORDER_DEPTH = "output-reorder-depth";

    field public static final String KEY_PCM_ENCODING = "pcm-encoding";

media/java/android/media/MediaFormat.java

+12 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.media;



import static android.media.codec.Flags.FLAG_IN_PROCESS_SW_AUDIO_CODEC;

import static android.media.codec.Flags.FLAG_NUM_INPUT_SLOTS;

import static android.media.codec.Flags.FLAG_REGION_OF_INTEREST;

import static android.media.codec.Flags.FLAG_APV_SUPPORT;
@@ -1776,6 +1777,17 @@ public final class MediaFormat { 
    @FlaggedApi(FLAG_IN_PROCESS_SW_AUDIO_CODEC)

    public static final String KEY_SECURITY_MODEL = "security-model";



    /**

     * A key describing the number of slots used in the codec. When present in input format,

     * the associated value indicates the number of input slots. The entry is set by the codec

     * if configured with (@link MediaCodec#CONFIGURE_FLAG_BLOCK_MODEL), and will be ignored if set

     * by the application.

     * <p>

     * The associated value is an integer.

     */

    @FlaggedApi(FLAG_NUM_INPUT_SLOTS)

    public static final String KEY_NUM_SLOTS = "num-slots";



    /**

     * QpOffsetRect constitutes the metadata required for encoding a region of interest in an

     * image or a video frame. The region of interest is represented by a rectangle. The four