Add LZO support for MP2 audio groups

CMakeLists.txt

@@ -74,7 +74,7 @@ set(HEADERS
 unset(EXTRAS)
 if(TARGET boo)
   include_directories(${BOO_INCLUDE_DIR} ${BOO_INCLUDE_DIR}/../lib ${BOO_INCLUDE_DIR}/../soxr/src
-                      ${LOGVISOR_INCLUDE_DIR} ${ATHENA_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
+                      ${LOGVISOR_INCLUDE_DIR} ${ATHENA_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${LZO_INCLUDE_DIR})
   list(APPEND EXTRAS lib/BooBackend.cpp include/amuse/BooBackend.hpp)
 endif()
 
@@ -97,13 +97,13 @@ if(TARGET boo)
 
   # Player
   add_executable(amuseplay WIN32 driver/amuseplay.cpp)
-  target_link_libraries(amuseplay amuse boo ${BOO_SYS_LIBS} logvisor athena-core ${ZLIB_LIBRARIES})
+  target_link_libraries(amuseplay amuse boo ${BOO_SYS_LIBS} logvisor athena-core ${ZLIB_LIBRARIES} ${LZO_LIB})
 
   # Converter
   add_executable(amuseconv driver/amuseconv.cpp)
-  target_link_libraries(amuseconv amuse ${BOO_SYS_LIBS} logvisor athena-core ${ZLIB_LIBRARIES})
+  target_link_libraries(amuseconv amuse ${BOO_SYS_LIBS} logvisor athena-core ${ZLIB_LIBRARIES} ${LZO_LIB})
 
   # Renderer
   add_executable(amuserender driver/amuserender.cpp)
-  target_link_libraries(amuserender amuse boo ${BOO_SYS_LIBS} logvisor athena-core ${ZLIB_LIBRARIES})
+  target_link_libraries(amuserender amuse boo ${BOO_SYS_LIBS} logvisor athena-core ${ZLIB_LIBRARIES} ${LZO_LIB})
 endif()

include/amuse/Common.hpp

@@ -9,9 +9,18 @@
 #include <string>
 #include <cstring>
 
-#ifndef _MSC_VER
+#ifndef _WIN32
 #include <strings.h>
 #include <sys/stat.h>
+#include <unistd.h>
+#else
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <Windows.h>
 #endif
 
 namespace amuse
@@ -186,6 +195,15 @@ static inline FILE* FOpen(const SystemChar* path, const SystemChar* mode)
     return fp;
 }
 
+static inline void Unlink(const SystemChar* file)
+{
+#if _WIN32
+    _wunlink(file);
+#else
+    unlink(file);
+#endif
+}
+
 #undef bswap16
 #undef bswap32
 #undef bswap64

lib/ContainerRegistry.cpp

@@ -6,6 +6,7 @@
 #include <memory>
 #include <unordered_map>
 #include <zlib.h>
+#include <lzo/lzo1x.h>
 
 #if _WIN32
 #define WIN32_LEAN_AND_MEAN
@@ -420,9 +421,6 @@ static std::vector<std::pair<SystemString, ContainerRegistry::SongData>> LoadMP1
 
 static bool ValidateMP2(FILE* fp)
 {
-    if (FileLength(fp) > 40 * 1024 * 1024)
-        return false;
-
     uint32_t magic;
     fread(&magic, 1, 4, fp);
     magic = SBig(magic);
@@ -448,7 +446,8 @@ static bool ValidateMP2(FILE* fp)
         resCount = SBig(resCount);
         for (uint32_t i = 0; i < resCount; ++i)
         {
-            FSeek(fp, 4, SEEK_CUR);
+            uint32_t compressed;
+            fread(&compressed, 1, 4, fp);
             uint32_t type;
             fread(&type, 1, 4, fp);
             type = SBig(type);
@@ -462,13 +461,28 @@ static bool ValidateMP2(FILE* fp)
                 int64_t origPos = FTell(fp);
                 FSeek(fp, offset, SEEK_SET);
                 char testBuf[4];
-                if (fread(testBuf, 1, 4, fp) == 4)
+                if (!compressed)
                 {
-                    if (amuse::SBig(*reinterpret_cast<uint32_t*>(testBuf)) == 0x1)
+                    if (fread(testBuf, 1, 4, fp) != 4)
-                        return true;
-                    else
                         return false;
                 }
+                else
+                {
+                    FSeek(fp, 4, SEEK_CUR);
+                    uint16_t chunkSz;
+                    fread(&chunkSz, 1, 2, fp);
+                    chunkSz = SBig(chunkSz);
+                    uint8_t compBuf[0x8000];
+                    uint8_t destBuf[0x8000 * 2];
+                    fread(compBuf, 1, chunkSz, fp);
+                    lzo_uint dsz = 0x8000 * 2;
+                    lzo1x_decompress(compBuf, chunkSz, destBuf, &dsz, nullptr);
+                    memcpy(testBuf, destBuf, 4);
+                }
+                if (amuse::SBig(*reinterpret_cast<uint32_t*>(testBuf)) == 0x1)
+                    return true;
+                else
+                    return false;
                 FSeek(fp, origPos, SEEK_SET);
             }
         }
@@ -508,7 +522,8 @@ static std::vector<std::pair<SystemString, IntrusiveAudioGroupData>> LoadMP2(FIL
         ret.reserve(resCount);
         for (uint32_t i = 0; i < resCount; ++i)
         {
-            FSeek(fp, 4, SEEK_CUR);
+            uint32_t compressed;
+            fread(&compressed, 1, 4, fp);
             uint32_t type;
             fread(&type, 1, 4, fp);
             type = SBig(type);
@@ -522,6 +537,33 @@ static std::vector<std::pair<SystemString, IntrusiveAudioGroupData>> LoadMP2(FIL
                 int64_t origPos = FTell(fp);
                 FSeek(fp, offset, SEEK_SET);
                 char testBuf[4];
+                FILE* old_fp = fp;
+                if (compressed)
+                {
+                    fprintf(stderr, "Decompressing...\n");
+                    uint32_t decompSz;
+                    fread(&decompSz, 1, 4, fp);
+                    decompSz = SBig(decompSz);
+                    uint8_t compBuf[0x8000];
+                    uint8_t* buf = new uint8_t[decompSz];
+                    uint8_t* bufCur = buf;
+                    uint32_t rem = decompSz;
+                    while (rem)
+                    {
+                        uint16_t chunkSz;
+                        fread(&chunkSz, 1, 2, fp);
+                        chunkSz = SBig(chunkSz);
+                        fread(compBuf, 1, chunkSz, fp);
+                        lzo_uint dsz = rem;
+                        lzo1x_decompress(compBuf, chunkSz, bufCur, &dsz, nullptr);
+                        bufCur += dsz;
+                        rem -= dsz;
+                    }
+
+                    fp = FOpen(_S("amuse_tmp.dat"), _S("r+"));
+                    fwrite(buf, 1, decompSz, fp);
+                    rewind(fp);
+                }
                 if (fread(testBuf, 1, 4, fp) == 4)
                 {
                     if (amuse::SBig(*reinterpret_cast<uint32_t*>(testBuf)) == 0x1)
@@ -567,6 +609,8 @@ static std::vector<std::pair<SystemString, IntrusiveAudioGroupData>> LoadMP2(FIL
                         }
                     }
                 }
+                Unlink(_S("amuse_tmp.dat"));
+                fp = old_fp;
                 FSeek(fp, origPos, SEEK_SET);
             }
         }