UAC code for Linxu host

.vscode/settings.json

@@ -63,7 +63,26 @@
         "typeinfo": "cpp",
         "variant": "cpp",
         "cstring": "cpp",
-        "complex": "cpp"
+        "complex": "cpp",
+        "any": "cpp",
+        "hash_map": "cpp",
+        "hash_set": "cpp",
+        "bitset": "cpp",
+        "codecvt": "cpp",
+        "forward_list": "cpp",
+        "set": "cpp",
+        "unordered_set": "cpp",
+        "fstream": "cpp",
+        "future": "cpp",
+        "queue": "cpp",
+        "ranges": "cpp",
+        "shared_mutex": "cpp",
+        "text_encoding": "cpp",
+        "cfenv": "cpp",
+        "typeindex": "cpp",
+        "valarray": "cpp",
+        "regex": "cpp",
+        "stack": "cpp"
     },
     "cmake.sourceDirectory": "${workspaceFolder}/linux/"
 }

libausbc/src/main/jni/UVCCamera/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.22)
 
 set(UVCCAMERA ${CMAKE_CURRENT_LIST_DIR}/)
 include_directories(
-    ${UVCCAMERA}/
+    ${UVCCAMERA}/include/
 )
 
 
@@ -20,15 +20,15 @@ endif ()
 add_compile_definitions(USE_TURBOJPEG)
 
 list(APPEND SOURCES
-	${UVCCAMERA}/_onload.cpp
-    ${UVCCAMERA}/UVCCamera.cpp
-    ${UVCCAMERA}/ImageUseCases.cpp
-    ${UVCCAMERA}/UVCPreviewBase.cpp
-    ${UVCCAMERA}/UVCPreviewJni.cpp
-    ${UVCCAMERA}/UVCCameraAdjustments.cpp
-    ${UVCCAMERA}/ProgressObserver.cpp
-    ${UVCCAMERA}/JniUVCCamera.cpp
-    ${UVCCAMERA}/JpegBenchmark.cpp
-    ${UVCCAMERA}/LoadJpegImageFromAssetsUseCase.cpp
-    ${UVCCAMERA}/JniJpegBenchmark.cpp
+	${UVCCAMERA}/src/_onload.cpp
+    ${UVCCAMERA}/src/UVCCamera.cpp
+    ${UVCCAMERA}/src/ImageUseCases.cpp
+    ${UVCCAMERA}/src/UVCPreviewBase.cpp
+    ${UVCCAMERA}/src/UVCPreviewJni.cpp
+    ${UVCCAMERA}/src/UVCCameraAdjustments.cpp
+    ${UVCCAMERA}/src/ProgressObserver.cpp
+    ${UVCCAMERA}/src/JniUVCCamera.cpp
+    ${UVCCAMERA}/src/JpegBenchmark.cpp
+    ${UVCCAMERA}/src/LoadJpegImageFromAssetsUseCase.cpp
+    ${UVCCAMERA}/src/JniJpegBenchmark.cpp
     )

libausbc/src/main/jni/UVCCamera/ImageUseCases.cpp → libausbc/src/main/jni/UVCCamera/src/ImageUseCases.cpp

@@ -20,7 +20,7 @@
     #include "jpeglib.h"
 #endif
 #ifdef USE_TURBOJPEG
