diff options
author | Igor Murashkin <iam@google.com> | 2013-03-04 16:14:23 -0800 |
---|---|---|
committer | Igor Murashkin <iam@google.com> | 2013-03-11 16:32:24 -0700 |
commit | 7cf9a7e7d19579565e0f9dba8be9c107f2dbf548 (patch) | |
tree | 842fc07ade8a885e0549d366b81e985bbb313dd6 /camera/Camera.cpp | |
parent | 71381051e2d048b2705c447b3d59db6e972493ee (diff) | |
download | frameworks_av-7cf9a7e7d19579565e0f9dba8be9c107f2dbf548.zip frameworks_av-7cf9a7e7d19579565e0f9dba8be9c107f2dbf548.tar.gz frameworks_av-7cf9a7e7d19579565e0f9dba8be9c107f2dbf548.tar.bz2 |
(Camera)ProCamera: Remove unused functions from binder interface
Change-Id: I0582268cef6e84b630bc87c8a03dcd69d54c440d
Diffstat (limited to 'camera/Camera.cpp')
-rw-r--r-- | camera/Camera.cpp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/camera/Camera.cpp b/camera/Camera.cpp index f417c90..e8908d2 100644 --- a/camera/Camera.cpp +++ b/camera/Camera.cpp @@ -283,7 +283,14 @@ void Camera::notifyCallback(int32_t msgType, int32_t ext1, int32_t ext2) void Camera::dataCallback(int32_t msgType, const sp<IMemory>& dataPtr, camera_frame_metadata_t *metadata) { - return CameraBaseT::dataCallback(msgType, dataPtr, metadata); + sp<CameraListener> listener; + { + Mutex::Autolock _l(mLock); + listener = mListener; + } + if (listener != NULL) { + listener->postData(msgType, dataPtr, metadata); + } } // callback from camera service when timestamped frame is ready @@ -302,7 +309,15 @@ void Camera::dataCallbackTimestamp(nsecs_t timestamp, int32_t msgType, const sp< return; } - if (!CameraBaseT::dataCallbackTimestamp(timestamp, msgType, dataPtr)) { + sp<CameraListener> listener; + { + Mutex::Autolock _l(mLock); + listener = mListener; + } + + if (listener != NULL) { + listener->postDataTimestamp(timestamp, msgType, dataPtr); + } else { ALOGW("No listener was set. Drop a recording frame."); releaseRecordingFrame(dataPtr); } |