summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/CameraService.h
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2011-07-28 05:30:59 +0800
committerWu-cheng Li <wuchengli@google.com>2011-07-29 07:14:38 +0800
commitf0d6a48c6ad852b84687127f14b1ffde02416dc4 (patch)
tree6b4eed1bc3c71d8b61638d27c67cd43420aed92d /services/camera/libcameraservice/CameraService.h
parent2043b01b207aae3458da395bc6d501d76e59425c (diff)
downloadframeworks_base-f0d6a48c6ad852b84687127f14b1ffde02416dc4.zip
frameworks_base-f0d6a48c6ad852b84687127f14b1ffde02416dc4.tar.gz
frameworks_base-f0d6a48c6ad852b84687127f14b1ffde02416dc4.tar.bz2
Add frame metadata parameter to camera data_callback.
bug:4460717 Change-Id: Ib47d7d7df20af8155a719f3dabefe030893bfebc
Diffstat (limited to 'services/camera/libcameraservice/CameraService.h')
-rw-r--r--services/camera/libcameraservice/CameraService.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
index c5fefb8..af7f06e 100644
--- a/services/camera/libcameraservice/CameraService.h
+++ b/services/camera/libcameraservice/CameraService.h
@@ -140,7 +140,8 @@ private:
// these are static callback functions
static void notifyCallback(int32_t msgType, int32_t ext1, int32_t ext2, void* user);
- static void dataCallback(int32_t msgType, const sp<IMemory>& dataPtr, void* user);
+ static void dataCallback(int32_t msgType, const sp<IMemory>& dataPtr,
+ camera_frame_metadata_t *metadata, void* user);
static void dataCallbackTimestamp(nsecs_t timestamp, int32_t msgType, const sp<IMemory>& dataPtr, void* user);
// convert client from cookie
static sp<Client> getClientFromCookie(void* user);