smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix analysis chunksize to be multiple of channel-count #8631

Browse source
This commit is contained in:
Robin Gareus 2021-03-20 16:20:20 +01:00
parent 745b194241
commit ff275b24c8
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
libs/ardour/analysis_graph.cc
View file

@ -56,13 +56,19 @@ AnalysisGraph::~AnalysisGraph ()
void void
AnalysisGraph::analyze_region (boost::shared_ptr<AudioRegion> region) AnalysisGraph::analyze_region (boost::shared_ptr<AudioRegion> region)
{ {
int n_channels = region->n_channels();
if (n_channels == 0 || n_channels > _max_chunksize) {
return;
}
samplecnt_t n_samples = _max_chunksize - (_max_chunksize % n_channels);
interleaver.reset (new Interleaver<Sample> ()); interleaver.reset (new Interleaver<Sample> ());
interleaver->init (region->n_channels(), _max_chunksize); interleaver->init (n_channels, _max_chunksize);
chunker.reset (new Chunker<Sample> (_max_chunksize)); chunker.reset (new Chunker<Sample> (n_samples));
analyser.reset (new Analyser ( analyser.reset (new Analyser (
_session->nominal_sample_rate(), _session->nominal_sample_rate(),
region->n_channels(), n_channels,
_max_chunksize, n_samples,
region->length())); region->length()));
interleaver->add_output(chunker); interleaver->add_output(chunker);
@ -101,13 +107,20 @@ void
AnalysisGraph::analyze_range (boost::shared_ptr<Route> route, boost::shared_ptr<AudioPlaylist> pl, const std::list<AudioRange>& range) AnalysisGraph::analyze_range (boost::shared_ptr<Route> route, boost::shared_ptr<AudioPlaylist> pl, const std::list<AudioRange>& range)
{ {
const uint32_t n_audio = route->n_inputs().n_audio(); const uint32_t n_audio = route->n_inputs().n_audio();
if (n_audio == 0 || n_audio > _max_chunksize) {
return;
}
const samplecnt_t n_samples = _max_chunksize - (_max_chunksize % n_audio);
for (std::list<AudioRange>::const_iterator j = range.begin(); j != range.end(); ++j) { for (std::list<AudioRange>::const_iterator j = range.begin(); j != range.end(); ++j) {
interleaver.reset (new Interleaver<Sample> ()); interleaver.reset (new Interleaver<Sample> ());
interleaver->init (n_audio, _max_chunksize); interleaver->init (n_audio, _max_chunksize);
chunker.reset (new Chunker<Sample> (_max_chunksize));
analyser.reset (new Analyser (48000.f, n_audio, _max_chunksize, (*j).length())); chunker.reset (new Chunker<Sample> (n_samples));
analyser.reset (new Analyser (
_session->nominal_sample_rate(),
n_audio, n_samples, (*j).length()));
interleaver->add_output(chunker); interleaver->add_output(chunker);
chunker->add_output (analyser); chunker->add_output (analyser);