From: Lin Johnson <johnson.lin@intel.com>
Date: Fri, 23 Mar 2018 03:30:26 +0000 (+0800)
Subject: Give out error message when meet errors
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=21d64df6f5249335be52829a4d02f7913a2aa7cb;p=android-x86%2Fexternal-IA-Hardware-Composer.git

Give out error message when meet errors

It will help for debug HWC.
Aslo fix android build warning cutils/log.h is deprecated

Jira:None
Tests:Build pass on Android
Signed-off-by: Lin Johnson <johnson.lin@intel.com>
---

diff --git a/common/compositor/va/vautils.cpp b/common/compositor/va/vautils.cpp
index 232e9a0..8e66802 100644
--- a/common/compositor/va/vautils.cpp
+++ b/common/compositor/va/vautils.cpp
@@ -20,6 +20,8 @@
 
 #include <drm_fourcc.h>
 
+#include <hwctrace.h>
+
 namespace hwcomposer {
 
 int DrmFormatToVAFormat(int format) {
@@ -43,6 +45,7 @@ int DrmFormatToVAFormat(int format) {
     case DRM_FORMAT_YUV444:
     case DRM_FORMAT_AYUV:
     default:
+      ETRACE("Unable to convert to VAFormat from format %x", format);
       break;
   }
   return 0;
@@ -65,6 +68,7 @@ int DrmFormatToRTFormat(int format) {
     case DRM_FORMAT_P010:
       return VA_RT_FORMAT_YUV420_10BPP;
     default:
+      ETRACE("Unable to convert to RTFormat from format %x", format);
       break;
   }
   return 0;
diff --git a/os/android/iahwc2.cpp b/os/android/iahwc2.cpp
index 09edb27..b55da27 100644
--- a/os/android/iahwc2.cpp
+++ b/os/android/iahwc2.cpp
@@ -21,7 +21,7 @@
 
 #include <inttypes.h>
 
-#include <cutils/log.h>
+#include <android/log.h>
 #include <cutils/properties.h>
 #include <hardware/hardware.h>
 #include <hardware/hwcomposer2.h>
diff --git a/os/android/platformdefines.h b/os/android/platformdefines.h
index 65e4188..17db955 100644
--- a/os/android/platformdefines.h
+++ b/os/android/platformdefines.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <utils/Trace.h>
-#include <cutils/log.h>
+#include <android/log.h>
 #include <hardware/hardware.h>
 #include <hardware/hwcomposer.h>
 #include <ui/GraphicBuffer.h>
diff --git a/wsi/drm/drmbuffer.cpp b/wsi/drm/drmbuffer.cpp
index e5346d9..4a7a2d3 100644
--- a/wsi/drm/drmbuffer.cpp
+++ b/wsi/drm/drmbuffer.cpp
@@ -209,6 +209,9 @@ const ResourceHandle& DrmBuffer::GetGpuResource(GpuDisplay egl_display,
                             static_cast<EGLClientBuffer>(nullptr), attr_list);
     }
 
+    if (image == EGL_NO_IMAGE_KHR) {
+      ETRACE("eglCreateKHR failed to create image for DrmBuffer");
+    }
     image_.image_ = image;
 #elif USE_VK
     struct vk_import import;
@@ -343,8 +346,11 @@ const MediaResourceHandle& DrmBuffer::GetMediaResource(MediaDisplay display,
   attribs[1].value.type = VAGenericValueTypePointer;
   attribs[1].value.value.p = &external;
 
-  vaCreateSurfaces(display, rt_format, external.width, external.height,
-                   &media_image_.surface_, 1, attribs, 2);
+  VAStatus ret =
+      vaCreateSurfaces(display, rt_format, external.width, external.height,
+                       &media_image_.surface_, 1, attribs, 2);
+  if (ret != VA_STATUS_SUCCESS)
+    ETRACE("Failed to create VASurface from drmbuffer with ret %x", ret);
 
   return media_image_;
 }