diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2017-04-04 22:22:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-04 22:22:03 +0000 |
| commit | ae880e49225d29f27a507814db5805f1a0357f45 (patch) | |
| tree | f70abc0bbc9bed356913a19773baaf3a0dec8c51 /camera/device/1.0/default/CameraDevice.cpp | |
| parent | 90b4baef525a5fc01aa778a9c0ca364943fc69f9 (diff) | |
| parent | c25c54f4b19e9a8bd5e908980ab8fdb96854678b (diff) | |
Merge "Revert "camera: Map between legacy gralloc0 usage, and HIDL gralloc1 usages"" into oc-dev
Diffstat (limited to 'camera/device/1.0/default/CameraDevice.cpp')
| -rw-r--r-- | camera/device/1.0/default/CameraDevice.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/camera/device/1.0/default/CameraDevice.cpp b/camera/device/1.0/default/CameraDevice.cpp index 5c4723ddad..877c6e7728 100644 --- a/camera/device/1.0/default/CameraDevice.cpp +++ b/camera/device/1.0/default/CameraDevice.cpp @@ -21,8 +21,6 @@ #include <hidlmemory/mapping.h> #include <utils/Trace.h> -#include <grallocusage/GrallocUsageConversion.h> - #include "CameraDevice_1_0.h" namespace android { @@ -32,6 +30,7 @@ namespace device { namespace V1_0 { namespace implementation { +using ::android::hardware::graphics::allocator::V2_0::ProducerUsage; using ::android::hardware::graphics::common::V1_0::PixelFormat; HandleImporter& CameraDevice::sHandleImporter = HandleImporter::getInstance(); @@ -260,10 +259,7 @@ int CameraDevice::sSetUsage(struct preview_stream_ops* w, int usage) { } object->cleanUpCirculatingBuffers(); - ProducerUsageFlags producerUsage; - uint64_t consumerUsage; - ::android_convertGralloc0To1Usage(usage, &producerUsage, &consumerUsage); - return getStatusT(object->mPreviewCallback->setUsage(producerUsage)); + return getStatusT(object->mPreviewCallback->setUsage((ProducerUsage) usage)); } int CameraDevice::sSetSwapInterval(struct preview_stream_ops *w, int interval) { |