diff options
author | Rashed Abdel-Tawab <rashed@linux.com> | 2018-01-28 11:34:01 -0800 |
---|---|---|
committer | Michael Bestas <mkbestas@lineageos.org> | 2019-12-11 20:00:10 +0200 |
commit | a1b45b72ae679766173c85781377c90f05ba10fc (patch) | |
tree | a55f20f05e5f4272415beae30850d82ef317426f | |
parent | 5d0c77c38827f82f1973ce64d9477aeaf0d45db5 (diff) | |
download | android_hardware_interfaces-a1b45b72ae679766173c85781377c90f05ba10fc.tar.gz android_hardware_interfaces-a1b45b72ae679766173c85781377c90f05ba10fc.tar.bz2 android_hardware_interfaces-a1b45b72ae679766173c85781377c90f05ba10fc.zip |
camera: Only link and use vendor.qti.hardware.camera.device if specified
Only use if TARGET_USES_QTI_CAMERA_DEVICE is set
Change-Id: I74b178c2f685a2ffda3e91eb7ff6d05664eebaf6
-rw-r--r-- | camera/device/1.0/default/Android.bp | 9 | ||||
-rw-r--r-- | camera/device/1.0/default/CameraDevice.cpp | 6 | ||||
-rw-r--r-- | camera/device/1.0/default/CameraDevice_1_0.h | 6 | ||||
-rw-r--r-- | camera/provider/2.4/default/Android.bp | 18 |
4 files changed, 36 insertions, 3 deletions
diff --git a/camera/device/1.0/default/Android.bp b/camera/device/1.0/default/Android.bp index 92af8c718..45722cfcd 100644 --- a/camera/device/1.0/default/Android.bp +++ b/camera/device/1.0/default/Android.bp @@ -12,7 +12,6 @@ cc_library_shared { "libhwbinder", "libutils", "android.hardware.camera.device@1.0", - "vendor.qti.hardware.camera.device@1.0", "android.hardware.camera.common@1.0", "android.hardware.graphics.allocator@2.0", "android.hardware.graphics.mapper@2.0", @@ -31,6 +30,14 @@ cc_library_shared { header_libs: [ "media_plugin_headers", ], + product_variables: { + lineage: { + uses_qti_camera_device: { + cppflags: ["-DQTI_CAMERA_DEVICE"], + shared_libs: ["vendor.qti.hardware.camera.device@1.0"], + }, + }, + }, export_include_dirs: ["."] } diff --git a/camera/device/1.0/default/CameraDevice.cpp b/camera/device/1.0/default/CameraDevice.cpp index 938697be8..a1f1830fd 100644 --- a/camera/device/1.0/default/CameraDevice.cpp +++ b/camera/device/1.0/default/CameraDevice.cpp @@ -428,6 +428,7 @@ void CameraDevice::sDataCb(int32_t msg_type, const camera_memory_t *data, unsign index, mem->mNumBufs); return; } +#ifdef QTI_CAMERA_DEVICE if(object->mQDeviceCallback != nullptr) { vendor::qti::hardware::camera::device::V1_0::QCameraFrameMetadata hidlMetadata; if (metadata) { @@ -465,6 +466,7 @@ void CameraDevice::sDataCb(int32_t msg_type, const camera_memory_t *data, unsign object->mQDeviceCallback->QDataCallback( (DataCallbackMsg) msg_type, mem->handle.mId, index, hidlMetadata); } else { +#endif if (object->mDeviceCallback != nullptr) { CameraFrameMetadata hidlMetadata; if (metadata) { @@ -489,7 +491,9 @@ void CameraDevice::sDataCb(int32_t msg_type, const camera_memory_t *data, unsign CameraHeapMemory* mem = static_cast<CameraHeapMemory *>(data->handle); object->mDeviceCallback->dataCallback( (DataCallbackMsg) msg_type, mem->handle.mId, index, hidlMetadata); +#ifdef QTI_CAMERA_DEVICE } +#endif } } @@ -705,11 +709,13 @@ Return<Status> CameraDevice::open(const sp<ICameraDeviceCallback>& callback) { initHalPreviewWindow(); mDeviceCallback = callback; +#ifdef QTI_CAMERA_DEVICE mQDeviceCallback = vendor::qti::hardware::camera::device::V1_0::IQCameraDeviceCallback::castFrom(callback); if(mQDeviceCallback == nullptr) { ALOGI("could not cast ICameraDeviceCallback to IQCameraDeviceCallback"); } +#endif if (mDevice->ops->set_callbacks) { mDevice->ops->set_callbacks(mDevice, diff --git a/camera/device/1.0/default/CameraDevice_1_0.h b/camera/device/1.0/default/CameraDevice_1_0.h index e5a194edc..2b35a730d 100644 --- a/camera/device/1.0/default/CameraDevice_1_0.h +++ b/camera/device/1.0/default/CameraDevice_1_0.h @@ -24,7 +24,9 @@ #include "HandleImporter.h" #include <android/hardware/camera/device/1.0/ICameraDevice.h> +#ifdef QTI_CAMERA_DEVICE #include <vendor/qti/hardware/camera/device/1.0/IQCameraDeviceCallback.h> +#endif #include <android/hidl/allocator/1.0/IAllocator.h> #include <android/hidl/memory/1.0/IMemory.h> #include <hidl/MQDescriptor.h> @@ -45,7 +47,9 @@ using ::android::hardware::camera::common::V1_0::helper::HandleImporter; using ::android::hardware::camera::device::V1_0::CameraInfo; using ::android::hardware::camera::device::V1_0::CommandType; using ::android::hardware::camera::device::V1_0::ICameraDevice; +#ifdef QTI_CAMERA_DEVICE using ::vendor::qti::hardware::camera::device::V1_0::IQCameraDeviceCallback; +#endif using ::android::hardware::camera::device::V1_0::ICameraDeviceCallback; using ::android::hardware::camera::device::V1_0::ICameraDevicePreviewCallback; using ::android::hardware::camera::device::V1_0::MemoryId; @@ -166,7 +170,9 @@ private: const SortedVector<std::pair<std::string, std::string>>& mCameraDeviceNames; sp<ICameraDeviceCallback> mDeviceCallback = nullptr; +#ifdef QTI_CAMERA_DEVICE sp<IQCameraDeviceCallback> mQDeviceCallback = nullptr; +#endif mutable Mutex mMemoryMapLock; // gating access to mMemoryMap // must not hold mLock after this lock is acquired diff --git a/camera/provider/2.4/default/Android.bp b/camera/provider/2.4/default/Android.bp index 2358b0eb3..be8446a5c 100644 --- a/camera/provider/2.4/default/Android.bp +++ b/camera/provider/2.4/default/Android.bp @@ -6,7 +6,6 @@ cc_library_shared { shared_libs: [ "android.hardware.camera.common@1.0", "android.hardware.camera.device@1.0", - "vendor.qti.hardware.camera.device@1.0", "android.hardware.camera.device@3.2", "android.hardware.camera.device@3.3", "android.hardware.camera.device@3.4", @@ -69,6 +68,14 @@ cc_library_shared { "libtinyxml2", "libutils", ], + product_variables: { + lineage: { + uses_qti_camera_device: { + cppflags: ["-DQTI_CAMERA_DEVICE"], + shared_libs: ["vendor.qti.hardware.camera.device@1.0"], + }, + }, + }, static_libs: [ "android.hardware.camera.common@1.0-helper", ], @@ -88,7 +95,6 @@ cc_library_shared { shared_libs: [ "android.hardware.camera.common@1.0", "android.hardware.camera.device@1.0", - "vendor.qti.hardware.camera.device@1.0", "android.hardware.camera.device@3.2", "android.hardware.camera.device@3.3", "android.hardware.camera.device@3.4", @@ -224,4 +230,12 @@ cc_binary { "camera.device@3.5-external-impl_headers", "camera.device@3.5-impl_headers", ], + product_variables: { + lineage: { + uses_qti_camera_device: { + cppflags: ["-DQTI_CAMERA_DEVICE"], + shared_libs: ["vendor.qti.hardware.camera.device@1.0"], + }, + }, + }, } |