aboutsummaryrefslogtreecommitdiff
path: root/camera/QCamera2
diff options
context:
space:
mode:
authorSanthosh Kumar Thimmanna Bhattar <sthim@codeaurora.org>2018-09-05 16:21:28 +0530
committerDavide Garberi <dade.garberi@gmail.com>2018-11-02 15:23:13 +0100
commit11a056bbec4054e0931eb748de62db0601f4b226 (patch)
treebf08ba9a056d5dd23ff639b8fb658d2a0ad32f18 /camera/QCamera2
parent3f0d02d2a722c2f0c59838a1ddab53992250e6dd (diff)
msm8996-common: QCamera2: HAL3: Add video encoder flags for high speed recording
High speed recording CTS test is failing due to missing stream configuration for video encoder. Added missing encoder flags for high speed vidoe recording. Change-Id: I1167ad29c6b30f88d100833fbc7dffe468c93503 Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Diffstat (limited to 'camera/QCamera2')
-rw-r--r--camera/QCamera2/HAL3/QCamera3HWI.cpp1
-rw-r--r--camera/QCamera2/HAL3/QCamera3Stream.cpp4
2 files changed, 5 insertions, 0 deletions
diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index 53abde9..2e13a2f 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -2060,6 +2060,7 @@ int QCamera3HardwareInterface::configureStreamsPerfLocked(
if (!m_bIsVideo && (streamList->operation_mode ==
CAMERA3_STREAM_CONFIGURATION_CONSTRAINED_HIGH_SPEED_MODE)) {
mDummyBatchStream = *newStream;
+ mDummyBatchStream.usage |= GRALLOC_USAGE_HW_VIDEO_ENCODER;
}
channel = new QCamera3RegularChannel(mCameraHandle->camera_handle,
mChannelHandle, mCameraHandle->ops, captureResultCb,
diff --git a/camera/QCamera2/HAL3/QCamera3Stream.cpp b/camera/QCamera2/HAL3/QCamera3Stream.cpp
index 71935e8..d36047a 100644
--- a/camera/QCamera2/HAL3/QCamera3Stream.cpp
+++ b/camera/QCamera2/HAL3/QCamera3Stream.cpp
@@ -279,6 +279,10 @@ QCamera3Stream::QCamera3Stream(uint32_t camHandle,
*==========================================================================*/
QCamera3Stream::~QCamera3Stream()
{
+ if (mBatchSize) {
+ flushFreeBatchBufQ();
+ }
+
if (mStreamInfoBuf != NULL) {
int rc = mCamOps->unmap_stream_buf(mCamHandle,
mChannelHandle, mHandle, CAM_MAPPING_BUF_TYPE_STREAM_INFO, 0, -1);