Mercurial > hg > svcore
view data/fileio/DecodingWavFileReader.cpp @ 1310:aa1b1fc2d018 mp3-gapless
Stop reporting sync errors only when we really are at eof, i.e. after the input callback has been called again (previously we just tested whether we'd buffered up all the input, which of course we do in one go at the start)
author | Chris Cannam |
---|---|
date | Tue, 29 Nov 2016 16:45:29 +0000 |
parents | 4704e834d0f9 |
children | 54af1e21705c |
line wrap: on
line source
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ /* Sonic Visualiser An audio file viewer and annotation editor. Centre for Digital Music, Queen Mary, University of London. This file copyright 2007 QMUL. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. See the file COPYING included with this distribution for more information. */ #include "DecodingWavFileReader.h" #include "WavFileReader.h" #include "base/Profiler.h" #include "base/ProgressReporter.h" #include <QFileInfo> using namespace std; DecodingWavFileReader::DecodingWavFileReader(FileSource source, DecodeMode decodeMode, CacheMode mode, sv_samplerate_t targetRate, bool normalised, ProgressReporter *reporter) : CodedAudioFileReader(mode, targetRate, normalised), m_source(source), m_path(source.getLocalFilename()), m_cancelled(false), m_processed(0), m_completion(0), m_original(0), m_reporter(reporter), m_decodeThread(0) { SVDEBUG << "DecodingWavFileReader: local path: \"" << m_path << "\", decode mode: " << decodeMode << " (" << (decodeMode == DecodeAtOnce ? "DecodeAtOnce" : "DecodeThreaded") << ")" << endl; m_channelCount = 0; m_fileRate = 0; Profiler profiler("DecodingWavFileReader::DecodingWavFileReader"); m_original = new WavFileReader(m_path); if (!m_original->isOK()) { m_error = m_original->getError(); return; } m_channelCount = m_original->getChannelCount(); m_fileRate = m_original->getSampleRate(); initialiseDecodeCache(); if (decodeMode == DecodeAtOnce) { if (m_reporter) { connect(m_reporter, SIGNAL(cancelled()), this, SLOT(cancelled())); m_reporter->setMessage (tr("Decoding %1...").arg(QFileInfo(m_path).fileName())); } sv_frame_t blockSize = 16384; sv_frame_t total = m_original->getFrameCount(); vector<float> block; for (sv_frame_t i = 0; i < total; i += blockSize) { sv_frame_t count = blockSize; if (i + count > total) count = total - i; block = m_original->getInterleavedFrames(i, count); addBlock(block); if (m_cancelled) break; } if (isDecodeCacheInitialised()) finishDecodeCache(); endSerialised(); if (m_reporter) m_reporter->setProgress(100); delete m_original; m_original = 0; } else { if (m_reporter) m_reporter->setProgress(100); m_decodeThread = new DecodeThread(this); m_decodeThread->start(); } } DecodingWavFileReader::~DecodingWavFileReader() { if (m_decodeThread) { m_cancelled = true; m_decodeThread->wait(); delete m_decodeThread; } delete m_original; } void DecodingWavFileReader::cancelled() { m_cancelled = true; } void DecodingWavFileReader::DecodeThread::run() { if (m_reader->m_cacheMode == CacheInTemporaryFile) { m_reader->startSerialised("DecodingWavFileReader::Decode"); } sv_frame_t blockSize = 16384; sv_frame_t total = m_reader->m_original->getFrameCount(); vector<float> block; for (sv_frame_t i = 0; i < total; i += blockSize) { sv_frame_t count = blockSize; if (i + count > total) count = total - i; block = m_reader->m_original->getInterleavedFrames(i, count); m_reader->addBlock(block); if (m_reader->m_cancelled) break; } if (m_reader->isDecodeCacheInitialised()) m_reader->finishDecodeCache(); m_reader->m_completion = 100; m_reader->endSerialised(); delete m_reader->m_original; m_reader->m_original = 0; } void DecodingWavFileReader::addBlock(const vector<float> &frames) { addSamplesToDecodeCache(frames); m_processed += frames.size(); double ratio = double(m_sampleRate) / double(m_fileRate); int progress = int(lrint((double(m_processed) * ratio * 100) / double(m_original->getFrameCount()))); if (progress > 99) progress = 99; m_completion = progress; if (m_reporter) { m_reporter->setProgress(progress); } } void DecodingWavFileReader::getSupportedExtensions(set<QString> &extensions) { WavFileReader::getSupportedExtensions(extensions); } bool DecodingWavFileReader::supportsExtension(QString extension) { return WavFileReader::supportsExtension(extension); } bool DecodingWavFileReader::supportsContentType(QString type) { return WavFileReader::supportsContentType(type); } bool DecodingWavFileReader::supports(FileSource &source) { return WavFileReader::supports(source); }