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

Commit dd6cb816 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "camera vts : cast android_convertGralloc1To0Usage to uint32_t before... 

Merge "camera vts : cast android_convertGralloc1To0Usage to uint32_t before passing to allocateGraphicBuffer." into android11-tests-dev am: ccef6458

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1426059

Change-Id: Iec0cf8f364d62e43b5453cd80c3c8f1bd4108378
parents 137c3919 ccef6458

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

+25 −19
Original line number Diff line number Diff line
@@ -1602,9 +1602,10 @@ Return<void> CameraHidlTest::DeviceCb::requestStreamBuffers( 
                w = stream.bufferSize;

                h = 1;

            }

            mParent->allocateGraphicBuffer(w, h,

                    android_convertGralloc1To0Usage(

                            halStream.producerUsage, halStream.consumerUsage),

            mParent->allocateGraphicBuffer(

                    w, h,

                    (uint32_t)android_convertGralloc1To0Usage(halStream.producerUsage,

                                                              halStream.consumerUsage),

                    halStream.overrideFormat, &buffer_handle);



            tmpRetBuffers[j] = {stream.v3_2.id, mNextBufferId, buffer_handle, BufferStatus::OK,
@@ -4675,7 +4676,7 @@ void CameraHidlTest::processCaptureRequestInternal(uint64_t bufferUsage, 
                                  /* We don't look at halStreamConfig.streams[0].consumerUsage

                                   * since that is 0 for output streams

                                   */

                                  android_convertGralloc1To0Usage(

                                  (uint32_t)android_convertGralloc1To0Usage(

                                          halStreamConfig.streams[0].producerUsage, bufferUsage),

                                  halStreamConfig.streams[0].overrideFormat, &buffer_handle);

            outputBuffer = {halStreamConfig.streams[0].id,
@@ -4897,7 +4898,8 @@ TEST_P(CameraHidlTest, processMultiCaptureRequestPreview) { 
                    BufferStatus::OK, nullptr, nullptr};

            } else {

                allocateGraphicBuffer(previewStream.width, previewStream.height,

                        android_convertGralloc1To0Usage(halStream.v3_3.v3_2.producerUsage,

                                      (uint32_t)android_convertGralloc1To0Usage(

                                              halStream.v3_3.v3_2.producerUsage,

                                              halStream.v3_3.v3_2.consumerUsage),

                                      halStream.v3_3.v3_2.overrideFormat, &buffer_handle);

                graphicBuffers.push_back(buffer_handle);
@@ -5288,7 +5290,8 @@ TEST_P(CameraHidlTest, processCaptureRequestBurstISO) { 
                    nullptr, BufferStatus::OK, nullptr, nullptr};

            } else {

                allocateGraphicBuffer(previewStream.width, previewStream.height,

                        android_convertGralloc1To0Usage(halStreamConfig.streams[0].producerUsage,

                                      (uint32_t)android_convertGralloc1To0Usage(

                                              halStreamConfig.streams[0].producerUsage,

                                              halStreamConfig.streams[0].consumerUsage),

                                      halStreamConfig.streams[0].overrideFormat, &buffers[i]);

                outputBuffers[i] = {halStreamConfig.streams[0].id, bufferId + i,
@@ -5394,7 +5397,8 @@ TEST_P(CameraHidlTest, processCaptureRequestInvalidSinglePreview) { 
            bufferId = 0;

        } else {

            allocateGraphicBuffer(previewStream.width, previewStream.height,

                    android_convertGralloc1To0Usage(halStreamConfig.streams[0].producerUsage,

                                  (uint32_t)android_convertGralloc1To0Usage(

                                          halStreamConfig.streams[0].producerUsage,

                                          halStreamConfig.streams[0].consumerUsage),

                                  halStreamConfig.streams[0].overrideFormat, &buffer_handle);

        }
@@ -5517,8 +5521,9 @@ TEST_P(CameraHidlTest, switchToOffline) { 
                        buffers[i], BufferStatus::OK, nullptr, nullptr};

            } else {

                // jpeg buffer (w,h) = (blobLen, 1)

                allocateGraphicBuffer(jpegBufferSize, /*height*/1,

                        android_convertGralloc1To0Usage(halStreamConfig3_2.producerUsage,

                allocateGraphicBuffer(

                        jpegBufferSize, /*height*/ 1,

                        (uint32_t)android_convertGralloc1To0Usage(halStreamConfig3_2.producerUsage,

                                                                  halStreamConfig3_2.consumerUsage),

                        halStreamConfig3_2.overrideFormat, &buffers[i]);

                outputBuffers[i] = {halStreamConfig3_2.id, bufferId + i,
@@ -5761,7 +5766,8 @@ TEST_P(CameraHidlTest, flushPreviewRequest) { 
            bufferId = 0;

        } else {

            allocateGraphicBuffer(previewStream.width, previewStream.height,

                    android_convertGralloc1To0Usage(halStreamConfig.streams[0].producerUsage,

                                  (uint32_t)android_convertGralloc1To0Usage(

                                          halStreamConfig.streams[0].producerUsage,

                                          halStreamConfig.streams[0].consumerUsage),

                                  halStreamConfig.streams[0].overrideFormat, &buffer_handle);

        }