[Audio/WavLoad] Ignoring all unsupported WAV chunks

Razakhel · Jan 7, 2025 · 7a32866 · 7a32866
1 parent c8544a0
commit 7a32866
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 26 deletions.
diff --git a/include/RaZ/Utils/StrUtils.hpp b/include/RaZ/Utils/StrUtils.hpp
@@ -367,7 +367,7 @@ inline std::vector<std::wstring> split(std::wstring text, wchar_t delimiter) {
   return parts;
 }
 
-/// Converts a wide string to an UTF-8 encoded one.
+/// Converts a wide string to a UTF-8 encoded one.
 /// \param text Wide string to convert.
 /// \return Converted UTF-8 string.
 inline std::string toUtf8(const std::wstring& text) {
@@ -385,7 +385,7 @@ constexpr const std::string& toUtf8(const std::string& text) {
   return text;
 }
 
-/// Converts an UTF-8 encoded string to a wide one.
+/// Converts a UTF-8 encoded string to a wide one.
 /// \param text UTF-8 string to convert.
 /// \return Converted wide string.
 inline std::wstring toWide(const std::string& text) {

diff --git a/src/RaZ/Data/WavLoad.cpp b/src/RaZ/Data/WavLoad.cpp
@@ -81,7 +81,7 @@ inline WavInfo validateWav(std::ifstream& file) {
   // 80: MPEG
 
   if (info.audioFormat != 1)
-    Logger::warn("Only WAV files with a PCM format are supported.");
+    Logger::warn("[WavLoad] Only WAV files with a PCM format are supported.");
 
   file.read(reinterpret_cast<char*>(bytes.data()), 2); // Channel count
   info.channelCount = fromLittleEndian(bytes[0], bytes[1]);
@@ -104,42 +104,26 @@ inline WavInfo validateWav(std::ifstream& file) {
   file.read(reinterpret_cast<char*>(bytes.data()), 2); // Bits per sample (bit depth)
   info.bitsPerSample = fromLittleEndian(bytes[0], bytes[1]);
 
-  if (info.audioFormat == 0)
-    Logger::warn("Failed to recover the WAV sound format.");
-
   ////////////////
   // Data block //
   ////////////////
 
   file.read(reinterpret_cast<char*>(bytes.data()), 4); // Supposed to be 'data'
 
-  // A 'cue ' field can be specified; if so, the given amount of bytes will be ignored
-  // See: https://sites.google.com/site/musicgapi/technical-documents/wav-file-format#cue
-  if (bytes[0] == 'c' && bytes[1] == 'u' && bytes[2] == 'e' && bytes[3] == ' ') {
-    file.read(reinterpret_cast<char*>(bytes.data()), 4); // Cue data size
-
-    const uint32_t cueDataSize = fromLittleEndian(bytes);
-    file.ignore(cueDataSize);
-
-    file.read(reinterpret_cast<char*>(bytes.data()), 4);
-  }
-
-  // A 'LIST' field can be specified; if so, the given amount of bytes will be ignored
+  // Additional chunks can be present (such as 'cue ', 'LIST', 'bext' and others), which aren't supported there. They must be skipped
   // See:
-  // - https://sites.google.com/site/musicgapi/technical-documents/wav-file-format#list
   // - https://en.wikipedia.org/wiki/WAV#RIFF_WAVE
-  if (bytes[0] == 'L' && bytes[1] == 'I' && bytes[2] == 'S' && bytes[3] == 'T') {
-    file.read(reinterpret_cast<char*>(bytes.data()), 4); // List data size
+  // - https://en.wikipedia.org/wiki/Broadcast_Wave_Format#Details
+  // - https://stackoverflow.com/a/76137824/3292304
+  while (bytes[0] != 'd' && bytes[1] != 'a' && bytes[2] != 't' && bytes[3] != 'a') {
+    file.read(reinterpret_cast<char*>(bytes.data()), 4); // Reading the chunk size
 
-    const uint32_t listDataSize = fromLittleEndian(bytes);
-    file.ignore(listDataSize);
+    const uint32_t chunkSize = fromLittleEndian(bytes);
+    file.ignore(chunkSize);
 
     file.read(reinterpret_cast<char*>(bytes.data()), 4);
   }
 
-  if (bytes[0] != 'd' && bytes[1] != 'a' && bytes[2] != 't' && bytes[3] != 'a')
-    return info;
-
   file.read(reinterpret_cast<char*>(bytes.data()), 4); // Data size (file size - header size (theoretically 44 bytes))
   info.dataSize = fromLittleEndian(bytes);