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

Commit 72f97643 authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

Camera: Fix VTS failure for depth only camera 

If the device is depth-only, use threshold with Y16 format rather than
IMPLEMENTATION_DEFINED.

This fixes the regression introduced by the fix for b/265984260.

Bug: 276957901
Test: atest VtsAidlHalCameraProvider_TargetTest
Change-Id: If9023f1ed17bb761abbb9be36e567264f8bf0689
parent 86206d71

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);

    }