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

Commit 36aa827f authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera: Avoid adding uninitialized hal requests 

The offline requests deque is constructed with
specific amount of entries. Initialize the
the already allocated entries before pushing
new ones.

Bug: 149346795
Test: Camera CTS
Change-Id: I6db8d48949caf753429702b60c48698c95ecf4ad
parent 3e9669ff

camera/device/3.6/default/ExternalCameraDeviceSession.cpp

+8 −7
Original line number Diff line number Diff line
@@ -272,16 +272,17 @@ Status ExternalCameraDeviceSession::switchToOffline(const hidl_vec<int32_t>& off 


    // convert hal requests to offline request

    std::deque<std::shared_ptr<HalRequest>> offlineReqs(halReqs.size());

    size_t i = 0;

    for (auto& v4lReq : halReqs) {

        std::shared_ptr<HalRequest> halReq = std::make_shared<HalRequest>();

        halReq->frameNumber = v4lReq->frameNumber;

        halReq->setting = v4lReq->setting;

        halReq->shutterTs = v4lReq->shutterTs;

        halReq->buffers = v4lReq->buffers;

        offlineReqs[i] = std::make_shared<HalRequest>();

        offlineReqs[i]->frameNumber = v4lReq->frameNumber;

        offlineReqs[i]->setting = v4lReq->setting;

        offlineReqs[i]->shutterTs = v4lReq->shutterTs;

        offlineReqs[i]->buffers = v4lReq->buffers;

        sp<V3_4::implementation::V4L2Frame> v4l2Frame =

                static_cast<V3_4::implementation::V4L2Frame*>(v4lReq->frameIn.get());

        halReq->frameIn = new AllocatedV4L2Frame(v4l2Frame);

        offlineReqs.push_back(halReq);

        offlineReqs[i]->frameIn = new AllocatedV4L2Frame(v4l2Frame);

        i++;

        // enqueue V4L2 frame

        enqueueV4l2Frame(v4l2Frame);

    }