summaryrefslogtreecommitdiff
path: root/libs/camera/Camera.cpp
diff options
context:
space:
mode:
author Wu-cheng Li <wuchengli@google.com> 2011-07-30 05:00:37 +0800
committer Wu-cheng Li <wuchengli@google.com> 2011-08-02 15:48:41 +0800
commitbb1e275c0e684dd213f124da77110cdd9d6f090c (patch)
tree0a20f8da5c8e09ca8663053ae39e544bfd315243 /libs/camera/Camera.cpp
parent0175028b73eefc503f67d5686b71e1957677e0de (diff)
Pass camera frame metadata from camera service to Java.
bug:4460717 Change-Id: I2fae6e1dfca6b8f3a5ee5716fc7817f5417bf657
Diffstat (limited to 'libs/camera/Camera.cpp')
-rw-r--r--libs/camera/Camera.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/camera/Camera.cpp b/libs/camera/Camera.cpp
index 3c00db556022..7ac3cc1df718 100644
--- a/libs/camera/Camera.cpp
+++ b/libs/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);
}
}