Skip to content

RF64 support #454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JeromeMartinez merged 3 commits into from
May 19, 2025
Merged

RF64 support #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56658f2
RF64 support
JeromeMartinez May 18, 2025
e0aaae8
Fix int32_t to uint64_t promotion issues
JeromeMartinez May 19, 2025
a7943fd
Fix compiler warning
JeromeMartinez May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Project/GNU/CLI/test/test1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,10 @@ Formats/WAV/Features/4ExtraNullBytesInFmtChunk/4ExtraNullBytesInFmtChunk.wav pas
Formats/WAV/Features/ChannelMask/48000_24_1_LE_0x00000000.wav pass
Formats/WAV/Features/ChannelMask/48000_24_2_LE_0x00000000.wav pass
Formats/WAV/Features/ChannelMask/48000_24_6_LE_0x00000000.wav pass
Formats/WAV/Features/RF64/rf64_data_size.wav pass
Formats/WAV/Features/RF64/rf64_extra_after_RIFF.wav pass
Formats/WAV/Features/RF64/rf64_normal.wav pass
Formats/WAV/Features/RF64/rf64_tablelength.wav fail
Formats/WAV/Flavors/44100_8_1_U/44100_8_1_U.wav pass
Formats/WAV/Flavors/44100_8_2_U/44100_8_2_U.wav pass
Formats/WAV/Flavors/44100_8_4_U/44100_8_4_U.wav pass
Expand Down
2 changes: 1 addition & 1 deletion Source/CLI/Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@ int main(int argc, const char* argv[])
const string& FileName = IsTemplate ? Output.Streams[i].FileName_Template : Output.Streams[i].FileName;
#if defined(_WIN32) || defined(_WINDOWS)
auto FileName2 = FileName.substr(PrefixSize);
auto Pos = 0;
size_t Pos = 0;
for (;;)
{
Pos = FileName2.find('\\');
Expand Down
101 changes: 80 additions & 21 deletions Source/Lib/Uncompressed/WAV/WAV.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ static const char* MessageText[] =
"file smaller than expected",
"RIFF chunk size",
"fmt chunk size",
"data chunk not found",
"ds64 size",
"ds64 dataSize not same as data size",
"truncated chunk",
};

Expand All @@ -30,6 +33,9 @@ enum code : uint8_t
BufferOverflow,
RIFF_ChunkSize,
fmt__ChunkSize,
data_Presence,
ds64_size,
ds64_dataSize,
TruncatedChunk,
Max
};
Expand All @@ -44,7 +50,7 @@ namespace unsupported
static const char* MessageText[] =
{
// Unsupported
"RF64 (4GB+ WAV)",
"RF64 tableLength",
"fmt FormatTag not WAVE_FORMAT_PCM 1 or 3",
"fmt AvgBytesPerSec",
"fmt BlockAlign",
Expand All @@ -54,13 +60,15 @@ static const char* MessageText[] =
"fmt ChannelMask",
"fmt SubFormat not KSDATAFORMAT_SUBTYPE_PCM 00000001-0000-0010-8000-00AA00389B71",
"fmt chunk not before data chunk",
"ds64 chunk not before data chunk",
"Flavor (SamplesPerSec / BitDepth / Channels / Endianness combination)",
"data chunk size is not a multiple of BlockAlign",
"extra data is big",
};

enum code : uint8_t
{
RF64,
ds64_tableLength,
fmt__FormatTag,
fmt__AvgBytesPerSec,
fmt__BlockAlign,
Expand All @@ -70,8 +78,10 @@ enum code : uint8_t
fmt__ChannelMask,
fmt__SubFormat,
fmt__Location,
ds64__Location,
Flavor,
data_Size,
extra_big,
Max
};

Expand Down Expand Up @@ -236,6 +246,7 @@ ELEMENT_END()

ELEMENT_BEGIN(WAVE)
ELEMENT_VOID(64617461, WAVE_data)
ELEMENT_VOID(64733634, WAVE_ds64)
ELEMENT_VOID(666D7420, WAVE_fmt_)
ELEMENT_END()

