commit 0924548d17f715d134cfeff1d53d35315bc6cbc0
author Binhao Lin <binhaol@codeaurora.org> Thu Aug 31 18:25:29 2017 -0700
committer Shuzhen Wang <shuzhenwang@google.com> Fri Sep 01 08:22:01 2017 -0700
tree f0f75dc17f5ab020953ee56d53bec68537922b15
parent db28575898ca2a53dabfc553e91460d8dd53da73

QCamera2: HAL3: WAR for VT call black screen issue

When AVTimer is enabled during VT call, as the frame buffers
always gets to HAL ahead of metadata buffers, we apply the
avtimestamp of the previous frame to the current.

Test: Camera CTS
Bug: 64778100
Change-Id: Ic7315623153f6c464da28787f1d0ec23fe071bae

msm8998/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
index 2faeba2..bda5b85 100644
--- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
@@ -474,6 +474,7 @@
       m_bEisSupportedSize(false),
       m_bEisEnable(false),
       m_bEis3PropertyEnabled(false),
+      m_bAVTimerEnabled(false),
       m_MobicatMask(0),
       mShutterDispatcher(this),
       mOutputBufferDispatcher(this),
@@ -1709,14 +1710,24 @@
 {
     for (auto req = mPendingBuffersMap.mPendingBuffersInRequest.begin();
             req != mPendingBuffersMap.mPendingBuffersInRequest.end(); req++) {
+        // WAR: save the av_timestamp to the next frame
+        if(req->frame_number == frameNumber + 1) {
+            req->av_timestamp = timestamp;
+        }
+
         if (req->frame_number != frameNumber)
             continue;
 
         for (auto k = req->mPendingBufferList.begin();
                 k != req->mPendingBufferList.end(); k++ ) {
-            struct private_handle_t *priv_handle =
-                    (struct private_handle_t *) (*(k->buffer));
-            setMetaData(priv_handle, SET_VT_TIMESTAMP, &timestamp);
+            // WAR: update timestamp when it's not VT usecase
+            QCamera3Channel *channel = (QCamera3Channel *)k->stream->priv;
+            if (!((1U << CAM_STREAM_TYPE_VIDEO) == channel->getStreamTypeMask() &&
+                m_bAVTimerEnabled)) {
+                    struct private_handle_t *priv_handle =
+                        (struct private_handle_t *) (*(k->buffer));
+                    setMetaData(priv_handle, SET_VT_TIMESTAMP, &timestamp);
+            }
         }
     }
     return;
@@ -1902,6 +1913,8 @@
     mCurrFeatureState = 0;
     mStreamConfig = true;
 
+    m_bAVTimerEnabled = false;
+
     memset(&mInputStreamInfo, 0, sizeof(mInputStreamInfo));
 
     size_t count = IS_TYPE_MAX;
@@ -4171,6 +4184,25 @@
         }
     }
 
+    // WAR for encoder avtimer timestamp issue
+    QCamera3Channel *channel = (QCamera3Channel *)buffer->stream->priv;
+    if ((1U << CAM_STREAM_TYPE_VIDEO) == channel->getStreamTypeMask() &&
+        m_bAVTimerEnabled) {
+        for (auto req = mPendingBuffersMap.mPendingBuffersInRequest.begin();
+            req != mPendingBuffersMap.mPendingBuffersInRequest.end(); req++) {
+            if (req->frame_number != frame_number)
+                continue;
+            if(req->av_timestamp == 0) {
+                buffer->status |= CAMERA3_BUFFER_STATUS_ERROR;
+            }
+            else {
+                struct private_handle_t *priv_handle =
+                    (struct private_handle_t *) (*(buffer->buffer));
+                setMetaData(priv_handle, SET_VT_TIMESTAMP, &(req->av_timestamp));
+            }
+        }
+    }
+
     buffer->status |= mPendingBuffersMap.getBufErrStatus(buffer->buffer);
     LOGH("result frame_number = %d, buffer = %p",
              frame_number, buffer->buffer);
@@ -4978,11 +5010,13 @@
             if (m_debug_avtimer){
                 LOGI(" Enabling AV timer through setprop");
                 use_av_timer = &m_debug_avtimer;
+                m_bAVTimerEnabled = true;
             }
             else{
                 use_av_timer =
                     meta.find(QCAMERA3_USE_AV_TIMER).data.u8;
                 if (use_av_timer) {
+                    m_bAVTimerEnabled = true;
                     LOGI("Enabling AV timer through Metadata: use_av_timer: %d", *use_av_timer);
                 }
             }
@@ -5550,6 +5584,7 @@
     bufsForCurRequest.frame_number = frameNumber;
     // Mark current timestamp for the new request
     bufsForCurRequest.timestamp = systemTime(CLOCK_MONOTONIC);
+    bufsForCurRequest.av_timestamp = 0;
     bufsForCurRequest.hdrplus = hdrPlusRequest;
 
     if (hdrPlusRequest) {