Jni migration

.github/workflows/ci.yml

@@ -59,11 +59,9 @@ jobs:
       - name: Build JNI (Mac and Linux)
         if: ${{ runner.os == 'macOS' || runner.os == 'linux' }}
         run: |
-          git clone https://github.com/awslabs/amazon-kinesis-video-streams-producer-sdk-cpp.git --single-branch -b ${{ env.BRANCH_NAME }}
-          cd amazon-kinesis-video-streams-producer-sdk-cpp
           mkdir build
           cd build
-          cmake .. -DBUILD_JNI_ONLY=ON
+          cmake ..
           make -j
 
       - name: Build JNI (Windows)
@@ -72,42 +70,27 @@ jobs:
         run: |
           @echo on
 
-          :: Create a shorter directory to avoid long path issues
-          mkdir D:\work || exit /b 1
-          git clone https://github.com/awslabs/amazon-kinesis-video-streams-producer-sdk-cpp.git D:\work\producer --single-branch -b ${{ env.BRANCH_NAME }} || exit /b 1
-
-          :: Ensure cloning succeeded
-          if not exist "D:\work\producer" (
-              echo "Error: Clone failed, directory does not exist."
-              exit /b 1
-          )
-
-          cd D:\work\producer || exit /b 1
-
           :: Create build directory
           mkdir build || exit /b 1
           cd build || exit /b 1
 
           :: Run CMake with the correct path
-          cmake .. -DBUILD_JNI_ONLY=ON -G "Visual Studio 17 2022" || exit /b 1
+          cmake .. -G "Visual Studio 17 2022" || exit /b 1
           cmake --build . --config Release --verbose || exit /b 1
 
           :: Move the compiled library to the expected location
           :: Note: Using Visual Studio generator, the output file gets put in Release\KinesisVideoProducerJNI.dll
           :: rather than in the build folder directly
-          cd "%GITHUB_WORKSPACE%" || exit /b 1
-          mkdir amazon-kinesis-video-streams-producer-sdk-cpp || exit /b 1
-          mkdir amazon-kinesis-video-streams-producer-sdk-cpp\build || exit /b 1
-          move D:\work\producer\build\Release\KinesisVideoProducerJNI.dll amazon-kinesis-video-streams-producer-sdk-cpp\build || exit /b 1
+          move Release\KinesisVideoProducerJNI.dll . || exit /b 1
 
       - name: Upload JNI Library
         uses: actions/upload-artifact@v4
         with:
           name: jni-library-${{ matrix.platform.name }}
           path: |
-            amazon-kinesis-video-streams-producer-sdk-cpp/build/libKinesisVideoProducerJNI.so
-            amazon-kinesis-video-streams-producer-sdk-cpp/build/libKinesisVideoProducerJNI.dylib
-            amazon-kinesis-video-streams-producer-sdk-cpp/build/KinesisVideoProducerJNI.dll
+            build/libKinesisVideoProducerJNI.so
+            build/libKinesisVideoProducerJNI.dylib
+            build/KinesisVideoProducerJNI.dll
           retention-days: 1
 
   run-unit-tests:

.gitignore

@@ -11,4 +11,4 @@ cm-file
 target
 logs
 hs_err_pid*.log
-
+dependency/

CMake/Dependencies/libkvspic-CMakeLists.txt

@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.6.3)
+
+project(libkvspic-download LANGUAGES C)
+
+include(ExternalProject)
+
+ExternalProject_Add(libkvspic-download
+    GIT_REPOSITORY    https://github.com/awslabs/amazon-kinesis-video-streams-pic.git
+    GIT_TAG           v1.2.0
+    GIT_SHALLOW       TRUE
+    GIT_PROGRESS      TRUE
+    SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/kvspic-src"
+    BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/kvspic-build"
+    CMAKE_ARGS        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_DEPENDENCIES=OFF
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND     ""
+    INSTALL_COMMAND   ""
+    TEST_COMMAND      ""
+)

CMake/Utilities.cmake

