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

Commit 7ebbe795 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Codec2InfoBuilder: List HDR profiles only if device supports HDR display" am: 94a233ae 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2105351



Change-Id: I737b47cc19c9c3a66b5e57d892e0eb5e24b94eec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 458d1544 94a233ae

media/codec2/sfplugin/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ cc_library_shared { 
        "media_ndk_headers",

    ],



    static_libs: [

        "SurfaceFlingerProperties",

    ],



    shared_libs: [

        "android.hardware.cas.native@1.0",

        "android.hardware.drm@1.0",

media/codec2/sfplugin/Codec2InfoBuilder.cpp

+9 −2
Original line number Diff line number Diff line
@@ -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>
@@ -158,6 +159,12 @@ bool addSupportedProfileLevels( 
    // 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) {
@@ -183,8 +190,8 @@ bool addSupportedProfileLevels( 
        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);