k4aviewer: Removing audio support. To turn on audio support, in tools…

…/k4aviewer/CMakeLists.txt, set K4A_INCLUDE_AUDIO to 1.

src/record/internal/matroska_read.cpp

@@ -671,8 +671,9 @@ k4a_result_t parse_recording_config(k4a_playback_context_t *context)
                 if (cJSON_IsNumber(device_info_json_capabilities) && device_info_json_capabilities->valuedouble != NULL)
                 {
                     uint32_t capabilities = (uint32_t)device_info_json_capabilities->valuedouble;
-                    //hasDepthDevice = capabilities == 1 || capabilities == 3 || capabilities == 5 || capabilities == 7;
-                    //hasColorDevice = capabilities == 2 || capabilities == 3 || capabilities == 6 || capabilities == 7;
+                    // hasDepthDevice = capabilities == 1 || capabilities == 3 || capabilities == 5 || capabilities ==
+                    // 7; hasColorDevice = capabilities == 2 || capabilities == 3 || capabilities == 6 || capabilities
+                    // == 7;
 
                     hasDepthDevice = (capabilities & 0x0001) == 1;
                     hasColorDevice = ((capabilities >> 1) & 0x01) == 1;

src/record/sdk/record.cpp

@@ -359,8 +359,8 @@ k4a_result_t k4a_record_create(const char *path,
         if (K4A_SUCCEEDED(device_info_result))
         {
             uint32_t capabilities = device_info.capabilities;
-            //hasDepthDevice = capabilities == 1 || capabilities == 3 || capabilities == 5 || capabilities == 7;
-            //hasColorDevice = capabilities == 2 || capabilities == 3 || capabilities == 6 || capabilities == 7;
+            // hasDepthDevice = capabilities == 1 || capabilities == 3 || capabilities == 5 || capabilities == 7;
+            // hasColorDevice = capabilities == 2 || capabilities == 3 || capabilities == 6 || capabilities == 7;
             hasDepthDevice = (capabilities & 0x0001) == 1;
             hasColorDevice = ((capabilities >> 1) & 0x01) == 1;
 

tools/k4aviewer/CMakeLists.txt

@@ -1,12 +1,26 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+# Include ${CMAKE_CURRENT_BINARY_DIR}/version.rc in the target's sources
+# to embed version information
+set(K4A_FILEDESCRIPTION "Azure Kinect Viewer")
+set(K4A_ORIGINALFILENAME "k4aviewer.exe")
+set(K4A_USE_ICON 1)
+configure_file(
+    ${K4A_VERSION_RC}
+    ${CMAKE_CURRENT_BINARY_DIR}/version.rc
+    @ONLY
+    )
+
+find_package(OpenGL REQUIRED)
+include_directories(
+    ${OPENGL_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_LIST_DIR}
+)
+
 set(SOURCE_FILES
     main.cpp
     gpudepthtopointcloudconverter.cpp
-    k4aaudiochanneldatagraph.cpp
-    k4aaudiomanager.cpp
-    k4aaudiowindow.cpp
     k4acolorimageconverter.cpp
     k4adevicedockcontrol.cpp
     k4afilepicker.cpp
@@ -15,8 +29,6 @@ set(SOURCE_FILES
     k4aimugraphdatagenerator.cpp
     k4aimuwindow.cpp
     k4alogdockcontrol.cpp
-    k4amicrophone.cpp
-    k4amicrophonelistener.cpp
     k4apointcloudrenderer.cpp
     k4apointcloudviewcontrol.cpp
     k4apointcloudvisualizer.cpp
@@ -37,70 +49,83 @@ set(SOURCE_FILES
     ${CMAKE_CURRENT_BINARY_DIR}/version.rc
 )
 
-# Include ${CMAKE_CURRENT_BINARY_DIR}/version.rc in the target's sources
-# to embed version information
-set(K4A_FILEDESCRIPTION "Azure Kinect Viewer")
-set(K4A_ORIGINALFILENAME "k4aviewer.exe")
-set(K4A_USE_ICON 1)
-configure_file(
-    ${K4A_VERSION_RC}
-    ${CMAKE_CURRENT_BINARY_DIR}/version.rc
-    @ONLY
-    )
-
-find_package(OpenGL REQUIRED)
-include_directories(
-    ${OPENGL_INCLUDE_DIRS}
-    ${CMAKE_CURRENT_LIST_DIR}
-)
-
 set(EXTERNAL_LIBRARIES
     k4a::k4a
     k4a::k4arecord
     k4a_math
     imgui::imgui
     libjpeg-turbo::libjpeg-turbo
-    libsoundio::libsoundio
     LibUSB::LibUSB
     libyuv::libyuv
     glfw::glfw
     ${OPENGL_LIBRARIES}
 )
 
-# On Windows, we need to call into setupapi to get USB container ID information
-# so we can correlate K4A microphone arrays and K4A depth cameras/sensors
-#
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-    list(APPEND SOURCE_FILES
-        platform/windows/filesystem17.cpp
-        platform/windows/k4adevicecorrelator.cpp
-        platform/windows/wmain.cpp
-    )
+	list(APPEND SOURCE_FILES
+		platform/windows/filesystem17.cpp
+		platform/windows/wmain.cpp
+	)
 
-    list(APPEND EXTERNAL_LIBRARIES
-        setupapi.lib
-        pathcch.lib
-        Shlwapi.lib
-    )
+	list(APPEND EXTERNAL_LIBRARIES
+		setupapi.lib
+		pathcch.lib
+		Shlwapi.lib
+	)
 else()
-    list(APPEND SOURCE_FILES
-        platform/linux/filesystem17.cpp
-        platform/linux/k4adevicecorrelator.cpp
+	list(APPEND SOURCE_FILES
+		platform/linux/filesystem17.cpp
+	)
+endif()
+
+
+# Set K4A_INCLUDE_AUDIO to 1 for audio support.
+set(K4A_INCLUDE_AUDIO 0)
+if (K4A_INCLUDE_AUDIO)
+
+	add_compile_definitions(K4A_INCLUDE_AUDIO)
+
+	list(APPEND SOURCE_FILES
+        k4aaudiochanneldatagraph.cpp
+		k4aaudiomanager.cpp
+		k4aaudiowindow.cpp
+		k4amicrophone.cpp
+		k4amicrophonelistener.cpp
     )
 
-    # This is a bit gross, but libsoundio has a file called endian.h in its
-    # include path, which conflicts with a system file with the same name on
-    # Linux.  On Ubuntu 16.04, this causes a struct in waitstatus.h to have
-    # all its members defined twice (once for each endianness), which results
-    # in a build break.  It looks like there's not a built-in way to pass
-    # idirafter in cmake like you can with target_include_directories, so
-    # anyone that uses libsoundio has to do this.  Fortunately, that should
-    # just be k4aviewer
-    #
-    add_compile_options("-idirafter/usr/include/soundio")
+	list(APPEND EXTERNAL_LIBRARIES
+        libsoundio::libsoundio
+    )
+
+	# On Windows, we need to call into setupapi to get USB container ID information
+	# so we can correlate K4A microphone arrays and K4A depth cameras/sensors
+	#
+	if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+		list(APPEND SOURCE_FILES
+			platform/windows/k4adevicecorrelator.cpp
+		)
+
+	else()
+		list(APPEND SOURCE_FILES
+			platform/linux/k4adevicecorrelator.cpp
+		)
+
+		# This is a bit gross, but libsoundio has a file called endian.h in its
+		# include path, which conflicts with a system file with the same name on
+		# Linux.  On Ubuntu 16.04, this causes a struct in waitstatus.h to have
+		# all its members defined twice (once for each endianness), which results
+		# in a build break.  It looks like there's not a built-in way to pass
+		# idirafter in cmake like you can with target_include_directories, so
+		# anyone that uses libsoundio has to do this.  Fortunately, that should
+		# just be k4aviewer
+		#
+		add_compile_options("-idirafter/usr/include/soundio")
+
+	endif()
 
 endif()
 
+
 add_executable(k4aviewer WIN32 ${SOURCE_FILES})
 target_link_libraries(k4aviewer PRIVATE ${EXTERNAL_LIBRARIES})
 

tools/k4aviewer/k4adevicedockcontrol.cpp

@@ -18,13 +18,16 @@
 
 // Project headers
 //
-#include "k4aaudiomanager.h"
 #include "k4aimguiextensions.h"
 #include "k4atypeoperators.h"
 #include "k4aviewererrormanager.h"
 #include "k4aviewerutil.h"
 #include "k4awindowmanager.h"
 
+#ifdef K4A_INCLUDE_AUDIO
+#include "k4aaudiomanager.h"
+#endif
+
 using namespace k4aviewer;
 
 namespace
@@ -272,7 +275,11 @@ void K4ADeviceDockControl::RefreshSyncCableStatus()
 
 bool K4ADeviceDockControl::DeviceIsStarted() const
 {
+#ifdef K4A_INCLUDE_AUDIO
     return m_camerasStarted || m_imuStarted || (m_microphone && m_microphone->IsStarted());
+#else
+    return m_camerasStarted || m_imuStarted;
+#endif
 }
 
 K4ADeviceDockControl::K4ADeviceDockControl(k4a::device &&device) : m_device(std::move(device))
@@ -282,7 +289,9 @@ K4ADeviceDockControl::K4ADeviceDockControl(k4a::device &&device) : m_device(std:
     m_deviceSerialNumber = m_device.get_serialnum();
     m_windowTitle = m_deviceSerialNumber + ": Configuration";
 
+#ifdef K4A_INCLUDE_AUDIO
     m_microphone = K4AAudioManager::Instance().GetMicrophoneForDevice(m_deviceSerialNumber);
+#endif
 
     LoadColorSettingsCache();
     RefreshSyncCableStatus();
@@ -312,6 +321,7 @@ K4ADockControlStatus K4ADeviceDockControl::Show()
 
     const bool deviceIsStarted = DeviceIsStarted();
 
+#ifdef K4A_INCLUDE_AUDIO
     // Check microphone health
     //
     if (m_microphone && m_microphone->GetStatusCode() != SoundIoErrorNone)
@@ -322,6 +332,7 @@ K4ADockControlStatus K4ADeviceDockControl::Show()
         StopMicrophone();
         m_microphone->ClearStatusCode();
     }
+#endif
 
     // Draw controls
     //
@@ -669,6 +680,7 @@ K4ADockControlStatus K4ADeviceDockControl::Show()
     const bool synchronizedImagesAvailable = m_config.EnableColorCamera && m_config.EnableDepthCamera;
     m_config.SynchronizedImagesOnly &= synchronizedImagesAvailable;
 
+#ifdef K4A_INCLUDE_AUDIO
     if (m_microphone)
     {
         ImGuiExtensions::K4ACheckbox("Enable Microphone", &m_config.EnableMicrophone, !deviceIsStarted);
@@ -678,6 +690,7 @@ K4ADockControlStatus K4ADeviceDockControl::Show()
         m_config.EnableMicrophone = false;
         ImGui::Text("Microphone not detected!");
     }
+#endif
 
     ImGui::Separator();
 
@@ -884,10 +897,13 @@ void K4ADeviceDockControl::Start()
             StartImu();
         }
     }
+
+#ifdef K4A_INCLUDE_AUDIO
     if (m_config.EnableMicrophone)
     {
         StartMicrophone();
     }
+#endif
 
     SetViewType(K4AWindowSet::ViewType::Normal);
     m_paused = false;
@@ -899,7 +915,10 @@ void K4ADeviceDockControl::Stop()
 
     StopCameras();
     StopImu();
+
+#ifdef K4A_INCLUDE_AUDIO
     StopMicrophone();
+#endif
 }
 
 bool K4ADeviceDockControl::StartCameras()
@@ -969,6 +988,7 @@ void K4ADeviceDockControl::StopCameras()
                       &m_camerasAbortInProgress);
 }
 
+#ifdef K4A_INCLUDE_AUDIO
 bool K4ADeviceDockControl::StartMicrophone()
 {
     if (!m_microphone)
@@ -1003,6 +1023,7 @@ void K4ADeviceDockControl::StopMicrophone()
         m_microphone->Stop();
     }
 }
