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

Merge "Camera: Avoid using an uninitialized physical camera id" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-05 01:45:21 +00:00
committed by Android (Google) Code Review
parent 94dd578b02 5874bba486
commit b902095897
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
camera/device/3.4/default/CameraDeviceSession.cpp
View File

@@ -187,7 +187,6 @@ bool CameraDeviceSession::preProcessConfigurationLocked_3_4(
mPhysicalCameraIdMap[id] = requestedConfiguration.streams[i].physicalCameraId;
mStreamMap[id].data_space = mapToLegacyDataspace(
mStreamMap[id].data_space);
mStreamMap[id].physical_camera_id = mPhysicalCameraIdMap[id].c_str();
mCirculatingBuffers.emplace(stream.mId, CirculatingBuffers{});
} else {
// width/height/format must not change, but usage/rotation might need to change
@@ -206,6 +205,11 @@ bool CameraDeviceSession::preProcessConfigurationLocked_3_4(
mStreamMap[id].rotation = (int) requestedConfiguration.streams[i].v3_2.rotation;
mStreamMap[id].usage = (uint32_t) requestedConfiguration.streams[i].v3_2.usage;
}
// It is possible for the entry in 'mStreamMap' to get initialized by an older
// HIDL API. Make sure that the physical id is always initialized when using
// a more recent API call.
mStreamMap[id].physical_camera_id = mPhysicalCameraIdMap[id].c_str();
(*streams)[i] = &mStreamMap[id];
}