Release v1.14.0

.github/workflows/ci.yml

@@ -73,7 +73,7 @@ jobs:
           - name: Mac Intel
             runner: macos-13
           - name: Mac Apple Silicon
-            runner: macos-15
+            runner: macos-14
         compiler: [ gcc, clang ]
         config:
           - name: Shared OpenSSL
@@ -123,10 +123,10 @@ jobs:
             export CXX="clang++"
           fi
           echo "Using CC: $CC and CXX: $CXX"
-          
+
           mkdir -p build
           cd build
-          
+
           if [[ "${{ matrix.compiler }}" == "gcc" ]]; then
             # Skip building the tests for Mac with GCC
             # https://github.com/awslabs/aws-crt-cpp/issues/605
@@ -246,7 +246,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DBUILD_TEST=ON -DENABLE_AWS_SDK_IN_TESTS=OFF -DUSE_OPENSSL=OFF -DUSE_MBEDTLS=ON
+          cmake .. -DBUILD_TEST=ON -DENABLE_AWS_SDK_IN_TESTS=OFF -DUSE_OPENSSL=OFF -DUSE_MBEDTLS=ON -DBUILD_OLD_MBEDTLS_VERSION=ON
           make -j
 
       - name: Configure AWS Credentials
@@ -350,11 +350,13 @@ jobs:
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
-      - name: Move cloned repo
+      - name: Move cloned repo to shorter path
         shell: powershell
         run: |
-          mkdir C:\webrtc
-          Move-Item -Path "D:\a\amazon-kinesis-video-streams-webrtc-sdk-c\amazon-kinesis-video-streams-webrtc-sdk-c\*" -Destination "C:\webrtc"
+          $src = "${env:GITHUB_WORKSPACE}\*"
+          $dest = "C:\webrtc"
+          mkdir "$dest"
+          Move-Item -Path $src -Destination $dest
       - name: Install dependencies
         shell: powershell
         run: |

CMake/Dependencies/libkvsCommonLws-CMakeLists.txt

@@ -11,7 +11,7 @@ ExternalProject_Add(libkvsCommonLws-download
     GIT_SHALLOW       TRUE
     PREFIX            ${CMAKE_CURRENT_BINARY_DIR}/build
     LIST_SEPARATOR    |
-    CMAKE_ARGS        
+    CMAKE_ARGS
       -DCMAKE_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX}
       -DCMAKE_PREFIX_PATH=${OPEN_SRC_INSTALL_PREFIX}
       -DBUILD_COMMON_LWS=ON
