From cd3c483ab054ea8778270503c7d99b102f2fd313 Mon Sep 17 00:00:00 2001 From: Shuzhen Wang Date: Thu, 26 Jan 2023 02:18:04 +0000 Subject: [PATCH] Camera VTS: Remove unnecessary test of Y16 depth format getAvailableOutputStreams() shouldn't unconditionally add Y16 stream configurations. Instead, if the threshold being passed in is valid, getAvailableOutputStreams() should use the threshold's format instead. Test: Run VTS on pixel; vendor testing. Bug: 265984260 Change-Id: I3c8119c6032141bb6e2f95f060f014a13340d16b --- .../functional/VtsHalCameraProviderV2_4TargetTest.cpp | 10 ++++++---- camera/provider/aidl/vts/camera_aidl_test.cpp | 8 +++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index b0ae20eae2..5ea6ae238e 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp @@ -6318,8 +6318,6 @@ Status CameraHidlTest::getAvailableOutputStreams(const camera_metadata_t* static std::vector& outputStreams, const AvailableStream* threshold, bool maxResolution) { - AvailableStream depthPreviewThreshold = {kMaxPreviewWidth, kMaxPreviewHeight, - static_cast(PixelFormat::Y16)}; if (nullptr == staticMeta) { return Status::ILLEGAL_ARGUMENT; } @@ -6345,8 +6343,12 @@ Status CameraHidlTest::getAvailableOutputStreams(const camera_metadata_t* static } if(foundDepth == 0 && (0 == (depthEntry.count % 4))) { - fillOutputStreams(&depthEntry, outputStreams, &depthPreviewThreshold, - ANDROID_DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS_OUTPUT); + AvailableStream depthPreviewThreshold = {kMaxPreviewWidth, kMaxPreviewHeight, + static_cast(PixelFormat::Y16)}; + const AvailableStream* depthThreshold = + (threshold != nullptr) ? threshold : &depthPreviewThreshold; + fillOutputStreams(&depthEntry, outputStreams, depthThreshold, + ANDROID_DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS_OUTPUT); } return Status::OK; diff --git a/camera/provider/aidl/vts/camera_aidl_test.cpp b/camera/provider/aidl/vts/camera_aidl_test.cpp index 2c2f1b2c66..5a8bbdd24b 100644 --- a/camera/provider/aidl/vts/camera_aidl_test.cpp +++ b/camera/provider/aidl/vts/camera_aidl_test.cpp @@ -751,8 +751,6 @@ Status CameraAidlTest::getAvailableOutputStreams(const camera_metadata_t* static std::vector& outputStreams, const AvailableStream* threshold, bool maxResolution) { - AvailableStream depthPreviewThreshold = {kMaxPreviewWidth, kMaxPreviewHeight, - static_cast(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(PixelFormat::Y16)}; + const AvailableStream* depthThreshold = + (threshold != nullptr) ? threshold : &depthPreviewThreshold; + fillOutputStreams(&depthEntry, outputStreams, depthThreshold, ANDROID_DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS_OUTPUT); }