- Windows build improvements + minor fixes (nothing critical, just to be on the safe side)

src/CMakeLists.txt

@@ -16,15 +16,13 @@ option (USE_MUSL        "Build with MUSL library"               OFF)
 set (CMAKE_POSITION_INDEPENDENT_CODE ON)
 set (RUNTIME_CPU_CAPABILITY_DETECTION ON)
 
-set (LIB_PLATFORM ${CMAKE_CURRENT_SOURCE_DIR}/libs/libraries)
-#include (${LIB_PLATFORM}/platform_libs.cmake)
+find_package(OpenSSL REQUIRED)
+set (OPENSSL_SSL OpenSSL::SSL)
+set (OPENSSL_CRYPTO OpenSSL::Crypto)
 
-
-message("Libraries: ${LIB_PLATFORM}")
-# set (OPENSSL_INCLUDE ${LIB_PLATFORM}/openssl/1.1/include)
 message ("Using OpenSSL include files from ${OPENSSL_INCLUDE}")
 message ("Using OpenSSL libs: ${OPENSSL_SSL} and ${OPENSSL_CRYPTO}")
-include_directories(${OPENSSL_INCLUDE})
+# include_directories(${OPENSSL_INCLUDE})
 
 # Used defines for our project
 set (DEFINES -DUSE_OPENSSL)

src/engine/helper/HL_Sync.cpp

@@ -110,13 +110,13 @@ timespec chronox::toTimespec(uint64_t milliseconds)
 
 uint64_t chronox::toTimestamp(const timeval& ts)
 {
-    return ts.tv_sec * 1000 + ts.tv_usec / 1000;
+    return (uint64_t)ts.tv_sec * 1000 + ts.tv_usec / 1000;
 }
 
 int64_t chronox::getDelta(const timespec& a, const timespec& b)
 {
-    uint64_t ms_a = a.tv_sec * 1000 + a.tv_nsec / 10000000;
-    uint64_t ms_b = b.tv_sec * 1000 + b.tv_nsec / 10000000;
+    uint64_t ms_a = (uint64_t)a.tv_sec * 1000 + a.tv_nsec / 10000000;
+    uint64_t ms_b = (uint64_t)b.tv_sec * 1000 + b.tv_nsec / 10000000;
     return ms_a - ms_b;
 }
 

src/engine/media/MT_AmrCodec.cpp

@@ -626,7 +626,7 @@ int AmrWbCodec::decodePlain(std::span<const uint8_t> input, std::span<uint8_t> o
     size_t dataOutSizeInBytes = 0;
     for (AmrFrame& frame: ap.mFrames)
     {
-        memset(dataOut, 0, static_cast<size_t>(pcmLength()));
+        memset(dataOut, 0, static_cast<size_t>(output.size()));
 
         if (frame.mData)
         {