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

Commit ca60e0b7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Camera VTS: Remove unnecessary test of Y16 depth format" into android13-tests-dev

parents c3702f8e cd3c483a

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

+6 −4
Original line number Diff line number Diff line
@@ -6318,8 +6318,6 @@ Status CameraHidlTest::getAvailableOutputStreams(const camera_metadata_t* static 
                                                 std::vector<AvailableStream>& outputStreams,

                                                 const AvailableStream* threshold,

                                                 bool maxResolution) {

    AvailableStream depthPreviewThreshold = {kMaxPreviewWidth, kMaxPreviewHeight,

                                             static_cast<int32_t>(PixelFormat::Y16)};

    if (nullptr == staticMeta) {

        return Status::ILLEGAL_ARGUMENT;

    }
@@ -6345,7 +6343,11 @@ Status CameraHidlTest::getAvailableOutputStreams(const camera_metadata_t* static 
    }



    if(foundDepth == 0 && (0 == (depthEntry.count % 4))) {

        fillOutputStreams(&depthEntry, outputStreams, &depthPreviewThreshold,

        AvailableStream depthPreviewThreshold = {kMaxPreviewWidth, kMaxPreviewHeight,

                                                 static_cast<int32_t>(PixelFormat::Y16)};

        const AvailableStream* depthThreshold =

                (threshold != nullptr) ? threshold : &depthPreviewThreshold;

        fillOutputStreams(&depthEntry, outputStreams, depthThreshold,

                          ANDROID_DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS_OUTPUT);

    }

camera/provider/aidl/vts/camera_aidl_test.cpp

+5 −3
Original line number Diff line number Diff line
@@ -751,8 +751,6 @@ Status CameraAidlTest::getAvailableOutputStreams(const camera_metadata_t* static 
                                                 std::vector<AvailableStream>& outputStreams,

                                                 const AvailableStream* threshold,

                                                 bool maxResolution) {

    AvailableStream depthPreviewThreshold = {kMaxPreviewWidth, kMaxPreviewHeight,

                                             static_cast<int32_t>(PixelFormat::Y16)};

    if (nullptr == staticMeta) {

        return Status::ILLEGAL_ARGUMENT;

    }
@@ -778,7 +776,11 @@ Status CameraAidlTest::getAvailableOutputStreams(const camera_metadata_t* static 
    }



    if (foundDepth == 0 && (0 == (depthEntry.count % 4))) {

        fillOutputStreams(&depthEntry, outputStreams, &depthPreviewThreshold,

        AvailableStream depthPreviewThreshold = {kMaxPreviewWidth, kMaxPreviewHeight,

                                                 static_cast<int32_t>(PixelFormat::Y16)};

        const AvailableStream* depthThreshold =

                (threshold != nullptr) ? threshold : &depthPreviewThreshold;

        fillOutputStreams(&depthEntry, outputStreams, depthThreshold,

                          ANDROID_DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS_OUTPUT);

    }