commit c25c54f4b19e9a8bd5e908980ab8fdb96854678b
author Yin-Chia Yeh <yinchiayeh@google.com> Tue Apr 04 13:00:35 2017 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Tue Apr 04 13:19:09 2017 -0700
tree c4fbded7a08ee796b01530a27c5d41333738c988
parent da0bc84ec6f918b74b75fd8724137d1db4b9dd54

Revert "camera: Map between legacy gralloc0 usage, and HIDL gralloc1 usages"

This reverts commit 2d80c0d66f9ca869d6102f07bd236b7c4c94c205.

Test: fix b/36876770
Bug: b/36876770
Change-Id: Ia251ec97273d71fd5bc759aa1161960f6266358a

camera/device/3.2/default/convert.cpp

diff --git a/camera/device/3.2/default/convert.cpp b/camera/device/3.2/default/convert.cpp
index c99d903..35676df 100644
--- a/camera/device/3.2/default/convert.cpp
+++ b/camera/device/3.2/default/convert.cpp
@@ -15,12 +15,8 @@
  */
 
 #define LOG_TAG "android.hardware.camera.device@3.2-convert-impl"
-#include <inttypes.h>
-
 #include <android/log.h>
 
-#include <grallocusage/GrallocUsageConversion.h>
-
 #include "include/convert.h"
 
 namespace android {
@@ -32,7 +28,6 @@
 
 using ::android::hardware::graphics::common::V1_0::Dataspace;
 using ::android::hardware::graphics::common::V1_0::PixelFormat;
-using ::android::hardware::graphics::allocator::V2_0::ConsumerUsage;
 using ::android::hardware::camera::device::V3_2::ConsumerUsageFlags;
 using ::android::hardware::camera::device::V3_2::ProducerUsageFlags;
 
@@ -71,37 +66,23 @@
     dst->format = (int) src.format;
     dst->data_space = (android_dataspace_t) src.dataSpace;
     dst->rotation = (int) src.rotation;
-    dst->usage = convertFromHidlUsage(src.usage);
+    dst->usage = (uint32_t) src.usage;
     // Fields to be filled by HAL (max_buffers, priv) are initialized to 0
     dst->max_buffers = 0;
     dst->priv = 0;
     return;
 }
 
-uint32_t convertFromHidlUsage(ConsumerUsageFlags usage) {
-    uint32_t dstUsage = 0;
-    dstUsage = ::android_convertGralloc1To0Usage(/*producerUsage*/ 0, usage);
-    // Compatibility workaround - add HW_CAMERA_ZSL when ConsumerUsage.CAMERA is set, to
-    // match pre-HIDL expected usage flags
-    if ( (usage & ConsumerUsage::CAMERA) == static_cast<uint64_t>(ConsumerUsage::CAMERA)) {
-        dstUsage |= GRALLOC_USAGE_HW_CAMERA_ZSL;
-    }
-    return dstUsage;
-}
-
 void convertToHidl(const Camera3Stream* src, HalStream* dst) {
     dst->id = src->mId;
     dst->overrideFormat = (PixelFormat) src->format;
     dst->maxBuffers = src->max_buffers;
-    ConsumerUsageFlags consumerUsage;
-    ProducerUsageFlags producerUsage;
-    ::android_convertGralloc0To1Usage(src->usage, &producerUsage, &consumerUsage);
     if (src->stream_type == CAMERA3_STREAM_OUTPUT) {
         dst->consumerUsage = (ConsumerUsageFlags) 0;
-        dst->producerUsage = producerUsage;
+        dst->producerUsage = (ProducerUsageFlags) src->usage;
     } else if (src->stream_type == CAMERA3_STREAM_INPUT) {
         dst->producerUsage = (ProducerUsageFlags) 0;
-        dst->consumerUsage = consumerUsage;
+        dst->consumerUsage = (ConsumerUsageFlags) src->usage;
     } else {
         //Should not reach here per current HIDL spec, but we might end up adding
         // bi-directional stream to HIDL.