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

Merge "[hardware][interfaces][camera] fix -Wreorder-init-list"

Browse Source 
am: 977e274043

Change-Id: Ifc6ba9337a2065ae17a02248523be0613d92f5ea
This commit is contained in:
Nick Desaulniers
2019-10-14 17:23:14 -07:00
committed by android-build-merger
parent 22408e85af 977e274043
commit e6faf9820f
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
camera/device/3.4/default/ExternalCameraDevice.cpp
View File

@@ -754,11 +754,11 @@ void ExternalCameraDevice::getFrameRateList(
int fd, double fpsUpperBound, SupportedV4L2Format* format) {
format->frameRates.clear();
v4l2_frmivalenum frameInterval {
.pixel_format = format->fourcc,
.width = format->width,
.height = format->height,
.index = 0
v4l2_frmivalenum frameInterval{
.index = 0,
.pixel_format = format->fourcc,
.width = format->width,
.height = format->height,
};
for (frameInterval.index = 0;

4
camera/device/3.4/default/ExternalCameraDeviceSession.cpp
View File

@@ -2412,9 +2412,7 @@ int ExternalCameraDeviceSession::configureV4l2StreamLocked(
mV4L2BufferCount = req_buffers.count;
for (uint32_t i = 0; i < req_buffers.count; i++) {
v4l2_buffer buffer = {
.type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
.index = i,
.memory = V4L2_MEMORY_MMAP};
.index = i, .type = V4L2_BUF_TYPE_VIDEO_CAPTURE, .memory = V4L2_MEMORY_MMAP};
if (TEMP_FAILURE_RETRY(ioctl(mV4l2Fd.get(), VIDIOC_QUERYBUF, &buffer)) < 0) {
ALOGE("%s: QUERYBUF %d failed: %s", __FUNCTION__, i, strerror(errno));