Merge branch 'acquire-project:main' into 7-simulated-camera-stalling

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
+- Users can specify access key ID and secret access key for S3 storage in `StorageProperties`.
+
 ### Fixed
 
 - A bug where changing device identifiers for the storage device was not being handled correctly.
@@ -15,6 +19,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - `reserve_image_shape` is now called in `acquire_configure` rather than `acquire_start`.
+- Users can now specify the names, ordering, and number of acquisition dimensions.
+- The `StorageProperties::filename` field is now `StorageProperties::uri`.
+- Files can be specified by URI with an optional `file://` prefix.
 
 ## 0.2.0 - 2024-01-05
 

README.md

@@ -83,7 +83,7 @@ This is an Acquire Driver that exposes commonly used devices.
 - **tiff** - Streams to a [bigtiff] file. Metadata is stored in the `ImageDescription` tag for each frame as a `json`
   string.
 - **tiff-json** - Stores the video stream in a *bigtiff* (as above) and stores metadata in a `json` file. Both are
-  located in a folder identified by the `filename` property.
+  located in a folder identified by the `uri` property.
 - **Trash** - Writes nothing. Discards incoming data.
 
 [bigtiff]: http://bigtiff.org/

acquire-core-libs/src/acquire-device-properties/device/props/components.c

@@ -52,6 +52,12 @@ bytes_of_type(enum SampleType type)
     return table[type];
 }
 
+size_t
+bytes_of_image(const struct ImageShape* const shape)
+{
+    return shape->strides.planes * bytes_of_type(shape->type);
+}
+
 //
 //  UNIT TESTS
 //

acquire-core-libs/src/acquire-device-properties/device/props/components.h

@@ -143,6 +143,7 @@ extern "C"
 
     const char* sample_type_as_string(enum SampleType type);
     size_t bytes_of_type(enum SampleType type);
+    size_t bytes_of_image(const struct ImageShape* shape);
 
 #ifdef __cplusplus
 }