From 80dbaca0e520c32a599a379feedb49e6bed3de30 Mon Sep 17 00:00:00 2001
From: christosts <christosts@google.com>
Date: Mon, 6 Feb 2023 17:21:02 +0000
Subject: [PATCH] Detect HEVC HDR10 codec profile more accurately

In MediaCodecUtil, use Format.colorInfo, besides the codec string,
to accurately map to a 10bit HEVC profile.

PiperOrigin-RevId: 507500071
---
 .../exoplayer2/mediacodec/MediaCodecUtil.java     | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index 16583004fc8..819c156bc95 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -250,7 +250,7 @@ public static Pair<Integer, Integer> getCodecProfileAndLevel(Format format) {
         return getVp9ProfileAndLevel(format.codecs, parts);
       case CODEC_ID_HEV1:
       case CODEC_ID_HVC1:
-        return getHevcProfileAndLevel(format.codecs, parts);
+        return getHevcProfileAndLevel(format.codecs, parts, format.colorInfo);
       case CODEC_ID_AV01:
         return getAv1ProfileAndLevel(format.codecs, parts, format.colorInfo);
       case CODEC_ID_MP4A:
@@ -729,7 +729,8 @@ private static Pair<Integer, Integer> getDolbyVisionProfileAndLevel(
   }
 
   @Nullable
-  private static Pair<Integer, Integer> getHevcProfileAndLevel(String codec, String[] parts) {
+  private static Pair<Integer, Integer> getHevcProfileAndLevel(
+      String codec, String[] parts, @Nullable ColorInfo colorInfo) {
     if (parts.length < 4) {
       // The codec has fewer parts than required by the HEVC codec string format.
       Log.w(TAG, "Ignoring malformed HEVC codec string: " + codec);
@@ -746,7 +747,15 @@ private static Pair<Integer, Integer> getHevcProfileAndLevel(String codec, Strin
     if ("1".equals(profileString)) {
       profile = CodecProfileLevel.HEVCProfileMain;
     } else if ("2".equals(profileString)) {
-      profile = CodecProfileLevel.HEVCProfileMain10;
+      if (colorInfo != null && colorInfo.colorTransfer == C.COLOR_TRANSFER_ST2084) {
+        profile = CodecProfileLevel.HEVCProfileMain10HDR10;
+      } else {
+        // For all other cases, we map to the Main10 profile. Note that this includes HLG
+        // HDR. On Android 13+, the platform guarantees that a decoder that advertises
+        // HEVCProfileMain10 will be able to decode HLG. This is not guaranteed for older
+        // Android versions, but we still map to Main10 for backwards compatibility.
+        profile = CodecProfileLevel.HEVCProfileMain10;
+      }
     } else {
       Log.w(TAG, "Unknown HEVC profile string: " + profileString);
       return null;