diff options
| -rwxr-xr-x | moorefield_hdmi/common/planes/DisplayPlane.cpp | 5 | ||||
| -rwxr-xr-x | moorefield_hdmi/ips/anniedale/PlaneCapabilities.cpp | 2 | ||||
| -rwxr-xr-x | moorefield_hdmi/ips/tangier/TngDisplayQuery.cpp | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/moorefield_hdmi/common/planes/DisplayPlane.cpp b/moorefield_hdmi/common/planes/DisplayPlane.cpp index 1251c29..a748b13 100755 --- a/moorefield_hdmi/common/planes/DisplayPlane.cpp +++ b/moorefield_hdmi/common/planes/DisplayPlane.cpp @@ -217,7 +217,10 @@ bool DisplayPlane::setDataBuffer(uint32_t handle) if (index < 0) { VLOGTRACE("unmapped buffer, mapping..."); mapper = mapBuffer(buffer); - if (!mapper) { + // Skip the unsupported format in case that a new gralloc buffer was + // created and added into the mapped list, triggered by SoftwareRender + // with color conversion from known formats to YV12. + if (!mapper || mapper->getFormat() == HAL_PIXEL_FORMAT_YV12) { ELOGTRACE("failed to map buffer %#x", handle); bm->unlockDataBuffer(buffer); return false; diff --git a/moorefield_hdmi/ips/anniedale/PlaneCapabilities.cpp b/moorefield_hdmi/ips/anniedale/PlaneCapabilities.cpp index 71def21..a7fbe48 100755 --- a/moorefield_hdmi/ips/anniedale/PlaneCapabilities.cpp +++ b/moorefield_hdmi/ips/anniedale/PlaneCapabilities.cpp @@ -58,7 +58,6 @@ 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: @@ -102,7 +101,6 @@ 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: diff --git a/moorefield_hdmi/ips/tangier/TngDisplayQuery.cpp b/moorefield_hdmi/ips/tangier/TngDisplayQuery.cpp index 8ba7e6d..1a8adb2 100755 --- a/moorefield_hdmi/ips/tangier/TngDisplayQuery.cpp +++ b/moorefield_hdmi/ips/tangier/TngDisplayQuery.cpp @@ -32,7 +32,6 @@ 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: |