diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-08 17:28:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-08 17:28:14 -0700 |
| commit | ec109bdd3982590709155006c1eb2e70c33015f0 (patch) | |
| tree | 986a23c60a13e7b68b9938b29251b59bc1e6c168 /include | |
| parent | b426703c1944aed7148be288d2c4b28bca4b75fc (diff) | |
| parent | 6698d16b951370a0cc6aa87bcd2ca91122a57410 (diff) | |
| download | frameworks_base-ec109bdd3982590709155006c1eb2e70c33015f0.zip frameworks_base-ec109bdd3982590709155006c1eb2e70c33015f0.tar.gz frameworks_base-ec109bdd3982590709155006c1eb2e70c33015f0.tar.bz2 | |
Merge change 6560
* changes:
resolved conflicts for merge of 04c7d0f8 to master
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/Camera.h | 3 | ||||
| -rw-r--r-- | include/ui/CameraHardwareInterface.h | 2 | ||||
| -rw-r--r-- | include/ui/ICameraClient.h | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/include/ui/Camera.h b/include/ui/Camera.h index e3544ab..afb07b5 100644 --- a/include/ui/Camera.h +++ b/include/ui/Camera.h @@ -18,6 +18,7 @@ #ifndef ANDROID_HARDWARE_CAMERA_H #define ANDROID_HARDWARE_CAMERA_H +#include <utils/Timers.h> #include <ui/ICameraClient.h> namespace android { @@ -94,6 +95,7 @@ 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 postDataTimestamp(nsecs_t timestamp, int32_t msgType, const sp<IMemory>& dataPtr) = 0; }; class Camera : public BnCameraClient, public IBinder::DeathRecipient @@ -155,6 +157,7 @@ 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 dataCallbackTimestamp(nsecs_t timestamp, int32_t msgType, const sp<IMemory>& dataPtr); sp<ICamera> remote(); diff --git a/include/ui/CameraHardwareInterface.h b/include/ui/CameraHardwareInterface.h index 2cdcc06..c703f5e 100644 --- a/include/ui/CameraHardwareInterface.h +++ b/include/ui/CameraHardwareInterface.h @@ -28,7 +28,7 @@ namespace android { typedef void (*preview_callback)(const sp<IMemory>& mem, void* user); /** Callback for startRecord() */ -typedef void (*recording_callback)(const sp<IMemory>& mem, void* user); +typedef void (*recording_callback)(nsecs_t timestamp, const sp<IMemory>& mem, void* user); /** Callback for takePicture() */ typedef void (*shutter_callback)(void* user); diff --git a/include/ui/ICameraClient.h b/include/ui/ICameraClient.h index f38a6aa..236d0f6 100644 --- a/include/ui/ICameraClient.h +++ b/include/ui/ICameraClient.h @@ -21,6 +21,7 @@ #include <binder/IInterface.h> #include <binder/Parcel.h> #include <binder/IMemory.h> +#include <utils/Timers.h> namespace android { @@ -31,7 +32,7 @@ public: 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 dataCallbackTimestamp(nsecs_t timestamp, int32_t msgType, const sp<IMemory>& data) = 0; }; // ---------------------------------------------------------------------------- |