v1.0.0-rc.40
This commit is contained in:
@@ -33,18 +33,18 @@ void test_puller(ZMQImagePuller *puller,
|
||||
diff_split[writer_id]++;
|
||||
|
||||
|
||||
if (img->cbor->data_message->image.size != x.GetPixelsNum() * sizeof(uint16_t))
|
||||
if (img->cbor->data_message->image.GetCompressedSize() != x.GetPixelsNum() * sizeof(uint16_t))
|
||||
diff_size[writer_id]++;
|
||||
else if (memcmp(img->cbor->data_message->image.data, image1.data() + img->cbor->data_message->number * x.GetPixelsNum(),
|
||||
else if (memcmp(img->cbor->data_message->image.GetCompressed(), image1.data() + img->cbor->data_message->number * x.GetPixelsNum(),
|
||||
x.GetPixelsNum() * sizeof(uint16_t)) != 0)
|
||||
diff_content[writer_id]++;
|
||||
if (img->cbor->data_message->image.xpixel != RAW_MODULE_COLS)
|
||||
if (img->cbor->data_message->image.GetWidth() != RAW_MODULE_COLS)
|
||||
diff_content[writer_id]++;
|
||||
if (img->cbor->data_message->image.ypixel != RAW_MODULE_LINES)
|
||||
if (img->cbor->data_message->image.GetHeight() != RAW_MODULE_LINES)
|
||||
diff_content[writer_id]++;
|
||||
if (img->cbor->data_message->image.pixel_depth_bytes != 2)
|
||||
if (img->cbor->data_message->image.GetByteDepth() != 2)
|
||||
diff_content[writer_id]++;
|
||||
if (img->cbor->data_message->image.algorithm != CompressionAlgorithm::NO_COMPRESSION)
|
||||
if (img->cbor->data_message->image.GetCompressionAlgorithm() != CompressionAlgorithm::NO_COMPRESSION)
|
||||
diff_content[writer_id]++;
|
||||
nimages[writer_id]++;
|
||||
}
|
||||
@@ -96,7 +96,12 @@ TEST_CASE("ZMQImageCommTest_1Writer","[ZeroMQ]") {
|
||||
for (int i = 0; i < nframes; i++) {
|
||||
DataMessage data_message;
|
||||
data_message.number = i;
|
||||
PrepareCBORImage(data_message, x, image1.data() + i * x.GetPixelsNum(), x.GetPixelsNum() * sizeof(uint16_t));
|
||||
data_message.image = CompressedImage(image1.data() + i * x.GetPixelsNum(),
|
||||
x.GetPixelsNum() * sizeof(uint16_t),
|
||||
x.GetXPixelsNum(),
|
||||
x.GetYPixelsNum(),
|
||||
x.GetImageMode(),
|
||||
x.GetCompressionAlgorithm());
|
||||
serializer.SerializeImage(data_message);
|
||||
pusher.SendImage(serialization_buffer.data(), serializer.GetBufferSize(), i);
|
||||
}
|
||||
@@ -172,7 +177,12 @@ TEST_CASE("ZMQImageCommTest_2Writers","[ZeroMQ]") {
|
||||
for (int i = 0; i < nframes; i++) {
|
||||
DataMessage data_message;
|
||||
data_message.number = i;
|
||||
PrepareCBORImage(data_message, x, image1.data() + i * x.GetPixelsNum(), x.GetPixelsNum() * sizeof(uint16_t));
|
||||
data_message.image = CompressedImage(image1.data() + i * x.GetPixelsNum(),
|
||||
x.GetPixelsNum() * sizeof(uint16_t),
|
||||
x.GetXPixelsNum(),
|
||||
x.GetYPixelsNum(),
|
||||
x.GetImageMode(),
|
||||
x.GetCompressionAlgorithm());
|
||||
serializer.SerializeImage(data_message);
|
||||
pusher.SendImage(serialization_buffer.data(), serializer.GetBufferSize(), i);
|
||||
}
|
||||
@@ -260,7 +270,12 @@ TEST_CASE("ZMQImageCommTest_4Writers","[ZeroMQ]") {
|
||||
for (int i = 0; i < nframes; i++) {
|
||||
DataMessage data_message;
|
||||
data_message.number = i;
|
||||
PrepareCBORImage(data_message, x, image1.data() + i * x.GetPixelsNum(), x.GetPixelsNum() * sizeof(uint16_t));
|
||||
data_message.image = CompressedImage(image1.data() + i * x.GetPixelsNum(),
|
||||
x.GetPixelsNum() * sizeof(uint16_t),
|
||||
x.GetXPixelsNum(),
|
||||
x.GetYPixelsNum(),
|
||||
x.GetImageMode(),
|
||||
x.GetCompressionAlgorithm());
|
||||
serializer.SerializeImage(data_message);
|
||||
pusher.SendImage(serialization_buffer.data(), serializer.GetBufferSize(), i);
|
||||
}
|
||||
@@ -304,21 +319,12 @@ TEST_CASE("ZMQImageCommTest_NoWriter","[ZeroMQ]") {
|
||||
|
||||
std::vector<uint8_t> test(512*1024, 11);
|
||||
|
||||
CompressedImage image {
|
||||
.data = test.data(),
|
||||
.size = 1024 * 512,
|
||||
.xpixel = 1024,
|
||||
.ypixel = 512,
|
||||
.pixel_depth_bytes = 1,
|
||||
.pixel_is_signed = false,
|
||||
.pixel_is_float = false,
|
||||
.algorithm = CompressionAlgorithm::NO_COMPRESSION,
|
||||
.channel = "default"
|
||||
};
|
||||
CompressedImage image(test, 1024, 512);
|
||||
|
||||
DataMessage data_message{};
|
||||
data_message.number = 1;
|
||||
data_message.image = image;
|
||||
DataMessage data_message{
|
||||
.number = 1,
|
||||
.image = image
|
||||
};
|
||||
std::vector<uint8_t> v(16*1024*1024);
|
||||
CBORStream2Serializer serializer(v.data(), v.size());
|
||||
serializer.SerializeImage(data_message);
|
||||
|
||||
Reference in New Issue
Block a user