Adjust compression header in sf_writer

This commit is contained in:
2020-05-18 17:19:07 +02:00
parent aa22236dfd
commit 188d50cbbf
3 changed files with 12 additions and 3 deletions
+8 -1
View File
@@ -1,4 +1,5 @@
#include "WriterZmqReceiver.hpp"
#include "bitshuffle/bitshuffle.h"
#include "zmq.h"
#include "date.h"
#include <chrono>
@@ -59,7 +60,13 @@ void WriterZmqReceiver::get_next_image(
image_metadata->is_good_frame = 1;
bool image_metadata_init = false;
size_t image_buffer_offset = 0;
// Set compression header.
bshuf_write_uint64_BE(image_buffer,
MODULE_N_BYTES * n_modules_);
bshuf_write_uint32_BE(image_buffer + 8,
MODULE_N_PIXELS * PIXEL_N_BYTES);
size_t image_buffer_offset = BSHUF_LZ4_HEADER_BYTES;
for (size_t i_module = 0; i_module < n_modules_; i_module++) {
+2 -1
View File
@@ -68,5 +68,6 @@ TEST(WriterZmqReceiver, basic_test)
EXPECT_EQ(pulse_id, image_metadata.pulse_id);
EXPECT_EQ(image_metadata.is_good_frame, 1);
EXPECT_EQ(image_metadata.daq_rec, 4);
EXPECT_EQ(image_metadata.compressed_image_size, 5000*n_modules);
EXPECT_EQ(image_metadata.compressed_image_size,
5000*n_modules+BSHUF_LZ4_HEADER_BYTES);
}
+2 -1
View File
@@ -91,7 +91,8 @@ int main (int argc, char *argv[])
MODULE_N_PIXELS, PIXEL_N_BYTES, MODULE_N_PIXELS);
FastQueue<ImageMetadata> queue(
compress_frame_size * n_modules, WRITER_FASTQUEUE_N_SLOTS);
(compress_frame_size * n_modules) + BSHUF_LZ4_HEADER_BYTES,
WRITER_FASTQUEUE_N_SLOTS);
auto ctx = zmq_ctx_new();
zmq_ctx_set (ctx, ZMQ_IO_THREADS, WRITER_ZMQ_IO_THREADS);