Skip to content
This repository was archived by the owner on Aug 22, 2024. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
f7686a9
Add K4A_RESULT_UNSUPPORTED to result enums.
AntonClaytonBursch Nov 6, 2020
70eaf43
Structs for device, color, depth. Enum for calibration. Functions to …
AntonClaytonBursch Nov 11, 2020
143cd46
Updates examples, src, tests and tools to use new config and color an…
AntonClaytonBursch Nov 11, 2020
7496015
Added fps mode structs and functions.
AntonClaytonBursch Nov 11, 2020
163d176
Updated code to reflect change to using fps mode.
AntonClaytonBursch Nov 11, 2020
bdb2ed3
Moded color, depth and fps enums from k4a/k4atypes.h to k4ainternal/m…
AntonClaytonBursch Nov 13, 2020
dc0db6b
Updated c++ wrapper to use new color and depth modes.
AntonClaytonBursch Nov 17, 2020
b7de2fb
Updated C++ wrapper with get device, depth, color and fps functions. …
AntonClaytonBursch Nov 17, 2020
f9dda0a
Update k4arecord/types.h and examples to use color, depth and fps mod…
AntonClaytonBursch Nov 19, 2020
051f8eb
added depth range to k4a_depth_mode_info, updated get color/depth/fps…
AntonClaytonBursch Nov 23, 2020
14ccb08
Update k4astaticimageproperties.h to use k4a.hpp instead of k4a.h
AntonClaytonBursch Nov 23, 2020
4bc4c00
Quick fix: forgot to add K4A_EXPORT to get mode and mode count functi…
AntonClaytonBursch Nov 23, 2020
e3d04a3
examples, tests, tools refactored to use new get mode functions
AntonClaytonBursch Nov 30, 2020
9ceb3e1
quick comments fix in calibration example and updates to color_ft tes…
AntonClaytonBursch Dec 3, 2020
b5b3806
Changed get modes loops for fps, color and depth.
AntonClaytonBursch Dec 9, 2020
33c964f
Viewer mode selection from radio to comboboxes
AntonClaytonBursch Dec 17, 2020
fcac45f
using mode info types instead of mode info type index
AntonClaytonBursch Dec 30, 2020
eed589a
refactor to use mode info instead of mode id
AntonClaytonBursch Dec 31, 2020
fc655bd
using depth/color/fps mode info instead of mode id
AntonClaytonBursch Jan 4, 2021
a85ed66
mode id changes and GUI cleanup
AntonClaytonBursch Jan 5, 2021
9c97825
revert back from using device mode info to device mode id for fps/col…
AntonClaytonBursch Jan 11, 2021
a488ed1
Use constants defined in usb_cmd_priv.h to set the vendor id and devi…
AntonClaytonBursch Jan 13, 2021
0289b22
Used const for color/depth/fps mode info initializers.
AntonClaytonBursch Jan 14, 2021
01893b2
Passing depth mode info down to point cloud viewer. Moved static k4a…
AntonClaytonBursch Jan 19, 2021
a1b772d
color, depth and fps mode infos saved in and parsed from recordings
AntonClaytonBursch Jan 20, 2021
158b641
Initialize the size and version of the mode structs
AntonClaytonBursch Jan 22, 2021
66bc1e5
Moved K4A_MSFT_VID, K4A_RGB_PID and K4A_DEPTH_PID to usbcommand.h. A…
AntonClaytonBursch Jan 22, 2021
2a70cd1
error handling for saving modes and device info in recording
AntonClaytonBursch Jan 22, 2021
5f99801
color, depth, fps mode info and device info saved in and parse from r…
AntonClaytonBursch Jan 22, 2021
af6d217
Fixing K4A build errors in src/record/internal/matroska_read.cpp abou…
JonathanESantos Jan 26, 2021
c541fde
SDK: docstring changes for Doxygen to run without errors.
JonathanESantos Jan 26, 2021
7a7854a
Merge pull request #1 from AntonClaytonBursch/user/jonsanto/Bug5456_F…
AntonClaytonBursch Jan 26, 2021
8f573d2
Merge pull request #2 from AntonClaytonBursch/user/jonsanto/Story5373…
AntonClaytonBursch Jan 26, 2021
e8fe464
K4A API: Adding to docstrings that functions may return status of UNS…
JonathanESantos Jan 26, 2021
d592958
linked k4a_math in viewer
AntonClaytonBursch Jan 26, 2021
5d51a26
Recording description from mode info saved in recording (or legacy de…
AntonClaytonBursch Jan 26, 2021
e3bfdb2
Merge pull request #3 from AntonClaytonBursch/user/jonsanto/Task5460_…
AntonClaytonBursch Jan 26, 2021
81b9de6
Use modes for k4arecorder
AntonClaytonBursch Jan 27, 2021
7a91853
Recorder mode option listed.
AntonClaytonBursch Jan 27, 2021
1bc8889
Merge branch 'api-update' of https://github.com/AntonClaytonBursch/Az…
AntonClaytonBursch Jan 27, 2021
162a016
k4aviewer: Removing audio support. To turn on audio support, in tools…
JonathanESantos Jan 27, 2021
1ccc23f
k4aviewer: Removing support for audio and clangformat wants to format…
JonathanESantos Jan 27, 2021
a828c1e
working on recorder command line validation
AntonClaytonBursch Jan 27, 2021
5be389d
Merge branch 'api-update' into user/jonsanto/Task5467_RemoveSupportFo…
JonathanESantos Jan 27, 2021
46e53da
k4arecorder: Minor editing.
JonathanESantos Jan 27, 2021
b493720
k4a: Adding functional tests for calling the added functions in k4a.h.
JonathanESantos Jan 28, 2021
b32f3ac
Removing commented-out code.
JonathanESantos Jan 28, 2021
6d28e16
k4a: Fixing a test in depth_ft.
JonathanESantos Jan 28, 2021
e8c0f22
Update main.cpp
JonathanESantos Jan 28, 2021
c7279c3
Update main.cpp
JonathanESantos Jan 28, 2021
da96ffc
Update main.cpp
JonathanESantos Jan 28, 2021
235ba8f
Update main.cpp
JonathanESantos Jan 28, 2021
8d2a3b1
Update main.cpp
JonathanESantos Jan 28, 2021
fa07ae8
Merge pull request #5 from AntonClaytonBursch/user/jonsanto/Task5466_…
AntonClaytonBursch Jan 28, 2021
df3b755
validate recorder cmd options
AntonClaytonBursch Jan 28, 2021
f82b42d
finished validating recording cmd options
AntonClaytonBursch Jan 28, 2021
1166777
Fixed get fps mode in recorder.
AntonClaytonBursch Jan 28, 2021
bab38b8
Merge branch 'api-update' into user/jonsanto/Task5467_RemoveSupportFo…
AntonClaytonBursch Jan 28, 2021
d9f616d
Merge pull request #4 from AntonClaytonBursch/user/jonsanto/Task5467_…
AntonClaytonBursch Jan 28, 2021
a5f6512
Fix broken Linux build.
JonathanESantos Jan 29, 2021
b4df263
k4a: ninja clangformat made these formatting changes.
JonathanESantos Jan 29, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions include/k4a/k4a.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ K4A_EXPORT uint32_t k4a_device_get_installed_count(void);
* The least critical error the user wants to be notified about.
*
* \return ::K4A_RESULT_SUCCEEDED if the callback function was set or cleared successfully. ::K4A_RESULT_FAILED if an
* error is encountered or the callback function has already been set.
* error is encountered or the callback function has already been set. ::K4A_RESULT_UNSUPPORTED if the operation is
* not supported.
*
* \remarks
* Call this function to set or clear the callback function that is used to deliver debug messages to the caller. This
Expand Down Expand Up @@ -107,7 +108,8 @@ K4A_EXPORT k4a_result_t k4a_set_debug_message_handler(k4a_logging_message_cb_t *
* is no longer needed.
*
* \return ::K4A_RESULT_SUCCEEDED if the callback function was set or cleared successfully. ::K4A_RESULT_FAILED if an
* error is encountered or the callback function has already been set.
* error is encountered or the callback function has already been set. ::K4A_RESULT_UNSUPPORTED if the operation is
* not supported.
*
* \remarks
* Call this function to hook memory allocation by the SDK. Calling with both \p allocate and \p free as NULL will
Expand Down Expand Up @@ -142,7 +144,8 @@ K4A_EXPORT k4a_result_t k4a_set_allocator(k4a_memory_allocate_cb_t allocate, k4a
*
* \relates k4a_device_t
*
* \return ::K4A_RESULT_SUCCEEDED if the device was opened successfully.
* \return ::K4A_RESULT_SUCCEEDED if the device was opened successfully. ::K4A_RESULT_FAILED if the device was
* not opened successfully.
*
* \remarks
* If successful, k4a_device_open() will return a device handle in the device_handle parameter.
Expand Down Expand Up @@ -261,7 +264,8 @@ K4A_EXPORT k4a_wait_result_t k4a_device_get_capture(k4a_device_t device_handle,
*
* \returns
* ::K4A_WAIT_RESULT_SUCCEEDED if a sample is returned. If a sample is not available before the timeout elapses, the
* function will return ::K4A_WAIT_RESULT_TIMEOUT. All other failures will return ::K4A_WAIT_RESULT_FAILED.
* function will return ::K4A_WAIT_RESULT_TIMEOUT. If a device does not support an IMU, then
* ::K4A_WAIT_RESULT_UNSUPPORTED is returned. All other failures will return ::K4A_WAIT_RESULT_FAILED.
*
* \relates k4a_device_t
*
Expand Down Expand Up @@ -1293,7 +1297,7 @@ K4A_EXPORT void k4a_device_stop_cameras(k4a_device_t device_handle);
*
* \returns
* ::K4A_RESULT_SUCCEEDED is returned on success. ::K4A_RESULT_FAILED if the sensor is already running or a failure is
* encountered
* encountered. If a device does not support an IMU, ::K4A_RESULT_UNSUPPORTED is returned.
*
* \relates k4a_device_t
*
Expand Down Expand Up @@ -1433,7 +1437,8 @@ K4A_EXPORT k4a_result_t k4a_device_get_version(k4a_device_t device_handle, k4a_h
* Location to store the color sensor's control default mode of /p command.
*
* \returns
* ::K4A_RESULT_SUCCEEDED if the value was successfully returned, ::K4A_RESULT_FAILED if an error occurred
* ::K4A_RESULT_SUCCEEDED if the value was successfully returned, ::K4A_RESULT_FAILED if an error occurred.
* ::K4A_RESULT_UNSUPPORTED if the device does not support this operation.
*
* \relates k4a_device_t
*
Expand Down Expand Up @@ -1472,7 +1477,8 @@ K4A_EXPORT k4a_result_t k4a_device_get_color_control_capabilities(k4a_device_t d
* mode returned is ::K4A_COLOR_CONTROL_MODE_MANUAL for the current \p command.
*
* \returns
* ::K4A_RESULT_SUCCEEDED if the value was successfully returned, ::K4A_RESULT_FAILED if an error occurred
* ::K4A_RESULT_SUCCEEDED if the value was successfully returned, ::K4A_RESULT_FAILED if an error occurred.
* ::K4A_RESULT_UNSUPPORTED if the device does not support this operation.
*
* \remarks
* Each control command may be set to manual or automatic. See the definition of \ref k4a_color_control_command_t on
Expand Down Expand Up @@ -1517,7 +1523,8 @@ K4A_EXPORT k4a_result_t k4a_device_get_color_control(k4a_device_t device_handle,
* is set to ::K4A_COLOR_CONTROL_MODE_MANUAL, and is otherwise ignored.
*
* \returns
* ::K4A_RESULT_SUCCEEDED if the value was successfully set, ::K4A_RESULT_FAILED if an error occurred
* ::K4A_RESULT_SUCCEEDED if the value was successfully set, ::K4A_RESULT_FAILED if an error occurred.
* ::K4A_RESULT_UNSUPPORTED if the device does not support this operation.
*
* \remarks
* Each control command may be set to manual or automatic. See the definition of \ref k4a_color_control_command_t on how
Expand Down Expand Up @@ -1637,6 +1644,7 @@ K4A_EXPORT k4a_result_t k4a_device_get_calibration(k4a_device_t device_handle,
*
* \returns
* ::K4A_RESULT_SUCCEEDED if the connector status was successfully read.
* ::K4A_RESULT_UNSUPPORTED if the device does not support this operation.
*
* \relates k4a_device_t
*
Expand Down Expand Up @@ -1728,7 +1736,7 @@ K4A_EXPORT k4a_result_t k4a_calibration_get_from_raw(char *raw_calibration,
*
* \returns
* ::K4A_RESULT_SUCCEEDED if \p target_point3d_mm was successfully written. ::K4A_RESULT_FAILED if \p calibration
* contained invalid transformation parameters.
* contained invalid transformation parameters. ::K4A_RESULT_UNSUPPORTED if the device does not support this operation.
*
* \remarks
* This function is used to transform 3D points between depth and color camera coordinate systems. The function uses the
Expand Down Expand Up @@ -1783,7 +1791,7 @@ K4A_EXPORT k4a_result_t k4a_calibration_3d_to_3d(const k4a_calibration_t *calibr
* ::K4A_RESULT_SUCCEEDED if \p target_point3d_mm was successfully written. ::K4A_RESULT_FAILED if \p calibration
* contained invalid transformation parameters. If the function returns ::K4A_RESULT_SUCCEEDED, but \p valid is 0,
* the transformation was computed, but the results in \p target_point3d_mm are outside of the range of valid
* calibration and should be ignored.
* calibration and should be ignored. ::K4A_RESULT_UNSUPPORTED if the device does not support this operation.
*
* \remarks
* This function applies the intrinsic calibration of \p source_camera to compute the 3D ray from the focal point of the
Expand Down Expand Up @@ -1840,7 +1848,7 @@ K4A_EXPORT k4a_result_t k4a_calibration_2d_to_3d(const k4a_calibration_t *calibr
* ::K4A_RESULT_SUCCEEDED if \p target_point2d was successfully written. ::K4A_RESULT_FAILED if \p calibration
* contained invalid transformation parameters. If the function returns ::K4A_RESULT_SUCCEEDED, but \p valid is 0,
* the transformation was computed, but the results in \p target_point2d are outside of the range of valid calibration
* and should be ignored.
* and should be ignored. ::K4A_RESULT_UNSUPPORTED if the device does not support this operation.
*
* \remarks
* If \p target_camera is different from \p source_camera, \p source_point3d_mm is transformed to \p target_camera using
Expand Down Expand Up @@ -1900,7 +1908,7 @@ K4A_EXPORT k4a_result_t k4a_calibration_3d_to_2d(const k4a_calibration_t *calibr
* ::K4A_RESULT_SUCCEEDED if \p target_point2d was successfully written. ::K4A_RESULT_FAILED if \p calibration
* contained invalid transformation parameters. If the function returns ::K4A_RESULT_SUCCEEDED, but \p valid is 0,
* the transformation was computed, but the results in \p target_point2d are outside of the range of valid calibration
* and should be ignored.
* and should be ignored. ::K4A_RESULT_UNSUPPORTED if the device does not support this operation.
*
* \remarks
* This function maps a pixel between the coordinate systems of the depth and color cameras. It is equivalent to calling
Expand Down Expand Up @@ -1957,7 +1965,7 @@ K4A_EXPORT k4a_result_t k4a_calibration_2d_to_2d(const k4a_calibration_t *calibr
* ::K4A_RESULT_SUCCEEDED if \p target_point2d was successfully written. ::K4A_RESULT_FAILED if \p calibration
* contained invalid transformation parameters. If the function returns ::K4A_RESULT_SUCCEEDED, but \p valid is 0,
* the transformation was computed, but the results in \p target_point2d are outside of the range of valid calibration
* and should be ignored.
* and should be ignored. ::K4A_RESULT_UNSUPPORTED if the device does not support this operation.
*
* \remarks
* This function represents an alternative to k4a_calibration_2d_to_2d() if the number of pixels that need to be
Expand Down Expand Up @@ -2063,6 +2071,7 @@ K4A_EXPORT void k4a_transformation_destroy(k4a_transformation_t transformation_h
*
* \returns
* ::K4A_RESULT_SUCCEEDED if \p transformed_depth_image was successfully written and ::K4A_RESULT_FAILED otherwise.
* ::K4A_RESULT_UNSUPPORTED if the device does not support this operation.
*
* \relates k4a_transformation_t
*
Expand Down Expand Up @@ -2142,7 +2151,7 @@ K4A_EXPORT k4a_result_t k4a_transformation_depth_image_to_color_camera(k4a_trans
*
* \returns
* ::K4A_RESULT_SUCCEEDED if \p transformed_depth_image and \p transformed_custom_image were successfully written and
* ::K4A_RESULT_FAILED otherwise.
* ::K4A_RESULT_FAILED otherwise. ::K4A_RESULT_UNSUPPORTED if the device does not support this operation.
*
* \relates k4a_transformation_t
*
Expand Down Expand Up @@ -2199,6 +2208,7 @@ k4a_transformation_depth_image_to_color_camera_custom(k4a_transformation_t trans
*
* \returns
* ::K4A_RESULT_SUCCEEDED if \p transformed_color_image was successfully written and ::K4A_RESULT_FAILED otherwise.
* ::K4A_RESULT_UNSUPPORTED if the device does not support this operation.
*
* \relates k4a_transformation_t
*
Expand Down Expand Up @@ -2251,6 +2261,7 @@ K4A_EXPORT k4a_result_t k4a_transformation_color_image_to_depth_camera(k4a_trans
*
* \returns
* ::K4A_RESULT_SUCCEEDED if \p xyz_image was successfully written and ::K4A_RESULT_FAILED otherwise.
* ::K4A_RESULT_UNSUPPORTED if the device does not support this operation.
*
* \relates k4a_transformation_t
*
Expand Down
6 changes: 3 additions & 3 deletions include/k4a/k4atypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ typedef enum
{
K4A_RESULT_SUCCEEDED = 0, /**< The result was successful */
K4A_RESULT_FAILED, /**< The result was a failure */
K4A_RESULT_UNSUPPORTED, /**< The result was unsupported */
K4A_RESULT_UNSUPPORTED, /**< The operation was unsupported */
} k4a_result_t;

/** Result code returned by Azure Kinect APIs.
Expand All @@ -234,7 +234,7 @@ typedef enum
K4A_BUFFER_RESULT_SUCCEEDED = 0, /**< The result was successful */
K4A_BUFFER_RESULT_FAILED, /**< The result was a failure */
K4A_BUFFER_RESULT_TOO_SMALL, /**< The input buffer was too small */
K4A_BUFFER_RESULT_UNSUPPORTED, /**< The result was unsupported */
K4A_BUFFER_RESULT_UNSUPPORTED, /**< The operation was unsupported */
} k4a_buffer_result_t;

/** Result code returned by Azure Kinect APIs.
Expand All @@ -250,7 +250,7 @@ typedef enum
K4A_WAIT_RESULT_SUCCEEDED = 0, /**< The result was successful */
K4A_WAIT_RESULT_FAILED, /**< The result was a failure */
K4A_WAIT_RESULT_TIMEOUT, /**< The operation timed out */
K4A_WAIT_RESULT_UNSUPPORTED, /**< The result was unsupported */
K4A_WAIT_RESULT_UNSUPPORTED, /**< The operation was unsupported */
} k4a_wait_result_t;

/** Verbosity levels of debug messaging
Expand Down