diff options
| author | Steven Laver <lavers@google.com> | 2019-10-24 16:40:00 -0700 |
|---|---|---|
| committer | Daniel Norman <danielnorman@google.com> | 2019-10-25 13:27:06 -0700 |
| commit | 76b1977dca6b72018663a9cd476f7c3d0604db31 (patch) | |
| tree | 788b2782ca42def0e34f44897369979e3089a322 /camera/device/3.4/default/ExternalCameraDeviceSession.cpp | |
| parent | 4db99f68ffc39b3e821b76fe66642e066149b645 (diff) | |
| parent | 6acc7b439ee8813198ddaecb86757c2da5d6c872 (diff) | |
Merge RP1A.191024.001
Change-Id: I22b7b600104c6d7fd4d448dd2efdeb20f95ca28b
Diffstat (limited to 'camera/device/3.4/default/ExternalCameraDeviceSession.cpp')
| -rw-r--r-- | camera/device/3.4/default/ExternalCameraDeviceSession.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/camera/device/3.4/default/ExternalCameraDeviceSession.cpp b/camera/device/3.4/default/ExternalCameraDeviceSession.cpp index dc5579ac67..9ff0d74687 100644 --- a/camera/device/3.4/default/ExternalCameraDeviceSession.cpp +++ b/camera/device/3.4/default/ExternalCameraDeviceSession.cpp @@ -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)); |