commit 1aa6de7654d5fb8ad13f7ed334d683692f26a61b
author Shuzhen Wang <shuzhenwang@google.com> Wed Mar 16 13:42:28 2016 -0700
committer Shuzhen Wang <shuzhenwang@google.com> Sat Mar 19 21:04:14 2016 -0700
tree 1388be96dd6f08d04524b18a2ed6eeda26be3a8e
parent c8929c5302acf5678666e93f1aad355b03214d6f

QCamera2: HAL3: Send BUFFER_ERROR for BLOB stream in case of buffer drop

In case of buffer drop, send BUFFER_ERROR, so that app doesn't receive a
green frame.

Bug: 27074407
Change-Id: I08062ef82e22f454f0cd466b4f3a2d65eeef52a7

camera/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index 06e316e..bba986b 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -2518,31 +2518,26 @@
             memset(&notify_msg, 0, sizeof(camera3_notify_msg_t));
             for (List<RequestedBufferInfo>::iterator j = i->buffers.begin();
                     j != i->buffers.end(); j++) {
-               if (j->stream->format != HAL_PIXEL_FORMAT_BLOB) {
-                   QCamera3ProcessingChannel *channel = (QCamera3ProcessingChannel *)j->stream->priv;
-                   uint32_t streamID = channel->getStreamID(channel->getStreamTypeMask());
-                   for (uint32_t k = 0; k < p_cam_frame_drop->cam_stream_ID.num_streams; k++) {
-                       if (streamID == p_cam_frame_drop->cam_stream_ID.streamID[k]) {
-                           // Send Error notify to frameworks with CAMERA3_MSG_ERROR_BUFFER
-                           ALOGW("%s: Start of reporting error frame#=%u, streamID=%u",
-                                   __func__, i->frame_number, streamID);
-                           notify_msg.type = CAMERA3_MSG_ERROR;
-                           notify_msg.message.error.frame_number = i->frame_number;
-                           notify_msg.message.error.error_code = CAMERA3_MSG_ERROR_BUFFER ;
-                           notify_msg.message.error.error_stream = j->stream;
-                           mCallbackOps->notify(mCallbackOps, &notify_msg);
-                           ALOGW("%s: End of reporting error frame#=%u, streamID=%u",
-                                  __func__, i->frame_number, streamID);
-                           PendingFrameDropInfo PendingFrameDrop;
-                           PendingFrameDrop.frame_number=i->frame_number;
-                           PendingFrameDrop.stream_ID = streamID;
-                           // Add the Frame drop info to mPendingFrameDropList
-                           mPendingFrameDropList.push_back(PendingFrameDrop);
-                      }
+                QCamera3ProcessingChannel *channel = (QCamera3ProcessingChannel *)j->stream->priv;
+                uint32_t streamID = channel->getStreamID(channel->getStreamTypeMask());
+                for (uint32_t k = 0; k < p_cam_frame_drop->cam_stream_ID.num_streams; k++) {
+                    if (streamID == p_cam_frame_drop->cam_stream_ID.streamID[k]) {
+                        // Send Error notify to frameworks with CAMERA3_MSG_ERROR_BUFFER
+                        ALOGW("%s: Start of reporting error frame#=%u, streamID=%u streamFormat=%d",
+                                __func__, i->frame_number, streamID, j->stream->format);
+                        notify_msg.type = CAMERA3_MSG_ERROR;
+                        notify_msg.message.error.frame_number = i->frame_number;
+                        notify_msg.message.error.error_code = CAMERA3_MSG_ERROR_BUFFER ;
+                        notify_msg.message.error.error_stream = j->stream;
+                        mCallbackOps->notify(mCallbackOps, &notify_msg);
+                        ALOGW("%s: End of reporting error frame#=%u, streamID=%u streamFormat=%d",
+                                __func__, i->frame_number, streamID, j->stream->format);
+                        PendingFrameDropInfo PendingFrameDrop;
+                        PendingFrameDrop.frame_number=i->frame_number;
+                        PendingFrameDrop.stream_ID = streamID;
+                        // Add the Frame drop info to mPendingFrameDropList
+                        mPendingFrameDropList.push_back(PendingFrameDrop);
                    }
-               } else {
-                   ALOGE("%s: JPEG buffer dropped for frame number %d",
-                           __func__, i->frame_number);
                }
             }
         }