diff options
| author | Jiyong Park <jiyong@google.com> | 2018-01-26 13:39:04 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2018-01-26 13:43:11 +0900 |
| commit | 3bc1c9ea0df3c17f0f882c955ede648bde2ef868 (patch) | |
| tree | 2105b7b44766ce3be3dfc5ce73364f431ae8073f /camera | |
| parent | fc563e72767dcab834e8d05c61bfd4595029dc6f (diff) | |
Remove dependency from QCamera2 to libgui
This is basically a cherry-pick of QCOM's change
73e915617b67d794a7c4b8b9c180229a2226ab3a from
hardware/qcom/camera/msm8998/QCamera2
Bug: 69526027
Test: mma with BOARD_VNDK_VERSION=current
Test: camera (still image, recording) works
Change-Id: I8e41ce2c4822bc4c84482bb27a7a8fecf8e79d12
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/QCamera2/Android.mk | 3 | ||||
| -rw-r--r-- | camera/QCamera2/HAL/QCamera2HWI.h | 4 | ||||
| -rw-r--r-- | camera/QCamera2/HAL/QCamera2HWICallbacks.cpp | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk index 672b60be..747021c3 100644 --- a/camera/QCamera2/Android.mk +++ b/camera/QCamera2/Android.mk @@ -7,7 +7,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ util/QCameraBufferMaps.cpp \ util/QCameraCmdThread.cpp \ - util/QCameraDisplay.cpp \ util/QCameraFlash.cpp \ util/QCameraPerf.cpp \ util/QCameraQueue.cpp \ @@ -101,7 +100,7 @@ LOCAL_C_INCLUDES += \ $(TARGET_OUT_HEADERS)/qcom/display LOCAL_C_INCLUDES += \ hardware/qcom/display/msm8996/libqservice -LOCAL_SHARED_LIBRARIES := liblog libhardware libutils libcutils libdl libsync libgui +LOCAL_SHARED_LIBRARIES := liblog libhardware libutils libcutils libdl libsync LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface libui libcamera_metadata LOCAL_SHARED_LIBRARIES += libqdMetaData libqservice libbinder LOCAL_SHARED_LIBRARIES += libcutils libdl diff --git a/camera/QCamera2/HAL/QCamera2HWI.h b/camera/QCamera2/HAL/QCamera2HWI.h index 9ab198c1..25a29e77 100644 --- a/camera/QCamera2/HAL/QCamera2HWI.h +++ b/camera/QCamera2/HAL/QCamera2HWI.h @@ -39,7 +39,9 @@ #include "QCameraAllocator.h" #include "QCameraChannel.h" #include "QCameraCmdThread.h" +#if 0 // Temporary removing the dependency on libgui #include "QCameraDisplay.h" +#endif #include "QCameraMem.h" #include "QCameraParameters.h" #include "QCameraParametersIntf.h" @@ -775,7 +777,9 @@ private: uint32_t mSurfaceStridePadding; //QCamera Display Object +#if 0 // Temporary removing the dependency on libgui QCameraDisplay mCameraDisplay; +#endif bool m_bNeedRestart; Mutex mMapLock; diff --git a/camera/QCamera2/HAL/QCamera2HWICallbacks.cpp b/camera/QCamera2/HAL/QCamera2HWICallbacks.cpp index dc24364c..d6417108 100644 --- a/camera/QCamera2/HAL/QCamera2HWICallbacks.cpp +++ b/camera/QCamera2/HAL/QCamera2HWICallbacks.cpp @@ -729,7 +729,9 @@ 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 +#if 0 // Temporary removing the dependency on libgui mPreviewTimestamp = pme->mCameraDisplay.computePresentationTimeStamp(frameTime); +#endif stream->mStreamTimestamp = frameTime; memory = (QCameraGrallocMemory *)super_frame->bufs[0]->mem_info; |