commit 47cf8e62b81770c0896aac444ef22a840b3a2c5e
author Yin-Chia Yeh <yinchiayeh@google.com> Tue Apr 04 13:00:03 2017 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Tue Apr 04 13:18:41 2017 -0700
tree 9744b05c0c22855b54fd7a1eafdc2b0a837b3de3
parent 80158939f9ce31676d6520ff97dc3af4a9760a7f

Revert "Camera: Map between bufferqueue gralloc0 usage, and HIDL gralloc1 usages"

This reverts commit 1a2f15daf13552e86324025cf6d31d887cd8fa02.

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

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 980ba39..e7a671d 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -44,8 +44,6 @@
 #include <utils/Timers.h>
 #include <cutils/properties.h>
 
-#include <grallocusage/GrallocUsageConversion.h>
-
 #include <android/hardware/camera2/ICameraDeviceUser.h>
 
 #include "utils/CameraTraces.h"
@@ -497,6 +495,11 @@
     return dataSpace;
 }
 
+ConsumerUsageFlags Camera3Device::mapToConsumerUsage(
+        uint32_t usage) {
+    return usage;
+}
+
 StreamRotation Camera3Device::mapToStreamRotation(camera3_stream_rotation_t rotation) {
     switch (rotation) {
         case CAMERA3_STREAM_ROTATION_0:
@@ -546,6 +549,16 @@
     return static_cast<uint32_t>(pixelFormat);
 }
 
+uint32_t Camera3Device::mapConsumerToFrameworkUsage(
+        ConsumerUsageFlags usage) {
+    return usage;
+}
+
+uint32_t Camera3Device::mapProducerToFrameworkUsage(
+        ProducerUsageFlags usage) {
+    return usage;
+}
+
 ssize_t Camera3Device::getJpegBufferSize(uint32_t width, uint32_t height) const {
     // Get max jpeg size (area-wise).
     Size maxJpegResolution = getMaxJpegResolution();
@@ -3143,9 +3156,7 @@
             dst.width = src->width;
             dst.height = src->height;
             dst.format = mapToPixelFormat(src->format);
-            uint64_t consumerUsage, producerUsage;
-            ::android_convertGralloc0To1Usage(src->usage, &producerUsage, &consumerUsage);
-            dst.usage = consumerUsage;
+            dst.usage = mapToConsumerUsage(src->usage);
             dst.dataSpace = mapToHidlDataspace(src->data_space);
             dst.rotation = mapToStreamRotation((camera3_stream_rotation_t) src->rotation);
 
@@ -3227,6 +3238,7 @@
                             __FUNCTION__, streamId);
                     return INVALID_OPERATION;
                 }
+                dst->usage = mapConsumerToFrameworkUsage(src.consumerUsage);
             } else {
                 // OUTPUT
                 if (src.consumerUsage != 0) {
@@ -3234,8 +3246,8 @@
                             __FUNCTION__, streamId);
                     return INVALID_OPERATION;
                 }
+                dst->usage = mapProducerToFrameworkUsage(src.producerUsage);
             }
-            dst->usage = ::android_convertGralloc1To0Usage(src.producerUsage, src.consumerUsage);
             dst->max_buffers = src.maxBuffers;
         }
     }