annotate data/fileio/AudioFileReader.cpp @ 1008:d9e0e59a1581

When using an aggregate model to pass data to a transform, zero-pad the shorter input to the duration of the longer rather than truncating the longer. (This is better behaviour for e.g. MATCH, and in any case the code was previously truncating incorrectly and ending up with garbage data at the end.)

/* -*- 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 2006 Chris Cannam.
    
    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 "AudioFileReader.h"

void
AudioFileReader::getDeInterleavedFrames(int start, int count,
                                        std::vector<SampleBlock> &frames) const
{
    SampleBlock interleaved;
    getInterleavedFrames(start, count, interleaved);
    
    int channels = getChannelCount();
    int rc = interleaved.size() / channels;

    frames.clear();

    for (int c = 0; c < channels; ++c) {
        frames.push_back(SampleBlock());
    }

    for (int i = 0; i < rc; ++i) {
        for (int c = 0; c < channels; ++c) {
            frames[c].push_back(interleaved[i * channels + c]);
        }
    }
}