Revert "Manta: libcamera2: prevent HAL crash when ZSL stream freed"
authorMark Salyzyn <salyzyn@google.com>
Sun, 14 Sep 2014 19:24:16 +0000 (19:24 +0000)
committerMark Salyzyn <salyzyn@google.com>
Sun, 14 Sep 2014 19:27:32 +0000 (19:27 +0000)
This reverts commit 492f70a554a92abd6c4b3159ca151f162b467b8b.

Bug: 17489789
Change-Id: Iffec3971acc6cbb4a760c2163d634f9d5c61ca3d

libcamera2/ExynosCameraHWInterface2.cpp

index ffa2199e9a9acffdbdeace1ba223c6313bccda1f..a722a90bdddb3ccc6f53f3b0eff65782d57ba49e 100644 (file)
@@ -1944,7 +1944,6 @@ int ExynosCameraHWInterface2::allocateStream(uint32_t width, uint32_t height, in
         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;
@@ -1983,7 +1982,6 @@ int ExynosCameraHWInterface2::allocateStream(uint32_t width, uint32_t height, in
         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;