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

Commit a9d02799 authored by Nick Desaulniers's avatar Nick Desaulniers Committed by android-build-merger
Browse files

Merge "[hardware][interfaces][camera] fix -Wreorder-init-list" am: 977e2740 

am: e6faf982

Change-Id: Ice0ec32c75b98a4d1283ef8a92f928fcb6f63a22
parents b500e1ab e6faf982

camera/device/3.4/default/ExternalCameraDevice.cpp

+5 −5
Original line number Original line Diff line number Diff line
@@ -755,10 +755,10 @@ void ExternalCameraDevice::getFrameRateList( 
    format->frameRates.clear();

    format->frameRates.clear();





    v4l2_frmivalenum frameInterval{

    v4l2_frmivalenum frameInterval{

            .index = 0,

            .pixel_format = format->fourcc,

            .pixel_format = format->fourcc,

            .width = format->width,

            .width = format->width,

            .height = format->height,

            .height = format->height,

        .index = 0

    };

    };





    for (frameInterval.index = 0;

    for (frameInterval.index = 0;

camera/device/3.4/default/ExternalCameraDeviceSession.cpp

+1 −3
Original line number Original line Diff line number Diff line
@@ -2412,9 +2412,7 @@ int ExternalCameraDeviceSession::configureV4l2StreamLocked( 
    mV4L2BufferCount = req_buffers.count;

    mV4L2BufferCount = req_buffers.count;

    for (uint32_t i = 0; i < req_buffers.count; i++) {

    for (uint32_t i = 0; i < req_buffers.count; i++) {

        v4l2_buffer buffer = {

        v4l2_buffer buffer = {

            .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,

                .index = i, .type = V4L2_BUF_TYPE_VIDEO_CAPTURE, .memory = V4L2_MEMORY_MMAP};

            .index = i,

            .memory = V4L2_MEMORY_MMAP};





        if (TEMP_FAILURE_RETRY(ioctl(mV4l2Fd.get(), VIDIOC_QUERYBUF, &buffer)) < 0) {

        if (TEMP_FAILURE_RETRY(ioctl(mV4l2Fd.get(), VIDIOC_QUERYBUF, &buffer)) < 0) {

            ALOGE("%s: QUERYBUF %d failed: %s", __FUNCTION__, i,  strerror(errno));

            ALOGE("%s: QUERYBUF %d failed: %s", __FUNCTION__, i,  strerror(errno));