summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/api1/client2/ZslProcessor.h
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2014-09-09 16:20:53 -0700
committerRuben Brunk <rubenbrunk@google.com>2014-09-09 16:20:53 -0700
commit6551e1ede59f4a3043fb141159ca67bd2c85a911 (patch)
tree53caae10974c1c2ec1461e22acd9daa4e1d37dc4 /services/camera/libcameraservice/api1/client2/ZslProcessor.h
parent767fc12e58422eef14aa40a5e7ffefd0b3949b82 (diff)
downloadframeworks_av-6551e1ede59f4a3043fb141159ca67bd2c85a911.zip
frameworks_av-6551e1ede59f4a3043fb141159ca67bd2c85a911.tar.gz
frameworks_av-6551e1ede59f4a3043fb141159ca67bd2c85a911.tar.bz2
camera2: Fix video snapshot for HAL 2.* devices.
Bug: 15408128 - Lazily destroy ZSL stream when ZslProcessor is updated, or when the camera client is disconnected, allowing HAL 2.* devices that rely on the ZSL stream to capture video snapshots to function correctly. Change-Id: Ia5cf14c62acda4d9c640440dc5b8e0796dc0b3fa
Diffstat (limited to 'services/camera/libcameraservice/api1/client2/ZslProcessor.h')
-rw-r--r--services/camera/libcameraservice/api1/client2/ZslProcessor.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/api1/client2/ZslProcessor.h b/services/camera/libcameraservice/api1/client2/ZslProcessor.h
index f4cf0c8..b6533cf 100644
--- a/services/camera/libcameraservice/api1/client2/ZslProcessor.h
+++ b/services/camera/libcameraservice/api1/client2/ZslProcessor.h
@@ -67,6 +67,7 @@ class ZslProcessor:
status_t updateStream(const Parameters &params);
status_t deleteStream();
+ status_t disconnect();
int getStreamId() const;
status_t pushToReprocess(int32_t requestId);
@@ -86,6 +87,8 @@ class ZslProcessor:
wp<CaptureSequencer> mSequencer;
int mId;
+ bool mDeleted;
+
mutable Mutex mInputMutex;
bool mZslBufferAvailable;
Condition mZslBufferAvailableSignal;