[Utils] Add HvccToAnnexb method

xbmc · Nov 12, 2024 · 56b683f · 56b683f
1 parent a1a28e0
commit 56b683f
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 1 deletion.
diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp
@@ -11,7 +11,6 @@
 #include "Base64Utils.h"
 #include "StringUtils.h"
 #include "log.h"
-#include "kodi/tools/StringUtils.h"
 
 #include <algorithm> // any_of
 #include <chrono>
@@ -21,6 +20,63 @@
 using namespace UTILS;
 using namespace kodi::tools;
 
+std::vector<uint8_t> UTILS::HvccToAnnexb(const std::vector<uint8_t>& hvcc)
+{
+  if (hvcc.size() < 23)
+  {
+    LOG::LogF(LOGERROR, "Cannot convert HVCC data, wrong data size");
+    return {};
+  }
+
+  std::vector<uint8_t> result;
+  const uint8_t* data = hvcc.data() + 22; // Start after length field
+  const uint8_t* end = hvcc.data() + hvcc.size();
+  uint8_t numSequences = *data++;
+
+  for (uint8_t i = 0; i < numSequences; ++i)
+  {
+    if (data + 2 > end)
+    {
+      LOG::LogF(LOGERROR, "Cannot convert HVCC data, wrong data size");
+      return {};
+    }
+
+    uint8_t nalType = (*data++ << 1);
+    uint16_t numNals = (data[0] << 8) | data[1];
+    data += 2;
+
+    for (uint16_t j = 0; j < numNals; ++j)
+    {
+      if (data + 2 > end)
+      {
+        LOG::LogF(LOGERROR, "Cannot convert HVCC data, wrong data size");
+        return {};
+      }
+
+      uint16_t nalSize = (data[0] << 8) | data[1];
+      data += 2;
+
+      if (data + nalSize > end)
+      {
+        LOG::LogF(LOGERROR, "Cannot convert HVCC data, wrong data size");
+        return {};
+      }
+
+      // Add Annex B start code
+      result.push_back(0x00);
+      result.push_back(0x00);
+      result.push_back(0x00);
+      result.push_back(0x01);
+
+      // Copy NAL data
+      result.insert(result.end(), data, data + nalSize);
+      data += nalSize;
+    }
+  }
+
+  return result;
+}
+
 std::vector<uint8_t> UTILS::AnnexbToHvcc(const std::vector<uint8_t>& annexb)
 {
   std::vector<uint8_t> result;

diff --git a/src/utils/Utils.h b/src/utils/Utils.h
@@ -22,6 +22,7 @@ constexpr uint8_t DEFAULT_KEYID[16]{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 // Placeholder for unknown AP4_Track id
 constexpr uint32_t AP4_TRACK_ID_UNKNOWN = -1;
 
+std::vector<uint8_t> HvccToAnnexb(const std::vector<uint8_t>& hvcc);
 std::vector<uint8_t> AnnexbToHvcc(const std::vector<uint8_t>& annexb);
 std::vector<uint8_t> AnnexbToAvc(const std::vector<uint8_t>& annexb);
 bool IsAnnexB(const std::vector<uint8_t>& data);