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

Commit 70eae1d3 authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera: Set buffer request stream id 

Additionally fix a possible issue with the buffer request index
and variable shadowing.

Bug: 129090247
Test: adb shell
/data/nativetest64/VtsHalCameraProviderV2_4TargetTest/VtsHalCameraProviderV2_4TargetTest
--hal_service_instance=android.hardware.camera.provider@2.4::ICameraProvider/legacy/0

Change-Id: I34ab0285e59233c1b6d276f9167372ef3b0bbd0b
parent f2005a3e

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

+4 −3
Original line number Diff line number Diff line
@@ -1364,19 +1364,20 @@ Return<void> CameraHidlTest::DeviceCb::requestStreamBuffers( 
        }



        hidl_vec<StreamBuffer> tmpRetBuffers(bufReq.numBuffersRequested);

        for (size_t i = 0; i < bufReq.numBuffersRequested; i++) {

        for (size_t j = 0; j < bufReq.numBuffersRequested; j++) {

            hidl_handle buffer_handle;

            mParent->allocateGraphicBuffer(stream.width, stream.height,

                    android_convertGralloc1To0Usage(

                            halStream.producerUsage, halStream.consumerUsage),

                    halStream.overrideFormat, &buffer_handle);



            tmpRetBuffers[i] = {stream.id, mNextBufferId, buffer_handle, BufferStatus::OK,

            tmpRetBuffers[j] = {stream.id, mNextBufferId, buffer_handle, BufferStatus::OK,

                                nullptr, nullptr};

            mOutstandingBufferIds[idx].insert(std::make_pair(mNextBufferId++, buffer_handle));

        }

        atLeastOneStreamOk = true;

        bufRets[0].val.buffers(std::move(tmpRetBuffers));

        bufRets[i].streamId = stream.id;

        bufRets[i].val.buffers(std::move(tmpRetBuffers));

    }



    if (allStreamOk) {