summaryrefslogtreecommitdiff
path: root/camera/device/1.0/default/CameraDevice.cpp
diff options
context:
space:
mode:
authorYin-Chia Yeh <yinchiayeh@google.com>2017-04-17 17:44:52 -0700
committerYin-Chia Yeh <yinchiayeh@google.com>2017-04-27 16:13:52 -0700
commit1ee279df205218fb7372baf031fb93d2a0d6a821 (patch)
treec9b2c41e224d4afee749b4a1fb97870b09e8b1bb /camera/device/1.0/default/CameraDevice.cpp
parent1c6cb69c3746fd4ec597ef152856c623f9871c04 (diff)
Camera: use framework header for VideoNativeHandleMetadata
Test: build Bug: 35625849 Change-Id: I8159dd571b6b390fa089d497d45b76c1ec5bda31
Diffstat (limited to 'camera/device/1.0/default/CameraDevice.cpp')
-rw-r--r--camera/device/1.0/default/CameraDevice.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/camera/device/1.0/default/CameraDevice.cpp b/camera/device/1.0/default/CameraDevice.cpp
index cb20fec80f..15a44ca7df 100644
--- a/camera/device/1.0/default/CameraDevice.cpp
+++ b/camera/device/1.0/default/CameraDevice.cpp
@@ -21,6 +21,7 @@
#include <log/log.h>
#include <utils/Trace.h>
+#include <media/hardware/HardwareAPI.h> // For VideoNativeHandleMetadata
#include "CameraDevice_1_0.h"
namespace android {
@@ -500,7 +501,7 @@ void CameraDevice::sDataCbTimestamp(nsecs_t timestamp, int32_t msg_type,
if (mem->mBufSize == sizeof(VideoNativeHandleMetadata)) {
VideoNativeHandleMetadata* md = (VideoNativeHandleMetadata*)
((uint8_t*) mem->mHidlHeapMemData + index * mem->mBufSize);
- if (md->eType == VideoNativeHandleMetadata::kMetadataBufferTypeNativeHandleSource) {
+ if (md->eType == kMetadataBufferTypeNativeHandleSource) {
handle = md->pHandle;
}
}
@@ -837,7 +838,7 @@ void CameraDevice::releaseRecordingFrameLocked(
void *data = ((uint8_t *) camMemory->mHidlHeapMemData) + bufferIndex * camMemory->mBufSize;
if (handle) {
VideoNativeHandleMetadata* md = (VideoNativeHandleMetadata*) data;
- if (md->eType == VideoNativeHandleMetadata::kMetadataBufferTypeNativeHandleSource) {
+ if (md->eType == kMetadataBufferTypeNativeHandleSource) {
// Input handle will be closed by HIDL transport later, so clone it
// HAL implementation is responsible to close/delete the clone
native_handle_t* clone = native_handle_clone(handle);