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

Kinect 4 Azure #197

Merged
merged 38 commits into from Jul 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
1369725
kinect4azure
jangernert Jun 13, 2019
99deb08
port from Zhang to Rational
jangernert Jun 19, 2019
2f1bdbc
fixup
jangernert Jun 19, 2019
a534f41
update util for strongname
jangernert Jun 19, 2019
1e98f2c
Updated Metrilus.Util binaries to latest master build.
sisiplac Jun 21, 2019
3a46d55
Kinect4Azure: Fixed ListParamDescs.
sisiplac Jun 21, 2019
80a9935
lower k4a framework version to 4.7.1 to avoid problems with MetriX
jangernert Jun 21, 2019
b88585a
Merge branch 'kinect_azure' of github.com:Metrilus/MetriCam2 into kin…
jangernert Jun 21, 2019
45d268f
update util to latest master
jangernert Jun 21, 2019
5464401
copy relevant enums to lib
jangernert Jun 21, 2019
dfcc0d7
add distance image
jangernert Jun 21, 2019
5281e23
switch extrinsics
jangernert Jun 21, 2019
83aa8a4
fixup
jangernert Jun 21, 2019
17134be
scale extrinsic translation to meter
jangernert Jun 24, 2019
efa8aba
block update when restarting the camera
jangernert Jun 24, 2019
dc83bc5
update util
jangernert Jun 24, 2019
aeb40d8
get intrinsics for channel distance
jangernert Jun 24, 2019
692bcc8
Updated to latest Util build.
sisiplac Jun 26, 2019
c5aa0e7
Update Util binaries.
sisiplac Jun 27, 2019
1f4db88
Updated Util binaries.
sisiplac Jun 27, 2019
422ab63
Updated Util binaries.
sisiplac Jun 27, 2019
4c70468
Update Metrilus.Util reference.
sisiplac Jun 28, 2019
470a99f
fix intrinsic cache key name for color channel
jangernert Jun 28, 2019
5dc4569
Merge branch 'kinect_azure' of github.com:Metrilus/MetriCam2 into kin…
jangernert Jun 28, 2019
905a4f0
Updated Util binary.
sisiplac Jun 28, 2019
33e0da8
[feature][WebCam] Added MirrorImage property. (#174)
sisiplac Jun 19, 2019
9fcac28
Kinect4Azure
jangernert Jun 13, 2019
e1c244b
Merge branch 'kinect_azure' of https://github.com/Metrilus/MetriCam2 …
sisiplac Jul 1, 2019
6fa0fa2
K4A: Coding guidelines.
sisiplac Jul 1, 2019
0edcb63
K4A: Dispose device, if not used.
sisiplac Jul 1, 2019
28f3749
[performance] K4A: Avoid nested loops in CalcZImage and CalcIntensity…
sisiplac Jul 1, 2019
f46751a
K4A: Support intensity channel in GetExtrinsics.
sisiplac Jul 1, 2019
d8f3b21
[bugfix] Set SynchronizedImagesOnly to false, if color or depth chann…
sisiplac Jul 1, 2019
a146587
Update Util binaries.
sisiplac Jul 2, 2019
7828af6
replace reset event with lock
jangernert Jul 2, 2019
8d2d730
switch depth/color image on/off depending on the active channels
jangernert Jul 2, 2019
2c5efa8
K4A: Turn color / depth off, if DeactivateChannel is called.
sisiplac Jul 2, 2019
0190d34
Add AzureKinect dependency to Jenkinsfile.
sisiplac Jul 3, 2019
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
6 changes: 2 additions & 4 deletions BetaCameras/Kinect2/Kinect2.cs
Expand Up @@ -578,7 +578,7 @@ protected override CameraImage CalcChannelImpl(string channelName)
/// Overrides the standard GetIntrinsic method.
/// </summary>
/// <param name="channelName">The channel name.</param>
/// <returns>The ProjectiveTransformationZhang</returns>
/// <returns>The ProjectiveTransformationRational</returns>
/// <remarks>The method first searches for a pt file on disk. If this fails it is able to provide internal intrinsics for amplitude / depth channel.</remarks>
public override IProjectiveTransformation GetIntrinsics(string channelName)
{
Expand All @@ -598,8 +598,6 @@ public override IProjectiveTransformation GetIntrinsics(string channelName)
switch (channelName)
{
case ChannelNames.Amplitude:
result = GetFactoryIRIntrinsics();
break;
case ChannelNames.Distance:
result = GetFactoryIRIntrinsics();
break;
Expand Down Expand Up @@ -629,7 +627,7 @@ public IProjectiveTransformation GetFactoryIRIntrinsics()

float principalPointX = depthWidthMinusOne - intrinsics.PrincipalPointX; //Principal point in x-direction needs to be mirrored, since native Kinect images are flipped.

return new ProjectiveTransformationZhang(depthWidth, depthHeight, intrinsics.FocalLengthX, intrinsics.FocalLengthY, principalPointX, intrinsics.PrincipalPointY, intrinsics.RadialDistortionSecondOrder, intrinsics.RadialDistortionFourthOrder, intrinsics.RadialDistortionSixthOrder, 0, 0);
return new ProjectiveTransformationRational(depthWidth, depthHeight, intrinsics.FocalLengthX, intrinsics.FocalLengthY, principalPointX, intrinsics.PrincipalPointY, intrinsics.RadialDistortionSecondOrder, intrinsics.RadialDistortionFourthOrder, intrinsics.RadialDistortionSixthOrder, 0, 0, 0, 0, 0);
}

/// <summary>
Expand Down