From 31906b4768868460b57a12a97ccf3537003073db Mon Sep 17 00:00:00 2001 From: Davide Garberi Date: Wed, 17 Jan 2018 16:25:28 +0100 Subject: msm8996-common: camera: Update to LA.HB.1.3.2-40600-8x96.0 * The kernel camera driver is currently updated to this tag, so it should be just better to update the HAL too Signed-off-by: Davide Garberi --- camera/QCamera2/HAL/QCamera2HWI.cpp | 2 +- camera/QCamera2/HAL/QCameraMem.cpp | 2 +- camera/QCamera2/HAL/QCameraStream.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'camera/QCamera2/HAL') diff --git a/camera/QCamera2/HAL/QCamera2HWI.cpp b/camera/QCamera2/HAL/QCamera2HWI.cpp index 1e6f310..bc97c07 100644 --- a/camera/QCamera2/HAL/QCamera2HWI.cpp +++ b/camera/QCamera2/HAL/QCamera2HWI.cpp @@ -6828,7 +6828,7 @@ int32_t QCamera2HardwareInterface::addStreamToChannel(QCameraChannel *pChannel, } else { padding_info = gCamCapability[mCameraId]->padding_info; - if (streamType == CAM_STREAM_TYPE_PREVIEW) { + if (streamType == CAM_STREAM_TYPE_PREVIEW || streamType == CAM_STREAM_TYPE_POSTVIEW) { padding_info.width_padding = mSurfaceStridePadding; padding_info.height_padding = CAM_PAD_TO_2; } diff --git a/camera/QCamera2/HAL/QCameraMem.cpp b/camera/QCamera2/HAL/QCameraMem.cpp index 00f1548..f4c239a 100755 --- a/camera/QCamera2/HAL/QCameraMem.cpp +++ b/camera/QCamera2/HAL/QCameraMem.cpp @@ -1289,7 +1289,7 @@ QCameraVideoMemory::QCameraVideoMemory(camera_request_memory memory, mMetaBufCount = 0; mBufType = bufType; //Set Default color conversion format - mUsage = private_handle_t::PRIV_FLAGS_ITU_R_601_FR; + mUsage = private_handle_t::PRIV_FLAGS_ITU_R_709; //Set Default frame format mFormat = OMX_COLOR_FormatYUV420SemiPlanar; diff --git a/camera/QCamera2/HAL/QCameraStream.cpp b/camera/QCamera2/HAL/QCameraStream.cpp index cbe8a6a..7817009 100644 --- a/camera/QCamera2/HAL/QCameraStream.cpp +++ b/camera/QCamera2/HAL/QCameraStream.cpp @@ -798,8 +798,9 @@ int32_t QCameraStream::calcOffset(cam_stream_info_t *streamInfo) &streamInfo->buf_planes); break; case CAM_STREAM_TYPE_POSTVIEW: - rc = mm_stream_calc_offset_post_view(streamInfo->fmt, + rc = mm_stream_calc_offset_post_view(streamInfo, &dim, + &mPaddingInfo, &streamInfo->buf_planes); break; case CAM_STREAM_TYPE_SNAPSHOT: -- cgit v1.2.3