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

Commit f70c11b2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: VTS: Set proper dataSpace for reprocessing test" into... 

Merge "Camera: VTS: Set proper dataSpace for reprocessing test" into stage-aosp-sc-ts-dev am: 6b94d29f am: 7a0dff74 am: 7429a7ea

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

Change-Id: I1250190634cc95b964cfdbe6dc4e11f945435e39
parents 4b636b0e 7429a7ea

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

+3 −1
Original line number Diff line number Diff line
@@ -3837,6 +3837,8 @@ TEST_P(CameraHidlTest, configureStreamsZSLInputOutputs) { 
                      getAvailableOutputStreams(staticMeta, outputStreams,

                              &outputThreshold));

            for (auto& outputIter : outputStreams) {

                V3_2::DataspaceFlags outputDataSpace =

                        getDataspace(static_cast<PixelFormat>(outputIter.format));

                V3_2::Stream zslStream = {streamId++,

                                    StreamType::OUTPUT,

                                    static_cast<uint32_t>(input.width),
@@ -3859,7 +3861,7 @@ TEST_P(CameraHidlTest, configureStreamsZSLInputOutputs) { 
                                       static_cast<uint32_t>(outputIter.height),

                                       static_cast<PixelFormat>(outputIter.format),

                                       GRALLOC1_CONSUMER_USAGE_HWCOMPOSER,

                                       0,

                                       outputDataSpace,

                                       StreamRotation::ROTATION_0};



                ::android::hardware::hidl_vec<V3_2::Stream> streams = {inputStream, zslStream,