From e6bb228dc663ab7f10882c6d60a5deb884376dd6 Mon Sep 17 00:00:00 2001 From: Changyeon Jo Date: Wed, 17 Aug 2022 01:02:35 +0000 Subject: [PATCH] Remove color format constraints VtsHalEvsV1_1TargetTest does not verify any behavior depending on a frame buffer's color format. Bug: 240685726 Test: atest VtsHalEvsV1_1TargetTest Change-Id: I592a0a8de5fffd98178d624ee5aac4c28245d056 --- .../functional/VtsHalEvsV1_1TargetTest.cpp | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp b/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp index b3eb7397ae..5688529df9 100644 --- a/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp +++ b/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp @@ -96,14 +96,6 @@ typedef struct { } RawStreamConfig; constexpr const size_t kStreamCfgSz = sizeof(RawStreamConfig) / sizeof(int32_t); -const std::unordered_set gSupportedColorFormats ({ - HAL_PIXEL_FORMAT_RGBA_8888, - HAL_PIXEL_FORMAT_BGRA_8888, - HAL_PIXEL_FORMAT_YCRCB_420_SP, // NV21 - HAL_PIXEL_FORMAT_YV12, // YV12 - HAL_PIXEL_FORMAT_YCBCR_422_I // YUY2 -}); - } // anonymous namespace @@ -258,8 +250,7 @@ protected: // Stream configurations are found in metadata RawStreamConfig *ptr = reinterpret_cast(streamCfgs.data.i32); for (unsigned offset = 0; offset < streamCfgs.count; offset += kStreamCfgSz) { - if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT && - isSupportedColorFormat(ptr->format)) { + if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT) { targetCfg.width = ptr->width; targetCfg.height = ptr->height; targetCfg.format = static_cast(ptr->format); @@ -272,10 +263,6 @@ protected: return targetCfg; } - bool isSupportedColorFormat(int32_t format) { - return gSupportedColorFormats.find(format) != gSupportedColorFormats.end(); - } - sp pEnumerator; // Every test needs access to the service std::vector cameraInfo; // Empty unless/until loadCameraList() is called bool mIsHwModule; // boolean to tell current module under testing @@ -2028,9 +2015,7 @@ TEST_P(EvsHidlTest, CameraUseStreamConfigToDisplay) { // Stream configurations are found in metadata RawStreamConfig *ptr = reinterpret_cast(streamCfgs.data.i32); for (unsigned offset = 0; offset < streamCfgs.count; offset += kStreamCfgSz) { - if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT && - isSupportedColorFormat(ptr->format)) { - + if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT) { if (ptr->width * ptr->height > maxArea && ptr->framerate >= minReqFps) { targetCfg.width = ptr->width; @@ -2130,9 +2115,7 @@ TEST_P(EvsHidlTest, MultiCameraStreamUseConfig) { // Stream configurations are found in metadata RawStreamConfig *ptr = reinterpret_cast(streamCfgs.data.i32); for (unsigned offset = 0; offset < streamCfgs.count; offset += kStreamCfgSz) { - if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT && - isSupportedColorFormat(ptr->format)) { - + if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT) { if (ptr->width * ptr->height > maxArea && ptr->framerate >= minReqFps) { targetCfg.width = ptr->width;