libpisp: utils: Fix support for wallpaper and semiplanar formats

Correct the stride calucation and add YUV420SP, YUV420SP_COL128,
and YUV420SP10_COL128 identifiers.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>

Author: naushir

src/helpers/v4l2_device.cpp

@@ -43,6 +43,7 @@ static FormatInfo get_v4l2_format(const std::string &format)
 		{ "UYVY", { V4L2_PIX_FMT_UYVY, 1 } },
 		{ "NV12", { V4L2_PIX_FMT_NV12M, 2 } },
 		{ "YUV420SP_COL128", { V4L2_PIX_FMT_NV12MT_COL128, 2 } },
+		{ "YUV420SP10_COL128", { V4L2_PIX_FMT_NV12MT_10_COL128, 2 } },
 	};
 
 	auto it = formats.find(format);

src/libpisp/common/pisp_utils.cpp

@@ -64,7 +64,7 @@ void compute_stride_align(pisp_image_format_config &config, int align, bool pres
 {
 	if (PISP_IMAGE_FORMAT_WALLPAPER(config.format))
 	{
-		config.stride2 = config.stride = config.height * PISP_WALLPAPER_WIDTH;
+		config.stride2 = config.stride = ((config.height + 7) & ~7) * PISP_WALLPAPER_WIDTH;
 		if (PISP_IMAGE_FORMAT_SAMPLING_420(config.format))
 			config.stride2 /= 2;
 		return;
@@ -222,11 +222,19 @@ static const std::map<std::string, uint32_t> &formats_table()
 	// Note that alternate names and plane orderings are not defined to keep a 1:1 mapping.
 	static const std::map<std::string, uint32_t> formats = {
 		{ "YUV444P", PISP_IMAGE_FORMAT_THREE_CHANNEL + PISP_IMAGE_FORMAT_BPS_8 + PISP_IMAGE_FORMAT_SAMPLING_444 +
-						PISP_IMAGE_FORMAT_PLANARITY_PLANAR },
+						 PISP_IMAGE_FORMAT_PLANARITY_PLANAR },
 		{ "YUV422P", PISP_IMAGE_FORMAT_THREE_CHANNEL + PISP_IMAGE_FORMAT_BPS_8 + PISP_IMAGE_FORMAT_SAMPLING_422 +
-						PISP_IMAGE_FORMAT_PLANARITY_PLANAR },
+						 PISP_IMAGE_FORMAT_PLANARITY_PLANAR },
 		{ "YUV420P", PISP_IMAGE_FORMAT_THREE_CHANNEL + PISP_IMAGE_FORMAT_BPS_8 + PISP_IMAGE_FORMAT_SAMPLING_420 +
-						PISP_IMAGE_FORMAT_PLANARITY_PLANAR },
+						 PISP_IMAGE_FORMAT_PLANARITY_PLANAR },
+		{ "YUV420SP", PISP_IMAGE_FORMAT_THREE_CHANNEL + PISP_IMAGE_FORMAT_BPS_8 + PISP_IMAGE_FORMAT_SAMPLING_420 +
+						  PISP_IMAGE_FORMAT_PLANARITY_SEMI_PLANAR },
+		{ "YUV420SP_COL128", PISP_IMAGE_FORMAT_THREE_CHANNEL + PISP_IMAGE_FORMAT_BPS_8 +
+								 PISP_IMAGE_FORMAT_SAMPLING_420 + PISP_IMAGE_FORMAT_PLANARITY_SEMI_PLANAR +
+								 PISP_IMAGE_FORMAT_WALLPAPER_ROLL },
+		{ "YUV420SP10_COL128", PISP_IMAGE_FORMAT_THREE_CHANNEL + PISP_IMAGE_FORMAT_BPS_10 +
+								   PISP_IMAGE_FORMAT_SAMPLING_420 + PISP_IMAGE_FORMAT_PLANARITY_SEMI_PLANAR +
+								   PISP_IMAGE_FORMAT_WALLPAPER_ROLL },
 		{ "NV12", PISP_IMAGE_FORMAT_THREE_CHANNEL + PISP_IMAGE_FORMAT_BPS_8 + PISP_IMAGE_FORMAT_SAMPLING_420 +
 					  PISP_IMAGE_FORMAT_PLANARITY_SEMI_PLANAR },
 		{ "NV21", PISP_IMAGE_FORMAT_THREE_CHANNEL + PISP_IMAGE_FORMAT_BPS_8 + PISP_IMAGE_FORMAT_SAMPLING_420 +