darkkirb/android_device_lenovo_karate
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

QCamera2: HAL: Changes to fix batch mode recording issue.

Browse source 
Batch mode video processing was broken on latest builds. Batch mode
enabled and verified with media extension now.

CRs-Fixed: 1013704
Change-Id: Ifb34a9c201f39591ab5d6a8aa70125ca7cad3f4f
This commit is contained in:
Guruprasad Gaonkar 2016-05-10 12:18:40 -07:00 committed by Prateek Chaubey
parent 6fb4d87d52
commit 665ea6feed
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
camera/QCamera2/HAL/QCamera2HWI.cpp
View file

@ -779,9 +779,8 @@ void QCamera2HardwareInterface::release_recording_frame(
LOGD("E camera id %d", hw->getCameraId());
//Close and delete duplicated native handle and FD's.
if (hw->mVideoMem != NULL) {
ret = hw->mVideoMem->closeNativeHandle(opaque,
hw->mStoreMetaDataInFrame > 0);
if ((hw->mVideoMem != NULL) && (hw->mStoreMetaDataInFrame)) {
ret = hw->mVideoMem->closeNativeHandle(opaque, TRUE);
if (ret != NO_ERROR) {
LOGE("Invalid video metadata");
return;
@ -2823,7 +2822,10 @@ QCameraMemory *QCamera2HardwareInterface::allocateStreamBuf(
}
videoMemory->setVideoInfo(usage, fmt);
mem = videoMemory;
mVideoMem = videoMemory;
if (!mParameters.getBufBatchCount()) {
//For batch mode this will be part of user buffer.
mVideoMem = videoMemory;
}
}
break;
case CAM_STREAM_TYPE_CALLBACK:

3
camera/QCamera2/HAL/QCameraMem.cpp
View file

@ -1628,8 +1628,7 @@ int QCameraVideoMemory::closeNativeHandle(const void *data, bool metadata)
return BAD_VALUE;
}
} else {
LOGE("Not of type video meta buffer. Failed");
return BAD_VALUE;
LOGW("Warning: Not of type video meta buffer");
}
#endif
return rc;