diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-07-24 13:45:15 -0700 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2014-07-24 15:40:16 -0700 |
| commit | 0a21051b91c2e07e49eb6fa568c505aee967ab9d (patch) | |
| tree | e5f844d8863a19fc11b5057645dbfe720bf1f57c /services/camera/libcameraservice/device3/Camera3Device.cpp | |
| parent | 81e50d0c782cc18eab4ef40ecd6c7f36df50fea5 (diff) | |
| download | frameworks_av-0a21051b91c2e07e49eb6fa568c505aee967ab9d.zip frameworks_av-0a21051b91c2e07e49eb6fa568c505aee967ab9d.tar.gz frameworks_av-0a21051b91c2e07e49eb6fa568c505aee967ab9d.tar.bz2 | |
Camera3: tear down Camera3 streams when they are deleted.
Also override the disconnectLocked method in Camera3ZslStream to make sure the
Camera3ZslStream specific buffer queue is cleaned up properly.
Also revert 0be123df1897fd3fe1b7ba30f24d8ae4c91b4dc7, as it was not the right
fix.
Change-Id: I89bdcb2e206379ae1f2602421e7fdbcde9a31399
Diffstat (limited to 'services/camera/libcameraservice/device3/Camera3Device.cpp')
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3Device.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp index 9d36bfa..44e8822 100644 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp @@ -1497,6 +1497,9 @@ status_t Camera3Device::configureStreamsLocked() { ALOGV("%s: Camera %d: Stream configuration complete", __FUNCTION__, mId); + // tear down the deleted streams after configure streams. + mDeletedStreams.clear(); + return OK; } |