v1.0.0-rc.40
This commit is contained in:
@@ -17,38 +17,41 @@ template <class T> void FillVector(std::vector<char> &v, int64_t fill_value) {
|
||||
|
||||
FrameTransformation::FrameTransformation(const DiffractionExperiment &in_experiment) :
|
||||
experiment(in_experiment),
|
||||
pixel_depth(experiment.GetByteDepthImage()), pixel_signed(experiment.IsPixelSigned()),
|
||||
image_mode(in_experiment.GetImageMode()),
|
||||
pixel_depth(in_experiment.GetByteDepthImage()),
|
||||
compressor(in_experiment.GetCompressionAlgorithm()),
|
||||
err_value(experiment.GetByteDepthImage() * RAW_MODULE_SIZE) {
|
||||
|
||||
precompression_buffer.resize(experiment.GetPixelsNum() * pixel_depth);
|
||||
|
||||
if (pixel_depth == 2) {
|
||||
if (pixel_signed) {
|
||||
FillVector<int16_t>(precompression_buffer, experiment.GetImageFillValue());
|
||||
FillVector<int16_t>(err_value, experiment.GetImageFillValue());
|
||||
} else {
|
||||
FillVector<uint16_t>(precompression_buffer, experiment.GetImageFillValue());
|
||||
FillVector<uint16_t>(err_value, experiment.GetImageFillValue());
|
||||
}
|
||||
} else if (pixel_depth == 4) {
|
||||
if (pixel_signed) {
|
||||
FillVector<int32_t>(precompression_buffer, experiment.GetImageFillValue());
|
||||
FillVector<int32_t>(err_value, experiment.GetImageFillValue());
|
||||
} else {
|
||||
FillVector<uint32_t>(precompression_buffer, experiment.GetImageFillValue());
|
||||
FillVector<uint32_t>(err_value, experiment.GetImageFillValue());
|
||||
}
|
||||
} else if (pixel_depth == 1) {
|
||||
if (pixel_signed) {
|
||||
switch (image_mode) {
|
||||
case CompressedImageMode::Int8:
|
||||
FillVector<int8_t>(precompression_buffer, experiment.GetImageFillValue());
|
||||
FillVector<int8_t>(err_value, experiment.GetImageFillValue());
|
||||
} else {
|
||||
break;
|
||||
case CompressedImageMode::Int16:
|
||||
FillVector<int16_t>(precompression_buffer, experiment.GetImageFillValue());
|
||||
FillVector<int16_t>(err_value, experiment.GetImageFillValue());
|
||||
break;
|
||||
case CompressedImageMode::Int32:
|
||||
FillVector<int32_t>(precompression_buffer, experiment.GetImageFillValue());
|
||||
FillVector<int32_t>(err_value, experiment.GetImageFillValue());
|
||||
break;
|
||||
case CompressedImageMode::Uint8:
|
||||
FillVector<uint8_t>(precompression_buffer, experiment.GetImageFillValue());
|
||||
FillVector<uint8_t>(err_value, experiment.GetImageFillValue());
|
||||
}
|
||||
} else
|
||||
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Pixel depth unsupported");
|
||||
break;
|
||||
case CompressedImageMode::Uint16:
|
||||
FillVector<uint16_t>(precompression_buffer, experiment.GetImageFillValue());
|
||||
FillVector<uint16_t>(err_value, experiment.GetImageFillValue());
|
||||
break;
|
||||
case CompressedImageMode::Uint32:
|
||||
FillVector<uint32_t>(precompression_buffer, experiment.GetImageFillValue());
|
||||
FillVector<uint32_t>(err_value, experiment.GetImageFillValue());
|
||||
break;
|
||||
default:
|
||||
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Image mode not supprted for FrameTransformation");
|
||||
}
|
||||
}
|
||||
|
||||
size_t FrameTransformation::CompressImage(void *output) {
|
||||
@@ -57,25 +60,22 @@ size_t FrameTransformation::CompressImage(void *output) {
|
||||
}
|
||||
|
||||
CompressedImage FrameTransformation::GetCompressedImage() {
|
||||
CompressedImage image{};
|
||||
const uint8_t *data;
|
||||
size_t size;
|
||||
if (experiment.GetCompressionAlgorithm() == CompressionAlgorithm::NO_COMPRESSION) {
|
||||
image.data = (uint8_t *) precompression_buffer.data();
|
||||
image.size = experiment.GetPixelsNum() * experiment.GetByteDepthImage();
|
||||
data = (uint8_t *) precompression_buffer.data();
|
||||
size = experiment.GetPixelsNum() * experiment.GetByteDepthImage();
|
||||
} else {
|
||||
compressed_buffer.resize(MaxCompressedSize(experiment.GetCompressionAlgorithm(),
|
||||
experiment.GetPixelsNum(),
|
||||
experiment.GetByteDepthImage()));
|
||||
image.data = (uint8_t *) compressed_buffer.data();
|
||||
image.size = CompressImage(compressed_buffer.data());
|
||||
data = (uint8_t *) compressed_buffer.data();
|
||||
size = CompressImage(compressed_buffer.data());
|
||||
}
|
||||
image.xpixel = experiment.GetXPixelsNum();
|
||||
image.ypixel = experiment.GetYPixelsNum();
|
||||
image.algorithm = experiment.GetCompressionAlgorithm();
|
||||
image.pixel_depth_bytes = experiment.GetByteDepthImage();
|
||||
image.pixel_is_signed = pixel_signed;
|
||||
image.pixel_is_float = false;
|
||||
image.channel = "default";
|
||||
return image;
|
||||
|
||||
return CompressedImage(data, size,experiment.GetXPixelsNum(),
|
||||
experiment.GetYPixelsNum(), image_mode,
|
||||
experiment.GetCompressionAlgorithm());
|
||||
}
|
||||
|
||||
void FrameTransformation::ProcessModule(const void *input, uint16_t module_number, int data_stream) {
|
||||
@@ -88,37 +88,42 @@ void FrameTransformation::ProcessModule(const void *input, uint16_t module_numbe
|
||||
auto pixel0 = experiment.GetPixel0OfModuleConv(module_number_abs);
|
||||
auto fast_step = experiment.GetModuleFastDirectionStep(module_number_abs);
|
||||
auto slow_step = experiment.GetModuleSlowDirectionStep(module_number_abs);
|
||||
|
||||
if (pixel_depth == 2) {
|
||||
if (pixel_signed)
|
||||
TransferModuleAdjustMultipixels((int16_t *) precompression_buffer.data(), (int16_t *) input,
|
||||
slow_step, static_cast<int16_t>(INT16_MIN), static_cast<int16_t>(INT16_MAX),
|
||||
fast_step, pixel0);
|
||||
else
|
||||
TransferModuleAdjustMultipixels((uint16_t *) precompression_buffer.data(), (uint16_t *) input,
|
||||
slow_step, static_cast<uint16_t>(0), static_cast<uint16_t>(UINT16_MAX - 1),
|
||||
fast_step, pixel0);
|
||||
} else if (pixel_depth == 4) {
|
||||
if (pixel_signed)
|
||||
TransferModuleAdjustMultipixels((int32_t *) precompression_buffer.data(), (int32_t *) input,
|
||||
slow_step, static_cast<int32_t>(INT32_MIN), static_cast<int32_t>(INT32_MAX),
|
||||
fast_step, pixel0);
|
||||
else
|
||||
TransferModuleAdjustMultipixels((uint32_t *) precompression_buffer.data(), (uint32_t *) input,
|
||||
slow_step, static_cast<uint32_t>(0), static_cast<uint32_t>(UINT32_MAX - 1),
|
||||
fast_step, pixel0);
|
||||
} else if (pixel_depth == 1) {
|
||||
if (pixel_signed)
|
||||
|
||||
switch (image_mode) {
|
||||
case CompressedImageMode::Int8:
|
||||
TransferModuleAdjustMultipixels((int8_t *) precompression_buffer.data(), (int8_t *) input,
|
||||
slow_step, static_cast<int8_t>(INT8_MIN), static_cast<int8_t>(INT8_MAX),
|
||||
fast_step, pixel0);
|
||||
else
|
||||
break;
|
||||
case CompressedImageMode::Int16:
|
||||
TransferModuleAdjustMultipixels((int16_t *) precompression_buffer.data(), (int16_t *) input,
|
||||
slow_step, static_cast<int16_t>(INT16_MIN), static_cast<int16_t>(INT16_MAX),
|
||||
fast_step, pixel0);
|
||||
break;
|
||||
case CompressedImageMode::Int32:
|
||||
TransferModuleAdjustMultipixels((int32_t *) precompression_buffer.data(), (int32_t *) input,
|
||||
slow_step, static_cast<int32_t>(INT32_MIN), static_cast<int32_t>(INT32_MAX),
|
||||
fast_step, pixel0);
|
||||
|
||||
break;
|
||||
case CompressedImageMode::Uint8:
|
||||
TransferModuleAdjustMultipixels((uint8_t *) precompression_buffer.data(), (uint8_t *) input,
|
||||
slow_step, static_cast<uint8_t>(0), static_cast<uint8_t>(UINT8_MAX - 1),
|
||||
fast_step, pixel0);
|
||||
} else
|
||||
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Pixel depth unsupported");
|
||||
|
||||
break;
|
||||
case CompressedImageMode::Uint16:
|
||||
TransferModuleAdjustMultipixels((uint16_t *) precompression_buffer.data(), (uint16_t *) input,
|
||||
slow_step, static_cast<uint16_t>(0), static_cast<uint16_t>(UINT16_MAX - 1),
|
||||
fast_step, pixel0);
|
||||
break;
|
||||
case CompressedImageMode::Uint32:
|
||||
TransferModuleAdjustMultipixels((uint32_t *) precompression_buffer.data(), (uint32_t *) input,
|
||||
slow_step, static_cast<uint32_t>(0), static_cast<uint32_t>(UINT32_MAX - 1),
|
||||
fast_step, pixel0);
|
||||
break;
|
||||
default:
|
||||
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Image mode not supprted for FrameTransformation");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user