Merge branch 'develop' into fix-memory-leak-from-shared-pointer

Author: maheshrkumar

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,11 @@
 *Issue #, if available:*
 
-*Description of changes:*
+*What was changed?*
 
+*Why was it changed?*
+
+*How was it changed?*
+
+*What testing was done for the changes?*
 
 By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

.github/workflows/ci.yml

@@ -40,11 +40,19 @@ jobs:
           role-duration-seconds: 10800
       - name: Run tests
         run: |
-          cd build  
+          cd build
           ./tst/producerTest
 
   mac-os-build-gcc:
     runs-on: macos-13
+    strategy:
+      matrix:
+        parallel-build:
+          - ON
+          - OFF
+
+      fail-fast: false
+
     permissions:
       id-token: write
       contents: read
@@ -62,21 +70,29 @@ jobs:
       - name: Build repository
         run: |
           mkdir build && cd build
-          cmake .. -DBUILD_TEST=TRUE -DCMAKE_INSTALL_PREFIX=.
-          make
-          make install
+          cmake .. -DBUILD_TEST=TRUE -DCMAKE_INSTALL_PREFIX=. -DPARALLEL_BUILD=${{ matrix.parallel-build }}
+
+          if [[ "${{ matrix.parallel-build }}" == 'ON' ]]; then
+            make
+            make -j install
+          else
+            make
+            make install
+          fi
       - name: Configure AWS Credentials
+        if: ${{ matrix.parallel-build == 'ON' }} # Only need to run the tests once
         uses: aws-actions/configure-aws-credentials@v1-node16
         with:
           role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
           role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
           aws-region: ${{ secrets.AWS_REGION }}
           role-duration-seconds: 10800
       - name: Run tests
-        run: |  
+        if: ${{ matrix.parallel-build == 'ON' }}
+        run: |
           cd build
           ./tst/producerTest
-  
+
   linux-gcc-code-coverage:
     runs-on: ubuntu-20.04
     env:
@@ -88,7 +104,7 @@ jobs:
       - name: Clone repository
         uses: actions/checkout@v3
       - name: Install dependencies
-        run: |  
+        run: |
           sudo apt clean && sudo apt update
           sudo apt install -y libunwind-dev
           sudo apt-get install -y libssl-dev libcurl4-openssl-dev liblog4cplus-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-base-apps gstreamer1.0-plugins-bad gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-tools
@@ -115,7 +131,7 @@ jobs:
           cd build
           for test_file in $(find CMakeFiles/KinesisVideoProducer.dir gstkvssink.dir KinesisVideoProducerJNI.dir -name '*.gcno'); do gcov $test_file; done
           bash <(curl -s https://codecov.io/bash)
-  
+
   address-sanitizer:
     runs-on: ubuntu-20.04
     permissions:
@@ -189,7 +205,7 @@ jobs:
           timeout --signal=SIGABRT 60m ./tst/producerTest
 
   # memory-sanitizer:
-  #   runs-on: ubuntu-20.04 
+  #   runs-on: ubuntu-20.04
   #   permissions:
   #     id-token: write
   #     contents: read
@@ -237,11 +253,20 @@ jobs:
   #         mkdir build && cd build
   #         cmake .. -DBUILD_TEST=TRUE -DTHREAD_SANITIZER=TRUE -DBUILD_GSTREAMER_PLUGIN=TRUE -DBUILD_JNI=TRUE
   #         make
-  #         ulimit -c unlimited -S 
+  #         ulimit -c unlimited -S
   #         timeout --signal=SIGABRT 20m ./tst/producerTest
-  
+
   ubuntu-gcc:
     runs-on: ubuntu-20.04
+
+    strategy:
+      matrix:
+        parallel-build:
+          - ON
+          - OFF
+
+      fail-fast: false
+
     env:
       AWS_KVS_LOG_LEVEL: 2
       CC: gcc
@@ -260,17 +285,24 @@ jobs:
       - name: Build repository
         run: |
           mkdir build && cd build
-          cmake .. -DBUILD_TEST=TRUE -DBUILD_GSTREAMER_PLUGIN=TRUE -DBUILD_JNI=TRUE -DCMAKE_INSTALL_PREFIX=.
-          make
-          make install
+          cmake .. -DBUILD_TEST=TRUE -DBUILD_GSTREAMER_PLUGIN=TRUE -DBUILD_JNI=TRUE -DCMAKE_INSTALL_PREFIX=. -DPARALLEL_BUILD=${{ matrix.parallel-build }}
+          
+          if [[ "${{ matrix.parallel-build }}" == 'ON' ]]; then
+            make -j install
+          else
+            make install
+          fi
+
       - name: Configure AWS Credentials
+        if: ${{ matrix.parallel-build == 'ON' }} # Only need to run the tests once
         uses: aws-actions/configure-aws-credentials@v1-node16
         with:
           role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
           role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
           aws-region: ${{ secrets.AWS_REGION }}
           role-duration-seconds: 10800
       - name: Run tests
+        if: ${{ matrix.parallel-build == 'ON' }}
         run: |
           cd build
           ulimit -c unlimited -S
@@ -312,7 +344,7 @@ jobs:
       - name: Run tests
         run: |
           $env:Path += ';C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Strawberry\c\bin;C:\Program Files\NASM;D:\producer\open-source\local\lib;D:\producer\open-source\local\bin'
-          & "D:\producer\build\tst\producerTest.exe" 
+          & "D:\producer\build\tst\producerTest.exe"
 
   arm64-cross-compilation:
     runs-on: ubuntu-20.04

.github/workflows/jni.yml

@@ -0,0 +1,76 @@
+name: Producer CPP JNI Builds
+
+on:
+  push:
+    branches:
+      - develop
+      - master
+  pull_request:
+    branches:
+      - develop
+      - master
+
+jobs:
+  mac-os:
+    strategy:
+      matrix:
+        config:
+          - name: Intel x86_64
+            runner: macos-13
+          - name: Apple Silicon
+            runner: macos-15
+          - name: Ubuntu 22.04
+            runner: ubuntu-latest
+            container: public.ecr.aws/ubuntu/ubuntu:22.04_stable
+          - name: Ubuntu 20.04
+            runner: ubuntu-latest
+            container: public.ecr.aws/ubuntu/ubuntu:20.04_stable
+
+        java:
+          - 11
+          - 17
+          - 21
+
+      fail-fast: false
+
+    name: JNI ${{ matrix.config.name }} (Java ${{ matrix.java }})
+    runs-on: ${{ matrix.config.runner }}
+    container: ${{ matrix.config.container || '' }}
+
+    env:
+      DEBIAN_FRONTEND: noninteractive
+
+    steps:
+      - name: Setup XCode
+        if: ${{ runner.os == 'macOS' }}
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest-stable
+
+      - name: Install Dependencies (Linux only)
+        if: runner.os == 'Linux'
+        run: |
+          apt-get update
+          apt-get install -y git cmake build-essential
+
+      - name: Set up Java (JDK ${{ matrix.java }})
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'corretto'
+          java-version: ${{ matrix.java }}
+
+      - name: Clone repository
+        uses: actions/checkout@v4
+
+      - name: Build JNI (CMake)
+        run: |
+          mkdir build && cd build
+          cmake .. -DBUILD_JNI_ONLY=ON
+
+          # Note: Dependencies on/off shouldn't make any difference since
+          # the only dependency for the JNI is PIC
+
+      - name: Build JNI (make)
+        working-directory: ./build
+        run: |
+          make -j