commit d9edd4aebddecdbb789de531a4b4f5874a6d38db
author Ranjith Kagathi Ananda <ranjith@codeaurora.org> Thu Sep 03 14:45:42 2015 -0700
committer Chien-Yu Chen <cychen@google.com> Tue Sep 08 11:23:16 2015 -0700
tree 24e8eaa7910db4af2cd6b798c3317c0605b73714
parent 620a481682b83c7c06642a95c51d4a6dd82e9c7d

QCamera2/HAL3: Handle releaseFrameData() correctly for batch mode

mDataQ.flush() calls releaseFrameData() with any pending buffers.
In case of batch mode, these are batch container buffers that
should be added to the empty batch buffer list.

Bug: 23360060

Change-Id: Ice2527b50ac9005055bd8f92312a111941855fe5

QCamera2/HAL3/QCamera3Stream.cpp

diff --git a/QCamera2/HAL3/QCamera3Stream.cpp b/QCamera2/HAL3/QCamera3Stream.cpp
index d495748..efd00e5 100644
--- a/QCamera2/HAL3/QCamera3Stream.cpp
+++ b/QCamera2/HAL3/QCamera3Stream.cpp
@@ -1079,7 +1079,15 @@
     QCamera3Stream *pme = (QCamera3Stream *)user_data;
     mm_camera_super_buf_t *frame = (mm_camera_super_buf_t *)data;
     if (NULL != pme) {
-        pme->bufDone(frame->bufs[0]->buf_idx);
+        if (UNLIKELY(pme->mBatchSize)) {
+            /* For batch mode, the batch buffer is added to empty list */
+            if(!pme->mFreeBatchBufQ.enqueue((void*) frame->bufs[0])) {
+                ALOGE("%s: batchBuf.buf_idx: %d enqueue failed", __func__,
+                        frame->bufs[0]->buf_idx);
+            }
+        } else {
+            pme->bufDone(frame->bufs[0]->buf_idx);
+        }
     }
 }