commit b49c278f015f4e954139000679302adf1ca34b92
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Tue May 24 15:48:34 2022 -0700
committer Harish Mahendrakar <harish.mahendrakar@ittiam.com> Wed May 25 15:20:28 2022 -0700
tree dacfa0e45c60d6030465d4afb7a6bf24d42e31f1
parent 8952e8e6f8ed8cc72fe0063119cf43b55141143c

Codec2InfoBuilder: List HDR profiles only if device supports HDR display

If device doesn't support HDR display, then codecs must not advertise
support for HDR profiles. Support for HDR display can be queried
using system property ro.surface_flinger.has_HDR_display.
When this property is not true, no HDR profiles will be listed as
advertised.

Bug: 228237404
Test: set ro.surface_flinger.has_HDR_display to false and then
 adb shell dumpsys media.player to confirm HDR profiles are not
 advertised.

Change-Id: Ib6bb6af4f5bb58357e804f124521b71a08e174b5

media/codec2/sfplugin/Android.bp

diff --git a/media/codec2/sfplugin/Android.bp b/media/codec2/sfplugin/Android.bp
index 39fa4fc..134bc53 100644
--- a/media/codec2/sfplugin/Android.bp
+++ b/media/codec2/sfplugin/Android.bp
@@ -37,6 +37,10 @@
         "media_ndk_headers",
     ],
 
+    static_libs: [
+        "SurfaceFlingerProperties",
+    ],
+
     shared_libs: [
         "android.hardware.cas.native@1.0",
         "android.hardware.drm@1.0",

media/codec2/sfplugin/Codec2InfoBuilder.cpp

diff --git a/media/codec2/sfplugin/Codec2InfoBuilder.cpp b/media/codec2/sfplugin/Codec2InfoBuilder.cpp
index 2b8a160..ec6ff8a 100644
--- a/media/codec2/sfplugin/Codec2InfoBuilder.cpp
+++ b/media/codec2/sfplugin/Codec2InfoBuilder.cpp
@@ -33,6 +33,7 @@
 #include <OMX_Video.h>
 #include <OMX_VideoExt.h>
 #include <OMX_AsString.h>
+#include <SurfaceFlingerProperties.sysprop.h>
 
 #include <android/hardware/media/omx/1.0/IOmx.h>
 #include <android/hardware/media/omx/1.0/IOmxObserver.h>
@@ -156,6 +157,12 @@
     // TODO: directly check this from the component interface
     supports10Bit = (supportsHdr || supportsHdr10Plus);
 
+    // If the device doesn't support HDR display, then no codec on the device
+    // can advertise support for HDR profiles.
+    // Default to true to maintain backward compatibility
+    auto ret = sysprop::SurfaceFlingerProperties::has_HDR_display();
+    bool hasHDRDisplay = ret.has_value() ? *ret : true;
+
     bool added = false;
 
     for (C2Value::Primitive profile : profileQuery[0].values.values) {
@@ -181,8 +188,8 @@
         if (mapper && mapper->mapProfile(pl.profile, &sdkProfile)
                 && mapper->mapLevel(pl.level, &sdkLevel)) {
             caps->addProfileLevel((uint32_t)sdkProfile, (uint32_t)sdkLevel);
-            // also list HDR profiles if component supports HDR
-            if (supportsHdr) {
+            // also list HDR profiles if component supports HDR and device has HDR display
+            if (supportsHdr && hasHDRDisplay) {
                 auto hdrMapper = C2Mapper::GetHdrProfileLevelMapper(trait.mediaType);
                 if (hdrMapper && hdrMapper->mapProfile(pl.profile, &sdkProfile)) {
                     caps->addProfileLevel((uint32_t)sdkProfile, (uint32_t)sdkLevel);