@@ -22,7 +22,7 @@ ExternalProject_Add(libkvsCommonLws-download
       -DUSE_OPENSSL=${USE_OPENSSL}
       -DUSE_MBEDTLS=${USE_MBEDTLS}
       -DKVS_DEFAULT_STACK_SIZE=${KVS_DEFAULT_STACK_SIZE}
-      -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+      -DCMAKE_C_FLAGS=-D_GNU_SOURCE\ ${CMAKE_C_FLAGS}
       -DBUILD_STATIC=${BUILD_STATIC}
     BUILD_ALWAYS      TRUE
     TEST_COMMAND      ""

CMake/Dependencies/libmbedtls-CMakeLists.txt

@@ -4,6 +4,12 @@ project(libmbedtls-download NONE)
 
 include(ExternalProject)
 
+if (BUILD_OLD_MBEDTLS_VERSION)
+  SET(MBEDTLS_GIT_TAG "v2.28.8")
+else()
+  SET(MBEDTLS_GIT_TAG "v3.6.3")
+endif()
+
 if (BUILD_STATIC_LIBS)
   set(BUILD_SHARED 0)
 else()
@@ -21,7 +27,7 @@ message(STATUS "C flags here are ${CMAKE_C_FLAGS}")
 ExternalProject_Add(
   project_libmbedtls
   GIT_REPOSITORY  https://github.com/ARMmbed/mbedtls.git
-  GIT_TAG         v2.28.8
+  GIT_TAG         ${MBEDTLS_GIT_TAG}
   GIT_PROGRESS    TRUE
   GIT_SHALLOW     TRUE
   PREFIX          ${CMAKE_CURRENT_BINARY_DIR}/build
@@ -32,6 +38,6 @@ ExternalProject_Add(
     -DCMAKE_MACOSX_RPATH=${CMAKE_MACOSX_RPATH}
     -DENABLE_TESTING=OFF
     -DENABLE_PROGRAMS=OFF
-    -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+    "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -Wno-array-bounds"
   BUILD_ALWAYS    TRUE
   TEST_COMMAND    "")

CMake/Dependencies/libwebsockets-CMakeLists.txt

@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.6.3)
 
 project(libwebsocket-download NONE)
 
-SET(PATCH_COMMAND git apply --verbose --ignore-whitespace ${CMAKE_CURRENT_LIST_DIR}/libwebsockets-old-gcc-fix-cast-cmakelists.patch)
-
 include(ExternalProject)
 if (BUILD_STATIC_LIBS)
   set(LWS_WITH_SHARED 0)
@@ -30,10 +28,9 @@ endif()
 
 ExternalProject_Add(project_libwebsockets
     GIT_REPOSITORY    https://github.com/warmcat/libwebsockets.git
-    GIT_TAG           v4.3.3
+    GIT_TAG           v4.3.5
     GIT_PROGRESS      TRUE
     GIT_SHALLOW       TRUE
-    PATCH_COMMAND     ${PATCH_COMMAND}
     PREFIX            ${CMAKE_CURRENT_BINARY_DIR}/build
     LIST_SEPARATOR    |
     CMAKE_ARGS
@@ -58,7 +55,7 @@ ExternalProject_Add(project_libwebsockets
         -DLWS_MBEDTLS_LIBRARIES=${LWS_MBEDTLS_LIBRARIES}
         -DLWS_MBEDTLS_INCLUDE_DIRS=${LWS_MBEDTLS_INCLUDE_DIRS}
         -DLWS_WITH_MINIMAL_EXAMPLES=1
-        -DLWS_HAVE_PTHREAD_H=1 
+        -DLWS_HAVE_PTHREAD_H=1
         -DLWS_WITH_THREADPOOL=${LWS_WITH_THREADPOOL}
         -DLWS_WITH_ZLIB=0
         -DLWS_HAVE_EVENTFD=0

CMakeLists.txt

@@ -5,7 +5,7 @@ include(CheckIncludeFiles)
 include(CheckFunctionExists)
 
 # The version MUST be updated before every release
-project(KinesisVideoWebRTCClient VERSION 1.12.1 LANGUAGES C)
+project(KinesisVideoWebRTCClient VERSION 1.14.0 LANGUAGES C)
 
 # User Flags
 option(ADD_MUCLIBC "Add -muclibc c flag" OFF)
@@ -22,6 +22,7 @@ option(ENABLE_KVS_THREADPOOL "Enable support for KVS thread pool in signaling" O
 option(INSTRUMENTED_ALLOCATORS "Enable memory instrumentation" OFF)
 option(ENABLE_AWS_SDK_IN_TESTS "Enable support for compiling AWS SDKs for tests" ON)
 option(ENABLE_STATS_CALCULATION_CONTROL "Enable support for runtime control of ice agent stat calculations." OFF)
+option(BUILD_OLD_MBEDTLS_VERSION "Use MbedTLS version 2.28.8." OFF)
 
 # Developer Flags
 option(BUILD_TEST "Build the testing tree." OFF)
@@ -76,11 +77,25 @@ if(NOT WIN32)
 CHECK_INCLUDE_FILES(ifaddrs.h       KVSWEBRTC_HAVE_IFADDRS_H)
 if(NOT KVSWEBRTC_HAVE_IFADDRS_H)
   message(FATAL_ERROR "Platform should support the ifaddrs interface.")
+else()
+  add_definitions(-DHAVE_IFADDRS_H=1)
 endif()
 CHECK_FUNCTION_EXISTS(getifaddrs    KVSWEBRTC_HAVE_GETIFADDRS)
 if(NOT KVSWEBRTC_HAVE_GETIFADDRS)
   message(FATAL_ERROR "Platform should support getifaddrs API.")
 endif()
+
+# Check for poll.h
+CHECK_INCLUDE_FILES(poll.h HAVE_POLL_H)
+if (HAVE_POLL_H)
+  add_definitions(-DHAVE_POLL_H=1)
+endif()
+
+# Check for socketpair availability
+CHECK_FUNCTION_EXISTS(socketpair HAVE_SOCKETPAIR)
+if (HAVE_SOCKETPAIR)
+  add_definitions(-DHAVE_SOCKETPAIR=1)
+endif()
 endif()
 
 set(CMAKE_MACOSX_RPATH TRUE)
@@ -182,6 +197,7 @@ if(BUILD_DEPENDENCIES)
   elseif(USE_MBEDTLS)
     set(BUILD_ARGS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
                    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+                   -DBUILD_OLD_MBEDTLS_VERSION=${BUILD_OLD_MBEDTLS_VERSION}
                     "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -std=c99")
       build_dependency(mbedtls ${BUILD_ARGS})
   endif()
@@ -446,7 +462,7 @@ target_link_libraries(
   kvsWebrtcSignalingClient
   PUBLIC
         kvsCommonLws
-        ${LIBWEBSOCKETS_LIBRARIES} 
+        ${LIBWEBSOCKETS_LIBRARIES}
   PRIVATE kvspicUtils
          kvspicState
          ${CMAKE_THREAD_LIBS_INIT}

samples/kvsWebRTCClientMaster.c

@@ -185,10 +185,11 @@ PVOID sendVideoPackets(PVOID args)
     lastFrameTime = startTime;
 
     while (!ATOMIC_LOAD_BOOL(&pSampleConfiguration->appTerminateFlag)) {
-        fileIndex = fileIndex % NUMBER_OF_H264_FRAME_FILES + 1;
         if (pSampleConfiguration->videoCodec == RTC_CODEC_H264_PROFILE_42E01F_LEVEL_ASYMMETRY_ALLOWED_PACKETIZATION_MODE) {
+            fileIndex = fileIndex % NUMBER_OF_H264_FRAME_FILES + 1;
             SNPRINTF(filePath, MAX_PATH_LEN, "./h264SampleFrames/frame-%04d.h264", fileIndex);
         } else if (pSampleConfiguration->videoCodec == RTC_CODEC_H265) {
+            fileIndex = fileIndex % NUMBER_OF_H265_FRAME_FILES + 1;
             SNPRINTF(filePath, MAX_PATH_LEN, "./h265SampleFrames/frame-%04d.h265", fileIndex);
         }
 

src/include/com/amazonaws/kinesis/video/webrtcclient/Include.h

@@ -449,12 +449,27 @@ extern "C" {
  */
 #define MAX_ICE_CONFIG_USER_NAME_LEN 256
 
+/**
+ * Buffer length for ICE configuration user name, including null terminator.
+ *
+ * \sa MAX_ICE_CONFIG_USER_NAME_LEN
+ */
+#define MAX_ICE_CONFIG_USER_NAME_BUFFER_LEN (MAX_ICE_CONFIG_USER_NAME_LEN + 1)
+
 /**
  * Maximum allowed ICE configuration password length
- * https://docs.aws.amazon.com/kinesisvideostreams/latest/dg/API_AWSAcuitySignalingService_IceServer.html#KinesisVideo-Type-AWSAcuitySignalingService_IceServer-Password
+ *
+ * \sa https://docs.aws.amazon.com/kinesisvideostreams/latest/dg/API_signaling_IceServer.html#KinesisVideo-Type-signaling_IceServer-Password
  */
 #define MAX_ICE_CONFIG_CREDENTIAL_LEN 256
 
+/**
+ * Buffer length for ICE configuration password, including null terminator.
+ *
+ * \sa MAX_ICE_CONFIG_USER_NAME_LEN
+ */
+#define MAX_ICE_CONFIG_CREDENTIAL_BUFFER_LEN (MAX_ICE_CONFIG_CREDENTIAL_LEN + 1)
+
 /**
  * Maximum allowed signaling URI length
  */
@@ -473,7 +488,7 @@ extern "C" {
 /**
  * Maximum allowed code string length
  */
-#define MAX_STATUS_CODE_STRING_LEN 256
+#define MAX_STATUS_CODE_STRING_LEN 8
 
 /**
  * Maximum allowed message description length
@@ -722,10 +737,12 @@ extern "C" {
 /**
  * Parameterized string for KVS STUN Server
  */
-#define KINESIS_VIDEO_STUN_URL_POSTFIX      "amazonaws.com"
-#define KINESIS_VIDEO_STUN_URL_POSTFIX_CN   "amazonaws.com.cn"
-#define KINESIS_VIDEO_STUN_URL              "stun:stun.kinesisvideo.%s.%s:443"
-#define KINESIS_VIDEO_STUN_URL_WITHOUT_PORT "stun.kinesisvideo.%s.%s"
+#define KINESIS_VIDEO_STUN_URL_POSTFIX       "amazonaws.com"
+#define KINESIS_VIDEO_STUN_URL_POSTFIX_CN    "amazonaws.com.cn"
+#define KINESIS_VIDEO_STUN_URL_PREFIX        "stun."
+#define KINESIS_VIDEO_STUN_URL_PREFIX_LENGTH 5
+#define KINESIS_VIDEO_STUN_URL               "stun:stun.kinesisvideo.%s.%s:443"
+#define KINESIS_VIDEO_STUN_URL_WITHOUT_PORT  "stun.kinesisvideo.%s.%s"
 
 /**
  * Default signaling SSL port
@@ -1137,9 +1154,9 @@ typedef struct {
  * https://www.w3.org/TR/webrtc/#rtciceserver-dictionary
  */
 typedef struct {
-    CHAR urls[MAX_ICE_CONFIG_URI_LEN + 1];              //!< URL of STUN/TURN Server
-    CHAR username[MAX_ICE_CONFIG_USER_NAME_LEN + 1];    //!< Username to be used with TURN server
-    CHAR credential[MAX_ICE_CONFIG_CREDENTIAL_LEN + 1]; //!< Password to be used with TURN server
+    CHAR urls[MAX_ICE_CONFIG_URI_LEN + 1];                 //!< URL of STUN/TURN Server
+    CHAR username[MAX_ICE_CONFIG_USER_NAME_BUFFER_LEN];    //!< Username to be used with TURN server
+    CHAR credential[MAX_ICE_CONFIG_CREDENTIAL_BUFFER_LEN]; //!< Password to be used with TURN server
 } RtcIceServer, *PRtcIceServer;
 
 /**
@@ -1388,12 +1405,12 @@ typedef struct {
  * NOTE:TTL is given in default which is 100ns duration
  */
 typedef struct {
-    UINT32 version;                                                  //!< Version of the struct
-    UINT64 ttl;                                                      //!< TTL of the configuration is 100ns
-    UINT32 uriCount;                                                 //!<  Number of Ice URI objects
-    CHAR uris[MAX_ICE_CONFIG_URI_COUNT][MAX_ICE_CONFIG_URI_LEN + 1]; //!< List of Ice server URIs
-    CHAR userName[MAX_ICE_CONFIG_USER_NAME_LEN + 1];                 //!< Username for the server
-    CHAR password[MAX_ICE_CONFIG_CREDENTIAL_LEN + 1];                //!< Password for the server
+    UINT32 version;                                                     //!< Version of the struct
+    UINT64 ttl;                                                         //!< TTL of the configuration is 100ns
+    UINT32 uriCount;                                                    //!<  Number of Ice URI objects
+    CHAR uris[MAX_ICE_CONFIG_URI_COUNT][MAX_ICE_CONFIG_URI_BUFFER_LEN]; //!< List of Ice server URIs
+    CHAR userName[MAX_ICE_CONFIG_USER_NAME_BUFFER_LEN];                 //!< Username for the server
+    CHAR password[MAX_ICE_CONFIG_CREDENTIAL_BUFFER_LEN];                //!< Password for the server
 } IceConfigInfo, *PIceConfigInfo;
 
 typedef struct {