tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove color format constraints am: e6bb228dc6 am: 9b60ecd229

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

Change-Id: I16002aae2f76e58380f72a131229a381cb11ca56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Changyeon Jo 2022-09-15 22:36:12 +00:00 committed by Automerger Merge Worker
commit a6e880a398
1 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp
View file

@ -96,14 +96,6 @@ typedef struct {
} RawStreamConfig;
constexpr const size_t kStreamCfgSz = sizeof(RawStreamConfig) / sizeof(int32_t);
const std::unordered_set<int32_t> 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<RawStreamConfig *>(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<PixelFormat>(ptr->format);
@ -272,10 +263,6 @@ protected:
return targetCfg;
}
bool isSupportedColorFormat(int32_t format) {
return gSupportedColorFormats.find(format) != gSupportedColorFormats.end();
}
sp<IEvsEnumerator> pEnumerator; // Every test needs access to the service
std::vector<CameraDesc> cameraInfo; // Empty unless/until loadCameraList() is called
bool mIsHwModule; // boolean to tell current module under testing
@ -2029,9 +2016,7 @@ TEST_P(EvsHidlTest, CameraUseStreamConfigToDisplay) {
// Stream configurations are found in metadata
RawStreamConfig *ptr = reinterpret_cast<RawStreamConfig *>(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;
@ -2131,9 +2116,7 @@ TEST_P(EvsHidlTest, MultiCameraStreamUseConfig) {
// Stream configurations are found in metadata
RawStreamConfig *ptr = reinterpret_cast<RawStreamConfig *>(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;