Switch from HAL_PIXEL_FORMAT_YV12 to HAL_PIXEL_FORMAT_INTEL_YV12.

am: b61d150a9f

* commit 'b61d150a9f3124bb8ad6937ab64e29eef5a0d1e4':
  Switch from HAL_PIXEL_FORMAT_YV12 to HAL_PIXEL_FORMAT_INTEL_YV12.

Change-Id: Ia57a00286a841b8e8dca90dbad271cae2fd03c4b

6 files changed, 10 insertions, 9 deletions

diff --git a/moorefield_hdmi/include/pvr/hal/hal_public.h b/moorefield_hdmi/include/pvr/hal/hal_public.h
index e1053bd..04939a0 100644
--- a/moorefield_hdmi/include/pvr/hal/hal_public.h
+++ b/moorefield_hdmi/include/pvr/hal/hal_public.h
@@ -31,6 +31,7 @@
 #undef HAL_PIXEL_FORMAT_NV12
 
 #define HAL_PIXEL_FORMAT_UYVY         0x107
+#define HAL_PIXEL_FORMAT_INTEL_YV12   0x108
 #define HAL_PIXEL_FORMAT_INTEL_ZSL    0x109
 #define HAL_PIXEL_FORMAT_NV12         0x3231564E
 #define HAL_PIXEL_FORMAT_NV21         0x3132564E
diff --git a/moorefield_hdmi/ips/anniedale/AnnOverlayPlane.cpp b/moorefield_hdmi/ips/anniedale/AnnOverlayPlane.cpp
index 77d9116..e1f528d 100755
--- a/moorefield_hdmi/ips/anniedale/AnnOverlayPlane.cpp
+++ b/moorefield_hdmi/ips/anniedale/AnnOverlayPlane.cpp
@@ -214,7 +214,7 @@ bool AnnOverlayPlane::bufferOffsetSetup(BufferMapper& mapper)
     }
 
     switch(format) {
-    case HAL_PIXEL_FORMAT_YV12:    // YV12
+    case HAL_PIXEL_FORMAT_INTEL_YV12:    // YV12
         vSurface = ySurface + yStride * h;
         uSurface = vSurface + uvStride * (h / 2);
         yTileOffsetX = srcX;
diff --git a/moorefield_hdmi/ips/anniedale/PlaneCapabilities.cpp b/moorefield_hdmi/ips/anniedale/PlaneCapabilities.cpp
index 98901e7..a7fbe48 100755
--- a/moorefield_hdmi/ips/anniedale/PlaneCapabilities.cpp
+++ b/moorefield_hdmi/ips/anniedale/PlaneCapabilities.cpp
@@ -58,7 +58,7 @@ bool PlaneCapabilities::isFormatSupported(int planeType, HwcLayer *hwcLayer)
                 WLOGTRACE("180 degree rotation is not supported yet");
             }
             return trans ? false : true;
-        case HAL_PIXEL_FORMAT_YV12:
+        case HAL_PIXEL_FORMAT_INTEL_YV12:
             return trans ? false: true;
         case HAL_PIXEL_FORMAT_NV12:
         case OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar:
