commit f1e2ad61d2575fbc44cbb7df5f55e0a7f51ad989
author Gaoxiang Chen <gaochen@qti.qualcomm.com> Wed Jun 14 21:52:40 2017 +0800
committer Shuzhen Wang <shuzhenwang@google.com> Fri Jun 16 14:24:48 2017 -0700
tree a3a3cac4e8af6a7c9694b1162e0a35b8234c768d
parent ff34af445dc45cdc348ee0fa3f16f7edc055a00e

QCamera2: HAL3: handle out of order buffers correctly

Sometimes, the stream buffers come in disorder,
treat the disordered frames as error frames.

Test: Camera CTS
Bug: 37657585
Change-Id: I910153e9216ed7a83648663176c58d3696b27107

camera/QCamera2/HAL3/QCamera3Channel.cpp

diff --git a/camera/QCamera2/HAL3/QCamera3Channel.cpp b/camera/QCamera2/HAL3/QCamera3Channel.cpp
index eced938..df38002 100644
--- a/camera/QCamera2/HAL3/QCamera3Channel.cpp
+++ b/camera/QCamera2/HAL3/QCamera3Channel.cpp
@@ -841,7 +841,26 @@
            if (mOutOfSequenceBuffers.empty()) {
               stream->cancelBuffer(oldestBufIndex);
            }
-           mOutOfSequenceBuffers.push_back(super_frame);
+
+           //push in order!
+           auto itr = mOutOfSequenceBuffers.begin();
+           for (; itr != mOutOfSequenceBuffers.end(); itr++) {
+               mm_camera_super_buf_t *super_buf = *itr;
+               uint32_t buf_idx = super_buf->bufs[0]->buf_idx;
+               int32_t frame_num = mMemory.getFrameNumber(buf_idx);
+               if (resultFrameNumber < frame_num) {
+                   LOGE("Out of order frame!! set buffer status error flag!");
+                   mOutOfSequenceBuffers.insert(itr, super_frame);
+                   super_buf->bufs[0]->flags |= V4L2_BUF_FLAG_ERROR;
+                   break;
+               }
+           }
+
+           if (itr == mOutOfSequenceBuffers.end()) {
+               LOGE("Add the frame to the end of mOutOfSequenceBuffers");
+               // add the buffer
+               mOutOfSequenceBuffers.push_back(super_frame);
+           }
            return;
        }