Build optimizations

Author: hassanctech

.github/workflows/ci.yml

@@ -15,6 +15,8 @@ jobs:
     runs-on: macos-13
     env:
       AWS_KVS_LOG_LEVEL: 2
+      CC: /usr/bin/clang
+      CXX: /usr/bin/clang++
     permissions:
       id-token: write
       contents: read

CMake/Dependencies/libautoconf-CMakeLists.txt

@@ -1,48 +1,36 @@
 cmake_minimum_required(VERSION 3.6.3)
-find_program(MAKE_EXE NAMES make)
-
 project(log4cplus-download NONE)
 
-set(BUILD_SHARED_LIBS 1)
+set(BUILD_SHARED_LIBS ON)
 if (BUILD_STATIC)
-    set(BUILD_SHARED_LIBS 0)
-    set(CONFIGURE_STATIC --disable-shared --enable-static)
-endif()
-
-if (DEFINED BUILD_LOG4CPLUS_HOST AND NOT BUILD_LOG4CPLUS_HOST STREQUAL OFF)
-  SET(CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_log4cplus/configure "CFLAGS=${CMAKE_C_FLAGS}" --prefix=${OPEN_SRC_INSTALL_PREFIX} ${CONFIGURE_STATIC} --host=${BUILD_LOG4CPLUS_HOST})
-else()
-  SET(CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_log4cplus/configure "CFLAGS=${CMAKE_C_FLAGS}" --prefix=${OPEN_SRC_INSTALL_PREFIX} ${CONFIGURE_STATIC})
+  set(BUILD_SHARED_LIBS OFF)
 endif()
 
-if (DEFINED CMAKE_OSX_SYSROOT AND NOT CMAKE_OSX_SYSROOT STREQUAL "")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -isysroot${CMAKE_OSX_SYSROOT}")
+set(EXTRA_CMAKE_ARGS "")
+if (DEFINED BUILD_LOG4CPLUS_HOST AND NOT BUILD_LOG4CPLUS_HOST STREQUAL "OFF")
+  list(APPEND EXTRA_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=${BUILD_LOG4CPLUS_HOST}")
 endif()
 
-
 include(ExternalProject)
 
 if (WIN32)
-  ExternalProject_Add(project_log4cplus
-      GIT_REPOSITORY    https://github.com/log4cplus/log4cplus
-      GIT_TAG           REL_2_0_1
-      GIT_SHALLOW       TRUE
-      GIT_PROGRESS      TRUE
-      PREFIX            ${CMAKE_CURRENT_BINARY_DIR}/build
-      TEST_COMMAND      ""
-      CMAKE_ARGS        -DCMAKE_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX} -DLOG4CPLUS_BUILD_TESTING=0 -DLOG4CPLUS_BUILD_LOGGINGSERVER=0 -DUNICODE=0 -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
-  )
-else()
-  ExternalProject_Add(project_log4cplus
-       GIT_REPOSITORY    https://github.com/log4cplus/log4cplus
-       GIT_TAG           REL_2_0_1
-       GIT_SHALLOW       TRUE
-       GIT_PROGRESS      TRUE
-       PREFIX            ${CMAKE_CURRENT_BINARY_DIR}/build
-       CONFIGURE_COMMAND ${CONFIGURE_COMMAND}
-       BUILD_COMMAND     ${MAKE_EXE}
-       BUILD_IN_SOURCE   TRUE
-       INSTALL_COMMAND   ${MAKE_EXE} install
-       TEST_COMMAND      ""
-  )
+  list(APPEND EXTRA_CMAKE_ARGS "-DUNICODE=0")
 endif()
+
+ExternalProject_Add(project_log4cplus
+  GIT_REPOSITORY    https://github.com/log4cplus/log4cplus
+  GIT_TAG           REL_2_1_2
+  GIT_SHALLOW       TRUE
+  GIT_PROGRESS      TRUE
+  PREFIX            ${CMAKE_CURRENT_BINARY_DIR}/build
+  CMAKE_ARGS
+    -DCMAKE_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX}
+    -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+    -DLOG4CPLUS_ENABLE_THREAD_POOL=OFF
+    -DLOG4CPLUS_BUILD_TESTING=OFF
+    -DLOG4CPLUS_BUILD_LOGGINGSERVER=OFF
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    ${EXTRA_CMAKE_ARGS}
+  BUILD_ALWAYS      TRUE
+  TEST_COMMAND      ""
+)

CMake/Dependencies/libautomake-CMakeLists.txt

