Fix bug where iot and file credentials failed to get cycled promptly.

Reworked stream and client shutdown flow.
Other minor stability and bug fixes.

Author: chehefen

README.md

@@ -70,8 +70,11 @@ This library is licensed under the Apache License, 2.0.
 ----
 ### Release notes
 
-#### Release 2.0.2 (17th Oct 2019)
-* fix bug where producer cannot recover from STATUS_STORE_OUT_OF_MEMORY after network outage
+#### Release 2.1.0 (2nd Dec 2019)
+* C/CPP-Producer - Updates
+  * Fix bug where iot and file credentials failed to get cycled promptly.
+  * Reworked stream and client shutdown flow.
+  * Other minor stability and bug fixes.
 
 #### Release 2.0.1 (25th Jul 2019)
 * C-Producer - Updates

kinesis-video-c-producer/CMakeLists.txt

@@ -55,36 +55,41 @@ if(BP_BUILD_LIB)
     endif()
 else()
 
-    if(DEFINED ENV{KINESIS_VIDEO_PIC_SRC})
-        set(KINESIS_VIDEO_PIC_SRC $ENV{KINESIS_VIDEO_PIC_SRC})
-    else()
-        set(KINESIS_VIDEO_PIC_SRC "${CMAKE_CURRENT_SOURCE_DIR}/../kinesis-video-pic")
-    endif()
-
-    if(DEFINED ENV{KINESIS_VIDEO_PRODUCER_C_SRC})
-        set(KINESIS_VIDEO_PRODUCER_C_SRC $ENV{KINESIS_VIDEO_PRODUCER_C_SRC})
-    else()
-        set(KINESIS_VIDEO_PRODUCER_C_SRC "${CMAKE_CURRENT_SOURCE_DIR}/../kinesis-video-producer-c")
+    if(NOT KINESIS_VIDEO_PIC_SRC)
+        if(DEFINED ENV{KINESIS_VIDEO_PIC_SRC})
+            set(KINESIS_VIDEO_PIC_SRC $ENV{KINESIS_VIDEO_PIC_SRC})
+        else()
+            set(KINESIS_VIDEO_PIC_SRC "${CMAKE_CURRENT_SOURCE_DIR}/../kinesis-video-pic")
+        endif()
     endif()
 