@@ -101,7 +101,7 @@ bool PlaneCapabilities::isSizeSupported(int planeType, HwcLayer *hwcLayer)
         }
     } else if (planeType == DisplayPlane::PLANE_OVERLAY) {
         switch (format) {
-        case HAL_PIXEL_FORMAT_YV12:
+        case HAL_PIXEL_FORMAT_INTEL_YV12:
         case HAL_PIXEL_FORMAT_I420:
         case HAL_PIXEL_FORMAT_NV12:
         case OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar:
diff --git a/moorefield_hdmi/ips/common/GrallocBufferBase.cpp b/moorefield_hdmi/ips/common/GrallocBufferBase.cpp
index ed2452a..286c5e5 100644
--- a/moorefield_hdmi/ips/common/GrallocBufferBase.cpp
+++ b/moorefield_hdmi/ips/common/GrallocBufferBase.cpp
@@ -46,7 +46,7 @@ void GrallocBufferBase::initStride()
 
     // setup stride
     switch (mFormat) {
-    case HAL_PIXEL_FORMAT_YV12:
+    case HAL_PIXEL_FORMAT_INTEL_YV12:
     case HAL_PIXEL_FORMAT_I420:
         uint32_t yStride_align;
         yStride_align = DisplayQuery::getOverlayLumaStrideAlignment(mFormat);
diff --git a/moorefield_hdmi/ips/common/OverlayPlaneBase.cpp b/moorefield_hdmi/ips/common/OverlayPlaneBase.cpp
index 5ba55c8..ccfb8b9 100755
--- a/moorefield_hdmi/ips/common/OverlayPlaneBase.cpp
+++ b/moorefield_hdmi/ips/common/OverlayPlaneBase.cpp
@@ -377,7 +377,7 @@ BufferMapper* OverlayPlaneBase::getTTMMapper(BufferMapper& grallocMapper, struct
 
         // calculate stride
         switch (format) {
-        case HAL_PIXEL_FORMAT_YV12:
+        case HAL_PIXEL_FORMAT_INTEL_YV12:
         case HAL_PIXEL_FORMAT_I420:
             uint32_t yStride_align;
             yStride_align = DisplayQuery::getOverlayLumaStrideAlignment(grallocMapper.getFormat());
@@ -690,7 +690,7 @@ bool OverlayPlaneBase::bufferOffsetSetup(BufferMapper& mapper)
     backBuffer->OSTART_1V = backBuffer->OSTART_0V;
 
     switch(format) {
-    case HAL_PIXEL_FORMAT_YV12:    // YV12
+    case HAL_PIXEL_FORMAT_INTEL_YV12:    // YV12
         backBuffer->OBUF_0Y = 0;
         backBuffer->OBUF_0V = yStride * h;
         backBuffer->OBUF_0U = backBuffer->OBUF_0V + (uvStride * (h / 2));
@@ -799,7 +799,7 @@ bool OverlayPlaneBase::coordinateSetup(BufferMapper& mapper)
     uint32_t offsetu = backBuffer->OBUF_0U;
 
     switch (format) {
-    case HAL_PIXEL_FORMAT_YV12:              // YV12
+    case HAL_PIXEL_FORMAT_INTEL_YV12:        // YV12
     case HAL_PIXEL_FORMAT_I420:              // I420
     case HAL_PIXEL_FORMAT_NV12:              // NV12
     case OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar:          // NV12
diff --git a/moorefield_hdmi/ips/tangier/TngDisplayQuery.cpp b/moorefield_hdmi/ips/tangier/TngDisplayQuery.cpp
index 13350aa..5828dca 100755
--- a/moorefield_hdmi/ips/tangier/TngDisplayQuery.cpp
+++ b/moorefield_hdmi/ips/tangier/TngDisplayQuery.cpp
@@ -32,7 +32,7 @@ bool DisplayQuery::isVideoFormat(uint32_t format)
     case OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar_Tiled:
     // Expand format to support the case: Software decoder + HW rendering
     // Only VP9 use this foramt now
-    case HAL_PIXEL_FORMAT_YV12:
+    case HAL_PIXEL_FORMAT_INTEL_YV12:
         return true;
     default:
         return false;
@@ -43,7 +43,7 @@ int DisplayQuery::getOverlayLumaStrideAlignment(uint32_t format)
 {
     // both luma and chroma stride need to be 64-byte aligned for overlay
     switch (format) {
-    case HAL_PIXEL_FORMAT_YV12:
+    case HAL_PIXEL_FORMAT_INTEL_YV12:
     case HAL_PIXEL_FORMAT_I420:
         // for these two formats, chroma stride is calculated as half of luma stride
         // so luma stride needs to be 128-byte aligned.