+#endif
 
 bool K4ADeviceDockControl::StartImu()
 {
@@ -1072,6 +1093,7 @@ void K4ADeviceDockControl::SetViewType(K4AWindowSet::ViewType viewType)
 {
     K4AWindowManager::Instance().ClearWindows();
 
+#ifdef K4A_INCLUDE_AUDIO
     std::shared_ptr<K4AMicrophoneListener> micListener = nullptr;
     if (m_config.EnableMicrophone)
     {
@@ -1083,6 +1105,7 @@ void K4ADeviceDockControl::SetViewType(K4AWindowSet::ViewType viewType)
             K4AViewerErrorManager::Instance().SetErrorStatus(errorBuilder.str());
         }
     }
+#endif
 
     k4a_depth_mode_info_t depth_mode_info = m_device.get_depth_mode(m_config.depth_mode_id);
     k4a_color_mode_info_t color_mode_info = m_device.get_color_mode(m_config.color_mode_id);
@@ -1093,7 +1116,9 @@ void K4ADeviceDockControl::SetViewType(K4AWindowSet::ViewType viewType)
         K4AWindowSet::StartNormalWindows(m_deviceSerialNumber.c_str(),
                                          &m_cameraDataSource,
                                          m_config.EnableImu ? &m_imuDataSource : nullptr,
+#ifdef K4A_INCLUDE_AUDIO
                                          std::move(micListener),
+#endif
                                          m_config.EnableDepthCamera,
                                          depth_mode_info,
                                          m_config.EnableColorCamera,

tools/k4aviewer/k4adevicedockcontrol.h

@@ -16,11 +16,14 @@
 //
 #include "ik4adockcontrol.h"
 #include "k4adatasource.h"
-#include "k4amicrophone.h"
 #include "k4apollingthread.h"
 #include "k4aviewersettingsmanager.h"
 #include "k4awindowset.h"
 
+#ifdef K4A_INCLUDE_AUDIO
+#include "k4amicrophone.h"
+#endif
+
 namespace k4aviewer
 {
 class K4ADeviceDockControl : public IK4ADockControl
@@ -84,8 +87,10 @@ class K4ADeviceDockControl : public IK4ADockControl
     bool StartCameras();
     void StopCameras();
 
+#ifdef K4A_INCLUDE_AUDIO
     bool StartMicrophone();
     void StopMicrophone();
+#endif
 
     bool StartImu();
     void StopImu();
@@ -110,7 +115,10 @@ class K4ADeviceDockControl : public IK4ADockControl
     bool m_imuAbortInProgress = false;
 
     std::string m_deviceSerialNumber;
+
+#ifdef K4A_INCLUDE_AUDIO
     std::shared_ptr<K4AMicrophone> m_microphone;
+#endif
 
     K4ADataSource<k4a::capture> m_cameraDataSource;
     K4ADataSource<k4a_imu_sample_t> m_imuDataSource;