@@ -0,0 +1,42 @@
+# only fetch target repo for add_subdirectory later
+function(fetch_repo lib_name)
+  set(supported_libs
+      kvspic)
+  list(FIND supported_libs ${lib_name} index)
+  if(${index} EQUAL -1)
+    message(WARNING "${lib_name} is not supported for fetch_repo")
+    return()
+  endif()
+
+  if (WIN32 OR NOT PARALLEL_BUILD)
+    set(PARALLEL_BUILD "")  # No parallel build for Windows
+  else()
+    set(PARALLEL_BUILD "--parallel")  # Enable parallel builds for Unix-like systems
+  endif()
+
+  # build library
+  configure_file(
+    ./CMake/Dependencies/lib${lib_name}-CMakeLists.txt
+    ${DEPENDENCY_DOWNLOAD_PATH}/lib${lib_name}/CMakeLists.txt COPYONLY)
+  execute_process(
+    COMMAND ${CMAKE_COMMAND}
+            ${CMAKE_GENERATOR} .
+    RESULT_VARIABLE result
+    WORKING_DIRECTORY ${DEPENDENCY_DOWNLOAD_PATH}/lib${lib_name})
+  if(result)
+    message(FATAL_ERROR "CMake step for lib${lib_name} failed: ${result}")
+  endif()
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} --build . ${PARALLEL_BUILD}
+    RESULT_VARIABLE result
+    WORKING_DIRECTORY ${DEPENDENCY_DOWNLOAD_PATH}/lib${lib_name})
+  if(result)
+    message(FATAL_ERROR "CMake step for lib${lib_name} failed: ${result}")
+  endif()
+endfunction()
+
+function(enableSanitizer SANITIZER)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g -fsanitize=${SANITIZER} -fno-omit-frame-pointer" PARENT_SCOPE)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g -fsanitize=${SANITIZER} -fno-omit-frame-pointer -fno-optimize-sibling-calls" PARENT_SCOPE)
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${SANITIZER}" PARENT_SCOPE)
+endfunction()

CMakeLists.txt

@@ -0,0 +1,86 @@
+cmake_minimum_required(VERSION 3.6.3)
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}")
+include(Utilities)
+
+project(KinesisVideoProducerJNI VERSION 3.4.2)
+
+set(CMAKE_CXX_STANDARD 11)
+include(GNUInstallDirs)
+
+add_definitions(-DCPP_VERSION_STRING=\"${PROJECT_VERSION}\")
+
+set(CMAKE_MACOSX_RPATH TRUE)
+
+############# Check dependencies ############
+
+find_package(Threads)
+
+find_package(JNI QUIET)
+if(NOT JNI_FOUND)
+    message(FATAL_ERROR
+        "\nJava Development Kit (JDK) not found!"
+        "\nPlease ensure that:"
+        "\n  1. JDK is installed"
+        "\n  2. JAVA_HOME environment variable is set correctly"
+        "\n  3. Your JDK installation includes JNI headers"
+    )
+endif()
+include_directories(${JNI_INCLUDE_DIRS})
+
+############# Enable Sanitizers ############
+if(${CMAKE_C_COMPILER_ID} MATCHES "GNU|Clang")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+
+  if(ADD_MUCLIBC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -muclibc")
+  endif()
+
+  if(CODE_COVERAGE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g -fprofile-arcs -ftest-coverage")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage")
+  endif()
+
+  if(ADDRESS_SANITIZER)
+    enableSanitizer("address")
+  endif()
+  if(MEMORY_SANITIZER)
+    enableSanitizer("memory")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize-memory-track-origins")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize-memory-track-origins")
+  endif()
+  if(THREAD_SANITIZER)
+    enableSanitizer("thread")
+  endif()
+  if(UNDEFINED_BEHAVIOR_SANITIZER)
+    enableSanitizer("undefined")
+  endif()
+endif()
+
+if(MSVC)
+  add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
+endif()
+
+############# Build Targets ############
+
+# PIC
+set(DEPENDENCY_DOWNLOAD_PATH ${CMAKE_CURRENT_SOURCE_DIR}/dependency)
+set(BUILD_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+fetch_repo(kvspic ${BUILD_ARGS})
+add_subdirectory("${DEPENDENCY_DOWNLOAD_PATH}/libkvspic/kvspic-src")
+file(GLOB PIC_HEADERS "${pic_project_SOURCE_DIR}/src/*/include")
+include_directories("${PIC_HEADERS}")
+
+# JNI
+file(GLOB_RECURSE JNI_SOURCE_FILES "jni/*.cpp")
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/jni/include)
+
+add_library(KinesisVideoProducerJNI SHARED ${JNI_HEADERS} ${JNI_SOURCE_FILES})
+target_link_libraries(KinesisVideoProducerJNI kvspic)
+
+add_custom_target(clean-all
+    COMMENT "Removing all build and dependency directories"
+    COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}
+    COMMAND ${CMAKE_COMMAND} -E remove_directory ${DEPENDENCY_DOWNLOAD_PATH}
+    COMMENT "Removed the build and dependency directories"
+)