examples: convert: Add support for RGBX input and output

We also check if the hardware platform supports this.

Signed-off-by: Nick Hollinghurst <[email protected]>

Author: njhollinghurst

src/examples/convert.cpp

@@ -65,6 +65,18 @@ void write_rgb888(std::ofstream &out, std::array<uint8_t *, 3> &mem, unsigned in
 	write_plane(out, (uint8_t *)mem[0], width * 3, height, file_stride, buffer_stride);
 }
 
+void read_32(std::array<uint8_t *, 3> &mem, std::ifstream &in, unsigned int width, unsigned int height,
+			 unsigned int file_stride, unsigned int buffer_stride)
+{
+	read_plane((uint8_t *)mem[0], in, width * 4, height, file_stride, buffer_stride);
+}
+
+void write_32(std::ofstream &out, std::array<uint8_t *, 3> &mem, unsigned int width, unsigned int height,
+			  unsigned int file_stride, unsigned int buffer_stride)
+{
+	write_plane(out, (uint8_t *)mem[0], width * 4, height, file_stride, buffer_stride);
+}
+
 void read_yuv(std::array<uint8_t *, 3> &mem, std::ifstream &in, unsigned int width, unsigned int height,
 			  unsigned int file_stride, unsigned int buffer_stride, unsigned int ss_x, unsigned int ss_y)
 {
@@ -152,6 +164,7 @@ struct FormatFuncs
 const std::map<std::string, FormatFuncs> Formats =
 {
 	{ "RGB888", { read_rgb888, write_rgb888 } },
+	{ "RGBX8888", { read_32, write_32 } },
 	{ "YUV420P", { read_yuv420, write_yuv420 } },
 	{ "YUV422P", { read_yuv422p, write_yuv422p } },
 	{ "YUV444P", { read_yuv444p, write_yuv444p } },
@@ -280,6 +293,11 @@ int main(int argc, char *argv[])
 	global.bayer_enables = 0;
 	global.rgb_enables = PISP_BE_RGB_ENABLE_INPUT + PISP_BE_RGB_ENABLE_OUTPUT0;
 
+	if ((in_file.format == "RGBX8888" || out_file.format == "RGBX8888") && !variant->BackendRGB32Supported(0))
+	{
+		std::cerr << "Backend hardware does not support RGBX formats" << std::endl;
+		exit(-1);
+	}
 	pisp_image_format_config i = {};
 	i.width = in_file.width;
 	i.height = in_file.height;
@@ -299,20 +317,20 @@ int main(int argc, char *argv[])
 	if (!out_file.stride)
 		out_file.stride = o.image.stride;
 
-	if (in_file.format != "RGB888")
+	if (in_file.format >= "U")
 	{
 		pisp_be_ccm_config csc;
 		be.InitialiseYcbcrInverse(csc, "jpeg");
 		be.SetCcm(csc);
-		global.rgb_enables += PISP_BE_RGB_ENABLE_CCM;
+		global.rgb_enables |= PISP_BE_RGB_ENABLE_CCM;
 	}
 
-	if (out_file.format != "RGB888")
+	if (out_file.format >= "U")
 	{
 		pisp_be_ccm_config csc;
 		be.InitialiseYcbcr(csc, "jpeg");
 		be.SetCsc(0, csc);
-		global.rgb_enables += PISP_BE_RGB_ENABLE_CSC0;
+		global.rgb_enables |= PISP_BE_RGB_ENABLE_CSC0;
 	}
 
 	be.SetGlobal(global);