/[svn]/libgig/trunk/src/DLS.cpp
ViewVC logotype

Diff of /libgig/trunk/src/DLS.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2911 by schoenebeck, Thu May 12 19:34:17 2016 UTC revision 2912 by schoenebeck, Tue May 17 14:30:10 2016 UTC
# Line 2  Line 2 
2   *                                                                         *   *                                                                         *
3   *   libgig - C++ cross-platform Gigasampler format file access library    *   *   libgig - C++ cross-platform Gigasampler format file access library    *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003-2014 by Christian Schoenebeck                      *   *   Copyright (C) 2003-2016 by Christian Schoenebeck                      *
6   *                              <cuse@users.sourceforge.net>               *   *                              <cuse@users.sourceforge.net>               *
7   *                                                                         *   *                                                                         *
8   *   This library is free software; you can redistribute it and/or modify  *   *   This library is free software; you can redistribute it and/or modify  *
# Line 711  namespace DLS { Line 711  namespace DLS {
711       * @param WavePoolOffset - offset of this sample data from wave pool       * @param WavePoolOffset - offset of this sample data from wave pool
712       *                         ('wvpl') list chunk       *                         ('wvpl') list chunk
713       */       */
714      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) {
715          pWaveList = waveList;          pWaveList = waveList;
716          ulWavePoolOffset = WavePoolOffset - LIST_HEADER_SIZE;          ullWavePoolOffset = WavePoolOffset - LIST_HEADER_SIZE(waveList->GetFile()->GetFileOffsetSize());
717          pCkFormat = waveList->GetSubChunk(CHUNK_ID_FMT);          pCkFormat = waveList->GetSubChunk(CHUNK_ID_FMT);
718          pCkData   = waveList->GetSubChunk(CHUNK_ID_DATA);          pCkData   = waveList->GetSubChunk(CHUNK_ID_DATA);
719          if (pCkFormat) {          if (pCkFormat) {
# Line 793  namespace DLS { Line 793  namespace DLS {
793          Resize(orig->GetSize());          Resize(orig->GetSize());
794          char* buf = (char*) LoadSampleData();          char* buf = (char*) LoadSampleData();
795          Sample* pOrig = (Sample*) orig; //HACK: circumventing the constness here for now          Sample* pOrig = (Sample*) orig; //HACK: circumventing the constness here for now
796          const unsigned long restorePos = pOrig->pCkData->GetPos();          const file_offset_t restorePos = pOrig->pCkData->GetPos();
797          pOrig->SetPos(0);          pOrig->SetPos(0);
798          for (unsigned long todo = pOrig->GetSize(), i = 0; todo; ) {          for (file_offset_t todo = pOrig->GetSize(), i = 0; todo; ) {
799              const int iReadAtOnce = 64*1024;              const int iReadAtOnce = 64*1024;
800              unsigned long n = (iReadAtOnce < todo) ? iReadAtOnce : todo;              file_offset_t n = (iReadAtOnce < todo) ? iReadAtOnce : todo;
801              n = pOrig->Read(&buf[i], n);              n = pOrig->Read(&buf[i], n);
802              if (!n) break;              if (!n) break;
803              todo -= n;              todo -= n;
# Line 855  namespace DLS { Line 855  namespace DLS {
855       * @returns number of sample points or 0 if FormatTag != DLS_WAVE_FORMAT_PCM       * @returns number of sample points or 0 if FormatTag != DLS_WAVE_FORMAT_PCM
856       * @see FrameSize, FormatTag       * @see FrameSize, FormatTag
857       */       */
858      unsigned long Sample::GetSize() const {      file_offset_t Sample::GetSize() const {
859          if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0;          if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0;
860          return (pCkData) ? pCkData->GetSize() / FrameSize : 0;          return (pCkData) ? pCkData->GetSize() / FrameSize : 0;
861      }      }
# Line 913  namespace DLS { Line 913  namespace DLS {
913       * @throws Exception if no data RIFF chunk was created for the sample yet       * @throws Exception if no data RIFF chunk was created for the sample yet
914       * @see FrameSize, FormatTag       * @see FrameSize, FormatTag
915       */       */
916      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) {
917          if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format          if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format
918          if (!pCkData) throw Exception("No data chunk created for sample yet, call Sample::Resize() to create one");          if (!pCkData) throw Exception("No data chunk created for sample yet, call Sample::Resize() to create one");
919          unsigned long orderedBytes = SampleCount * FrameSize;          file_offset_t orderedBytes = SampleCount * FrameSize;
920          unsigned long result = pCkData->SetPos(orderedBytes, Whence);          file_offset_t result = pCkData->SetPos(orderedBytes, Whence);
921          return (result == orderedBytes) ? SampleCount          return (result == orderedBytes) ? SampleCount
922                                          : result / FrameSize;                                          : result / FrameSize;
923      }      }
# Line 931  namespace DLS { Line 931  namespace DLS {
931       * @param pBuffer      destination buffer       * @param pBuffer      destination buffer
932       * @param SampleCount  number of sample points to read       * @param SampleCount  number of sample points to read
933       */       */
934      unsigned long Sample::Read(void* pBuffer, unsigned long SampleCount) {      file_offset_t Sample::Read(void* pBuffer, file_offset_t SampleCount) {
935          if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format          if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format
936          return pCkData->Read(pBuffer, SampleCount, FrameSize); // FIXME: channel inversion due to endian correction?          return pCkData->Read(pBuffer, SampleCount, FrameSize); // FIXME: channel inversion due to endian correction?
937      }      }
# Line 951  namespace DLS { Line 951  namespace DLS {
951       * @throws Exception if current sample size is too small       * @throws Exception if current sample size is too small
952       * @see LoadSampleData()       * @see LoadSampleData()
953       */       */
954      unsigned long Sample::Write(void* pBuffer, unsigned long SampleCount) {      file_offset_t Sample::Write(void* pBuffer, file_offset_t SampleCount) {
955          if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format          if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format
956          if (GetSize() < SampleCount) throw Exception("Could not write sample data, current sample size to small");          if (GetSize() < SampleCount) throw Exception("Could not write sample data, current sample size to small");
957          return pCkData->Write(pBuffer, SampleCount, FrameSize); // FIXME: channel inversion due to endian correction?          return pCkData->Write(pBuffer, SampleCount, FrameSize); // FIXME: channel inversion due to endian correction?
# Line 1047  namespace DLS { Line 1047  namespace DLS {
1047      Sample* Region::GetSample() {      Sample* Region::GetSample() {
1048          if (pSample) return pSample;          if (pSample) return pSample;
1049          File* file = (File*) GetParent()->GetParent();          File* file = (File*) GetParent()->GetParent();
1050          unsigned long soughtoffset = file->pWavePoolTable[WavePoolTableIndex];          uint64_t soughtoffset = file->pWavePoolTable[WavePoolTableIndex];
1051          Sample* sample = file->GetFirstSample();          Sample* sample = file->GetFirstSample();
1052          while (sample) {          while (sample) {
1053              if (sample->ulWavePoolOffset == soughtoffset) return (pSample = sample);              if (sample->ullWavePoolOffset == soughtoffset) return (pSample = sample);
1054              sample = file->GetNextSample();              sample = file->GetNextSample();
1055          }          }
1056          return NULL;          return NULL;
# Line 1526  namespace DLS { Line 1526  namespace DLS {
1526          if (!pSamples) pSamples = new SampleList;          if (!pSamples) pSamples = new SampleList;
1527          RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);          RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);
1528          if (wvpl) {          if (wvpl) {
1529              unsigned long wvplFileOffset = wvpl->GetFilePos();              file_offset_t wvplFileOffset = wvpl->GetFilePos();
1530              RIFF::List* wave = wvpl->GetFirstSubList();              RIFF::List* wave = wvpl->GetFirstSubList();
1531              while (wave) {              while (wave) {
1532                  if (wave->GetListType() == LIST_TYPE_WAVE) {                  if (wave->GetListType() == LIST_TYPE_WAVE) {
1533                      unsigned long waveFileOffset = wave->GetFilePos();                      file_offset_t waveFileOffset = wave->GetFilePos();
1534                      pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset));                      pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset));
1535                  }                  }
1536                  wave = wvpl->GetNextSubList();                  wave = wvpl->GetNextSubList();
# Line 1539  namespace DLS { Line 1539  namespace DLS {
1539          else { // Seen a dwpl list chunk instead of a wvpl list chunk in some file (officially not DLS compliant)          else { // Seen a dwpl list chunk instead of a wvpl list chunk in some file (officially not DLS compliant)
1540              RIFF::List* dwpl = pRIFF->GetSubList(LIST_TYPE_DWPL);              RIFF::List* dwpl = pRIFF->GetSubList(LIST_TYPE_DWPL);
1541              if (dwpl) {              if (dwpl) {
1542                  unsigned long dwplFileOffset = dwpl->GetFilePos();                  file_offset_t dwplFileOffset = dwpl->GetFilePos();
1543                  RIFF::List* wave = dwpl->GetFirstSubList();                  RIFF::List* wave = dwpl->GetFirstSubList();
1544                  while (wave) {                  while (wave) {
1545                      if (wave->GetListType() == LIST_TYPE_WAVE) {                      if (wave->GetListType() == LIST_TYPE_WAVE) {
1546                          unsigned long waveFileOffset = wave->GetFilePos();                          file_offset_t waveFileOffset = wave->GetFilePos();
1547                          pSamples->push_back(new Sample(this, wave, waveFileOffset - dwplFileOffset));                          pSamples->push_back(new Sample(this, wave, waveFileOffset - dwplFileOffset));
1548                      }                      }
1549                      wave = dwpl->GetNextSubList();                      wave = dwpl->GetNextSubList();
# Line 1737  namespace DLS { Line 1737  namespace DLS {
1737    
1738          // update 'ptbl' chunk          // update 'ptbl' chunk
1739          const int iSamples = (pSamples) ? pSamples->size() : 0;          const int iSamples = (pSamples) ? pSamples->size() : 0;
1740          const int iPtblOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4;          int iPtblOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4;
1741          RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL);          RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL);
1742          if (!ptbl)   ptbl = pRIFF->AddSubChunk(CHUNK_ID_PTBL, 1 /*anything, we'll resize*/);          if (!ptbl)   ptbl = pRIFF->AddSubChunk(CHUNK_ID_PTBL, 1 /*anything, we'll resize*/);
1743          const int iPtblSize = WavePoolHeaderSize + iPtblOffsetSize * iSamples;          int iPtblSize = WavePoolHeaderSize + iPtblOffsetSize * iSamples;
1744          ptbl->Resize(iPtblSize);          ptbl->Resize(iPtblSize);
1745          pData = (uint8_t*) ptbl->LoadChunkData();          pData = (uint8_t*) ptbl->LoadChunkData();
1746          WavePoolCount = iSamples;          WavePoolCount = iSamples;
# Line 1768  namespace DLS { Line 1768  namespace DLS {
1768              __notify_progress(&subprogress, 1.0); // notify subprogress done              __notify_progress(&subprogress, 1.0); // notify subprogress done
1769          }          }
1770    
1771            // the RIFF file to be written might now been grown >= 4GB or might
1772            // been shrunk < 4GB, so we might need to update the wave pool offset
1773            // size and thus accordingly we would need to resize the wave pool
1774            // chunk
1775            const file_offset_t finalFileSize = pRIFF->GetRequiredFileSize();
1776            const bool bRequires64Bit = (finalFileSize >> 32) != 0;
1777            if (b64BitWavePoolOffsets != bRequires64Bit) {
1778                b64BitWavePoolOffsets = bRequires64Bit;
1779                iPtblOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4;
1780                iPtblSize = WavePoolHeaderSize + iPtblOffsetSize * iSamples;
1781                ptbl->Resize(iPtblSize);
1782            }
1783    
1784          __notify_progress(pProgress, 1.0); // notify done          __notify_progress(pProgress, 1.0); // notify done
1785      }      }
1786    
# Line 1883  namespace DLS { Line 1896  namespace DLS {
1896          const int iOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4;          const int iOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4;
1897          // check if 'ptbl' chunk is large enough          // check if 'ptbl' chunk is large enough
1898          WavePoolCount = (pSamples) ? pSamples->size() : 0;          WavePoolCount = (pSamples) ? pSamples->size() : 0;
1899          const unsigned long ulRequiredSize = WavePoolHeaderSize + iOffsetSize * WavePoolCount;          const file_offset_t ulRequiredSize = WavePoolHeaderSize + iOffsetSize * WavePoolCount;
1900          if (ptbl->GetSize() < ulRequiredSize) throw Exception("Fatal error, 'ptbl' chunk too small");          if (ptbl->GetSize() < ulRequiredSize) throw Exception("Fatal error, 'ptbl' chunk too small");
1901          // save the 'ptbl' chunk's current read/write position          // save the 'ptbl' chunk's current read/write position
1902          unsigned long ulOriginalPos = ptbl->GetPos();          file_offset_t ullOriginalPos = ptbl->GetPos();
1903          // update headers          // update headers
1904          ptbl->SetPos(0);          ptbl->SetPos(0);
1905          uint32_t tmp = WavePoolHeaderSize;          uint32_t tmp = WavePoolHeaderSize;
# Line 1909  namespace DLS { Line 1922  namespace DLS {
1922              }              }
1923          }          }
1924          // restore 'ptbl' chunk's original read/write position          // restore 'ptbl' chunk's original read/write position
1925          ptbl->SetPos(ulOriginalPos);          ptbl->SetPos(ullOriginalPos);
1926      }      }
1927    
1928      /**      /**
# Line 1932  namespace DLS { Line 1945  namespace DLS {
1945              SampleList::iterator iter = pSamples->begin();              SampleList::iterator iter = pSamples->begin();
1946              SampleList::iterator end  = pSamples->end();              SampleList::iterator end  = pSamples->end();
1947              for (int i = 0 ; iter != end ; ++iter, i++) {              for (int i = 0 ; iter != end ; ++iter, i++) {
1948                  uint64_t _64BitOffset = (*iter)->pWaveList->GetFilePos() - wvplFileOffset - LIST_HEADER_SIZE;                  uint64_t _64BitOffset = (*iter)->pWaveList->GetFilePos() - wvplFileOffset - LIST_HEADER_SIZE(pRIFF->GetFileOffsetSize());
1949                  (*iter)->ulWavePoolOffset = _64BitOffset;                  (*iter)->ullWavePoolOffset = _64BitOffset;
1950                  pWavePoolTableHi[i] = (uint32_t) (_64BitOffset >> 32);                  pWavePoolTableHi[i] = (uint32_t) (_64BitOffset >> 32);
1951                  pWavePoolTable[i]   = (uint32_t) _64BitOffset;                  pWavePoolTable[i]   = (uint32_t) _64BitOffset;
1952              }              }
# Line 1941  namespace DLS { Line 1954  namespace DLS {
1954              SampleList::iterator iter = pSamples->begin();              SampleList::iterator iter = pSamples->begin();
1955              SampleList::iterator end  = pSamples->end();              SampleList::iterator end  = pSamples->end();
1956              for (int i = 0 ; iter != end ; ++iter, i++) {              for (int i = 0 ; iter != end ; ++iter, i++) {
1957                  uint64_t _64BitOffset = (*iter)->pWaveList->GetFilePos() - wvplFileOffset - LIST_HEADER_SIZE;                  uint64_t _64BitOffset = (*iter)->pWaveList->GetFilePos() - wvplFileOffset - LIST_HEADER_SIZE(pRIFF->GetFileOffsetSize());
1958                  (*iter)->ulWavePoolOffset = _64BitOffset;                  (*iter)->ullWavePoolOffset = _64BitOffset;
1959                  pWavePoolTable[i] = (uint32_t) _64BitOffset;                  pWavePoolTable[i] = (uint32_t) _64BitOffset;
1960              }              }
1961          }          }
Legend:
Removed from v.2911  
changed lines
  Added in v.2912
  ViewVC Help
Powered by ViewVC