diff options
| author | Dave Sparks <davidsparks@android.com> | 2009-07-08 17:26:05 -0700 |
|---|---|---|
| committer | Dave Sparks <davidsparks@android.com> | 2009-07-08 17:26:05 -0700 |
| commit | 9f1234e4600d343710635973f3296da7b39cd9a2 (patch) | |
| tree | e110a73a5cec4dd06a16f666430bc04413680b3f /libs/ui/Camera.cpp | |
| parent | 9e76a23f59880a4709a300f5af5c6e9a348f6e19 (diff) | |
| parent | 47a97daf3b85e07551751eaf095106c1a911fc99 (diff) | |
| download | frameworks_native-9f1234e4600d343710635973f3296da7b39cd9a2.zip frameworks_native-9f1234e4600d343710635973f3296da7b39cd9a2.tar.gz frameworks_native-9f1234e4600d343710635973f3296da7b39cd9a2.tar.bz2 | |
resolved conflicts for merge of 04c7d0f8 to master
Diffstat (limited to 'libs/ui/Camera.cpp')
| -rw-r--r-- | libs/ui/Camera.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libs/ui/Camera.cpp b/libs/ui/Camera.cpp index 0aa77ff..12a7725 100644 --- a/libs/ui/Camera.cpp +++ b/libs/ui/Camera.cpp @@ -310,6 +310,19 @@ void Camera::dataCallback(int32_t msgType, const sp<IMemory>& dataPtr) } } +// callback from camera service when timestamped frame is ready +void Camera::dataCallbackTimestamp(nsecs_t timestamp, int32_t msgType, const sp<IMemory>& dataPtr) +{ + sp<CameraListener> listener; + { + Mutex::Autolock _l(mLock); + listener = mListener; + } + if (listener != NULL) { + listener->postDataTimestamp(timestamp, msgType, dataPtr); + } +} + void Camera::binderDied(const wp<IBinder>& who) { LOGW("ICamera died"); notifyCallback(CAMERA_MSG_ERROR, CAMERA_ERROR_SERVER_DIED, 0); |