diff options
| author | mahongpe <hongpeng.ma@intel.com> | 2015-12-07 02:38:15 +0800 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-12-17 13:15:19 -0800 |
| commit | 6fd39da3507005fb5f733fddfd516f5e5b6f0149 (patch) | |
| tree | e14b035aee6f15ccc9c6e4e25b93c105398cb747 | |
| parent | cf8b08fb0602b74df217dfc4a458966c145dd504 (diff) | |
| download | android_hardware_intel_img_hwcomposer-6fd39da3507005fb5f733fddfd516f5e5b6f0149.tar.gz android_hardware_intel_img_hwcomposer-6fd39da3507005fb5f733fddfd516f5e5b6f0149.tar.bz2 android_hardware_intel_img_hwcomposer-6fd39da3507005fb5f733fddfd516f5e5b6f0149.zip | |
Use default csc mode and video range setting for HDMI.
Update VideoPayloadBuffer to align with palyload in video driver
Bug: 25936176
Change-Id: I5b0ad4d7aa107f4dc4ecca38659ec94c3799447e
Signed-off-by: mahongpe <hongpeng.ma@intel.com>
| -rwxr-xr-x | moorefield_hdmi/ips/common/OverlayPlaneBase.cpp | 6 | ||||
| -rw-r--r-- | moorefield_hdmi/ips/common/VideoPayloadBuffer.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/moorefield_hdmi/ips/common/OverlayPlaneBase.cpp b/moorefield_hdmi/ips/common/OverlayPlaneBase.cpp index 173f194..5ba55c8 100755 --- a/moorefield_hdmi/ips/common/OverlayPlaneBase.cpp +++ b/moorefield_hdmi/ips/common/OverlayPlaneBase.cpp @@ -1122,6 +1122,9 @@ bool OverlayPlaneBase::colorSetup(BufferMapper& mapper) return false; } + if (mPipeConfig == (0x2 << 6)) + return true; + uint32_t format = mapper.getFormat(); if (format != OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar && format != OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar_Tiled) { @@ -1147,8 +1150,7 @@ bool OverlayPlaneBase::colorSetup(BufferMapper& mapper) backBuffer->OCONFIG &= ~(1 << 5); backBuffer->OCONFIG |= (payload->csc_mode << 5); - // no level expansion for video on HDMI - if (payload->video_range || mPipeConfig == (0x2 << 6)) { + if (payload->video_range) { // full range, no need to do level expansion backBuffer->OCLRC0 = 0x1000000; backBuffer->OCLRC1 = 0x80; diff --git a/moorefield_hdmi/ips/common/VideoPayloadBuffer.h b/moorefield_hdmi/ips/common/VideoPayloadBuffer.h index e6b1879..e7f0750 100644 --- a/moorefield_hdmi/ips/common/VideoPayloadBuffer.h +++ b/moorefield_hdmi/ips/common/VideoPayloadBuffer.h @@ -63,6 +63,8 @@ struct VideoPayloadBuffer { uint32_t coded_width; uint32_t coded_height; + uint32_t initialized; + uint32_t csc_mode; uint32_t video_range; }; |