Piteball
/
android_device_asus_flo
mirror of https://github.com/followmsi/android_device_asus_flo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Camera3: Initialize capture result structure before use 

memset camera3_capture_result_t data structure before
using it in HAL.

Bug: 16132385
Change-Id: I0a55cf47984c1d1413b9a492d79543c47ff5bc23
Signed-off-by: Daniel Jarai <jaraidaniel@gmail.com>
This commit is contained in:
Mansoor Aftab 2014-07-08 00:16:42 -07:00 committed by Artem Borisov
parent 480867917e
commit 06f4759c72
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
camera/QCamera2/HAL3/QCamera3HWI.cpp
View File

@ -819,6 +819,7 @@ void QCamera3HardwareInterface::handleMetadataWithLock(
for (List<PendingRequestInfo>::iterator i = mPendingRequestsList.begin();
i != mPendingRequestsList.end() && i->frame_number <= frame_number;) {
camera3_capture_result_t result;
memset(&result, 0, sizeof(camera3_capture_result_t));
camera3_notify_msg_t notify_msg;
ALOGV("%s: frame_number in the list is %d", __func__, i->frame_number);
frame_number_exists = TRUE; // This frame number exists in Pending list
@ -1007,6 +1008,7 @@ void QCamera3HardwareInterface::handleBufferWithLock(
}
}
camera3_capture_result_t result;
memset(&result, 0, sizeof(camera3_capture_result_t));
result.result = NULL;
result.frame_number = frame_number;
result.num_output_buffers = 1;
@ -1468,6 +1470,7 @@ int QCamera3HardwareInterface::flush()
pStream_Buf.status = CAMERA3_BUFFER_STATUS_ERROR;
pStream_Buf.stream = k->stream;
memset(&result, 0, sizeof(camera3_capture_result_t));
result.result = NULL;
result.frame_number = k->frame_number;
result.num_output_buffers = 1;
@ -1497,6 +1500,7 @@ int QCamera3HardwareInterface::flush()
notify_msg.message.error.frame_number = i->frame_number;
mCallbackOps->notify(mCallbackOps, &notify_msg);
memset(&result, 0, sizeof(camera3_capture_result_t));
result.frame_number = i->frame_number;
result.num_output_buffers = 0;
result.output_buffers = NULL;