| author | Yao.Liu <yao.liu@amlogic.com> | 2018-07-19 11:02:49 (GMT) |
|---|---|---|
| committer | Tellen Yu <tellen.yu@amlogic.com> | 2018-08-21 08:55:57 (GMT) |
| commit | 409ff2ab8f4f622ccdb843d14c766abc4f090566 (patch) | |
| tree | b4e1b9d6959712d0550804b3a56b67302c78ebcb | |
| parent | 4443631ed448c0640b2c32451c6240f77104a3c2 (diff) | |
| download | amlogic-ampere-20180821.zip amlogic-ampere-20180821.tar.gz amlogic-ampere-20180821.tar.bz2 | |
HWC2: android P use default hdr capability no matter what TV
PD#170144
Change-Id: Iea021e7d183a221f94fedb80e0b3a79ce521f772
Signed-off-by: Yao.Liu <yao.liu@amlogic.com>
| -rw-r--r-- | hwcomposer/hwc2/common/devices/PhysicalDevice.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/hwcomposer/hwc2/common/devices/PhysicalDevice.cpp b/hwcomposer/hwc2/common/devices/PhysicalDevice.cpp index 7fa3a41..3ac65ef 100644 --- a/hwcomposer/hwc2/common/devices/PhysicalDevice.cpp +++ b/hwcomposer/hwc2/common/devices/PhysicalDevice.cpp @@ -35,9 +35,17 @@ //#define HWC_SUPPORT_SECURE_DISPLAY 1 #define FBIOPUT_OSD_CURSOR _IOWR(FB_IOC_MAGIC, 0x0, struct fb_cursor) +#if PLATFORM_SDK_VERSION == 28 +#define USE_DEFAULT_HDR_CAP 1 +#else +#define USE_DEFAULT_HDR_CAP 0 +#endif namespace android { namespace amlogic { +constexpr static float sDefaultMinLumiance = 0.0; +constexpr static float sDefaultMaxLumiance = 500.0; + PhysicalDevice::PhysicalDevice(hwc2_display_t id, Hwcomposer& hwc, IComposeDeviceFactory* controlFactory) : mStartBootanim(true), mId(id), @@ -1867,6 +1875,14 @@ int32_t PhysicalDevice::parseHdrCapabilities() { mHdrCapabilities.dvSupport = true; // dobly version parse end +#if USE_DEFAULT_HDR_CAP + mHdrCapabilities.hdrSupport = true; + + mHdrCapabilities.maxLuminance = sDefaultMaxLumiance; + mHdrCapabilities.avgLuminance = sDefaultMaxLumiance; + mHdrCapabilities.minLuminance = sDefaultMinLumiance; + +#else memset(buf, 0, 1024); if ((fd = open(HDR_PATH, O_RDONLY)) < 0) { ETRACE("open %s fail.", HDR_PATH); @@ -1887,7 +1903,7 @@ int32_t PhysicalDevice::parseHdrCapabilities() { mHdrCapabilities.avgLuminance = getLineValue(pos, "Avg: "); mHdrCapabilities.minLuminance = getLineValue(pos, "Min: "); } - +#endif ITRACE("dolby version support:%d, hdr support:%d max:%d, avg:%d, min:%d\n", mHdrCapabilities.dvSupport?1:0, mHdrCapabilities.hdrSupport?1:0, mHdrCapabilities.maxLuminance, mHdrCapabilities.avgLuminance, mHdrCapabilities.minLuminance); exit: |