From 7aadde3a0913f9dcf74ed814a0aaac9d162acf5d Mon Sep 17 00:00:00 2001
From: Dmytro Bogovych <dmytro.bogovych@gmail.com>
Date: Tue, 20 Aug 2024 19:15:28 +0300
Subject: [PATCH] - fixes to handle codec configs properly

---
 src/engine/helper/HL_Uuid.cpp   | 56 ++++++---------------------------
 src/engine/helper/HL_Uuid.h     | 34 +++++---------------
 src/engine/media/MT_CodecList.h |  8 ++---
 3 files changed, 21 insertions(+), 77 deletions(-)

diff --git a/src/engine/helper/HL_Uuid.cpp b/src/engine/helper/HL_Uuid.cpp
index ad02a678..5393ebdb 100644
--- a/src/engine/helper/HL_Uuid.cpp
+++ b/src/engine/helper/HL_Uuid.cpp
@@ -1,23 +1,20 @@
 #include "HL_Uuid.h"
 #include <memory.h>
+#include <random>
+#include "uuid_v4.h"
 
 Uuid::Uuid()
 {
-#if defined(TARGET_WIN) || defined(TARGET_LINUX) || defined(TARGET_OSX)
     memset(&mUuid, 0, sizeof mUuid);
-#endif
 }
 
 Uuid Uuid::generateOne()
 {
     Uuid result;
 #if !defined(USE_NULL_UUID)
-#if defined(TARGET_LINUX) || defined(TARGET_OSX)
-    uuid_generate(result.mUuid);
-#endif
-#if defined(TARGET_WIN)
-    UuidCreate(&result.mUuid);
-#endif
+    UUIDv4::UUIDGenerator<std::mt19937_64> generatorUUID;
+    auto r = generatorUUID.getUUID();
+    r.bytes((char*)result.mUuid);
 #endif
     return result;
 }
@@ -25,53 +22,20 @@ Uuid Uuid::generateOne()
 Uuid Uuid::parse(const std::string &s)
 {
     Uuid result;
-#if !defined(USE_NULL_UUID)
-#if defined(TARGET_LINUX) || defined(TARGET_OSX)
-    uuid_parse(s.c_str(), result.mUuid);
-#endif
-
-#if defined(TARGET_WIN)
-    UuidFromStringA((RPC_CSTR)s.c_str(), &result.mUuid);
-#endif
-#endif
+    UUIDv4::UUID load;
+    load.fromStr(s.c_str());
+    load.bytes((char*)result.mUuid);
     return result;
 }
 
 std::string Uuid::toString() const
 {
-#if defined(USE_NULL_UUID)
-    return "UUID_disabled";
-#else
-    char buf[64];
-
-#if defined(TARGET_LINUX) || defined(TARGET_OSX)
-    uuid_unparse_lower(mUuid, buf);
-#endif
-
-#if defined(TARGET_WIN)
-    RPC_CSTR s = nullptr;
-    UuidToStringA(&mUuid, &s);
-    if (s)
-    {
-        strcpy(buf, (const char*)s);
-        RpcStringFreeA(&s);
-        s = nullptr;
-    }
-#endif
-
-    return buf;
-#endif
+    UUIDv4::UUID load((const uint8_t*)mUuid);
+    return load.str();
 }
 
 bool Uuid::operator < (const Uuid& right) const
 {
-#if defined(TARGET_LINUX) || defined(TARGET_OSX)
     return memcmp(mUuid, right.mUuid, sizeof(mUuid)) < 0;
-#endif
-
-#if defined(TARGET_WIN)
-    return memcmp(&mUuid, &right.mUuid, sizeof(mUuid)) < 0;
-#endif
-
     return false;
 }
diff --git a/src/engine/helper/HL_Uuid.h b/src/engine/helper/HL_Uuid.h
index 205e7273..c3821583 100644
--- a/src/engine/helper/HL_Uuid.h
+++ b/src/engine/helper/HL_Uuid.h
@@ -2,39 +2,19 @@
 #define __HL_UUID_H
 
 #include <string>
-
-#if (defined(TARGET_LINUX) || defined(TARGET_OSX)) && !defined(USE_NULL_UUID)
-// Please do not forget "sudo apt install uuid-dev" on Ubuntu
-# include <uuid/uuid.h>
-#endif
-#if defined(TARGET_WIN)
-# include <rpc.h>
-#endif
+#include <stdint.h>
 
 class Uuid
 {
 public:
-  Uuid();
-  static Uuid generateOne();
-  static Uuid parse(const std::string& s);
-  std::string toString() const;
-  bool operator < (const Uuid& right) const;
+    Uuid();
+    static Uuid generateOne();
+    static Uuid parse(const std::string& s);
+    std::string toString() const;
+    bool operator < (const Uuid& right) const;
 
 protected:
-#if defined(USE_NULL_UUID)
-  unsigned char mUuid[16];
-#else
-
-#if defined(TARGET_LINUX) || defined(TARGET_OSX)
-  uuid_t mUuid;
-#endif
-#if defined(TARGET_WIN)
-  UUID mUuid;
-#endif
-#if defined(TARGET_ANDROID)
-  // Stub only
-#endif
-#endif
+    uint8_t mUuid[16];
 };
 
 
diff --git a/src/engine/media/MT_CodecList.h b/src/engine/media/MT_CodecList.h
index 71cfb739..a307a671 100644
--- a/src/engine/media/MT_CodecList.h
+++ b/src/engine/media/MT_CodecList.h
@@ -31,10 +31,10 @@ public:
         bool mSkipDecode            = false;
 
         // AMR payload types
-        std::set<int> mAmrWbPayloadType       = { MT_AMRWB_PAYLOADTYPE };
-        std::set<int> mAmrNbPayloadType       = { MT_AMRNB_PAYLOADTYPE };
-        std::set<int> mAmrWbOctetPayloadType  = { MT_AMRWB_OCTET_PAYLOADTYPE };
-        std::set<int> mAmrNbOctetPayloadType  = { MT_AMRNB_OCTET_PAYLOADTYPE };
+        std::set<int64_t> mAmrWbPayloadType       = { MT_AMRWB_PAYLOADTYPE };
+        std::set<int64_t> mAmrNbPayloadType       = { MT_AMRNB_PAYLOADTYPE };
+        std::set<int64_t> mAmrWbOctetPayloadType  = { MT_AMRWB_OCTET_PAYLOADTYPE };
+        std::set<int64_t> mAmrNbOctetPayloadType  = { MT_AMRNB_OCTET_PAYLOADTYPE };
 
         bool isAmrWb(int ptype) const { return mAmrWbOctetPayloadType.count(ptype) > 0 || mAmrWbPayloadType.count(ptype) > 0; }
         bool isAmrNb(int ptype) const { return mAmrNbOctetPayloadType.count(ptype) > 0 || mAmrNbPayloadType.count(ptype) > 0; }