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

Commit d7e13ac2 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Camera: Fix VTS failure for depth only camera am: 72f97643 am: e5489ab2 

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



Change-Id: Ie7635f706dd8b9d13997700532f286ec56d32958
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1e591051 e5489ab2

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

+1 −1
Original line number Diff line number Diff line
@@ -6346,7 +6346,7 @@ Status CameraHidlTest::getAvailableOutputStreams(const camera_metadata_t* static 
        AvailableStream depthPreviewThreshold = {kMaxPreviewWidth, kMaxPreviewHeight,

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

        const AvailableStream* depthThreshold =

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

                isDepthOnly(staticMeta) ? &depthPreviewThreshold : threshold;

        fillOutputStreams(&depthEntry, outputStreams, depthThreshold,

                          ANDROID_DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS_OUTPUT);

    }

camera/provider/aidl/vts/camera_aidl_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ Status CameraAidlTest::getAvailableOutputStreams(const camera_metadata_t* static 
        AvailableStream depthPreviewThreshold = {kMaxPreviewWidth, kMaxPreviewHeight,

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

        const AvailableStream* depthThreshold =

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

                isDepthOnly(staticMeta) ? &depthPreviewThreshold : threshold;

        fillOutputStreams(&depthEntry, outputStreams, depthThreshold,

                          ANDROID_DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS_OUTPUT);

    }