summaryrefslogtreecommitdiffstats
path: root/camera/ProCamera.cpp
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-02-20 19:15:15 -0800
committerIgor Murashkin <iam@google.com>2013-02-22 10:50:14 -0800
commit76f8b43909817179b317880202360863b8f976d0 (patch)
tree2d845b0c60925c6af6d77ec167366140e4843ea6 /camera/ProCamera.cpp
parent3261fd3f1d8f798fab2f1b3efaa92d5a35cd42e7 (diff)
downloadframeworks_av-76f8b43909817179b317880202360863b8f976d0.zip
frameworks_av-76f8b43909817179b317880202360863b8f976d0.tar.gz
frameworks_av-76f8b43909817179b317880202360863b8f976d0.tar.bz2
Camera: Change ProCamera to take IGraphicBufferProducer
Change-Id: Iec62eead6d179aa5486f7719143340976bb76e7d
Diffstat (limited to 'camera/ProCamera.cpp')
-rw-r--r--camera/ProCamera.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/camera/ProCamera.cpp b/camera/ProCamera.cpp
index 92ec9d6..8fd08f4 100644
--- a/camera/ProCamera.cpp
+++ b/camera/ProCamera.cpp
@@ -278,7 +278,8 @@ status_t ProCamera::createStream(int width, int height, int format,
sp <IProCameraUser> c = mCamera;
if (c == 0) return NO_INIT;
- return c->createStream(width, height, format, surface, streamId);
+ return c->createStream(width, height, format, surface->getIGraphicBufferProducer(),
+ streamId);
}
status_t ProCamera::createStream(int width, int height, int format,
@@ -293,10 +294,10 @@ status_t ProCamera::createStream(int width, int height, int format,
status_t stat = INVALID_OPERATION;
if (bufferProducer != 0) {
- binder = bufferProducer->asBinder();
+ sp <IProCameraUser> c = mCamera;
+ if (c == 0) return NO_INIT;
- ALOGV("%s: createStreamT END (%d), StreamID = %d", __FUNCTION__, stat,
- *streamId);
+ return c->createStream(width, height, format, bufferProducer, streamId);
}
else {
*streamId = -1;