From a49988325a4a4cb868b2a5049c82e097e3ce246a Mon Sep 17 00:00:00 2001 From: Wonsik Kim Date: Mon, 8 Feb 2021 11:45:57 -0800 Subject: [PATCH] media: add KEY_COLOR_TRANSFER_REQUEST The new key is used to request video frame tone-mapping to MediaCodec components. Bug: 160259947 Test: atest CtsMediaTestCases:DecoderTest Change-Id: I178bbb29932e4ddb8d722c18e20c1eece10ca836 --- core/api/current.txt | 1 + media/java/android/media/MediaFormat.java | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/core/api/current.txt b/core/api/current.txt index f82e00035e65e..3db3257832bc3 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -21890,6 +21890,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"; diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index 1a49b85403e44..67f1660fff782 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -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. *