diff options
| author | Mansoor Aftab <maftab@codeaurora.org> | 2015-02-13 21:12:57 -0800 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2015-02-17 10:24:33 -0800 |
| commit | 2f4dba92e33a9909f2037f2925990f7a15d160ad (patch) | |
| tree | 14d1e19d728de2af47b228d223b7dbe54b94f160 | |
| parent | df7652db7a352b2c2622df489682ac721bafad7d (diff) | |
| download | flo-lollipop-mr1-wfc-release.tar.gz | |
Camera3: Ensure postprocessor is stopped during teardownandroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-release
Not shutting down postprocessor during channel teardown
can cause jpeg messaging threads to linger around,
causing performance issue due to large number of abandoned
threads.
Bug: 19255187
Change-Id: Icde28a91ccc80bb29b836588abfdfca94ae97d27
| -rwxr-xr-x | camera/QCamera2/HAL3/QCamera3Channel.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/camera/QCamera2/HAL3/QCamera3Channel.cpp b/camera/QCamera2/HAL3/QCamera3Channel.cpp index 6212159..ae042e0 100755 --- a/camera/QCamera2/HAL3/QCamera3Channel.cpp +++ b/camera/QCamera2/HAL3/QCamera3Channel.cpp @@ -927,7 +927,11 @@ QCamera3PicChannel::QCamera3PicChannel(uint32_t cam_handle, QCamera3PicChannel::~QCamera3PicChannel() { - int32_t rc = m_postprocessor.deinit(); + int32_t rc = m_postprocessor.stop(); + if (rc != NO_ERROR) { + ALOGE("%s: Postprocessor stop failed", __func__); + } + rc = m_postprocessor.deinit(); if (rc != 0) { ALOGE("De-init Postprocessor failed"); } |