Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "media: add KEY_COLOR_TRANSFER_REQUEST" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-13 00:01:57 +00:00
committed by Android (Google) Code Review
parent fe27c4fe5a a49988325a
commit 31cce824af
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

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

17
media/java/android/media/MediaFormat.java
View File

@@ -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.
*