Mercurial > hg > sonic-annotator
comparison runner/FeatureExtractionManager.cpp @ 286:5ba121f3889e piper-nopiper
Update for latest audio file reader changes & tests
author | Chris Cannam |
---|---|
date | Fri, 02 Dec 2016 09:33:00 +0000 |
parents | 0be716283c61 |
children | 0e866ef12d87 |
comparison
equal
deleted
inserted
replaced
285:10cd9443fe48 | 286:5ba121f3889e |
---|---|
588 source.waitForData(); | 588 source.waitForData(); |
589 | 589 |
590 // Open to determine validity, channel count, sample rate only | 590 // Open to determine validity, channel count, sample rate only |
591 // (then close, and open again later with actual desired rate &c) | 591 // (then close, and open again later with actual desired rate &c) |
592 | 592 |
593 AudioFileReaderFactory::Parameters params; | |
594 params.normalisation = (m_normalise ? | |
595 AudioFileReaderFactory::Normalisation::Peak : | |
596 AudioFileReaderFactory::Normalisation::None); | |
597 | |
593 AudioFileReader *reader = | 598 AudioFileReader *reader = |
594 AudioFileReaderFactory::createReader | 599 AudioFileReaderFactory::createReader |
595 (source, 0, m_normalise, m_verbose ? &retrievalProgress : 0); | 600 (source, params, m_verbose ? &retrievalProgress : 0); |
596 | 601 |
597 if (!reader) { | 602 if (!reader) { |
598 throw FailedToOpenFile(audioSource); | 603 throw FailedToOpenFile(audioSource); |
599 } | 604 } |
600 | 605 |
684 // can't use this; open it again | 689 // can't use this; open it again |
685 delete reader; | 690 delete reader; |
686 reader = 0; | 691 reader = 0; |
687 } | 692 } |
688 } | 693 } |
694 | |
689 if (!reader) { | 695 if (!reader) { |
690 ProgressPrinter retrievalProgress("Retrieving audio data..."); | 696 ProgressPrinter retrievalProgress("Retrieving audio data..."); |
691 FileSource fs(source, m_verbose ? &retrievalProgress : 0); | 697 FileSource fs(source, m_verbose ? &retrievalProgress : 0); |
692 fs.waitForData(); | 698 fs.waitForData(); |
699 | |
700 AudioFileReaderFactory::Parameters params; | |
701 params.targetRate = m_sampleRate; | |
702 params.normalisation = (m_normalise ? | |
703 AudioFileReaderFactory::Normalisation::Peak : | |
704 AudioFileReaderFactory::Normalisation::None); | |
705 | |
693 reader = AudioFileReaderFactory::createReader | 706 reader = AudioFileReaderFactory::createReader |
694 (fs, m_sampleRate, m_normalise, m_verbose ? &retrievalProgress : 0); | 707 (fs, params, m_verbose ? &retrievalProgress : 0); |
695 if (m_verbose) retrievalProgress.done(); | 708 if (m_verbose) retrievalProgress.done(); |
696 } | 709 } |
710 | |
697 if (!reader) { | 711 if (!reader) { |
698 throw FailedToOpenFile(source); | 712 throw FailedToOpenFile(source); |
699 } | 713 } |
700 if (reader->getChannelCount() != m_channels || | 714 if (reader->getChannelCount() != m_channels || |
701 reader->getNativeRate() != m_sampleRate) { | 715 reader->getNativeRate() != m_sampleRate) { |