-    if(DEFINED ENV{KINESIS_VIDEO_OPEN_SOURCE_SRC})
-        set(KINESIS_VIDEO_OPEN_SOURCE_SRC $ENV{KINESIS_VIDEO_OPEN_SOURCE_SRC})
-    else()
-        set(KINESIS_VIDEO_OPEN_SOURCE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/../kinesis-video-native-build/downloads")
+    if(NOT KINESIS_VIDEO_PRODUCER_C_SRC)
+        if(DEFINED ENV{KINESIS_VIDEO_PRODUCER_C_SRC})
+            set(KINESIS_VIDEO_PRODUCER_C_SRC $ENV{KINESIS_VIDEO_PRODUCER_C_SRC})
+        else()
+            set(KINESIS_VIDEO_PRODUCER_C_SRC "${CMAKE_CURRENT_SOURCE_DIR}")
+        endif()
     endif()
 
-    if (DEFINED ENV{KVS_JSMN_ROOT})
-        set(KVS_JSMN_ROOT $ENV{KVS_JSMN_ROOT})
-    else()
-        message( FATAL_ERROR "No JSMN root specified." )
+    if(NOT KINESIS_VIDEO_OPEN_SOURCE_SRC)
+        if(DEFINED ENV{KINESIS_VIDEO_OPEN_SOURCE_SRC})
+            set(KINESIS_VIDEO_OPEN_SOURCE_SRC $ENV{KINESIS_VIDEO_OPEN_SOURCE_SRC})
+        else()
+            set(KINESIS_VIDEO_OPEN_SOURCE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/../kinesis-video-native-build/downloads/local")
+        endif()
     endif()
 
     message(STATUS "Kinesis Video PIC path is ${KINESIS_VIDEO_PIC_SRC}")
-    message(STATUS "Kinesis Video Producer path is ${KINESIS_VIDEO_PRODUCER_SRC}")
+    message(STATUS "Kinesis Video Producer path is ${KINESIS_VIDEO_PRODUCER_C_SRC}")
     message(STATUS "Kinesis Video Open Source path is ${KINESIS_VIDEO_OPEN_SOURCE_SRC}")
 
-    set(CMAKE_INSTALL_RPATH "${KVS_INSTALL_PATH}")
-    set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+    if (NOT EXISTS ${KINESIS_VIDEO_PIC_SRC})
+        message(FATAL_ERROR "KINESIS_VIDEO_PIC_SRC ${KINESIS_VIDEO_PIC_SRC} does not exist")
+    elseif(NOT EXISTS ${KINESIS_VIDEO_PRODUCER_C_SRC})
+        message(FATAL_ERROR "KINESIS_VIDEO_PRODUCER_C_SRC ${KINESIS_VIDEO_PRODUCER_C_SRC} does not exist")
+    elseif(NOT EXISTS ${KINESIS_VIDEO_OPEN_SOURCE_SRC})
+        message(FATAL_ERROR "KINESIS_VIDEO_OPEN_SOURCE_SRC ${KINESIS_VIDEO_OPEN_SOURCE_SRC} does not exist.")
+    endif()
 
     if(CMAKE_SIZEOF_VOID_P STREQUAL 4)
         message(STATUS "Bitness 32 bits")
@@ -103,93 +108,110 @@ else()
     if("${CMAKE_C_COMPILER_ID}" MATCHES "GNU|Clang")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
 
-        find_package(PkgConfig REQUIRED)
+        if (NOT OPENSSL_FOUND)
+            message("looking for openssl")
+            if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+                set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl")
+            endif()
+
+            find_package(OpenSSL    REQUIRED)
 
-        if (USE_SYS_LIBRARIES AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-            set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl")
+            set(OPEN_SRC_INCLUDE_DIRS
+                ${OPEN_SRC_INCLUDE_DIRS}
+                ${OPENSSL_INCLUDE_DIR})
         endif()
 
-        find_package(OpenSSL    REQUIRED)
-        find_package(CURL       REQUIRED)
+        if (NOT CURL_FOUND AND BUILD_COMMON_CURL)
+            message("looking for curl")
+            find_package(CURL       REQUIRED)
 
-        set(OPEN_SRC_INCLUDE_DIRS
-                ${CURL_INCLUDE_DIRS}
-                ${OPENSSL_INCLUDE_DIR})
+            set(OPEN_SRC_INCLUDE_DIRS
+                ${OPEN_SRC_INCLUDE_DIRS}
+                ${CURL_INCLUDE_DIRS})
+        endif()
 
-        set(PRODUCER_C_LIBRARIES
-                ${OPENSSL_CRYPTO_LIBRARY}
-                ${OPENSSL_SSL_LIBRARY}
-                ${CURL_LIBRARIES})
+        if (NOT LIBSRTP_FOUND AND BUILD_COMMON_LWS)
+            message("looking for libwebsocket")
+            set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${KINESIS_VIDEO_OPEN_SOURCE_SRC}/lib/pkgconfig")
+            pkg_check_modules(LIBSRTP REQUIRED libsrtp2)
+
+            set(OPEN_SRC_INCLUDE_DIRS
+                    ${LIBWEBSOCKET_INCLUDE_DIRS})
+            link_directories(${LIBWEBSOCKET_LIBRARY_DIRS})
+        endif()
     endif()
 
-    find_library(KvsPic
-            NAMES kvspic
-            REQUIRED
-            PATHS ${KINESIS_VIDEO_PIC_SRC}
-            NO_DEFAULT_PATH)
-    find_library(Jsmn
+    if (NOT Jsmn)
+        find_library(Jsmn
             NAMES jsmn
             REQUIRED
-            PATHS   ${KVS_JSMN_ROOT}/lib
+            PATHS   ${KINESIS_VIDEO_OPEN_SOURCE_SRC}/lib
             NO_DEFAULT_PATH)
+    endif()
 
     # Uncomment below line for debug heap
     #add_definitions(-DHEAP_DEBUG)
 
     # Uncomment below line for very verbose logging
     #add_definitions(-DLOG_STREAMING)
 
-    set(PRODUCER_C_SOURCE_FILES
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/Auth.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/AwsV4Signer.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/CallbacksProvider.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/CurlApiCallbacks.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/DeviceInfoProvider.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/StreamInfoProvider.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/Producer.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/Request.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/Response.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/Util.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/FileAuthCallbacks.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/StaticAuthCallbacks.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/IotAuthCallback.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/ConnectionStaleStateMachine.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/ContinuousRetryStreamCallbacks.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/StateMachineData.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/StreamErrorReportStateMachine.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/StreamLatencyStateMachine.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/StreamCallbacksProvider.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/FileLoggerPlatformCallbackProvider.c
-            ${KINESIS_VIDEO_PRODUCER_C_SRC}/src/source/Version.c)
-
-    include_directories(${KINESIS_VIDEO_PIC_SRC}/src/client/include)
-    include_directories(${KINESIS_VIDEO_PIC_SRC}/src/common/include)
-    include_directories(${KINESIS_VIDEO_PIC_SRC}/src/heap/include)
-    include_directories(${KINESIS_VIDEO_PIC_SRC}/src/trace/include)
-    include_directories(${KINESIS_VIDEO_PIC_SRC}/src/mkvgen/include)
-    include_directories(${KINESIS_VIDEO_PIC_SRC}/src/view/include)
-    include_directories(${KINESIS_VIDEO_PIC_SRC}/src/utils/include)
-    include_directories(${KINESIS_VIDEO_PRODUCER_C_SRC})
+    file(GLOB KVS_COMMON_SOURCE_FILES_BASE
+        "src/source/Common/*.c"
+    )
+
+    file(GLOB KVS_COMMON_SOURCE_FILES_LWS
+        "src/source/Common/Lws/*.c"
+    )
+
+    file(GLOB KVS_COMMON_SOURCE_FILES_CURL
+        "src/source/Common/Curl/*.c"
+    )
+
+    file(GLOB PRODUCER_C_SOURCE_FILES
+        "src/source/*.c"
+    )
+
+    file(GLOB PIC_HEADERS
+        "${KINESIS_VIDEO_PIC_SRC}/src/*/include"
+    )
+
+    include_directories(${PIC_HEADERS})
+    include_directories(${KINESIS_VIDEO_PRODUCER_C_SRC}/src/include)
     include_directories(${OPEN_SRC_INCLUDE_DIRS})
-    include_directories(${KVS_JSMN_ROOT}/include)
+    include_directories(${KINESIS_VIDEO_OPEN_SOURCE_SRC}/include)
+
+    add_subdirectory(${KINESIS_VIDEO_PIC_SRC} ./kvspic EXCLUDE_FROM_ALL)
 
-    add_library(kvsproducerc SHARED ${PRODUCER_C_SOURCE_FILES})
+    if(BUILD_COMMON_LWS)
+        add_library(kvsCommonLws STATIC ${KVS_COMMON_SOURCE_FILES_BASE} ${KVS_COMMON_SOURCE_FILES_LWS})
+        target_compile_definitions(kvsCommonLws PRIVATE KVS_BUILD_WITH_LWS=1)
+        target_link_libraries(kvsCommonLws
+                ${Jsmn}
+                ${OPENSSL_CRYPTO_LIBRARY}
+                ${OPENSSL_SSL_LIBRARY}
+                ${LIBWEBSOCKET_LIBRARIES})
+    endif()
 
-    target_link_libraries(kvsproducerc
-            ${KvsPic}
+    # producer only uses curl right now
+    add_library(kvsCommonCurl STATIC ${KVS_COMMON_SOURCE_FILES_BASE} ${KVS_COMMON_SOURCE_FILES_CURL})
+    target_compile_definitions(kvsCommonCurl PRIVATE KVS_BUILD_WITH_CURL=1)
+    target_link_libraries(kvsCommonCurl
             ${Jsmn}
-            ${PRODUCER_C_LIBRARIES})
+            ${OPENSSL_CRYPTO_LIBRARY}
+            ${OPENSSL_SSL_LIBRARY}
+            ${CURL_LIBRARIES})
+
+    add_library(cproducer SHARED ${PRODUCER_C_SOURCE_FILES})
+
+    target_link_libraries(cproducer
+        kvspic
+        kvsCommonCurl)
 
     add_executable(kvsVideoOnlyStreamingSample ${KINESIS_VIDEO_PRODUCER_C_SRC}/samples/KvsVideoOnlyStreamingSample.c)
     target_link_libraries(kvsVideoOnlyStreamingSample
-            kvsproducerc)
+        cproducer)
 
     if (BUILD_TEST)
         add_subdirectory(tst)
     endif()
-
-    install(TARGETS kvsproducerc
-            DESTINATION ${KVS_INSTALL_PATH})
-    install(TARGETS kvsVideoOnlyStreamingSample
-            DESTINATION ${KVS_INSTALL_PATH})
 endif()

kinesis-video-c-producer/samples/KvsVideoOnlyStreamingSample.c

@@ -1,6 +1,5 @@
 #include <com/amazonaws/kinesis/video/cproducer/Include.h>
 
-#define DEFAULT_AWS_REGION                  (PCHAR) "us-west-2"
 #define DEFAULT_RETENTION_PERIOD            2 * HUNDREDS_OF_NANOS_IN_AN_HOUR
 #define DEFAULT_BUFFER_DURATION             120 * HUNDREDS_OF_NANOS_IN_A_SECOND
 #define DEFAULT_CALLBACK_CHAIN_COUNT        5
@@ -38,6 +37,9 @@ STATUS readFrameData(PFrame pFrame, PCHAR frameFilePath)
     return retStatus;
 }
 
+// Forward declaration of the default thread sleep function
+VOID defaultThreadSleep(UINT64);
+
 INT32 main(INT32 argc, CHAR *argv[])
 {
     PDeviceInfo pDeviceInfo = NULL;

kinesis-video-c-producer/src/CMakeLists.txt

@@ -4,17 +4,20 @@ project(KinesisVideoProducerC LANGUAGES C)
 
 file(GLOB_RECURSE HEADERS "include/*.h")
 file(GLOB_RECURSE SOURCE "source/*.cpp")
-file(GLOB_RECURSE SOURCE "source/*.c")
+file(GLOB SOURCE "source/*.c")
+file(GLOB SOURCE_COMMON "source/Common/*.c")
+file(GLOB SOURCE_COMMON_CURL "source/Common/Curl/*.c")
 
 set(INCLUDES_PATH "${CMAKE_CURRENT_SOURCE_DIR}/include/")
 include_directories(${INCLUDES_PATH})
 include_directories(${BP_BUILD_INCLUDE_DIRS})
 link_directories(${BP_BUILD_LIB})
 get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
 
-add_library(${PROJECT_NAME} SHARED ${HEADERS} ${SOURCE})
+add_library(${PROJECT_NAME} SHARED ${HEADERS} ${SOURCE} ${SOURCE_COMMON} ${SOURCE_COMMON_CURL})
+target_compile_definitions(${PROJECT_NAME} PRIVATE KVS_BUILD_WITH_CURL=1)
 target_link_libraries(${PROJECT_NAME} ${BP_BUILD_LIB_DIRS}
-  client heap trace view mkvgen utils curl crypto ssl jsmn)
+  client heap trace view mkvgen state utils curl crypto ssl jsmn)
 
 install(TARGETS ${PROJECT_NAME} DESTINATION lib)
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/