Use default csc mode and video range setting for HDMI.android-6.0.1_r81android-6.0.1_r80android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r69android-6.0.1_r66android-6.0.1_r65android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13marshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-release

Update VideoPayloadBuffer to align with palyload in video driver

Bug: 25936176

Change-Id: I5b0ad4d7aa107f4dc4ecca38659ec94c3799447e
Signed-off-by: mahongpe <hongpeng.ma@intel.com>

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;
 };