Mercurial > hg > svcore
changeset 1285:757a406dabc4 3.0-integration
More diagnostic output
| author | Chris Cannam |
|---|---|
| date | Wed, 23 Nov 2016 13:57:36 +0000 |
| parents | 16a8e97179d7 |
| children | 40c042780bc9 |
| files | data/fileio/CodedAudioFileReader.cpp data/fileio/CodedAudioFileReader.h |
| diffstat | 2 files changed, 48 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/data/fileio/CodedAudioFileReader.cpp Wed Nov 23 12:05:53 2016 +0000 +++ b/data/fileio/CodedAudioFileReader.cpp Wed Nov 23 13:57:36 2016 +0000 @@ -47,7 +47,9 @@ m_fileFrameCount(0), m_normalised(normalised), m_max(0.f), - m_gain(1.f) + m_gain(1.f), + m_clippedCount(0), + m_firstNonzero(0) { SVDEBUG << "CodedAudioFileReader:: cache mode: " << cacheMode << " (" << (cacheMode == CacheInTemporaryFile @@ -334,6 +336,20 @@ (StorageAdviser::MemoryAllocation, (m_data.size() * sizeof(float)) / 1024); } + + SVDEBUG << "CodedAudioFileReader: File decodes to " << m_fileFrameCount + << " frames" << endl; + if (m_fileFrameCount != m_frameCount) { + SVDEBUG << "CodedAudioFileReader: Resampled to " << m_frameCount + << " frames" << endl; + } + SVDEBUG << "CodedAudioFileReader: Signal abs max is " << m_max + << ", " << m_clippedCount + << " samples clipped, first non-zero frame is at " + << m_firstNonzero << endl; + if (m_normalised) { + SVDEBUG << "CodedAudioFileReader: Normalising, gain is " << m_gain << endl; + } } void @@ -362,6 +378,9 @@ if (m_normalised) { for (sv_frame_t i = 0; i < count; ++i) { float v = fabsf(buffer[i]); + if (m_firstNonzero == 0 && v != 0.f) { + m_firstNonzero = m_frameCount + i; + } if (v > m_max) { m_max = v; m_gain = 1.f / m_max; @@ -369,10 +388,21 @@ } } else { for (sv_frame_t i = 0; i < count; ++i) { - if (buffer[i] > clip) buffer[i] = clip; - } - for (sv_frame_t i = 0; i < count; ++i) { - if (buffer[i] < -clip) buffer[i] = -clip; + float v = buffer[i]; + if (v > clip) { + buffer[i] = clip; + ++m_clippedCount; + } else if (v < -clip) { + buffer[i] = -clip; + ++m_clippedCount; + } + v = fabsf(v); + if (m_firstNonzero == 0 && v != 0.f) { + m_firstNonzero = m_frameCount + i; + } + if (v > m_max) { + m_max = v; + } } } @@ -390,6 +420,16 @@ case CacheInMemory: m_dataLock.lock(); + /* + if (m_data.size() < 5120) { + for (int i = 0; i < count && i < 5120; ++i) { + if (i % 8 == 0) cerr << i << ": "; + cerr << buffer[i] << " "; + if (i % 8 == 7) cerr << endl; + } + } + cerr << endl; + */ m_data.insert(m_data.end(), buffer, buffer + count); m_dataLock.unlock(); break;