commit bcb0f6a889bd59d971140a9e927417dc7af8101a
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 13 15:52:34 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 13 15:52:34 2018 +0000
tree d0669e971be5859522d455ccf7c184831f15489c
parent 6161c465eddd147a93152d72e069621888eadd91
parent 8a874d48a86ad0c6ada84b063b2caab5ee7aab66

Merge "QCamera3: Set the gralloc usage of dummy batch stream correctly"

msm8998/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
index cae96f7..9f4c118 100644
--- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
@@ -2654,6 +2654,7 @@
                         if (!m_bIsVideo && (streamList->operation_mode ==
                                 CAMERA3_STREAM_CONFIGURATION_CONSTRAINED_HIGH_SPEED_MODE)) {
                             mDummyBatchStream = *newStream;
+                            mDummyBatchStream.usage = GRALLOC_USAGE_HW_VIDEO_ENCODER;
                         }
                         int bufferCount = MAX_INFLIGHT_REQUESTS;
                         if (mStreamConfigInfo.type[mStreamConfigInfo.num_streams] ==

msm8998/QCamera2/HAL3/QCamera3Stream.cpp

diff --git a/msm8998/QCamera2/HAL3/QCamera3Stream.cpp b/msm8998/QCamera2/HAL3/QCamera3Stream.cpp
index 85887fd..3a0352f 100644
--- a/msm8998/QCamera2/HAL3/QCamera3Stream.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3Stream.cpp
@@ -1513,6 +1513,10 @@
         delete mStreamBatchBufs;
         mStreamBatchBufs = NULL;
     }
+    // Flush any free batch buffers in the queue. The dummy batch stream doesn't
+    // get started, stop will not be able to trigger the flush call making it possible
+    // to free the buffer definitions twice.
+    flushFreeBatchBufQ();
     // mm-camera-interface frees bufDefs even though bufDefs are allocated by
     // QCamera3Stream. Don't free here
     mBatchBufDefs = NULL;