aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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);