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

Commit 37622769 authored by Kriti Dang's avatar Kriti Dang
Browse files

Update setHdrConversionStrategy to return the preferredHdrOutput type 

Bug: 268336382
Test: atest VtsHalGraphicsComposer3_TargetTest
Change-Id: I6ac912ac8a0329f4ea32acad657e44b473660c42
parent 06fc4aa7

graphics/common/aidl/aidl_api/android.hardware.graphics.common/current/android/hardware/graphics/common/Hdr.aidl

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ package android.hardware.graphics.common; 
/* @hide */

@Backing(type="int") @VintfStability

enum Hdr {

  INVALID = 0,

  DOLBY_VISION = 1,

  HDR10 = 2,

  HLG = 3,

graphics/common/aidl/android/hardware/graphics/common/Hdr.aidl

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ package android.hardware.graphics.common; 
@VintfStability

@Backing(type="int")

enum Hdr {

    /**

     *   Invalid HDR type

     */

    INVALID = 0,

    /**

     * Device supports Dolby Vision HDR

     */

graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/IComposerClient.aidl

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ interface IComposerClient { 
  void setIdleTimerEnabled(long display, int timeoutMs);

  android.hardware.graphics.composer3.OverlayProperties getOverlaySupport();

  android.hardware.graphics.common.HdrConversionCapability[] getHdrConversionCapabilities();

  void setHdrConversionStrategy(in android.hardware.graphics.common.HdrConversionStrategy conversionStrategy);

  android.hardware.graphics.common.Hdr setHdrConversionStrategy(in android.hardware.graphics.common.HdrConversionStrategy conversionStrategy);

  void setRefreshRateChangedCallbackDebugEnabled(long display, boolean enabled);

  const int EX_BAD_CONFIG = 1;

  const int EX_BAD_DISPLAY = 2;

graphics/composer/aidl/android/hardware/graphics/composer3/IComposerClient.aidl

+4 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.hardware.graphics.composer3;



import android.hardware.graphics.common.DisplayDecorationSupport;

import android.hardware.graphics.common.Hdr;

import android.hardware.graphics.common.HdrConversionCapability;

import android.hardware.graphics.common.HdrConversionStrategy;

import android.hardware.graphics.common.Transform;
@@ -844,12 +845,13 @@ interface IComposerClient { 
    /**

     * Sets the of HDR conversion strategy.

     *

     *

     * @return the chosen HDR type in case HdrConversionStrategy has autoAllowedHdrTypes set. In

     * other cases, return HDR type INVALID.

     * @exception EX_UNSUPPORTED when not supported by the underlying HAL

     *

     * @see getHdrConversionCapabilities

     */

    void setHdrConversionStrategy(in HdrConversionStrategy conversionStrategy);

    Hdr setHdrConversionStrategy(in HdrConversionStrategy conversionStrategy);



    /*

     * Sets either the callback for the refresh rate change is enabled or disabled

graphics/composer/aidl/vts/VtsComposerClient.cpp

+4 −2
Original line number Diff line number Diff line
@@ -344,9 +344,11 @@ VtsComposerClient::getHdrConversionCapabilities() { 
            hdrConversionCapability};

}



ScopedAStatus VtsComposerClient::setHdrConversionStrategy(

std::pair<ScopedAStatus, common::Hdr> VtsComposerClient::setHdrConversionStrategy(

        const common::HdrConversionStrategy& conversionStrategy) {

    return mComposerClient->setHdrConversionStrategy(conversionStrategy);

    common::Hdr preferredHdrOutputType;

    return {mComposerClient->setHdrConversionStrategy(conversionStrategy, &preferredHdrOutputType),

            preferredHdrOutputType};

}



std::pair<ScopedAStatus, common::Transform> VtsComposerClient::getDisplayPhysicalOrientation(