commit 492f70a554a92abd6c4b3159ca151f162b467b8b
author Mark Salyzyn <salyzyn@google.com> Wed Sep 03 11:06:49 2014 -0700
committer Mark Salyzyn <salyzyn@google.com> Wed Sep 03 15:17:30 2014 -0700
tree 87508b9adc0d59fd7ede35b99b5912f1796a3950
parent 1422aff903ba3c0f37e1e0aab34ccc0f35a27ae1

Manta: libcamera2: prevent HAL crash when ZSL stream freed

This is a hardening band-aid to prevent HAL crash. Crash results in
Inaccessible camera hardware requiring a reboot of the device to recover.

NB: With Current GoogleCamera.app: Camera to Video switch, snapshots are
all green (blank). Workaround, switch to video mode, exit Camera application
and re-enter before running video where one expects to take snapshots as well.

Bug: 15408128
Change-Id: I1e6057069cace0e46e367f76f4a91f6b1f5459a5

libcamera2/ExynosCameraHWInterface2.cpp

diff --git a/libcamera2/ExynosCameraHWInterface2.cpp b/libcamera2/ExynosCameraHWInterface2.cpp
index a722a90..ffa2199 100644
--- a/libcamera2/ExynosCameraHWInterface2.cpp
+++ b/libcamera2/ExynosCameraHWInterface2.cpp
@@ -1944,6 +1944,7 @@
         subParameters->height        = height;
         subParameters->format        = *format_actual;
         subParameters->svcPlanes     = 1;
+        parentStream->m_parameters.streamOps =
         subParameters->streamOps     = stream_ops;
         subParameters->usage         = *usage;
         subParameters->numOwnSvcBuffers = *max_buffers;
@@ -1982,6 +1983,7 @@
         subParameters->height       = height;
         subParameters->format       = *format_actual;
         subParameters->svcPlanes     = NUM_PLANES(*format_actual);
+        parentStream->m_parameters.streamOps =
         subParameters->streamOps     = stream_ops;
         subParameters->usage         = *usage;
         subParameters->numOwnSvcBuffers = *max_buffers;