From 6e9a1bd317ed9f4b00c878f97fc5bd757745137a Mon Sep 17 00:00:00 2001 From: Robin Getz Date: Tue, 22 Sep 2026 23:45:14 -0400 Subject: [PATCH] wavfilerecord: add RF64 support Support WAV recordings larger than 4 GiB by using the RF64 format and storing 64-bit RIFF and data sizes in the ds64 chunk. Reserve space for the ds64 chunk in the initial header and convert the file to RF64 when the RIFF or data chunk exceeds the 32-bit WAV size limit. Update header parsing to handle RF64, ds64, JUNK, variable-size fmt and auxi chunks, and unknown chunks. Generate standard RF64 headers that can be read by other RF64-compatible audio applications. Signed-off-by: Robin Getz --- sdrbase/dsp/wavfilerecord.cpp | 306 +++++++++++++++++++++++++--------- sdrbase/dsp/wavfilerecord.h | 12 +- 2 files changed, 242 insertions(+), 76 deletions(-) diff --git a/sdrbase/dsp/wavfilerecord.cpp b/sdrbase/dsp/wavfilerecord.cpp index a052b4c27..221dafff8 100644 --- a/sdrbase/dsp/wavfilerecord.cpp +++ b/sdrbase/dsp/wavfilerecord.cpp @@ -335,9 +335,9 @@ bool WavFileRecord::stopRecording() qDebug() << "WavFileRecord::stopRecording"; #ifdef ANDROID - long dataSize = (long)m_sampleFile.size(); + quint64 dataSize = m_sampleFile.size(); #else - long dataSize = m_sampleFile.tellp(); + quint64 dataSize = m_sampleFile.tellp(); #endif // Write meta data @@ -349,21 +349,52 @@ bool WavFileRecord::stopRecording() // Fix up chunk sizes #ifdef ANDROID - long fileSize = (long)m_sampleFile.size(); + quint64 fileSize = m_sampleFile.size(); m_sampleFile.seek(offsetof(Header, m_riffHeader.m_size)); #else - long fileSize = m_sampleFile.tellp(); + quint64 fileSize = m_sampleFile.tellp(); m_sampleFile.seekp(offsetof(Header, m_riffHeader.m_size)); #endif - qint32 size = (fileSize - 8); + const bool rf64 = ((fileSize - 8) >= 0xffffffffULL) || + ((dataSize - sizeof(Header)) >= 0xffffffffULL); + + quint32 size = rf64 ? 0xffffffffU : (quint32)(fileSize - 8); m_sampleFile.write((char *)&size, 4); #ifdef ANDROID m_sampleFile.seek(offsetof(Header, m_dataHeader.m_size)); #else m_sampleFile.seekp(offsetof(Header, m_dataHeader.m_size)); #endif - size = dataSize - sizeof(Header); + size = rf64 ? 0xffffffffU : (quint32)(dataSize - sizeof(Header)); m_sampleFile.write((char *)&size, 4); + + if (rf64) + { + DS64 ds64{}; + ds64.m_riffSize = fileSize - 8; + ds64.m_dataSize = dataSize - sizeof(Header); + ds64.m_sampleCount = ds64.m_dataSize / (m_nbChannels * sizeof(qint16)); + ds64.m_tableLength = 0; + +#ifdef ANDROID + m_sampleFile.seek(offsetof(Header, m_riffHeader.m_id)); + m_sampleFile.write("RF64", 4); + m_sampleFile.seek(offsetof(Header, m_junk.m_id)); +#else + m_sampleFile.seekp(offsetof(Header, m_riffHeader.m_id)); + m_sampleFile.write("RF64", 4); + m_sampleFile.seekp(offsetof(Header, m_junk.m_id)); +#endif + m_sampleFile.write("ds64", 4); + +#ifdef ANDROID + m_sampleFile.seek(offsetof(Header, m_ds64)); +#else + m_sampleFile.seekp(offsetof(Header, m_ds64)); +#endif + m_sampleFile.write((char *)&ds64, sizeof(ds64)); + } + m_sampleFile.close(); m_recordOn = false; m_recordStart = false; @@ -411,7 +442,7 @@ bool WavFileRecord::handleMessage(const Message& message) void WavFileRecord::writeHeader() { - Header header; + Header header{}; header.m_riffHeader.m_id[0] = 'R'; header.m_riffHeader.m_id[1] = 'I'; header.m_riffHeader.m_id[2] = 'F'; @@ -421,6 +452,11 @@ void WavFileRecord::writeHeader() header.m_type[1] = 'A'; header.m_type[2] = 'V'; header.m_type[3] = 'E'; + header.m_junk.m_id[0] = 'J'; + header.m_junk.m_id[1] = 'U'; + header.m_junk.m_id[2] = 'N'; + header.m_junk.m_id[3] = 'K'; + header.m_junk.m_size = sizeof(DS64); header.m_fmtHeader.m_id[0] = 'f'; header.m_fmtHeader.m_id[1] = 'm'; header.m_fmtHeader.m_id[2] = 't'; @@ -467,7 +503,6 @@ void WavFileRecord::writeHeader() header.m_auxi.m_unused5 = 0; memset(&header.m_auxi.m_nextFilename[0], 0, 96); - header.m_dataHeader.m_size = sizeof(Auxi); header.m_dataHeader.m_id[0] = 'd'; header.m_dataHeader.m_id[1] = 'a'; header.m_dataHeader.m_id[2] = 't'; @@ -477,122 +512,243 @@ void WavFileRecord::writeHeader() writeHeader(m_sampleFile, header); } -bool WavFileRecord::readHeader(std::ifstream& sampleFile, Header& header, bool check) +static bool checkHeader(const WavFileRecord::Header& header) { - memset(&header, 0, sizeof(Header)); - - sampleFile.read((char *) &header, 8+4+8+16); - if (!sampleFile) + if (strncmp(header.m_riffHeader.m_id, "RIFF", 4) && + strncmp(header.m_riffHeader.m_id, "RF64", 4)) { - qDebug() << "WavFileRecord::readHeader: End of file without reading header"; + qDebug() << "WavFileRecord::readHeader: No RIFF/RF64 header"; return false; } - - if (check && !checkHeader(header)) { + if (strncmp(header.m_type, "WAVE", 4)) + { + qDebug() << "WavFileRecord::readHeader: No WAVE header"; return false; } - - Chunk chunkHeader; - bool gotData = false; - while (!gotData) + if (!strncmp(header.m_riffHeader.m_id, "RF64", 4) && + header.m_riffHeader.m_size != 0xffffffffU) { - sampleFile.read((char *) &chunkHeader, 8); - if (!sampleFile) - { - qDebug() << "WavFileRecord::readHeader: End of file without reading data header"; - return false; - } - - if (!strncmp(chunkHeader.m_id, "auxi", 4)) - { - memcpy(&header.m_auxiHeader, &chunkHeader, sizeof(Chunk)); - sampleFile.read((char *) &header.m_auxi, sizeof(Auxi)); - if (!sampleFile) - return false; - } - else if (!strncmp(chunkHeader.m_id, "data", 4)) - { - memcpy(&header.m_dataHeader, &chunkHeader, sizeof(Chunk)); - gotData = true; - } + qDebug() << "WavFileRecord::readHeader: Invalid RF64 RIFF size"; + return false; } + return true; +} +static bool checkFormat(const WavFileRecord::Header& header) +{ + if (strncmp(header.m_fmtHeader.m_id, "fmt ", 4)) + { + qDebug() << "WavFileRecord::readHeader: No fmt header"; + return false; + } + if (header.m_audioFormat != 1) + { + qDebug() << "WavFileRecord::readHeader: Audio format is not PCM"; + return false; + } + if (header.m_numChannels != 2) + { + qDebug() << "WavFileRecord::readHeader: Number of channels is not 2"; + return false; + } + // FileInputWorker can't handle other bits sizes + if (header.m_bitsPerSample != 16) + { + qDebug() << "WavFileRecord::readHeader: Number of bits per sample is not 16"; + return false; + } return true; } -bool WavFileRecord::readHeader(QFile& sampleFile, Header& header) + +static bool readBytes(std::ifstream& file, char *data, std::streamsize size) +{ + file.read(data, size); + return !!file; +} + +static bool readBytes(QFile& file, char *data, qint64 size) +{ + return file.read(data, size) == size; +} + +static bool skipBytes(std::ifstream& file, std::streamoff size) +{ + file.seekg(size, std::ios::cur); + return !!file; +} + +static bool skipBytes(QFile& file, qint64 size) +{ + return file.seek(file.pos() + size); +} + +template +bool WavFileRecord::readHeaderInternal(File& sampleFile, Header& header, bool check) { memset(&header, 0, sizeof(Header)); - sampleFile.read((char *) &header, 8+4+8+16); + if (!readBytes(sampleFile, (char *) &header, sizeof(Chunk) + sizeof(header.m_type))) + { + qDebug() << "WavFileRecord::readHeader: End of file without reading header"; + return false; + } - if (!checkHeader(header)) { + if (check && !checkHeader(header)) { + qDebug() << "WavFileRecord::readHeader: Header failure"; return false; } Chunk chunkHeader; bool gotData = false; + bool gotFmt = false; + bool gotDs64 = false; + while (!gotData) { - if (sampleFile.read((char *) &chunkHeader, 8) != 8) + if (!readBytes(sampleFile, (char *) &chunkHeader, sizeof(Chunk))) { qDebug() << "WavFileRecord::readHeader: End of file without reading data header"; return false; } + if (!strncmp(chunkHeader.m_id, "fmt ", sizeof(chunkHeader.m_id))) + { + const quint32 formatSize = sizeof(header.m_audioFormat) + sizeof(header.m_numChannels) + + sizeof(header.m_sampleRate) + sizeof(header.m_byteRate) + + sizeof(header.m_blockAlign) + sizeof(header.m_bitsPerSample); + if (gotFmt) + { + qDebug() << "WavFileRecord::readHeader: Duplicate format"; + return false; + } + if (chunkHeader.m_size < formatSize) + { + qDebug() << "WavFileRecord::readHeader: Invalid format size"; + return false; + } + + memcpy(&header.m_fmtHeader, &chunkHeader, sizeof(Chunk)); + if (!readBytes(sampleFile, (char *) &header.m_audioFormat, sizeof(header.m_audioFormat)) || + !readBytes(sampleFile, (char *) &header.m_numChannels, sizeof(header.m_numChannels)) || + !readBytes(sampleFile, (char *) &header.m_sampleRate, sizeof(header.m_sampleRate)) || + !readBytes(sampleFile, (char *) &header.m_byteRate, sizeof(header.m_byteRate)) || + !readBytes(sampleFile, (char *) &header.m_blockAlign, sizeof(header.m_blockAlign)) || + !readBytes(sampleFile, (char *) &header.m_bitsPerSample, sizeof(header.m_bitsPerSample))) + { + qDebug() << "WavFileRecord::readHeader: End of file while reading format"; + return false; + } + if (check && !checkFormat(header)) { + qDebug() << "WavFileRecord::readHeader: Incompatible format failure"; + return false; + } - if (!strncmp(chunkHeader.m_id, "auxi", 4)) + gotFmt = true; + + // Skip remaining payload and word-alignment padding + if (!skipBytes(sampleFile, chunkHeader.m_size - formatSize + (chunkHeader.m_size & 1))) + { + qDebug() << "WavFileRecord::readHeader: Error while skipping format"; + return false; + } + } + else if (!strncmp(chunkHeader.m_id, "JUNK", sizeof(chunkHeader.m_id))) + { + memcpy(&header.m_junk, &chunkHeader, sizeof(Chunk)); + if (!skipBytes(sampleFile, static_cast(chunkHeader.m_size) + (chunkHeader.m_size & 1))) + { + qDebug() << "WavFileRecord::readHeader: Error while skipping JUNK"; + return false; + } + } + else if (!strncmp(chunkHeader.m_id, "ds64", sizeof(chunkHeader.m_id))) + { + if (chunkHeader.m_size < sizeof(DS64)) + { + qDebug() << "WavFileRecord::readHeader: Invalid ds64 size"; + return false; + } + memcpy(&header.m_junk, &chunkHeader, sizeof(Chunk)); + if (!readBytes(sampleFile, (char *) &header.m_ds64, sizeof(DS64))) + { + qDebug() << "WavFileRecord::readHeader: End of file while reading ds64"; + return false; + } + if (!skipBytes(sampleFile, chunkHeader.m_size - sizeof(DS64) + (chunkHeader.m_size & 1))) + { + qDebug() << "WavFileRecord::readHeader: Error while skipping ds64"; + return false; + } + gotDs64 = true; + } + else if (!strncmp(chunkHeader.m_id, "auxi", sizeof(chunkHeader.m_id))) { + if (chunkHeader.m_size < sizeof(Auxi)) + { + qDebug() << "WavFileRecord::readHeader: Invalid auxi size"; + return false; + } + memcpy(&header.m_auxiHeader, &chunkHeader, sizeof(Chunk)); - if (sampleFile.read((char *) &header.m_auxi, sizeof(Auxi)) != sizeof(Auxi)) { + if (!readBytes(sampleFile, (char *) &header.m_auxi, sizeof(Auxi))) + { + qDebug() << "WavFileRecord::readHeader: End of file while reading auxi"; return false; } + if (!skipBytes(sampleFile, chunkHeader.m_size - sizeof(Auxi) + (chunkHeader.m_size & 1))) + { + qDebug() << "WavFileRecord::readHeader: Error while skipping auxi"; + return false; + } + } else if (!strncmp(chunkHeader.m_id, "data", 4)) { memcpy(&header.m_dataHeader, &chunkHeader, sizeof(Chunk)); + + if (gotDs64 && !strncmp(header.m_riffHeader.m_id, "RF64", 4) && + header.m_dataHeader.m_size != 0xffffffffU) { + qDebug() << "WavFileRecord::readHeader: Invalid RF64 data size"; + return false; + } gotData = true; } - } - - return true; -} + else + { + qDebug() << "WavFileRecord::readHeader: skipping unknown section :" << chunkHeader.m_id; + if (!skipBytes(sampleFile, static_cast(chunkHeader.m_size) + (chunkHeader.m_size & 1))) + { + qDebug() << "WavFileRecord::readHeader: Error while skipping" << chunkHeader.m_id; + return false; + } -bool WavFileRecord::checkHeader(Header& header) -{ - if (strncmp(header.m_riffHeader.m_id, "RIFF", 4)) - { - qDebug() << "WavFileRecord::readHeader: No RIFF header"; - return false; - } - if (strncmp(header.m_type, "WAVE", 4)) - { - qDebug() << "WavFileRecord::readHeader: No WAVE header"; - return false; - } - if (strncmp(header.m_fmtHeader.m_id, "fmt ", 4)) - { - qDebug() << "WavFileRecord::readHeader: No fmt header"; - return false; + } } - if (header.m_audioFormat != 1) + + if (check && !gotFmt) { - qDebug() << "WavFileRecord::readHeader: Audio format is not PCM"; + qDebug() << "WavFileRecord::readHeader: No format"; return false; } - if (header.m_numChannels != 2) + if (check && !strncmp(header.m_riffHeader.m_id, "RF64", 4) && !gotDs64) { - qDebug() << "WavFileRecord::readHeader: Number of channels is not 2"; - return false; - } - // FileInputWorker can't handle other bits sizes - if (header.m_bitsPerSample != 16) - { - qDebug() << "WavFileRecord::readHeader: Number of bits per sample is not 16"; + qDebug() << "WavFileRecord::readHeader: No ds64 header"; return false; } + return true; } +bool WavFileRecord::readHeader(std::ifstream& sampleFile, Header& header, bool check) +{ + return readHeaderInternal(sampleFile, header, check); +} + +bool WavFileRecord::readHeader(QFile& sampleFile, Header& header) +{ + return readHeaderInternal(sampleFile, header, true); +} + void WavFileRecord::writeHeader(std::ofstream& sampleFile, Header& header) { sampleFile.write((const char *) &header, sizeof(Header)); diff --git a/sdrbase/dsp/wavfilerecord.h b/sdrbase/dsp/wavfilerecord.h index 62c68d953..80004b2a1 100644 --- a/sdrbase/dsp/wavfilerecord.h +++ b/sdrbase/dsp/wavfilerecord.h @@ -68,10 +68,19 @@ public: quint32 m_unused5; char m_nextFilename[96]; }; + struct DS64 + { + quint64 m_riffSize; + quint64 m_dataSize; + quint64 m_sampleCount; + quint32 m_tableLength; + }; struct SDRBASE_API Header { Chunk m_riffHeader; char m_type[4]; // "WAVE" + Chunk m_junk; // "JUNK" placeholder for RF64 ds64 + DS64 m_ds64; // Not used if RIFF Chunk m_fmtHeader; quint16 m_audioFormat; quint16 m_numChannels; @@ -151,7 +160,8 @@ private: void writeInfoList(); void writeID3(); - static bool checkHeader(Header& header); + template + static bool readHeaderInternal(File& sampleFile, Header& header, bool check); }; #endif // INCLUDE_WAV_FILERECORD_H