summaryrefslogtreecommitdiffstats
path: root/camera/Camera.cpp
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2011-07-30 05:00:37 +0800
committerWu-cheng Li <wuchengli@google.com>2011-08-02 15:48:41 +0800
commit57c86189bc07d9ccb0fd044e66df736d0bf19639 (patch)
tree850a15dd5d48eb35aa993ceb27f3551a25622803 /camera/Camera.cpp
parent40cdc56efa47580d89a93750cefecb8ccbaf9a72 (diff)
downloadframeworks_av-57c86189bc07d9ccb0fd044e66df736d0bf19639.zip
frameworks_av-57c86189bc07d9ccb0fd044e66df736d0bf19639.tar.gz
frameworks_av-57c86189bc07d9ccb0fd044e66df736d0bf19639.tar.bz2
Pass camera frame metadata from camera service to Java.
bug:4460717 Change-Id: I2fae6e1dfca6b8f3a5ee5716fc7817f5417bf657
Diffstat (limited to 'camera/Camera.cpp')
-rw-r--r--camera/Camera.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/camera/Camera.cpp b/camera/Camera.cpp
index 3c00db5..7ac3cc1 100644
--- a/camera/Camera.cpp
+++ b/camera/Camera.cpp
@@ -360,7 +360,8 @@ void Camera::notifyCallback(int32_t msgType, int32_t ext1, int32_t ext2)
}
// callback from camera service when frame or image is ready
-void Camera::dataCallback(int32_t msgType, const sp<IMemory>& dataPtr)
+void Camera::dataCallback(int32_t msgType, const sp<IMemory>& dataPtr,
+ camera_frame_metadata_t *metadata)
{
sp<CameraListener> listener;
{
@@ -368,7 +369,7 @@ void Camera::dataCallback(int32_t msgType, const sp<IMemory>& dataPtr)
listener = mListener;
}
if (listener != NULL) {
- listener->postData(msgType, dataPtr);
+ listener->postData(msgType, dataPtr, metadata);
}
}