Moved K4A_MSFT_VID, K4A_RGB_PID and K4A_DEPTH_PID to usbcommand.h. Ad…

…ding device info to recordings.

include/k4ainternal/usbcommand.h

@@ -36,6 +36,10 @@ typedef enum
 
 K4A_DECLARE_HANDLE(usbcmd_t);
 
+#define K4A_MSFT_VID 0x045E
+#define K4A_RGB_PID 0x097D
+#define K4A_DEPTH_PID 0x097C
+
 /** Delivers a sample to the registered callback function when a capture is ready for processing.
  *
  * \param result

include/k4arecord/types.h

@@ -180,6 +180,9 @@ typedef struct _k4a_record_configuration_t
     /** Frame rate used to record the color and depth camera. */
     k4a_fps_mode_info_t fps_mode_info;
 
+    // TODO: comment
+    k4a_device_info_t device_info;
+
     /** True if the recording contains Color camera frames. */
     bool color_track_enabled;
 

src/record/internal/matroska_read.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include <ctime>
@@ -11,6 +11,7 @@
 #include <k4ainternal/matroska_read.h>
 #include <k4ainternal/common.h>
 #include <k4ainternal/logging.h>
+#include <k4ainternal\usbcommand.h>
 
 #include <turbojpeg.h>
 #include <libyuv.h>
@@ -645,14 +646,16 @@ k4a_result_t parse_recording_config(k4a_playback_context_t *context)
     KaxTag *color_mode_info_tag = get_tag(context, "K4A_COLOR_MODE_INFO");
     KaxTag *depth_mode_info_tag = get_tag(context, "K4A_DEPTH_MODE_INFO");
     KaxTag *fps_mode_info_tag = get_tag(context, "K4A_FPS_MODE_INFO");
+    KaxTag *device_info_tag = get_tag(context, "K4A_DEVICE_INFO");
 
-    if (color_mode_info_tag != NULL && depth_mode_info_tag != NULL && fps_mode_info_tag != NULL)
+    if (color_mode_info_tag != NULL && depth_mode_info_tag != NULL && fps_mode_info_tag != NULL && device_info_tag != NULL)
     {
         std::string color_mode_info_string = get_tag_string(color_mode_info_tag);
         std::string depth_mode_info_string = get_tag_string(depth_mode_info_tag);
         std::string fps_mode_info_string = get_tag_string(fps_mode_info_tag);
+        std::string device_info_string = get_tag_string(device_info_tag);
 
-        if (!color_mode_info_string.empty() && !depth_mode_info_string.empty() && !fps_mode_info_string.empty())
+        if (!color_mode_info_string.empty() && !depth_mode_info_string.empty() && !fps_mode_info_string.empty() && !device_info_string.empty())
         {
             cJSON *color_mode_info_json = cJSON_Parse(color_mode_info_string.c_str());
             const cJSON *color_mode_info_json_mode_id = cJSON_GetObjectItem(color_mode_info_json, "mode_id");
@@ -710,15 +713,28 @@ k4a_result_t parse_recording_config(k4a_playback_context_t *context)
             fps_mode_info.mode_id = (uint32_t)fps_mode_info_json_mode_id->valuedouble;
             fps_mode_info.fps = (uint32_t)fps_mode_info_json_fps->valuedouble;
 
+            // device info
+            cJSON *device_info_json = cJSON_Parse(device_info_string.c_str());
+            const cJSON *device_info_json_capabilities = cJSON_GetObjectItem(device_info_json, "capabilities");
+            const cJSON *device_info_json_device_id = cJSON_GetObjectItem(device_info_json, "device_id");
+            const cJSON *device_info_json_vendor_id = cJSON_GetObjectItem(device_info_json, "vendor_id");
+
+            k4a_device_info_t device_info = { sizeof(k4a_device_info_t), K4A_ABI_VERSION, { 0 } };
+            device_info.capabilities = (uint32_t)device_info_json_capabilities->valuedouble;
+            device_info.device_id = (uint32_t)device_info_json_device_id->valuedouble;
+            device_info.vendor_id = (uint32_t)device_info_json_vendor_id->valuedouble;
+
             // set record config modes
             context->record_config.color_mode_info = color_mode_info;
             context->record_config.depth_mode_info = depth_mode_info;
             context->record_config.fps_mode_info = fps_mode_info;
+            context->record_config.device_info = device_info;
 
             // delete json objects
             cJSON_Delete(color_mode_info_json);
             cJSON_Delete(depth_mode_info_json);
             cJSON_Delete(fps_mode_info_json);
+            cJSON_Delete(device_info_json);
         }
     }
     else 
@@ -798,9 +814,16 @@ k4a_result_t parse_recording_config(k4a_playback_context_t *context)
         fps_mode_info.mode_id = fps_mode_id;
         fps_mode_info.fps = recording_fps_modes[fps_mode_id].fps;
 
