Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 10:44:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Camera: Avoid adding uninitialized hal requests" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-20 17:59:15 +00:00
committed by Android (Google) Code Review
parent 5f4b632312 36aa827f70
commit 104fe8332f
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
camera/device/3.6/default/ExternalCameraDeviceSession.cpp
View File

@@ -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);
}