diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2017-01-23 17:27:26 -0800 |
|---|---|---|
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | 2017-03-01 22:24:39 -0800 |
| commit | 248ed700fed7e682eddf3d0607592eb5f3a3fb1a (patch) | |
| tree | b1189f979a00501cd5147855641a815b527516ab /camera/device/3.2/default/CameraDevice.cpp | |
| parent | 77b2bf00f5c270940516f3aee32c89165dcbf4d1 (diff) | |
Camera: default implementation of device 1.0
Also some updates to HIDL interface:
- Add releaseRecordingFrameHandle to ICameraDevice
for native handle metadata recording mode
- Add handleCallbackTimestamp to ICameraDevieCallback
for native handle metadata recording mode
- Add missing face detection metadata to
ICameraDeviceCallback::dataCallback
- Instead of passing native handle, pass buffer ID
in dequeueBuffer/enqueueBuffer/cancelBuffer in
ICameraDevicePreviewCallback
- Add CameraFrameMetadata in types.hal for face
metadata
Test: Camera CTS passing (except FlashLightTest) on Angler
Bug: 30985004
Change-Id: Idf72a4b5f4c934845ac698f0b13536608ffd0100
Diffstat (limited to 'camera/device/3.2/default/CameraDevice.cpp')
| -rw-r--r-- | camera/device/3.2/default/CameraDevice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/device/3.2/default/CameraDevice.cpp b/camera/device/3.2/default/CameraDevice.cpp index 18e0e7bb87..0a457ad91d 100644 --- a/camera/device/3.2/default/CameraDevice.cpp +++ b/camera/device/3.2/default/CameraDevice.cpp @@ -15,11 +15,11 @@ */ #define LOG_TAG "CamDev@3.2-impl" -#include <android/log.h> +#include <utils/Log.h> #include <utils/Vector.h> #include <utils/Trace.h> -#include "CameraDevice.h" +#include "CameraDevice_3_2.h" #include <include/convert.h> namespace android { |