diff options
author | Zhijun He <zhijunhe@google.com> | 2014-04-15 14:09:55 -0700 |
---|---|---|
committer | Zhijun He <zhijunhe@google.com> | 2014-04-18 17:55:51 -0700 |
commit | 6adc9ccb2948d9421a0ed4b74f52b909bcec2037 (patch) | |
tree | 511b67a742dcc45fa1e7d7932cb9275069e56fae /services/camera/libcameraservice/device3/Camera3OutputStream.cpp | |
parent | cb010a3fa85db1eb90346b35e484e21e7f1b1a4b (diff) | |
download | frameworks_av-6adc9ccb2948d9421a0ed4b74f52b909bcec2037.zip frameworks_av-6adc9ccb2948d9421a0ed4b74f52b909bcec2037.tar.gz frameworks_av-6adc9ccb2948d9421a0ed4b74f52b909bcec2037.tar.bz2 |
Camera3: block until get an available buffer
Camera3Stream shouldn't error out when the max number of buffers are already
dequeued. It should block until next buffer returned from camera device.
Bug: 11595505
Change-Id: If65a70c29cb04219e14ded0744059c0ab783444b
Diffstat (limited to 'services/camera/libcameraservice/device3/Camera3OutputStream.cpp')
-rw-r--r-- | services/camera/libcameraservice/device3/Camera3OutputStream.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp index 682755d..7ec649b 100644 --- a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp +++ b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp @@ -119,7 +119,7 @@ status_t Camera3OutputStream::getBufferLocked(camera3_stream_buffer *buffer) { * in which case we reassign it to acquire_fence */ handoutBufferLocked(*buffer, &(anb->handle), /*acquireFence*/fenceFd, - /*releaseFence*/-1, CAMERA3_BUFFER_STATUS_OK); + /*releaseFence*/-1, CAMERA3_BUFFER_STATUS_OK, /*output*/true); return OK; } @@ -324,7 +324,7 @@ status_t Camera3OutputStream::configureQueueLocked() { } mTotalBufferCount = maxConsumerBuffers + camera3_stream::max_buffers; - mDequeuedBufferCount = 0; + mHandoutTotalBufferCount = 0; mFrameCount = 0; mLastTimestamp = 0; |