Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow 8-bit bslz4 data without decompression from stream #63

Merged
merged 4 commits into from
May 29, 2024
Merged

Allow 8-bit bslz4 data without decompression from stream #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca59b69
Allow 8-bit bslz4 data from stream
tguruswamy Jan 9, 2024
e497d6b
Update RELEASE.md
tguruswamy Jan 9, 2024
d9f1183
BSLZ4 frames should be 12 bytes shorter after removing header
tguruswamy May 10, 2024
1c5f49f
Add 12byte BSLZ4 size change to RELEASE notes
tguruswamy May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions RELEASE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ R3-5 (July XXX, 2022)
This logic was accidentally removed when adding support for Continuous trigger mode.
* Fix to only create and access High Voltage parameters on Eiger2.
This fixes error messages when creating the detector object on Eiger detectors.
* Allow 8-bit BSLZ4 data in Stream mode with Decompress=No (encoding "bs8-lz4<").
* Correctly calculate size of BSLZ4 frames without their 12-byte header

R3-4 (June 10, 2022)
----
Expand Down
4 changes: 3 additions & 1 deletion eigerApp/src/eigerDetector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1441,9 +1441,11 @@ void eigerDetector::streamTask (void)
pArray->codec.name = "lz4";
}
else if ((strcmp(frame.encoding, "bs32-lz4<") == 0) ||
(strcmp(frame.encoding, "bs16-lz4<") == 0)) {
(strcmp(frame.encoding, "bs16-lz4<") == 0) ||
(strcmp(frame.encoding, "bs8-lz4<") == 0)) {
pArray->codec.name = "bslz4";
pInput += 12;
frame.compressedSize -= 12;
}
else {
ERR_ARGS("unknown encoding %s", frame.encoding);
Expand Down