X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_buffers.cc;h=82df9d6f6984dfc19f36dcc5dd71932df15eae91;hp=0130f17b46d1b59562d47aca53956a7c75e56e58;hb=f62398d081db17afd1816bfc8312afb386f22e78;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26 diff --git a/src/lib/audio_buffers.cc b/src/lib/audio_buffers.cc index 0130f17b4..82df9d6f6 100644 --- a/src/lib/audio_buffers.cc +++ b/src/lib/audio_buffers.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2013 Carl Hetherington + Copyright (C) 2012-2017 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic 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. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -31,7 +32,7 @@ using boost::shared_ptr; * @param channels Number of channels. * @param frames Number of frames to reserve space for. */ -AudioBuffers::AudioBuffers (int channels, int frames) +AudioBuffers::AudioBuffers (int channels, int32_t frames) { allocate (channels, frames); } @@ -72,7 +73,7 @@ AudioBuffers::~AudioBuffers () } void -AudioBuffers::allocate (int channels, int frames) +AudioBuffers::allocate (int channels, int32_t frames) { DCPOMATIC_ASSERT (frames >= 0); DCPOMATIC_ASSERT (channels >= 0); @@ -120,20 +121,15 @@ AudioBuffers::data (int c) const * @param f Frames; must be less than or equal to the number of allocated frames. */ void -AudioBuffers::set_frames (int f) +AudioBuffers::set_frames (int32_t f) { DCPOMATIC_ASSERT (f <= _allocated_frames); - for (int c = 0; c < _channels; ++c) { - for (int i = f; i < _frames; ++i) { - _data[c][i] = 0; - } - } - + make_silent (f, _frames - f); _frames = f; } -/** Make all samples on all channels silent */ +/** Make all frames silent */ void AudioBuffers::make_silent () { @@ -150,20 +146,26 @@ AudioBuffers::make_silent (int c) { DCPOMATIC_ASSERT (c >= 0 && c < _channels); - for (int i = 0; i < _frames; ++i) { - _data[c][i] = 0; - } + /* This isn't really allowed, as all-bits-0 is not guaranteed to mean a 0 float, + but it seems that we can get away with it. + */ + memset (_data[c], 0, _frames * sizeof(float)); } +/** Make some frames. + * @param from Start frame. + * @param frames Number of frames to silence. + */ void -AudioBuffers::make_silent (int from, int frames) +AudioBuffers::make_silent (int32_t from, int32_t frames) { DCPOMATIC_ASSERT ((from + frames) <= _allocated_frames); for (int c = 0; c < _channels; ++c) { - for (int i = from; i < (from + frames); ++i) { - _data[c][i] = 0; - } + /* This isn't really allowed, as all-bits-0 is not guaranteed to mean a 0 float, + but it seems that we can get away with it. + */ + memset (_data[c] + from, 0, frames * sizeof(float)); } } @@ -174,7 +176,7 @@ AudioBuffers::make_silent (int from, int frames) * @param write_offset Offset to write to in `to'. */ void -AudioBuffers::copy_from (AudioBuffers const * from, int frames_to_copy, int read_offset, int write_offset) +AudioBuffers::copy_from (AudioBuffers const * from, int32_t frames_to_copy, int32_t read_offset, int32_t write_offset) { if (frames_to_copy == 0) { /* Prevent the asserts from firing if there is nothing to do */ @@ -197,9 +199,8 @@ AudioBuffers::copy_from (AudioBuffers const * from, int frames_to_copy, int read * @param to Offset to move to. * @param frames Number of frames to move. */ - void -AudioBuffers::move (int from, int to, int frames) +AudioBuffers::move (int32_t frames, int32_t from, int32_t to) { if (frames == 0) { return; @@ -220,6 +221,9 @@ AudioBuffers::move (int from, int to, int frames) } /** Add data from from `from', `from_channel' to our channel `to_channel'. + * @param from Buffers to copy data from. + * @param from_channel Channel index to read in \p from. + * @param to_channel Channel index to accumulate into. * @param gain Linear gain to apply to the data before it is added. */ void @@ -241,35 +245,54 @@ AudioBuffers::accumulate_channel (AudioBuffers const * from, int from_channel, i * the buffers, fill the new space with silence. */ void -AudioBuffers::ensure_size (int frames) +AudioBuffers::ensure_size (int32_t frames) { if (_allocated_frames >= frames) { return; } + /* Round up frames to the next power of 2 to reduce the number + of realloc()s that are necessary. + */ + frames--; + frames |= frames >> 1; + frames |= frames >> 2; + frames |= frames >> 4; + frames |= frames >> 8; + frames |= frames >> 16; + frames++; + for (int i = 0; i < _channels; ++i) { _data[i] = static_cast (realloc (_data[i], frames * sizeof (float))); if (!_data[i]) { throw bad_alloc (); } - for (int j = _allocated_frames; j < frames; ++j) { - _data[i][j] = 0; - } } + int32_t const old_allocated = _allocated_frames; _allocated_frames = frames; + if (old_allocated < _allocated_frames) { + make_silent (old_allocated, _allocated_frames - old_allocated); + } } +/** Mix some other buffers with these ones. The AudioBuffers must have the same number of channels. + * @param from Audio buffers to get data from. + * @param frames Number of frames to mix. + * @param read_offset Offset within `from' to read from. + * @param write_offset Offset within this to mix into. + */ void -AudioBuffers::accumulate_frames (AudioBuffers const * from, int read_offset, int write_offset, int frames) +AudioBuffers::accumulate_frames (AudioBuffers const * from, int32_t frames, int32_t read_offset, int32_t write_offset) { DCPOMATIC_ASSERT (_channels == from->channels ()); DCPOMATIC_ASSERT (read_offset >= 0); DCPOMATIC_ASSERT (write_offset >= 0); + float** from_data = from->data (); for (int i = 0; i < _channels; ++i) { for (int j = 0; j < frames; ++j) { - _data[i][j + write_offset] += from->data()[i][j + read_offset]; + _data[i][j + write_offset] += from_data[i][j + read_offset]; } } } @@ -298,6 +321,11 @@ AudioBuffers::channel (int c) const return o; } +/** Copy all the samples from a channel on another AudioBuffers to a channel on this one. + * @param from AudioBuffers to copy from. + * @param from_channel Channel index in `from' to copy from. + * @param to_channel Channel index in this to copy into, overwriting what's already there. + */ void AudioBuffers::copy_channel_from (AudioBuffers const * from, int from_channel, int to_channel) { @@ -305,6 +333,7 @@ AudioBuffers::copy_channel_from (AudioBuffers const * from, int from_channel, in memcpy (data(to_channel), from->data(from_channel), frames() * sizeof (float)); } +/** Make a copy of these AudioBuffers */ shared_ptr AudioBuffers::clone () const { @@ -312,3 +341,22 @@ AudioBuffers::clone () const b->copy_from (this, frames (), 0, 0); return b; } + +/** Extend these buffers with the data from another. The AudioBuffers must have the same number of channels. */ +void +AudioBuffers::append (shared_ptr other) +{ + DCPOMATIC_ASSERT (channels() == other->channels()); + ensure_size (_frames + other->frames()); + copy_from (other.get(), other->frames(), 0, _frames); + _frames += other->frames(); +} + +/** Remove some frames from the start of these AudioBuffers */ +void +AudioBuffers::trim_start (int32_t frames) +{ + DCPOMATIC_ASSERT (frames <= _frames); + move (_frames - frames, frames, 0); + set_frames (_frames - frames); +}