Skip to content

Commit

Permalink
Nontrivial chunking support (#6)
Browse files Browse the repository at this point in the history
Submodule updates. Don't merge before
[core-libs/#2](acquire-project/acquire-core-libs#2),
[driver-common/#4](acquire-project/acquire-driver-common#4),
and
[video-runtime/#2](acquire-project/acquire-video-runtime#2).
  • Loading branch information
aliddell authored Jun 2, 2023
1 parent 813223d commit d878f56
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 16 deletions.
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# 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.3](https://github.com/acquire-project/acquire-driver-hdcam/compare/v0.1.2...v0.1.3) - 2023-06-02

### Added

- Nightly releases.

### Changes

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

## [0.1.2](https://github.com/acquire-project/acquire-driver-hdcam/compare/v0.1.1...v0.1.2) - 2023-05-12

### Fixed

- Fixes a bug where `acquire_abort` hangs for a max_frame_count of anything other than 0.

## 0.1.1 - 2023-05-11
3 changes: 2 additions & 1 deletion 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/ide.cmake)
include(cmake/install-prefix.cmake)
include(cmake/hdcam.cmake)
Expand All @@ -15,4 +16,4 @@ set(CMAKE_CXX_STANDARD 20)
add_subdirectory(src)
add_subdirectory(tests)

include(cmake/cpack.cmake)
include(CPack)
5 changes: 0 additions & 5 deletions cmake/cpack.cmake

This file was deleted.

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}")
9 changes: 2 additions & 7 deletions tests/one-video-stream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,8 @@ main()
SIZED("tiff") - 1,
&props.video[0].storage.identifier));

storage_properties_init(&props.video[0].storage.settings,
0,
SIZED("out.tif"),
0,
0,
{ 0 },
0);
storage_properties_init(
&props.video[0].storage.settings, 0, SIZED("out.tif"), 0, 0, { 0 });

OK(acquire_configure(runtime, &props));

Expand Down

0 comments on commit d878f56

Please sign in to comment.