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

Commit bf124a3f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "media: add KEY_COLOR_TRANSFER_REQUEST" into sc-dev am: 31cce824 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e09236ce2f9e8117e5743ff206fbf689eeeea89
parents 66e22356 31cce824

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -21896,6 +21896,7 @@ package android.media { 
    field public static final String KEY_COLOR_RANGE = "color-range";

    field public static final String KEY_COLOR_STANDARD = "color-standard";

    field public static final String KEY_COLOR_TRANSFER = "color-transfer";

    field public static final String KEY_COLOR_TRANSFER_REQUEST = "color-transfer-request";

    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";

media/java/android/media/MediaFormat.java

+16 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.annotation.IntDef; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.compat.annotation.UnsupportedAppUsage;

import android.util.Log;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -1153,6 +1152,22 @@ public final class MediaFormat { 
     */

    public static final String KEY_HDR10_PLUS_INFO = "hdr10-plus-info";



    /**

     * An optional key describing the opto-electronic transfer function

     * requested for the output video content.

     *

     * The associated value is an integer: 0 if unspecified, or one of the

     * COLOR_TRANSFER_ values. When unspecified the component will not touch the

     * video content; otherwise the component will tone-map the raw video frame

     * to match the requested transfer function.

     *

     * After configure, component's input format will contain this key to note

     * whether the request is supported or not. If the value in the input format

     * is the same as the requested value, the request is supported. The value

     * is set to 0 if unsupported.

     */

    public static final String KEY_COLOR_TRANSFER_REQUEST = "color-transfer-request";



    /**

     * A key describing a unique ID for the content of a media track.

     *