diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-01-27 19:37:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-27 19:37:03 +0000 |
| commit | ad1763b4ae3c60eb11182d2fd4c5a79f15275a52 (patch) | |
| tree | 7ade2fa12dea22f346b336bed60d20faee633f69 /services/camera/libcameraservice/api1 | |
| parent | e24c62ed878bffead16831391458ba2816600fb2 (diff) | |
| parent | 491e341211b4772c75f719158f6b397e1c40497d (diff) | |
| download | frameworks_av-ad1763b4ae3c60eb11182d2fd4c5a79f15275a52.zip frameworks_av-ad1763b4ae3c60eb11182d2fd4c5a79f15275a52.tar.gz frameworks_av-ad1763b4ae3c60eb11182d2fd4c5a79f15275a52.tar.bz2 | |
Merge "Camera3: Flush device before ZSL reprocess"
Diffstat (limited to 'services/camera/libcameraservice/api1')
| -rw-r--r-- | services/camera/libcameraservice/api1/client2/ZslProcessor3.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/api1/client2/ZslProcessor3.cpp b/services/camera/libcameraservice/api1/client2/ZslProcessor3.cpp index 776ebe2..e17d05d 100644 --- a/services/camera/libcameraservice/api1/client2/ZslProcessor3.cpp +++ b/services/camera/libcameraservice/api1/client2/ZslProcessor3.cpp @@ -273,6 +273,15 @@ status_t ZslProcessor3::pushToReprocess(int32_t requestId) { return INVALID_OPERATION; } + // Flush device to clear out all in-flight requests pending in HAL. + res = client->getCameraDevice()->flush(); + if (res != OK) { + ALOGE("%s: Camera %d: Failed to flush device: " + "%s (%d)", + __FUNCTION__, client->getCameraId(), strerror(-res), res); + return res; + } + // Update JPEG settings { SharedParameters::Lock l(client->getParameters()); |