diff options
| author | Chien-Yu Chen <cychen@google.com> | 2015-09-04 01:51:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-04 01:51:46 +0000 |
| commit | 50d12164efe3e4df9a1d994afdeb4779ce0f63c9 (patch) | |
| tree | 0b1785e26deb4dcc6ae55fb74e63d66feb51a819 /services/camera/libcameraservice/device3/Camera3Stream.cpp | |
| parent | 52aad85627f5216e7a3d9db425d2cc409f998a01 (diff) | |
| parent | 85a6455f269d79adf9bf48d757a4b1b3c81cf760 (diff) | |
| download | frameworks_av-50d12164efe3e4df9a1d994afdeb4779ce0f63c9.zip frameworks_av-50d12164efe3e4df9a1d994afdeb4779ce0f63c9.tar.gz frameworks_av-50d12164efe3e4df9a1d994afdeb4779ce0f63c9.tar.bz2 | |
Merge "Camera3Device: Support batch requests" into mnc-dr-dev
Diffstat (limited to 'services/camera/libcameraservice/device3/Camera3Stream.cpp')
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3Stream.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Stream.cpp b/services/camera/libcameraservice/device3/Camera3Stream.cpp index 7163d62..691764f 100644 --- a/services/camera/libcameraservice/device3/Camera3Stream.cpp +++ b/services/camera/libcameraservice/device3/Camera3Stream.cpp @@ -455,8 +455,9 @@ status_t Camera3Stream::getBuffer(camera3_stream_buffer *buffer) { res = mOutputBufferReturnedSignal.waitRelative(mLock, kWaitForBufferDuration); if (res != OK) { if (res == TIMED_OUT) { - ALOGE("%s: wait for output buffer return timed out after %lldms", __FUNCTION__, - kWaitForBufferDuration / 1000000LL); + ALOGE("%s: wait for output buffer return timed out after %lldms (max_buffers %d)", + __FUNCTION__, kWaitForBufferDuration / 1000000LL, + camera3_stream::max_buffers); } return res; } |