diff options
| 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 |
| commit | 57c86189bc07d9ccb0fd044e66df736d0bf19639 (patch) | |
| tree | 850a15dd5d48eb35aa993ceb27f3551a25622803 /include/camera | |
| parent | 40cdc56efa47580d89a93750cefecb8ccbaf9a72 (diff) | |
| download | frameworks_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 'include/camera')
| -rw-r--r-- | include/camera/Camera.h | 6 | ||||
| -rw-r--r-- | include/camera/ICameraClient.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/camera/Camera.h b/include/camera/Camera.h index f701280..234e165 100644 --- a/include/camera/Camera.h +++ b/include/camera/Camera.h @@ -59,7 +59,8 @@ class CameraListener: virtual public RefBase { public: virtual void notify(int32_t msgType, int32_t ext1, int32_t ext2) = 0; - virtual void postData(int32_t msgType, const sp<IMemory>& dataPtr) = 0; + virtual void postData(int32_t msgType, const sp<IMemory>& dataPtr, + camera_frame_metadata_t *metadata) = 0; virtual void postDataTimestamp(nsecs_t timestamp, int32_t msgType, const sp<IMemory>& dataPtr) = 0; }; @@ -138,7 +139,8 @@ public: // ICameraClient interface virtual void notifyCallback(int32_t msgType, int32_t ext, int32_t ext2); - virtual void dataCallback(int32_t msgType, const sp<IMemory>& dataPtr); + virtual void dataCallback(int32_t msgType, const sp<IMemory>& dataPtr, + camera_frame_metadata_t *metadata); virtual void dataCallbackTimestamp(nsecs_t timestamp, int32_t msgType, const sp<IMemory>& dataPtr); sp<ICamera> remote(); diff --git a/include/camera/ICameraClient.h b/include/camera/ICameraClient.h index 236d0f6..b30aa7a 100644 --- a/include/camera/ICameraClient.h +++ b/include/camera/ICameraClient.h @@ -22,6 +22,7 @@ #include <binder/Parcel.h> #include <binder/IMemory.h> #include <utils/Timers.h> +#include <system/camera.h> namespace android { @@ -31,7 +32,8 @@ public: DECLARE_META_INTERFACE(CameraClient); virtual void notifyCallback(int32_t msgType, int32_t ext1, int32_t ext2) = 0; - virtual void dataCallback(int32_t msgType, const sp<IMemory>& data) = 0; + virtual void dataCallback(int32_t msgType, const sp<IMemory>& data, + camera_frame_metadata_t *metadata) = 0; virtual void dataCallbackTimestamp(nsecs_t timestamp, int32_t msgType, const sp<IMemory>& data) = 0; }; |