diff options
author | Zhijun He <zhijunhe@google.com> | 2014-07-07 17:05:38 -0700 |
---|---|---|
committer | Zhijun He <zhijunhe@google.com> | 2014-07-08 14:13:16 +0000 |
commit | 0ea8fa4ccbf9b2b179370b983f3887d3daf2381f (patch) | |
tree | 7c513124746228beab5a262424fcbdd2a00018c7 /services/camera/libcameraservice/device3 | |
parent | d8cbe4a024ef54adf043b6ea31fa22271b8b2c51 (diff) | |
download | frameworks_av-0ea8fa4ccbf9b2b179370b983f3887d3daf2381f.zip frameworks_av-0ea8fa4ccbf9b2b179370b983f3887d3daf2381f.tar.gz frameworks_av-0ea8fa4ccbf9b2b179370b983f3887d3daf2381f.tar.bz2 |
Camera3: Add capture intent for ZSL capture
Also fix the warning condition in input buffer return path.
Change-Id: I90e9edc1db9f1de87bc8936000b00c3306160c71
Diffstat (limited to 'services/camera/libcameraservice/device3')
-rw-r--r-- | services/camera/libcameraservice/device3/Camera3Device.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp index bbb1e1c..6ceb9d4 100644 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp @@ -1929,11 +1929,11 @@ void Camera3Device::processCaptureResult(const camera3_capture_result *result) { ALOGE("%s: RequestThread: Can't return input buffer for frame %d to" " its stream:%s (%d)", __FUNCTION__, frameNumber, strerror(-res), res); - } else { - ALOGW("%s: Input buffer should be NULL if there is no input" - " buffer sent in the request", - __FUNCTION__); - } + } + } else { + ALOGW("%s: Input buffer should be NULL if there is no input" + " buffer sent in the request, skipping input buffer return.", + __FUNCTION__); } } |