Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 436f9779 authored by Rashed Abdel-Tawab's avatar Rashed Abdel-Tawab Committed by Bruno Martins
Browse files

camera: Only link and use vendor.qti.hardware.camera.device if specified 

Set TARGET_USES_QTI_CAMERA_DEVICE to link and use

Change-Id: I3a82412190b8918248bdd7a1d823777debd67173
parent d43ebe13

services/camera/libcameraservice/Android.bp

+9 −1
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ cc_library_shared { 
        "android.hardware.camera.provider@2.5",

        "android.hardware.camera.provider@2.6",

        "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",
@@ -159,5 +158,14 @@ cc_library_shared { 
        "-Wno-ignored-qualifiers",

    ],



    product_variables: {

        lineage: {

            uses_qti_camera_device: {

                cppflags: ["-DQTI_CAMERA_DEVICE"],

                shared_libs: ["vendor.qti.hardware.camera.device@1.0"],

            },

        },

    },



}

services/camera/libcameraservice/device1/CameraHardwareInterface.cpp

+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ hardware::Return<void> CameraHardwareInterface::dataCallback( 
    return hardware::Void();

}



#ifdef QTI_CAMERA_DEVICE

hardware::Return<void> CameraHardwareInterface::QDataCallback(

        DataCallbackMsg msgType, uint32_t data, uint32_t bufferIndex,

        const vendor::qti::hardware::camera::device::V1_0::QCameraFrameMetadata& metadata) {
@@ -154,6 +155,7 @@ hardware::Return<void> CameraHardwareInterface::QDataCallback( 
    sDataCb((int32_t) msgType, mem, bufferIndex, &md, this);

    return hardware::Void();

}

#endif



hardware::Return<void> CameraHardwareInterface::dataCallbackTimestamp(

        DataCallbackMsg msgType, uint32_t data,

services/camera/libcameraservice/device1/CameraHardwareInterface.h

+8 −0
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ 
#include <hardware/camera.h>



#include <common/CameraProviderManager.h>

#ifdef QTI_CAMERA_DEVICE

#include <vendor/qti/hardware/camera/device/1.0/IQCameraDeviceCallback.h>

#endif



namespace android {
@@ -86,7 +88,11 @@ typedef void (*data_callback_timestamp_batch)( 


class CameraHardwareInterface :

        public virtual RefBase,

#ifdef QTI_CAMERA_DEVICE

        public virtual vendor::qti::hardware::camera::device::V1_0::IQCameraDeviceCallback,

#else

        public virtual hardware::camera::device::V1_0::ICameraDeviceCallback,

#endif

        public virtual hardware::camera::device::V1_0::ICameraDevicePreviewCallback {



public:
@@ -396,10 +402,12 @@ private: 
            hardware::camera::device::V1_0::DataCallbackMsg msgType,

            const hardware::hidl_vec<

                    hardware::camera::device::V1_0::HandleTimestampMessage>&) override;

#ifdef QTI_CAMERA_DEVICE

    hardware::Return<void> QDataCallback(

            hardware::camera::device::V1_0::DataCallbackMsg msgType,

            uint32_t data, uint32_t bufferIndex,

            const vendor::qti::hardware::camera::device::V1_0::QCameraFrameMetadata& metadata) override;

#endif



    /**

     * Implementation of android::hardware::camera::device::V1_0::ICameraDevicePreviewCallback