--- libgig/trunk/src/DLS.cpp 2014/12/29 16:25:51 2682 +++ libgig/trunk/src/DLS.cpp 2016/11/25 18:34:45 3048 @@ -2,7 +2,7 @@ * * * libgig - C++ cross-platform Gigasampler format file access library * * * - * Copyright (C) 2003-2014 by Christian Schoenebeck * + * Copyright (C) 2003-2016 by Christian Schoenebeck * * * * * * This library is free software; you can redistribute it and/or modify * @@ -711,9 +711,9 @@ * @param WavePoolOffset - offset of this sample data from wave pool * ('wvpl') list chunk */ - Sample::Sample(File* pFile, RIFF::List* waveList, unsigned long WavePoolOffset) : Resource(pFile, waveList) { + Sample::Sample(File* pFile, RIFF::List* waveList, file_offset_t WavePoolOffset) : Resource(pFile, waveList) { pWaveList = waveList; - ulWavePoolOffset = WavePoolOffset - LIST_HEADER_SIZE; + ullWavePoolOffset = WavePoolOffset - LIST_HEADER_SIZE(waveList->GetFile()->GetFileOffsetSize()); pCkFormat = waveList->GetSubChunk(CHUNK_ID_FMT); pCkData = waveList->GetSubChunk(CHUNK_ID_DATA); if (pCkFormat) { @@ -793,11 +793,11 @@ Resize(orig->GetSize()); char* buf = (char*) LoadSampleData(); Sample* pOrig = (Sample*) orig; //HACK: circumventing the constness here for now - const unsigned long restorePos = pOrig->pCkData->GetPos(); + const file_offset_t restorePos = pOrig->pCkData->GetPos(); pOrig->SetPos(0); - for (unsigned long todo = pOrig->GetSize(), i = 0; todo; ) { + for (file_offset_t todo = pOrig->GetSize(), i = 0; todo; ) { const int iReadAtOnce = 64*1024; - unsigned long n = (iReadAtOnce < todo) ? iReadAtOnce : todo; + file_offset_t n = (iReadAtOnce < todo) ? iReadAtOnce : todo; n = pOrig->Read(&buf[i], n); if (!n) break; todo -= n; @@ -855,7 +855,7 @@ * @returns number of sample points or 0 if FormatTag != DLS_WAVE_FORMAT_PCM * @see FrameSize, FormatTag */ - unsigned long Sample::GetSize() const { + file_offset_t Sample::GetSize() const { if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; return (pCkData) ? pCkData->GetSize() / FrameSize : 0; } @@ -882,19 +882,21 @@ * FormatTag must be DLS_WAVE_FORMAT_PCM. Trying to resize samples with * other formats will fail! * - * @param iNewSize - new sample wave data size in sample points (must be - * greater than zero) - * @throws Excecption if FormatTag != DLS_WAVE_FORMAT_PCM - * @throws Exception if \a iNewSize is less than 1 + * @param NewSize - new sample wave data size in sample points (must be + * greater than zero) + * @throws Exception if FormatTag != DLS_WAVE_FORMAT_PCM + * @throws Exception if \a NewSize is less than 1 or unrealistic large * @see File::Save(), FrameSize, FormatTag */ - void Sample::Resize(int iNewSize) { + void Sample::Resize(file_offset_t NewSize) { if (FormatTag != DLS_WAVE_FORMAT_PCM) throw Exception("Sample's format is not DLS_WAVE_FORMAT_PCM"); - if (iNewSize < 1) throw Exception("Sample size must be at least one sample point"); - const int iSizeInBytes = iNewSize * FrameSize; + if (NewSize < 1) throw Exception("Sample size must be at least one sample point"); + if ((NewSize >> 48) != 0) + throw Exception("Unrealistic high DLS sample size detected"); + const file_offset_t sizeInBytes = NewSize * FrameSize; pCkData = pWaveList->GetSubChunk(CHUNK_ID_DATA); - if (pCkData) pCkData->Resize(iSizeInBytes); - else pCkData = pWaveList->AddSubChunk(CHUNK_ID_DATA, iSizeInBytes); + if (pCkData) pCkData->Resize(sizeInBytes); + else pCkData = pWaveList->AddSubChunk(CHUNK_ID_DATA, sizeInBytes); } /** @@ -913,11 +915,11 @@ * @throws Exception if no data RIFF chunk was created for the sample yet * @see FrameSize, FormatTag */ - unsigned long Sample::SetPos(unsigned long SampleCount, RIFF::stream_whence_t Whence) { + file_offset_t Sample::SetPos(file_offset_t SampleCount, RIFF::stream_whence_t Whence) { if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format if (!pCkData) throw Exception("No data chunk created for sample yet, call Sample::Resize() to create one"); - unsigned long orderedBytes = SampleCount * FrameSize; - unsigned long result = pCkData->SetPos(orderedBytes, Whence); + file_offset_t orderedBytes = SampleCount * FrameSize; + file_offset_t result = pCkData->SetPos(orderedBytes, Whence); return (result == orderedBytes) ? SampleCount : result / FrameSize; } @@ -931,7 +933,7 @@ * @param pBuffer destination buffer * @param SampleCount number of sample points to read */ - unsigned long Sample::Read(void* pBuffer, unsigned long SampleCount) { + file_offset_t Sample::Read(void* pBuffer, file_offset_t SampleCount) { if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format return pCkData->Read(pBuffer, SampleCount, FrameSize); // FIXME: channel inversion due to endian correction? } @@ -951,7 +953,7 @@ * @throws Exception if current sample size is too small * @see LoadSampleData() */ - unsigned long Sample::Write(void* pBuffer, unsigned long SampleCount) { + file_offset_t Sample::Write(void* pBuffer, file_offset_t SampleCount) { if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format if (GetSize() < SampleCount) throw Exception("Could not write sample data, current sample size to small"); return pCkData->Write(pBuffer, SampleCount, FrameSize); // FIXME: channel inversion due to endian correction? @@ -994,7 +996,7 @@ Region::Region(Instrument* pInstrument, RIFF::List* rgnList) : Resource(pInstrument, rgnList), Articulator(rgnList), Sampler(rgnList) { pCkRegion = rgnList; - // articulation informations + // articulation information RIFF::Chunk* rgnh = rgnList->GetSubChunk(CHUNK_ID_RGNH); if (rgnh) { rgnh->Read(&KeyRange, 2, 2); @@ -1016,7 +1018,7 @@ } SelfNonExclusive = FormatOptionFlags & F_RGN_OPTION_SELFNONEXCLUSIVE; - // sample informations + // sample information RIFF::Chunk* wlnk = rgnList->GetSubChunk(CHUNK_ID_WLNK); if (wlnk) { WaveLinkOptionFlags = wlnk->ReadUint16(); @@ -1047,10 +1049,10 @@ Sample* Region::GetSample() { if (pSample) return pSample; File* file = (File*) GetParent()->GetParent(); - unsigned long soughtoffset = file->pWavePoolTable[WavePoolTableIndex]; + uint64_t soughtoffset = file->pWavePoolTable[WavePoolTableIndex]; Sample* sample = file->GetFirstSample(); while (sample) { - if (sample->ulWavePoolOffset == soughtoffset) return (pSample = sample); + if (sample->ullWavePoolOffset == soughtoffset) return (pSample = sample); sample = file->GetNextSample(); } return NULL; @@ -1281,7 +1283,7 @@ void Instrument::MoveRegion(Region* pSrc, Region* pDst) { RIFF::List* lrgn = pCkInstrument->GetSubList(LIST_TYPE_LRGN); - lrgn->MoveSubChunk(pSrc->pCkRegion, pDst ? pDst->pCkRegion : 0); + lrgn->MoveSubChunk(pSrc->pCkRegion, (RIFF::Chunk*) (pDst ? pDst->pCkRegion : 0)); pRegions->remove(pSrc); RegionList::iterator iter = find(pRegions->begin(), pRegions->end(), pDst); @@ -1467,8 +1469,9 @@ for (int i = 0 ; i < WavePoolCount ; i++) { pWavePoolTableHi[i] = ptbl->ReadUint32(); pWavePoolTable[i] = ptbl->ReadUint32(); - if (pWavePoolTable[i] & 0x80000000) - throw DLS::Exception("Files larger than 2 GB not yet supported"); + //NOTE: disabled this 2GB check, not sure why this check was still left here (Christian, 2016-05-12) + //if (pWavePoolTable[i] & 0x80000000) + // throw DLS::Exception("Files larger than 2 GB not yet supported"); } } else { // conventional 32 bit offsets ptbl->Read(pWavePoolTable, WavePoolCount, sizeof(uint32_t)); @@ -1525,11 +1528,11 @@ if (!pSamples) pSamples = new SampleList; RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL); if (wvpl) { - unsigned long wvplFileOffset = wvpl->GetFilePos(); + file_offset_t wvplFileOffset = wvpl->GetFilePos(); RIFF::List* wave = wvpl->GetFirstSubList(); while (wave) { if (wave->GetListType() == LIST_TYPE_WAVE) { - unsigned long waveFileOffset = wave->GetFilePos(); + file_offset_t waveFileOffset = wave->GetFilePos(); pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset)); } wave = wvpl->GetNextSubList(); @@ -1538,11 +1541,11 @@ else { // Seen a dwpl list chunk instead of a wvpl list chunk in some file (officially not DLS compliant) RIFF::List* dwpl = pRIFF->GetSubList(LIST_TYPE_DWPL); if (dwpl) { - unsigned long dwplFileOffset = dwpl->GetFilePos(); + file_offset_t dwplFileOffset = dwpl->GetFilePos(); RIFF::List* wave = dwpl->GetFirstSubList(); while (wave) { if (wave->GetListType() == LIST_TYPE_WAVE) { - unsigned long waveFileOffset = wave->GetFilePos(); + file_offset_t waveFileOffset = wave->GetFilePos(); pSamples->push_back(new Sample(this, wave, waveFileOffset - dwplFileOffset)); } wave = dwpl->GetNextSubList(); @@ -1736,10 +1739,10 @@ // update 'ptbl' chunk const int iSamples = (pSamples) ? pSamples->size() : 0; - const int iPtblOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4; + int iPtblOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4; RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL); if (!ptbl) ptbl = pRIFF->AddSubChunk(CHUNK_ID_PTBL, 1 /*anything, we'll resize*/); - const int iPtblSize = WavePoolHeaderSize + iPtblOffsetSize * iSamples; + int iPtblSize = WavePoolHeaderSize + iPtblOffsetSize * iSamples; ptbl->Resize(iPtblSize); pData = (uint8_t*) ptbl->LoadChunkData(); WavePoolCount = iSamples; @@ -1767,6 +1770,19 @@ __notify_progress(&subprogress, 1.0); // notify subprogress done } + // the RIFF file to be written might now been grown >= 4GB or might + // been shrunk < 4GB, so we might need to update the wave pool offset + // size and thus accordingly we would need to resize the wave pool + // chunk + const file_offset_t finalFileSize = pRIFF->GetRequiredFileSize(); + const bool bRequires64Bit = (finalFileSize >> 32) != 0; + if (b64BitWavePoolOffsets != bRequires64Bit) { + b64BitWavePoolOffsets = bRequires64Bit; + iPtblOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4; + iPtblSize = WavePoolHeaderSize + iPtblOffsetSize * iSamples; + ptbl->Resize(iPtblSize); + } + __notify_progress(pProgress, 1.0); // notify done } @@ -1811,8 +1827,8 @@ * have at the end of the saving process. * * @param pProgress - optional: callback function for progress notification - * @throws RIFF::Exception if any kind of IO error occured - * @throws DLS::Exception if any kind of DLS specific error occured + * @throws RIFF::Exception if any kind of IO error occurred + * @throws DLS::Exception if any kind of DLS specific error occurred */ void File::Save(progress_t* pProgress) { { @@ -1882,10 +1898,10 @@ const int iOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4; // check if 'ptbl' chunk is large enough WavePoolCount = (pSamples) ? pSamples->size() : 0; - const unsigned long ulRequiredSize = WavePoolHeaderSize + iOffsetSize * WavePoolCount; + const file_offset_t ulRequiredSize = WavePoolHeaderSize + iOffsetSize * WavePoolCount; if (ptbl->GetSize() < ulRequiredSize) throw Exception("Fatal error, 'ptbl' chunk too small"); // save the 'ptbl' chunk's current read/write position - unsigned long ulOriginalPos = ptbl->GetPos(); + file_offset_t ullOriginalPos = ptbl->GetPos(); // update headers ptbl->SetPos(0); uint32_t tmp = WavePoolHeaderSize; @@ -1908,7 +1924,7 @@ } } // restore 'ptbl' chunk's original read/write position - ptbl->SetPos(ulOriginalPos); + ptbl->SetPos(ullOriginalPos); } /** @@ -1931,8 +1947,8 @@ SampleList::iterator iter = pSamples->begin(); SampleList::iterator end = pSamples->end(); for (int i = 0 ; iter != end ; ++iter, i++) { - uint64_t _64BitOffset = (*iter)->pWaveList->GetFilePos() - wvplFileOffset - LIST_HEADER_SIZE; - (*iter)->ulWavePoolOffset = _64BitOffset; + uint64_t _64BitOffset = (*iter)->pWaveList->GetFilePos() - wvplFileOffset - LIST_HEADER_SIZE(pRIFF->GetFileOffsetSize()); + (*iter)->ullWavePoolOffset = _64BitOffset; pWavePoolTableHi[i] = (uint32_t) (_64BitOffset >> 32); pWavePoolTable[i] = (uint32_t) _64BitOffset; } @@ -1940,8 +1956,8 @@ SampleList::iterator iter = pSamples->begin(); SampleList::iterator end = pSamples->end(); for (int i = 0 ; iter != end ; ++iter, i++) { - uint64_t _64BitOffset = (*iter)->pWaveList->GetFilePos() - wvplFileOffset - LIST_HEADER_SIZE; - (*iter)->ulWavePoolOffset = _64BitOffset; + uint64_t _64BitOffset = (*iter)->pWaveList->GetFilePos() - wvplFileOffset - LIST_HEADER_SIZE(pRIFF->GetFileOffsetSize()); + (*iter)->ullWavePoolOffset = _64BitOffset; pWavePoolTable[i] = (uint32_t) _64BitOffset; } }