diff options
| author | Chien-Yu Chen <cychen@google.com> | 2015-09-12 18:12:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-12 18:12:25 +0000 |
| commit | 99c906570b8663da8709fd986323470984f9c57e (patch) | |
| tree | b6c89e759a64d887b8099b0eec4e1eaa8c690cba /services | |
| parent | 5c0adc3e632fbb2929cb20e32a8a9f2864c01490 (diff) | |
| parent | b83c1fe4e793da269b9340c64f7032a9cc27809c (diff) | |
| download | frameworks_av-99c906570b8663da8709fd986323470984f9c57e.zip frameworks_av-99c906570b8663da8709fd986323470984f9c57e.tar.gz frameworks_av-99c906570b8663da8709fd986323470984f9c57e.tar.bz2 | |
Merge "Camera3Device: Signal buffer returned after it failed" into mnc-dr-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3Stream.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Stream.cpp b/services/camera/libcameraservice/device3/Camera3Stream.cpp index 691764f..96299b3 100644 --- a/services/camera/libcameraservice/device3/Camera3Stream.cpp +++ b/services/camera/libcameraservice/device3/Camera3Stream.cpp @@ -487,9 +487,12 @@ status_t Camera3Stream::returnBuffer(const camera3_stream_buffer &buffer, status_t res = returnBufferLocked(buffer, timestamp); if (res == OK) { fireBufferListenersLocked(buffer, /*acquired*/false, /*output*/true); - mOutputBufferReturnedSignal.signal(); } + // Even if returning the buffer failed, we still want to signal whoever is waiting for the + // buffer to be returned. + mOutputBufferReturnedSignal.signal(); + return res; } |