Expand All @@ -261,22 +272,21 @@ void wav::ParseBuffer()
{
if (Buffer.Size() < 12)
return;
if (Buffer[8] != 'W' || Buffer[9] != 'A' || Buffer[10] != 'V' || Buffer[11] != 'E')
return;
if (Buffer[0] == 'R' && Buffer[1] == 'F' && Buffer[2] == '6' && Buffer[3] == '4')
{
Unsupported(unsupported::RF64);
return;
}
if (Buffer[0] != 'R' || Buffer[1] != 'I' || Buffer[2] != 'F' || Buffer[3] != 'F')

Buffer_Offset = 0;
auto FirstName = Get_B4();
Buffer_Offset += 4;
auto FirstRealName = Get_B4();
IsRF64 = FirstName == 0x52463634;
if ((FirstName != 0x52494646 && !IsRF64) || FirstRealName != 0x57415645) // "RIFF", "RF64", "WAVE"
return;
SetDetected();

Flavor = (decltype(Flavor))-1;
Buffer_Offset = 0;
Levels[0].Offset_End = Buffer.Size();
Levels[0].SubElements = &wav::SubElements__;
Level=1;
Level = 1;

while (Buffer_Offset < Buffer.Size())
{
Expand All @@ -291,32 +301,52 @@ void wav::ParseBuffer()
// Parse the chunk header
uint64_t Name;
uint64_t Size;
if (Buffer_Offset + 8 > End)
if (End - Buffer_Offset < 8)
{
Undecodable(undecodable::TruncatedChunk);
return;
}
Name = Get_B4();
Size = Get_L4();
if (Name == 0x52494646) // "RIFF"
if (Level == 1)
{
if (Size < 4 || Buffer_Offset + 4 > End)
if (Name == 0x52463634) // "RF64"
Name = 0x52494646;
if (Name == 0x52494646) // "RIFF"
{
Undecodable(undecodable::RIFF_ChunkSize);
return;
if (Size < 4 || Buffer_Offset + 4 > End)
{
Undecodable(undecodable::RIFF_ChunkSize);
return;
}
Name <<= 32;
Name |= Get_B4();
Size -= 4;
ds64_riffOffset = Buffer_Offset - 4;
}
if (DataIsParsed)
{
// Data after the WAVE chunk, we ignore everything
Size = Levels[0].Offset_End - Buffer_Offset;
}
Name <<= 32;
Name |= Get_B4();
Size -= 4;
}
if (Buffer_Offset + Size > End)
if (Level == 2)
{
if (IsRF64 && Levels[1].SubElements == &wav::SubElements_WAVE && Name == 0x64617461) // "data"
{
if (Size != 0xFFFFFFFF && Size != ds64_dataSize)
Undecodable(undecodable::ds64_dataSize);
Size = ds64_dataSize;
}
}
if (Size > End - Buffer_Offset)
{
if (!Actions[Action_AcceptTruncated])
{
Undecodable(undecodable::TruncatedChunk);
return;
}
Size = Levels[Level - 1].Offset_End - Buffer_Offset;
Size = End - Buffer_Offset;
}

// Parse the chunk content
Expand All @@ -340,6 +370,9 @@ void wav::ParseBuffer()
if (Buffer_Offset < Levels[Level].Offset_End)
Level++;
}

if (!DataIsParsed)
Undecodable(undecodable::data_Presence);
}

//---------------------------------------------------------------------------
Expand All @@ -356,6 +389,8 @@ void wav::WAVE()
//---------------------------------------------------------------------------
void wav::WAVE_data()
{
DataIsParsed = true;

// Test if fmt chunk was parsed
if (!HasErrors() && Flavor == (decltype(Flavor))-1)
Unsupported(unsupported::fmt__Location);
Expand All @@ -370,6 +405,8 @@ void wav::WAVE_data()
if (InputInfo && !InputInfo->SampleCount)
InputInfo->SampleCount = Size / BlockAlign;
}
if (!Actions[Action_AcceptTruncated] && Levels[0].Offset_End - Levels[Level].Offset_End > 0x04000000)
Unsupported(unsupported::extra_big);

// Can we compress?
if (!HasErrors())
Expand Down Expand Up @@ -398,6 +435,28 @@ void wav::WAVE_data()
}
}

