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

Commit 3b0bf852 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add constants needed for applying Picture Profile to MediaCodec" into main

parents b65432e4 aee95f1c

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -24166,6 +24166,8 @@ package android.media { 
    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";

    field @FlaggedApi("android.media.tv.flags.apply_picture_profiles") public static final String KEY_PICTURE_PROFILE_ID = "picture-profile-id";

    field @FlaggedApi("android.media.tv.flags.apply_picture_profiles") public static final String KEY_PICTURE_PROFILE_INSTANCE = "picture-profile-instance";

    field public static final String KEY_PICTURE_TYPE = "picture-type";

    field public static final String KEY_PIXEL_ASPECT_RATIO_HEIGHT = "sar-height";

    field public static final String KEY_PIXEL_ASPECT_RATIO_WIDTH = "sar-width";

media/java/android/media/MediaFormat.java

+23 −2
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 


package android.media;





import static android.media.audio.Flags.FLAG_IAMF_DEFINITIONS_API;

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

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;

import static android.media.tv.flags.Flags.FLAG_APPLY_PICTURE_PROFILES;



import static com.android.media.codec.flags.Flags.FLAG_CODEC_IMPORTANCE;

import static com.android.media.codec.flags.Flags.FLAG_LARGE_AUDIO_FRAME;
@@ -1795,6 +1795,27 @@ public final class MediaFormat { 
    @FlaggedApi(FLAG_NUM_INPUT_SLOTS)

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



    /**

     * A key describing the picture profile ID to be applied to {@link MediaCodec}.

     * <p>

     * The associated value is a string.

     * <p>

     * @see {@link android.media.quality.PictureProfile}

     * @see {@link android.media.quality.PictureProfile#getProfileId}

     */

    @FlaggedApi(FLAG_APPLY_PICTURE_PROFILES)

    public static final String KEY_PICTURE_PROFILE_ID = "picture-profile-id";



    /**

     * A key describing the picture profile instance to be applied to {@link MediaCodec}.

     * <p>

     * The associated value is an instance of {@link android.media.quality.PictureProfile}.

     * <p>

     * @see {@link android.media.quality.PictureProfile}

     */

    @FlaggedApi(FLAG_APPLY_PICTURE_PROFILES)

    public static final String KEY_PICTURE_PROFILE_INSTANCE = "picture-profile-instance";



    /**

     * 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