diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-01-24 19:18:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-24 19:18:32 +0000 |
| commit | 1862a008db748fd55834345dffe298078455d5c3 (patch) | |
| tree | 06e9b8ce61c2de0ddb87c94c20270dab1a95d755 /services/camera/libcameraservice/api1 | |
| parent | f0002d142e6d24c5438600b2c259679de710f8ac (diff) | |
| parent | 661076292093f82aec488baf8460cdf204a5efd2 (diff) | |
| download | frameworks_av-1862a008db748fd55834345dffe298078455d5c3.zip frameworks_av-1862a008db748fd55834345dffe298078455d5c3.tar.gz frameworks_av-1862a008db748fd55834345dffe298078455d5c3.tar.bz2 | |
Merge "Camera: delete zsl stream for video mode"
Diffstat (limited to 'services/camera/libcameraservice/api1')
| -rw-r--r-- | services/camera/libcameraservice/api1/Camera2Client.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp index c370536..02be634 100644 --- a/services/camera/libcameraservice/api1/Camera2Client.cpp +++ b/services/camera/libcameraservice/api1/Camera2Client.cpp @@ -797,6 +797,8 @@ status_t Camera2Client::startPreviewL(Parameters ¶ms, bool restart) { return res; } outputStreams.push(getZslStreamId()); + } else { + mZslProcessor->deleteStream(); } outputStreams.push(getPreviewStreamId()); |