From 8c7b1d2502f70b1aa3c11d3afdcc5fa608000cc0 Mon Sep 17 00:00:00 2001 From: Santhosh Kumar Thimmanna Bhattar Date: Tue, 9 May 2017 19:27:39 +0530 Subject: [PATCH] QCamera2: Disable QCameraDisplay temporarily Camera launch is failing due to QCameraDisplay crash. Disabling temporarily for AOSP upgrade to avoid the crash. This will be reverted once proper fix is found. Change-Id: I6ed87edcfbb07410899dcde13341b7ddd404960e --- camera/QCamera2/HAL/QCamera2HWI.h | 2 +- camera/QCamera2/HAL/QCamera2HWICallbacks.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camera/QCamera2/HAL/QCamera2HWI.h b/camera/QCamera2/HAL/QCamera2HWI.h index c1b7d2d..739cba1 100644 --- a/camera/QCamera2/HAL/QCamera2HWI.h +++ b/camera/QCamera2/HAL/QCamera2HWI.h @@ -759,7 +759,7 @@ private: uint32_t mSurfaceStridePadding; //QCamera Display Object - QCameraDisplay mCameraDisplay; + //QCameraDisplay mCameraDisplay; bool m_bNeedRestart; Mutex mMapLock; diff --git a/camera/QCamera2/HAL/QCamera2HWICallbacks.cpp b/camera/QCamera2/HAL/QCamera2HWICallbacks.cpp index 13e6944..5308df5 100644 --- a/camera/QCamera2/HAL/QCamera2HWICallbacks.cpp +++ b/camera/QCamera2/HAL/QCamera2HWICallbacks.cpp @@ -735,7 +735,7 @@ void QCamera2HardwareInterface::synchronous_stream_cb_routine( frameTime = nsecs_t(frame->ts.tv_sec) * 1000000000LL + frame->ts.tv_nsec; // Calculate the future presentation time stamp for displaying frames at regular interval - mPreviewTimestamp = pme->mCameraDisplay.computePresentationTimeStamp(frameTime); + //mPreviewTimestamp = pme->mCameraDisplay.computePresentationTimeStamp(frameTime); stream->mStreamTimestamp = frameTime; memory = (QCameraGrallocMemory *)super_frame->bufs[0]->mem_info;