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.

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

Nontrivial chunking support #5

Merged
merged 12 commits into from
Jun 27, 2023
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
windows-build:
name: "Build on Windows with DCAM SDK"
name: "Build on Windows with eGrabber SDK"
runs-on: [ self-hosted, egrabber ]

permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
nightly-windows-build:
name: "Nightly build on Windows with EGrabber SDK"
name: "Nightly build on Windows with eGrabber SDK"

runs-on: [ self-hosted, egrabber ]

Expand Down
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [0.1.2](https://github.com/acquire-project/acquire-driver-egrabber/compare/v0.1.1...v0.1.2) - 2023-06-27

### Added

- Nightly releases.

### Changes

- Updates call to `storage_properties_init` for the new function signature.

## 0.1.1 - 2023-05-11
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ cmake_policy(SET CMP0079 NEW) # allows use with targets in other directories
enable_testing()

include(cmake/aq_require.cmake)
include(cmake/git-versioning.cmake)
include(cmake/euresys.egrabber.cmake)
include(cmake/ide.cmake)
include(cmake/install-prefix.cmake)
Expand Down
30 changes: 30 additions & 0 deletions cmake/git-versioning.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
find_program(GIT git)
set(GIT_TAG "v0")
set(GIT_HASH "")

if(GIT)
execute_process(COMMAND ${GIT} describe --tags --abbrev=0
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE _GIT_TAG
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
)
execute_process(COMMAND ${GIT} describe --always
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE GIT_HASH
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
)

string(FIND "${_GIT_TAG}" "fatal" find_result)

if(${find_result} EQUAL -1)
set(GIT_TAG "${_GIT_TAG}")
endif()
endif()

# Output
add_definitions(-DGIT_TAG=${GIT_TAG})
add_definitions(-DGIT_HASH=${GIT_HASH})
set(CPACK_PACKAGE_VERSION ${GIT_TAG})
message(STATUS "Version ${GIT_TAG} ${GIT_HASH}")
2 changes: 1 addition & 1 deletion tests/acquire-driver-zarr
Submodule acquire-driver-zarr updated 43 files
+78 −0 .github/workflows/auto-merge.yml
+62 −0 .github/workflows/release.yml
+8 −8 .github/workflows/test_pr.yml
+19 −0 CHANGELOG.md
+1 −0 CMakeLists.txt
+77 −3 README.md
+30 −0 cmake/git-versioning.cmake
+11 −8 cmake/simd.cmake
+1 −1 src/3rdParty/cblosc/inc/blosc-export.h
+8 −10 src/3rdParty/cblosc/inc/blosc.h
+ src/3rdParty/cblosc/lib/linux-amd64/libblosc.a
+4 −4 src/3rdParty/cblosc/lib/osx/README.md
+ src/3rdParty/cblosc/lib/osx/libblosc.a
+ src/3rdParty/cblosc/lib/win64/libblosc-debug.lib
+ src/3rdParty/cblosc/lib/win64/libblosc.lib
+ src/3rdParty/cblosc/lib/win64/libblosc.pdb
+6 −1 src/CMakeLists.txt
+1 −1 src/acquire-core-libs
+242 −0 src/chunk.writer.cpp
+73 −0 src/chunk.writer.hh
+126 −0 src/tiled.frame.cpp
+69 −0 src/tiled.frame.hh
+69 −8 src/zarr.blosc.cpp
+35 −108 src/zarr.blosc.hh
+0 −222 src/zarr.codec.hh
+540 −13 src/zarr.cpp
+91 −0 src/zarr.encoder.cpp
+41 −0 src/zarr.encoder.hh
+65 −386 src/zarr.hh
+12 −29 src/zarr.raw.cpp
+13 −25 src/zarr.raw.hh
+6 −2 tests/CMakeLists.txt
+1 −1 tests/acquire-driver-common
+1 −1 tests/acquire-video-runtime
+24,596 −0 tests/json.hpp
+217 −0 tests/write-zarr-compressed-with-chunking-and-rollover.cpp
+92 −39 tests/write-zarr-compressed-with-chunking.cpp
+199 −0 tests/write-zarr-raw-with-chunking-and-rollover.cpp
+184 −0 tests/write-zarr-raw-with-chunking.cpp
+87 −27 tests/write-zarr-raw-with-ragged-tiling.cpp
+55 −15 tests/write-zarr-with-defaults.cpp
+16 −3 tests/write-zarr-with-lz4-compression.cpp
+16 −3 tests/write-zarr-with-zstd-compression.cpp
3 changes: 1 addition & 2 deletions tests/one-video-stream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ main()
SIZED("out.zarr"),
0,
0,
{ 0 },
1ULL << 30);
{ 0 });

OK(acquire_configure(runtime, &props));

Expand Down