Flatbuffer/Protobuf now able to receive rgba data

libsrc/flatbufserver/FlatBufferClient.cpp

@@ -152,15 +152,30 @@ void FlatBufferClient::handleImageCommand(const hyperionnet::Image *image)
 		const int width = img->width();
 		const int height = img->height();
 
-		if ((int) imageData->size() != width*height*3)
+		// check consistency of the size of the received data
+		int channelCount = (int)imageData->size()/(width*height);
+		if (channelCount != 3 && channelCount != 4)
 		{
 			sendErrorReply("Size of image data does not match with the width and height");
 			return;
 		}
 
-		Image<ColorRgb> imageDest(width, height);
-		memmove(imageDest.memptr(), imageData->data(), imageData->size());
-		emit setGlobalInputImage(_priority, imageDest, duration);
+		// create ImageRgb
+		Image<ColorRgb> imageRGB(width, height);
+		if (channelCount == 3)
+		{
+			memmove(imageRGB.memptr(), imageData->data(), imageData->size());
+		}
+
+		if (channelCount == 4)
+		{
+			for (int source=0, destination=0; source < width * height * sizeof(ColorRgb); source+=sizeof(ColorRgb), destination+=sizeof(ColorRgba))
+			{
+				memmove((uint8_t*)imageRGB.memptr() + source, imageData->data() + destination, sizeof(ColorRgb));
+			}
+		}
+
+		emit setGlobalInputImage(_priority, imageRGB, duration);
 	}
 
 	// send reply

libsrc/flatbufserver/FlatBufferClient.h

@@ -4,6 +4,7 @@
 #include <utils/Logger.h>
 #include <utils/Image.h>
 #include <utils/ColorRgb.h>
+#include <utils/ColorRgba.h>
 #include <utils/Components.h>
 
 // flatbuffer FBS

libsrc/flatbufserver/hyperion_request.fbs

@@ -14,6 +14,7 @@ table RawImage {
 
 union ImageType {RawImage}
 
+// Either RGB or RGBA data can be transferred
 table Image {
   data:ImageType (required);
   duration:int = -1;

libsrc/protoserver/ProtoClientConnection.cpp

@@ -169,17 +169,29 @@ void ProtoClientConnection::handleImageCommand(const proto::ImageRequest &messag
 	}
 
 	// check consistency of the size of the received data
-	if ((int) imageData.size() != width*height*3)
+	int channelCount = (int)imageData.size()/(width*height);
+	if (channelCount != 3 && channelCount != 4)
 	{
 		sendErrorReply("Size of image data does not match with the width and height");
 		return;
 	}
 
 	// create ImageRgb
-	Image<ColorRgb> image(width, height);
-	memcpy(image.memptr(), imageData.c_str(), imageData.size());
+	Image<ColorRgb> imageRGB(width, height);
+	if (channelCount == 3)
+	{
+		memmove(imageRGB.memptr(), imageData.c_str(), imageData.size());
+	}
+
+	if (channelCount == 4)
+	{
+		for (int source=0, destination=0; source < width * height * sizeof(ColorRgb); source+=sizeof(ColorRgb), destination+=sizeof(ColorRgba))
+		{
+			memmove((uint8_t*)imageRGB.memptr() + source, imageData.c_str() + destination, sizeof(ColorRgb));
+		}
+	}
 
-	emit setGlobalInputImage(_priority, image, duration);
+	emit setGlobalInputImage(_priority, imageRGB, duration);
 
 	// send reply
 	sendSuccessReply();

libsrc/protoserver/ProtoClientConnection.h

@@ -9,6 +9,7 @@
 #include <utils/Logger.h>
 #include <utils/Image.h>
 #include <utils/ColorRgb.h>
+#include <utils/ColorRgba.h>
 #include <utils/Components.h>
 
 class QTcpSocket;

libsrc/protoserver/message.proto

@@ -44,7 +44,7 @@ message ImageRequest {
 	// height of the image
 	required int32 imageheight = 3;
 
-	// image data
+	// image data (either RGB or RGBA data can be transferred)
 	required bytes imagedata = 4;
 
 	// duration of the request (negative results in infinite)