Skip to content

Rebase of csharp-record against upstream develop#1

Draft
thedewi wants to merge 135 commits into
Brent-A:csharp-recordfrom
vald-green:csharp-record
Draft

Rebase of csharp-record against upstream develop#1
thedewi wants to merge 135 commits into
Brent-A:csharp-recordfrom
vald-green:csharp-record

Conversation

@thedewi
Copy link
Copy Markdown

@thedewi thedewi commented Jul 14, 2021

It's awkward to PR these, but in case it's useful to you, here is a rebase of csharp-record off current upstream develop.

The conflicts seemed minor, and I have successfully tested recording functionality.

tesych and others added 30 commits October 7, 2019 17:29
* ready

* cleaned up and works with released FW

* removed cmake verbose message

* cp

* added Multidevice tests

* updated NuGet package name

* Fix Linux build break

* address feedback and fixed build issue

* Fixed build break

* Fixed Master/Subordinate detection logic
* Fix link OpenCV

* Update OpenCV for CI
* RUNPATH only should be set during build

Currently, we set RUNPATH in all our shared objects and executables
at both build time and runtime. Build time is needed because we move
the binaries around to other machines. However, the install time is not
needed.

This is step 1 of 2 in order to move the depthengine into a private
folder instead of in the /lib folder

* Updated comment to explain why its only set during build
Co-Authored-By: wes-b <wesbarc@microsoft.com>
Co-Authored-By: wes-b <wesbarc@microsoft.com>
Co-Authored-By: wes-b <wesbarc@microsoft.com>
Co-Authored-By: wes-b <wesbarc@microsoft.com>
Co-Authored-By: wes-b <wesbarc@microsoft.com>
Co-Authored-By: Erica Towle <48578768+ETowleMS@users.noreply.github.com>
Co-Authored-By: Erica Towle <48578768+ETowleMS@users.noreply.github.com>
Co-Authored-By: Erica Towle <48578768+ETowleMS@users.noreply.github.com>
Co-Authored-By: Erica Towle <48578768+ETowleMS@users.noreply.github.com>
Co-Authored-By: wes-b <wesbarc@microsoft.com>
Co-Authored-By: wes-b <wesbarc@microsoft.com>
wes-b and others added 9 commits April 16, 2020 22:13
It needs to handle exceptions and retry
* Update Document OpenCV Version

Azure Kinect Sensor SDK v1.4.0 and later has been tested with OpenCV 4.1.1.

* Remove unnecessary settings from CMakeLists

It is not necessary because settings of include directory for OpenCV is done with OpenCV_LIBS. It is redundant.
* Dropping failed conversions from MJPEG
@thedewi thedewi marked this pull request as draft July 15, 2021 03:09
thedewi and others added 4 commits July 26, 2021 13:41
This reverts commit 6b58afb.

# Conflicts:
#	include/k4arecord/record.h
#	src/csharp/Record/Exceptions/AzureKinectCreateRecordingException.cs
#	src/csharp/Record/RecordLogger.cs
#	src/csharp/SDK/Logger.cs
#	src/csharp/SDK/Native/LoggingTracer.cs
#	src/csharp/Tests/Record.UnitTests/LoopbackTests.cs
#	src/record/sdk/record.cpp
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants