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

Commit 54626d96 authored by Abhinav Sohane's avatar Abhinav Sohane Committed by Arne Coucheron
Browse files

Camera: CameraHardwareInterface: Releasing mHIDLMemoryMapLock in QdataCallback 

Issue: Camera is getting stuck due to mHIDLMemoryMapLock when called for
       QDataCallback then  unregister  memory from HAL.
Solution: Releasing mHIDLMemoryMapLock after reading mHIDLMemoryMap variable

Change-Id: I7239f6eb6a9dec67393e11b83d0ef6c986215940
parent 8d18353c

services/camera/libcameraservice/device1/CameraHardwareInterface.cpp

+9 −5
Original line number Diff line number Diff line
@@ -140,15 +140,19 @@ hardware::Return<void> CameraHardwareInterface::dataCallback( 
hardware::Return<void> CameraHardwareInterface::QDataCallback(

        DataCallbackMsg msgType, uint32_t data, uint32_t bufferIndex,

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

    camera_memory_t* mem = nullptr;

    {

        std::lock_guard<std::mutex> lock(mHidlMemPoolMapLock);

        if (mHidlMemPoolMap.count(data) == 0) {

            ALOGE("%s: memory pool ID %d not found", __FUNCTION__, data);

            return hardware::Void();

        }

        mem = mHidlMemPoolMap.at(data);

    }

    camera_frame_metadata_t md;

    md.number_of_faces = metadata.faces.size();

    md.faces = (camera_face_t*) metadata.faces.data();

    sDataCb((int32_t) msgType, mHidlMemPoolMap.at(data), bufferIndex, &md, this);

    sDataCb((int32_t) msgType, mem, bufferIndex, &md, this);

    return hardware::Void();

}

#endif