//---------------------------------------------------------------------------
void wav::WAVE_ds64()
{
// Coherency test
if (Buffer.Size() < 28)
{
Undecodable(undecodable::ds64_size);
return;
}

auto ds64_riffSize = Get_L8();
Levels[Level - 1].Offset_End = ds64_riffOffset + ds64_riffSize;
ds64_dataSize = Get_L8();
Buffer_Offset += 8;
auto tableLength = Get_L4();
if (tableLength)
{
Unsupported(unsupported::ds64_tableLength);
return;
}
}

//---------------------------------------------------------------------------
void wav::WAVE_fmt_()
{
Expand Down
5 changes: 5 additions & 0 deletions Source/Lib/Uncompressed/WAV/WAV.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,11 @@ class wav : public input_base_uncompressed_audio
bool IsList;

// Temp
uint64_t ds64_riffOffset = 0;
uint64_t ds64_dataSize = 0;
uint32_t BlockAlign = 0;
bool IsRF64 = false;
bool DataIsParsed = false;

#define WAV_ELEMENT(_NAME) \
void _NAME(); \
Expand All @@ -140,6 +144,7 @@ class wav : public input_base_uncompressed_audio
WAV_ELEMENT(_);
WAV_ELEMENT(WAVE);
WAV_ELEMENT(WAVE_data);
WAV_ELEMENT(WAVE_ds64);
WAV_ELEMENT(WAVE_fmt_);
WAV_ELEMENT(Void);
};
Expand Down
4 changes: 2 additions & 2 deletions Source/Lib/Utils/FileIO/Input_Base.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ uint64_t input_base::Get_L8()
{
TEST_BUFFEROVERFLOW(8);

uint64_t ToReturn = Buffer[Buffer_Offset + 0] | (Buffer[Buffer_Offset + 1] << 8) | (Buffer[Buffer_Offset + 2] << 16) | (Buffer[Buffer_Offset + 3] << 24) | ((uint64_t)Buffer[Buffer_Offset + 4] << 32) | ((uint64_t)Buffer[Buffer_Offset + 5] << 40) | ((uint64_t)Buffer[Buffer_Offset + 6] << 48) | ((uint64_t)Buffer[Buffer_Offset + 7] << 56);
uint64_t ToReturn = ((uint64_t)Buffer[Buffer_Offset + 0]) | (((uint64_t)Buffer[Buffer_Offset + 1]) << 8) | (((uint64_t)Buffer[Buffer_Offset + 2]) << 16) | (((uint64_t)Buffer[Buffer_Offset + 3]) << 24) | (((uint64_t)Buffer[Buffer_Offset + 4]) << 32) | (((uint64_t)Buffer[Buffer_Offset + 5]) << 40) | (((uint64_t)Buffer[Buffer_Offset + 6]) << 48) | (((uint64_t)Buffer[Buffer_Offset + 7]) << 56);
Buffer_Offset += 8;
return ToReturn;
}
Expand All @@ -153,7 +153,7 @@ uint64_t input_base::Get_B8()
{
TEST_BUFFEROVERFLOW(8);

uint64_t ToReturn = ((uint64_t)Buffer[Buffer_Offset + 0] << 56) | ((uint64_t)Buffer[Buffer_Offset + 1] << 48) | ((uint64_t)Buffer[Buffer_Offset + 2] << 40) | ((uint64_t)Buffer[Buffer_Offset + 3] << 32) | (Buffer[Buffer_Offset + 4] << 24) | (Buffer[Buffer_Offset + 5] << 16) | (Buffer[Buffer_Offset + 6] << 8) | Buffer[Buffer_Offset + 7];
uint64_t ToReturn = ((uint64_t)Buffer[Buffer_Offset + 0] << 56) | ((uint64_t)Buffer[Buffer_Offset + 1] << 48) | ((uint64_t)Buffer[Buffer_Offset + 2] << 40) | ((uint64_t)Buffer[Buffer_Offset + 3] << 32) | (((uint64_t)Buffer[Buffer_Offset + 4]) << 24) | (((uint64_t)Buffer[Buffer_Offset + 5]) << 16) | (((uint64_t)Buffer[Buffer_Offset + 6]) << 8) | ((uint64_t)Buffer[Buffer_Offset + 7]);
Buffer_Offset += 8;
return ToReturn;
}
Expand Down