Merge "Update setHdrConversionStrategy to return the preferredHdrOutput type"

5 files changed, 10 insertions, 6 deletions

diff --git a/hwc3/ComposerClient.cpp b/hwc3/ComposerClient.cpp
index ff65c04..7f73d0f 100644
--- a/hwc3/ComposerClient.cpp
+++ b/hwc3/ComposerClient.cpp
@@ -360,9 +360,10 @@ ndk::ScopedAStatus ComposerClient::getHdrConversionCapabilities(
 }
 
 ndk::ScopedAStatus ComposerClient::setHdrConversionStrategy(
-        const common::HdrConversionStrategy& hdrConversionStrategy) {
+        const common::HdrConversionStrategy& hdrConversionStrategy,
+        common::Hdr* preferredHdrOutputType) {
     DEBUG_FUNC();
-    auto err = mHal->setHdrConversionStrategy(hdrConversionStrategy);
+    auto err = mHal->setHdrConversionStrategy(hdrConversionStrategy, preferredHdrOutputType);
     return TO_BINDER_STATUS(err);
 }
 
diff --git a/hwc3/ComposerClient.h b/hwc3/ComposerClient.h
index f8bfa4c..7a76fa4 100644
--- a/hwc3/ComposerClient.h
+++ b/hwc3/ComposerClient.h
@@ -118,7 +118,8 @@ public:
     ndk::ScopedAStatus getPreferredBootDisplayConfig(int64_t display, int32_t* config) override;
     ndk::ScopedAStatus getHdrConversionCapabilities(
             std::vector<common::HdrConversionCapability>*) override;
-    ndk::ScopedAStatus setHdrConversionStrategy(const common::HdrConversionStrategy&) override;
+    ndk::ScopedAStatus setHdrConversionStrategy(const common::HdrConversionStrategy&,
+                                                common::Hdr* preferredHdrOutputType) override;
     ndk::ScopedAStatus setAutoLowLatencyMode(int64_t display, bool on) override;
     ndk::ScopedAStatus setClientTargetSlotCount(int64_t display, int32_t count) override;
     ndk::ScopedAStatus setColorMode(int64_t display, ColorMode mode, RenderIntent intent) override;
diff --git a/hwc3/impl/HalImpl.cpp b/hwc3/impl/HalImpl.cpp
index 92e120a..fb41a77 100644
--- a/hwc3/impl/HalImpl.cpp
+++ b/hwc3/impl/HalImpl.cpp
@@ -640,7 +640,7 @@ int32_t HalImpl::getHdrConversionCapabilities(std::vector<common::HdrConversionC
     return HWC2_ERROR_UNSUPPORTED;
 }
 
-int32_t HalImpl::setHdrConversionStrategy(const common::HdrConversionStrategy&) {
+int32_t HalImpl::setHdrConversionStrategy(const common::HdrConversionStrategy&, common::Hdr*) {
     return HWC2_ERROR_UNSUPPORTED;
 }
 
diff --git a/hwc3/impl/HalImpl.h b/hwc3/impl/HalImpl.h
index 372e190..6af1b17 100644
--- a/hwc3/impl/HalImpl.h
+++ b/hwc3/impl/HalImpl.h
@@ -94,7 +94,7 @@ class HalImpl : public IComposerHal {
     int32_t clearBootDisplayConfig(int64_t display) override;
     int32_t getPreferredBootDisplayConfig(int64_t display, int32_t* config) override;
     int32_t getHdrConversionCapabilities(std::vector<common::HdrConversionCapability>*) override;
-    int32_t setHdrConversionStrategy(const common::HdrConversionStrategy&) override;
+    int32_t setHdrConversionStrategy(const common::HdrConversionStrategy&, common::Hdr*) override;
     int32_t setAutoLowLatencyMode(int64_t display, bool on) override;
     int32_t setClientTarget(int64_t display, buffer_handle_t target,
                             const ndk::ScopedFileDescriptor& fence, common::Dataspace dataspace,
diff --git a/hwc3/include/IComposerHal.h b/hwc3/include/IComposerHal.h
index 898f254..9a9108f 100644
--- a/hwc3/include/IComposerHal.h
+++ b/hwc3/include/IComposerHal.h
@@ -25,6 +25,7 @@
 #include <aidl/android/hardware/graphics/common/ColorTransform.h>
 #include <aidl/android/hardware/graphics/common/Dataspace.h>
 #include <aidl/android/hardware/graphics/common/FRect.h>
+#include <aidl/android/hardware/graphics/common/Hdr.h>
 #include <aidl/android/hardware/graphics/common/HdrConversionCapability.h>
 #include <aidl/android/hardware/graphics/common/HdrConversionStrategy.h>
 #include <aidl/android/hardware/graphics/common/PixelFormat.h>
@@ -166,7 +167,8 @@ class IComposerHal {
     virtual int32_t clearBootDisplayConfig(int64_t display) = 0;
     virtual int32_t getPreferredBootDisplayConfig(int64_t display, int32_t* config) = 0;
     virtual int32_t getHdrConversionCapabilities(std::vector<common::HdrConversionCapability>*) = 0;
-    virtual int32_t setHdrConversionStrategy(const common::HdrConversionStrategy&) = 0;
+    virtual int32_t setHdrConversionStrategy(const common::HdrConversionStrategy&,
+                                             common::Hdr*) = 0;
     virtual int32_t setAutoLowLatencyMode(int64_t display, bool on) = 0;
     virtual int32_t setClientTarget(int64_t display, buffer_handle_t target,
                                     const ndk::ScopedFileDescriptor& fence,