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 | fa4cf9d310685b4c25877cba772ff7da84caf517 (patch) | |
tree | d954ae7a991a1dfc084019433f370b46abb1f6c4 /camera/ProCamera.cpp | |
parent | ce124da179775a81ad7dcc3f33315eca451e66f2 (diff) | |
download | frameworks_av-fa4cf9d310685b4c25877cba772ff7da84caf517.zip frameworks_av-fa4cf9d310685b4c25877cba772ff7da84caf517.tar.gz frameworks_av-fa4cf9d310685b4c25877cba772ff7da84caf517.tar.bz2 |
(Camera)ProCamera: Remove unused functions from binder interface
Change-Id: I0582268cef6e84b630bc87c8a03dcd69d54c440d
Diffstat (limited to 'camera/ProCamera.cpp')
-rw-r--r-- | camera/ProCamera.cpp | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/camera/ProCamera.cpp b/camera/ProCamera.cpp index 3cfabf6..396b009 100644 --- a/camera/ProCamera.cpp +++ b/camera/ProCamera.cpp @@ -60,21 +60,6 @@ void ProCamera::notifyCallback(int32_t msgType, int32_t ext1, int32_t ext2) return CameraBaseT::notifyCallback(msgType, ext1, ext2); } -// callback from camera service when frame or image is ready -void ProCamera::dataCallback(int32_t msgType, const sp<IMemory>& dataPtr, - camera_frame_metadata_t *metadata) -{ - return CameraBaseT::dataCallback(msgType, dataPtr, metadata); -} - -// callback from camera service when timestamped frame is ready -void ProCamera::dataCallbackTimestamp(nsecs_t timestamp, int32_t msgType, - const sp<IMemory>& dataPtr) -{ - CameraBaseT::dataCallbackTimestamp(timestamp, msgType, dataPtr); -} - - void ProCamera::onLockStatusChanged( IProCameraCallbacks::LockStatus newLockStatus) { @@ -185,7 +170,7 @@ status_t ProCamera::deleteStream(int streamId) sp <IProCameraUser> c = mCamera; if (c == 0) return NO_INIT; - status_t s = c->cancelStream(streamId); + status_t s = c->deleteStream(streamId); mStreams.removeItem(streamId); @@ -330,10 +315,7 @@ void ProCamera::onFrameAvailable(int streamId) { CpuConsumer::LockedBuffer buf; if (listener.get() != NULL) { - if (listener->useOnFrameAvailable()) { - listener->onFrameAvailable(streamId, stream.cpuConsumer); - return; - } + listener->onFrameAvailable(streamId, stream.cpuConsumer); } // Unblock waitForFrame(id) callers |