@@ -36,6 +36,7 @@ find_path(LOG4CPLUS_INCLUDE_DIR
 find_library(LOG4CPLUS_LIBRARY
   NAMES
     log4cplus
+    log4cplusS
   PATHS
     /usr/local
     /usr

CMake/Dependencies/liblog4cplus-CMakeLists.txt

@@ -39,9 +39,6 @@ endfunction()
 # build library from source
 function(build_dependency lib_name)
   set(supported_libs
-      autoconf
-      automake
-      kvspic
       log4cplus)
   list(FIND supported_libs ${lib_name} index)
   if(${index} EQUAL -1)
@@ -51,24 +48,12 @@ function(build_dependency lib_name)
 
   set(target_found NOTFOUND)
 
-  if (${lib_name} STREQUAL "autoconf" OR ${lib_name} STREQUAL "automake")
-    find_program(
-      target_found
-      NAMES ${lib_name}
-      PATHS ${OPEN_SRC_INSTALL_PREFIX}/bin
-      NO_DEFAULT_PATH)
-  else()
-    set(lib_file_name ${lib_name})
-    if (${lib_name} STREQUAL "openssl")
-      set(lib_file_name ssl)
-    endif()
+  set(lib_file_name ${lib_name})
 
-    find_library(
-      target_found
+  find_library(target_found
       NAMES ${lib_file_name}
       PATHS ${OPEN_SRC_INSTALL_PREFIX}/lib
       NO_DEFAULT_PATH)
-  endif()
 
   if(target_found)
     message(STATUS "${lib_name} already built")

CMake/FindLog4cplus.cmake

@@ -74,10 +74,6 @@ if(NOT BUILD_JNI_ONLY)
 
 
     message(STATUS "Begin building dependencies.")
-    if (NOT WIN32)
-      build_dependency(autoconf)
-      build_dependency(automake)
-    endif()
 
     if(BUILD_LOG4CPLUS_HOST)
       set(BUILD_ARGS -DBUILD_LOG4CPLUS_HOST=${BUILD_LOG4CPLUS_HOST})
@@ -89,12 +85,6 @@ if(NOT BUILD_JNI_ONLY)
     message(STATUS "Finished building dependencies.")
   endif()
 
-  set(BUILD_COMMON_LWS
-      FALSE
-      CACHE BOOL "Build ProducerC without LWS Support" FORCE)
-  set(BUILD_COMMON_CURL
-      TRUE
-      CACHE BOOL "Build ProducerC with CURL Support" FORCE)
   set(DEPENDENCY_DOWNLOAD_PATH ${CMAKE_CURRENT_SOURCE_DIR}/dependency)
   if(NOT EXISTS ${DEPENDENCY_DOWNLOAD_PATH})
     file(MAKE_DIRECTORY ${DEPENDENCY_DOWNLOAD_PATH})
@@ -107,26 +97,18 @@ if(NOT BUILD_JNI_ONLY)
   find_package(Threads)
   find_package(PkgConfig REQUIRED)
 
-  if (OPEN_SRC_INSTALL_PREFIX)
-    find_package(CURL REQUIRED PATHS ${OPEN_SRC_INSTALL_PREFIX})
-  else()
-    find_package(CURL REQUIRED)
-  endif()
-
-  set(OPEN_SRC_INCLUDE_DIRS ${OPEN_SRC_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS})
-  link_directories(${CURL_LIBRARY_DIRS})
-
   if (WIN32)
     find_package(Log4cplus
       NAMES log4cplus REQUIRED
       PATHS ${OPEN_SRC_INSTALL_PREFIX}/lib)
-    SET(Log4cplus "log4cplus::log4cplus")
+    SET(LOG4CPLUS_LIBRARIES "log4cplus::log4cplus")
   else()
     find_package(Log4cplus REQUIRED)
-    include_directories(${LOG4CPLUS_INCLUDE_DIR})
-    set(Log4cplus ${LOG4CPLUS_LIBRARIES})
   endif()
 
+  message("LOG4CPLUS_INCLUDE_DIR is ${LOG4CPLUS_INCLUDE_DIR}")
+  message("LOG4CPLUS_LIBRARIES is ${LOG4CPLUS_LIBRARIES}")
+
   if (WIN32)
     if(EXISTS "C:\\gstreamer\\1.0\\msvc_x86_64\\bin\\pkg-config.exe")
       set(PKG_CONFIG_EXECUTABLE "C:\\gstreamer\\1.0\\msvc_x86_64\\bin\\pkg-config.exe")
@@ -183,19 +165,20 @@ include_directories(${KINESIS_VIDEO_PRODUCER_CPP_SRC}/src)
 include_directories(${KINESIS_VIDEO_PRODUCER_CPP_SRC}/src/credential-providers)
 include_directories(${KINESIS_VIDEO_PRODUCER_CPP_SRC}/src/common)
 include_directories(${KINESIS_VIDEO_PRODUCER_CPP_SRC}/src/JNI/include)
+include_directories(${LOG4CPLUS_INCLUDE_DIR})
 
 if (NOT BUILD_JNI_ONLY)
   install(
     DIRECTORY ${KINESIS_VIDEO_PRODUCER_CPP_SRC}/src
     DESTINATION .)
 
+  link_directories(${OPEN_SRC_INSTALL_PREFIX}/lib)
+
   add_library(KinesisVideoProducer ${LINKAGE} ${PRODUCER_CPP_SOURCE_FILES})
   target_link_libraries(
     KinesisVideoProducer
-    PUBLIC kvsCommonCurl
-           cproducer
-           ${Log4cplus}
-           ${LIBCURL_LIBRARIES})
+    PUBLIC cproducer
+           ${LOG4CPLUS_LIBRARIES})
 
   install(
       TARGETS KinesisVideoProducer
@@ -226,28 +209,29 @@ if(BUILD_GSTREAMER_PLUGIN)
   pkg_check_modules(GST_APP REQUIRED gstreamer-app-1.0)
   include_directories(${GST_APP_INCLUDE_DIRS})
   link_directories(${GST_APP_LIBRARY_DIRS})
+  include_directories(${OPEN_SRC_INSTALL_PREFIX}/include)
 
   if(BUILD_STATIC)
     add_library(gstkvssink STATIC ${GST_PLUGIN_SOURCE_FILES})
   else()
     add_library(gstkvssink MODULE ${GST_PLUGIN_SOURCE_FILES})
   endif()
-  target_link_libraries(gstkvssink PRIVATE ${GST_APP_LIBRARIES} KinesisVideoProducer)
+  target_link_libraries(gstkvssink PRIVATE ${LOG4CPLUS_LIBRARIES} ${GST_APP_LIBRARIES} KinesisVideoProducer)
 
   add_executable(kvssink_gstreamer_sample samples/kvssink_gstreamer_sample.cpp)
-  target_link_libraries(kvssink_gstreamer_sample ${GST_APP_LIBRARIES} KinesisVideoProducer)
+  target_link_libraries(kvssink_gstreamer_sample ${LOG4CPLUS_LIBRARIES} ${GST_APP_LIBRARIES} kvspic)
 
   add_executable(kvs_gstreamer_sample samples/kvs_gstreamer_sample.cpp)
-  target_link_libraries(kvs_gstreamer_sample ${GST_APP_LIBRARIES} KinesisVideoProducer kvspic)
+  target_link_libraries(kvs_gstreamer_sample ${LOG4CPLUS_LIBRARIES} ${GST_APP_LIBRARIES} KinesisVideoProducer kvspic)
 
   add_executable(kvs_gstreamer_multistream_sample samples/kvs_gstreamer_multistream_sample.cpp)
-  target_link_libraries(kvs_gstreamer_multistream_sample ${GST_APP_LIBRARIES} KinesisVideoProducer)
+  target_link_libraries(kvs_gstreamer_multistream_sample ${LOG4CPLUS_LIBRARIES} ${GST_APP_LIBRARIES} KinesisVideoProducer)
 
   add_executable(kvs_gstreamer_audio_video_sample samples/kvs_gstreamer_audio_video_sample.cpp)
-  target_link_libraries(kvs_gstreamer_audio_video_sample ${GST_APP_LIBRARIES} KinesisVideoProducer)
+  target_link_libraries(kvs_gstreamer_audio_video_sample ${LOG4CPLUS_LIBRARIES} ${GST_APP_LIBRARIES} KinesisVideoProducer)
 
   add_executable(kvs_gstreamer_file_uploader_sample samples/kvs_gstreamer_file_uploader_sample.cpp)
-  target_link_libraries(kvs_gstreamer_file_uploader_sample ${GST_APP_LIBRARIES})
+  target_link_libraries(kvs_gstreamer_file_uploader_sample ${LOG4CPLUS_LIBRARIES} ${GST_APP_LIBRARIES})
 endif()
 
 if(BUILD_TEST)

CMake/Utilities.cmake

@@ -2,7 +2,6 @@
 #include <string.h>
 #include <chrono>
 #include <Logger.h>
-#include "KinesisVideoProducer.h"
 #include <vector>
 #include <stdlib.h>
 #include <mutex>
@@ -58,12 +57,10 @@ typedef struct _CustomData {
             first_pts(GST_CLOCK_TIME_NONE),
             use_absolute_fragment_times(true),
             max_runtime(0)	{
-        producer_start_time = chrono::duration_cast<nanoseconds>(systemCurrentTime().time_since_epoch()).count();
+        producer_start_time = chrono::duration_cast<nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
     }
 
     GMainLoop *main_loop;
-    unique_ptr<KinesisVideoProducer> kinesis_video_producer;
-    shared_ptr<KinesisVideoStream> kinesis_video_stream;
     bool stream_started;
     bool h264_stream_supported;
     char *stream_name;