eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4 from pljones/bugfix/wave-header-lengths

Browse source 
Fix wave file header lengths
This commit is contained in:
corrados 2019-04-22 13:01:17 +02:00 committed by GitHub
commit 78a4f52142
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/recorder/cwavestream.cpp
View file

@ -120,10 +120,13 @@ void CWaveStream::waveStreamHeaders()
*this << scHdrRiff << cFmtSubChunk << scDataSubChunkHdr; *this << scHdrRiff << cFmtSubChunk << scDataSubChunkHdr;
} }
CWaveStream::~CWaveStream() void CWaveStream::finalise()
{ {
static const uint32_t hdrRiffChunkSize = sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t);
static const uint32_t fmtSubChunkSize = sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) + sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t);
static const uint32_t hdrRiffChunkSizeOffset = sizeof(uint32_t); static const uint32_t hdrRiffChunkSizeOffset = sizeof(uint32_t);
static const uint32_t dataSubChunkHdrChunkSizeOffset = sizeof(HdrRiff) + sizeof(FmtSubChunk) + sizeof (uint32_t) + sizeof (uint32_t); static const uint32_t dataSubChunkHdrChunkSizeOffset = hdrRiffChunkSize + fmtSubChunkSize + sizeof (uint32_t);
const int64_t currentPos = this->device()->pos(); const int64_t currentPos = this->device()->pos();
const uint32_t fileLength = static_cast<uint32_t>(currentPos - initialPos); const uint32_t fileLength = static_cast<uint32_t>(currentPos - initialPos);

3
src/recorder/cwavestream.h
View file

@ -73,7 +73,8 @@ public:
explicit CWaveStream(QIODevice *iod, const uint16_t numChannels); explicit CWaveStream(QIODevice *iod, const uint16_t numChannels);
CWaveStream(QByteArray *iod, QIODevice::OpenMode flags, const uint16_t numChannels); CWaveStream(QByteArray *iod, QIODevice::OpenMode flags, const uint16_t numChannels);
CWaveStream(const QByteArray &ba, const uint16_t numChannels); CWaveStream(const QByteArray &ba, const uint16_t numChannels);
~CWaveStream();
void finalise();
private: private:
void waveStreamHeaders(); void waveStreamHeaders();

2
src/recorder/jamrecorder.cpp
View file

@ -87,7 +87,7 @@ void CJamClient::Frame(const QString _name, const CVector<int16_t>& pcm)
*/ */
void CJamClient::Disconnect() void CJamClient::Disconnect()
{ {
delete out; static_cast<CWaveStream*>(out)->finalise();
out = nullptr; out = nullptr;
wavFile->close(); wavFile->close();