+        k4a_device_info_t device_info = { sizeof(k4a_device_info_t),
+                                          K4A_ABI_VERSION,
+                                          K4A_MSFT_VID,
+                                          K4A_DEPTH_PID,
+                                          ​​​​​​K4A_CAPABILITY_DEPTH | K4A_CAPABILITY_COLOR | K4A_CAPABILITY_IMU };
+
         context->record_config.color_mode_info = color_mode_info;
         context->record_config.depth_mode_info = depth_mode_info;
         context->record_config.fps_mode_info = fps_mode_info;
+        context->record_config.device_info = device_info;
     }
 
     // Read depth_delay_off_color_usec and set offsets for each builtin track accordingly.

src/record/sdk/record.cpp

@@ -346,6 +346,7 @@ k4a_result_t k4a_record_create(const char *path,
         const char *color_mode_info_str = "";
         const char *depth_mode_info_str = "";
         const char *fps_mode_info_str = "";
+        const char *device_info_str = "";
 
         // get mode info structs
         k4a_color_mode_info_t color_mode_info = { sizeof(k4a_color_mode_info_t), K4A_ABI_VERSION, { 0 } };
@@ -357,6 +358,9 @@ k4a_result_t k4a_record_create(const char *path,
         k4a_fps_mode_info_t fps_mode_info = { sizeof(k4a_fps_mode_info_t), K4A_ABI_VERSION, { 0 } };
         k4a_device_get_fps_mode(device, device_config.fps_mode_id, &fps_mode_info);
 
+        k4a_device_info_t device_info = { sizeof(k4a_device_info_t), K4A_ABI_VERSION, { 0 } };
+        k4a_device_get_info(device, &device_info);
+
         // print to json
 
         // color
@@ -396,25 +400,35 @@ k4a_result_t k4a_record_create(const char *path,
         cJSON_AddNumberToObject(fps_mode_info_json, "mode_id", fps_mode_info.mode_id);
         cJSON_AddNumberToObject(fps_mode_info_json, "fps", fps_mode_info.fps);
 
-        std::cout << "fps: " << fps_mode_info.fps << std::endl;
-
         fps_mode_info_str = cJSON_Print(fps_mode_info_json);
 
+        // device info
+        cJSON *device_info_json = cJSON_CreateObject();
+
+        cJSON_AddNumberToObject(device_info_json, "capabilities", device_info.capabilities);
+        cJSON_AddNumberToObject(device_info_json, "device_id", device_info.device_id);
+        cJSON_AddNumberToObject(device_info_json, "vendor_id", device_info.vendor_id);
+
+        device_info_str = cJSON_Print(device_info_json);
 
+        // TODO: remove after finished testing
         // k4arecorder -l 10 -c 1080p -d NFOV_2X2BINNED -r 30 "D:\Neal Analytics\Microsoft\Kinect Recordings\output.mkv"
         std::cout << color_mode_info_str << std::endl;
         std::cout << depth_mode_info_str << std::endl;
         std::cout << fps_mode_info_str << std::endl;
+        std::cout << device_info_str << std::endl;
 
         // save json in tags
         add_tag(context, "K4A_COLOR_MODE_INFO", color_mode_info_str);
         add_tag(context, "K4A_DEPTH_MODE_INFO", depth_mode_info_str);
         add_tag(context, "K4A_FPS_MODE_INFO", fps_mode_info_str);
+        add_tag(context, "K4A_DEVICE_INFO", device_info_str);
 
         // delete json objects
         cJSON_Delete(color_mode_info_json);
         cJSON_Delete(depth_mode_info_json);
         cJSON_Delete(fps_mode_info_json);
+        cJSON_Delete(device_info_json);
     }
 
 

src/sdk/k4a.c

@@ -18,6 +18,7 @@
 #include <k4ainternal/logging.h>
 #include <k4ainternal/modes.h>
 #include <azure_c_shared_utility/tickcounter.h>
+#include <k4ainternal\usbcommand.h>
 
 // System dependencies
 #include <stdlib.h>
@@ -28,7 +29,6 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "../usbcommand/usb_cmd_priv.h"
 
 char K4A_ENV_VAR_LOG_TO_A_FILE[] = K4A_ENABLE_LOG_TO_A_FILE;
 

src/usbcommand/usb_cmd_priv.h

@@ -45,9 +45,6 @@ extern "C" {
 #define USB_MAX_TX_DATA 128
 #define USB_CMD_PACKET_TYPE 0x06022009
 #define USB_CMD_PACKET_TYPE_RESPONSE 0x0A6FE000
-#define K4A_MSFT_VID 0x045E
-#define K4A_RGB_PID 0x097D
-#define K4A_DEPTH_PID 0x097C
 #define USB_CMD_DEFAULT_CONFIG 1
 
 #define USB_CMD_DEPTH_INTERFACE 0