Merge "Remove color format constraints" into android13-tests-dev (3457c4ee) · Commits · e / os / android_hardware_interfaces

automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp

+5 −8

Original line number	Diff line number	Diff line
		@@ -231,8 +231,7 @@ class EvsAidlTest : public ::testing::TestWithParam<std::string> {
		// 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 &&
		ptr->format == HAL_PIXEL_FORMAT_RGBA_8888) {
		if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT) {
		targetCfg.width = ptr->width;
		targetCfg.height = ptr->height;
		targetCfg.format = static_cast<PixelFormat>(ptr->format);
		@@ -1732,11 +1731,11 @@ TEST_P(EvsAidlTest, 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 &&
		ptr->format == HAL_PIXEL_FORMAT_RGBA_8888) {
		if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT) {
		if (ptr->width * ptr->height > maxArea && ptr->framerate >= minReqFps) {
		targetCfg.width = ptr->width;
		targetCfg.height = ptr->height;
		targetCfg.format = static_cast<PixelFormat>(ptr->format);

		maxArea = ptr->width * ptr->height;
		foundCfg = true;
		@@ -1745,7 +1744,6 @@ TEST_P(EvsAidlTest, CameraUseStreamConfigToDisplay) {
		++ptr;
		}
		}
		targetCfg.format = static_cast<PixelFormat>(HAL_PIXEL_FORMAT_RGBA_8888);

		if (!foundCfg) {
		// Current EVS camera does not provide stream configurations in the
		@@ -1829,11 +1827,11 @@ TEST_P(EvsAidlTest, 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 &&
		ptr->format == HAL_PIXEL_FORMAT_RGBA_8888) {
		if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT) {
		if (ptr->width * ptr->height > maxArea && ptr->framerate >= minReqFps) {
		targetCfg.width = ptr->width;
		targetCfg.height = ptr->height;
		targetCfg.format = static_cast<PixelFormat>(ptr->format);

		maxArea = ptr->width * ptr->height;
		foundCfg = true;
		@@ -1842,7 +1840,6 @@ TEST_P(EvsAidlTest, MultiCameraStreamUseConfig) {
		++ptr;
		}
		}
		targetCfg.format = static_cast<PixelFormat>(HAL_PIXEL_FORMAT_RGBA_8888);

		if (!foundCfg) {
		LOG(INFO) << "Device " << cam.id