-    #include <turbojpeg.h>
+    #include "turbojpeg.h"
 #endif
 
 LoadJpegImageUseCase::Result LoadJpegImageFromFileUseCase::load(std::string imageId) {

libausbc/src/main/jni/UVCCamera/JniJpegBenchmark.cpp → libausbc/src/main/jni/UVCCamera/src/JniJpegBenchmark.cpp

@@ -19,7 +19,6 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
-#include "JpegBenchmark.h"
 #include "utilbase.h"
 #include <map>
 #include <thread>

libausbc/src/main/jni/UVCCamera/UVCPreviewBase.cpp → libausbc/src/main/jni/UVCCamera/src/UVCPreviewBase.cpp

@@ -23,7 +23,7 @@
  * Files in the jni/libjpeg, jni/libusb, jin/libuvc, jni/rapidjson folder may have a different license, see the respective files.
 */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
 #include "utilbase.h"
 #include "UVCPreviewBase.h"

libausbc/src/main/jni/UVCCamera/UVCPreviewJni.cpp → libausbc/src/main/jni/UVCCamera/src/UVCPreviewJni.cpp

@@ -23,7 +23,7 @@
  * Files in the jni/libjpeg, jni/libusb, jin/libuvc folder may have a different license, see the respective files.
 */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "UVCPreviewJni.h"
 
 int UVCPreviewJni::setPreviewDisplay(ANativeWindow *preview_window) {

linux/CMakeLists.txt

@@ -2,28 +2,41 @@ cmake_minimum_required(VERSION 3.22)
 
 project(LinuxUvcTests)
 
+cmake_path(GET CMAKE_CURRENT_LIST_DIR PARENT_PATH ROOT_DIR)
+set(UVCCAMERA ${ROOT_DIR}/libausbc/src/main/jni/UVCCamera)
+
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_C_STANDARD_REQUIRED True)
 
-find_package( Threads REQUIRED )
+include(FetchContent)
+FetchContent_Declare(
+    Catch2
+    GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+    GIT_TAG        v3.5.3
+)
+FetchContent_MakeAvailable(Catch2)
+
+find_package(PkgConfig REQUIRED)
+find_package(Threads REQUIRED)
 find_package (JPEG REQUIRED)
 
 #set(USE_TURBOJPEG 1)
 set(USE_LIBJPEG 1)
 
 include_directories(
-        ../libausbc/src/main/jni/UVCCamera/
+        ${UVCCAMERA}/include/
+        ./include/
 )
 
 find_package(SDL2 REQUIRED)
 
 add_executable(uvccapture
-        SdlTools.cpp
-        UvcCamera.cpp
-        uvccapture.cpp
-        ../libausbc/src/main/jni/UVCCamera/ImageUseCases.cpp
+        ./src/SdlTools.cpp
+        ./src/UvcCamera.cpp
+        ./src/uvccapture.cpp
+        ${UVCCAMERA}/src/ImageUseCases.cpp
         )
 
 target_link_libraries(
@@ -33,10 +46,10 @@ target_link_libraries(
 
 
 add_executable(jpegbenchmark
-        jpegdecodebenchmark.cpp
-        ../libausbc/src/main/jni/UVCCamera/ImageUseCases.cpp
-        ../libausbc/src/main/jni/UVCCamera/JpegBenchmark.cpp
-        ../libausbc/src/main/jni/UVCCamera/ProgressObserver.cpp
+        ./src/jpegdecodebenchmark.cpp
+        ${UVCCAMERA}/src/ImageUseCases.cpp
+        ${UVCCAMERA}/src/JpegBenchmark.cpp
+        ${UVCCAMERA}/src/ProgressObserver.cpp
         )
 
 if(USE_TURBOJPEG)
@@ -58,6 +71,28 @@ if (USE_LIBJPEG)
                 ${CMAKE_THREAD_LIBS_INIT})        
 endif()
 
-# add_executable(unix_socket_client unix_socket_client.cpp)
-# add_executable(unix_socket_server unix_socket_server.cpp)
+##
+## USB Audio devices tests
+##
+
+pkg_check_modules(LibUSB REQUIRED libusb-1.0)
+
+if(LibUSB_FOUND)
+  include_directories(${LibUSB_INCLUDE_DIRS})
+else()
+  message(FATAL_ERROR "LibUSB not found. Please install libusb-dev (or equivalent) on your system.")
+endif()
+
+add_executable(uaccapture
+        ./src/uaccapture.cpp
+        ./src/UacSource.cpp
+        )
+
+target_link_libraries(uaccapture ${LibUSB_LIBRARIES})
 
+# Enable testing with CTest
+enable_testing()
+
+# add_test(NAME DemoTests COMMAND catch2_tests)
+add_executable(tests test/test_catch2.cpp)
+target_link_libraries(tests PRIVATE Catch2::Catch2WithMain)

linux/include/UacSource.h

@@ -0,0 +1,52 @@
+#pragma once
+
+#include <string>
+#include <libusb-1.0/libusb.h>
+#include <fstream> // For writing to a file 
+
+class UacSource {
+public:
+    class Error : public std::exception {
+    private:
+        std::string message;
+    public:
+        Error(const char* msg) : message(msg) {}
+        Error(const std::string& msg) : message(msg) {}
+        const char* what() const noexcept {
+            return message.c_str();
+        }
+    };
+
+    struct StartConfiguration {
+        const uint16_t vendor_id;
+        const uint16_t product_id;
+        const int interface_number;
+        const int endpoint_address;
+    };
+public:
+    virtual ~UacSource() = default;
+    virtual void init() = 0;
+    virtual void deinit() = 0;
+    virtual void test(const StartConfiguration &cfg) = 0;
+};
+
+class UacSourceImpl : public UacSource {
+public:
+
+protected:
+    libusb_context* ctx = nullptr;
+
+    libusb_device_handle *handle;
+    int endpoint;
+    std::ofstream outputFile;
+protected:
+    static void entryPoint(UacSourceImpl* uacSource);
+    libusb_device_handle *findAudioDevice(const StartConfiguration &cfg);
+    void handleAudioData();
+public:
+    UacSourceImpl();
+    ~UacSourceImpl() override;
+    void init() override;
+    void deinit() override;
+    void test(const StartConfiguration &cfg) override;
+};