commit 86cbf71505b7e2f8418f9d4b112731363345634b
author Jooyung Han <jooyung@google.com> Thu Feb 21 15:25:02 2019 +0900
committer Jooyung Han <jooyung@google.com> Fri Feb 22 07:00:50 2019 +0000
tree 162db1e45eebac8105dc6bbe9d70a1f2269bc278
parent 27d84b795f118b2db5ca632f38d001154fe71cd2

Use PublicFormat from libui

This is a part of cutting dependency from libmediandk to
libandroid_runtime.

PublicFormat which was defined in android_view_Surface has
been moved to libui.

Bug: 124268753
Test: m -j
Change-Id: I5f0e64ee6e2d5eb6b64491356a5bfa50b512a9c9

media/ndk/NdkImageReader.cpp

diff --git a/media/ndk/NdkImageReader.cpp b/media/ndk/NdkImageReader.cpp
index b929f7f..30fe8d6 100644
--- a/media/ndk/NdkImageReader.cpp
+++ b/media/ndk/NdkImageReader.cpp
@@ -25,7 +25,7 @@
 #include <cutils/atomic.h>
 #include <utils/Log.h>
 #include <android_media_Utils.h>
-#include <android_runtime/android_view_Surface.h>
+#include <ui/PublicFormat.h>
 #include <private/android/AHardwareBufferHelpers.h>
 #include <grallocusage/GrallocUsageConversion.h>
 #include <media/stagefright/bqhelper/WGraphicBufferProducer.h>
@@ -270,8 +270,8 @@
 media_status_t
 AImageReader::init() {
     PublicFormat publicFormat = static_cast<PublicFormat>(mFormat);
-    mHalFormat = android_view_Surface_mapPublicFormatToHalFormat(publicFormat);
-    mHalDataSpace = android_view_Surface_mapPublicFormatToHalDataspace(publicFormat);
+    mHalFormat = mapPublicFormatToHalFormat(publicFormat);
+    mHalDataSpace = mapPublicFormatToHalDataspace(publicFormat);
     mHalUsage = AHardwareBuffer_convertToGrallocUsageBits(mUsage);
 
     sp<IGraphicBufferProducer> gbProducer;