X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_buffers.cc;h=0130f17b46d1b59562d47aca53956a7c75e56e58;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=090c0108134d3d17a49af6332f551092f1b43b0f;hpb=89ea093ab1ed7a526b9332922c674d9eca42d7f2;p=dcpomatic.git diff --git a/src/lib/audio_buffers.cc b/src/lib/audio_buffers.cc index 090c01081..0130f17b4 100644 --- a/src/lib/audio_buffers.cc +++ b/src/lib/audio_buffers.cc @@ -17,10 +17,12 @@ */ +#include "audio_buffers.h" +#include "dcpomatic_assert.h" #include #include +#include #include -#include "audio_buffers.h" using std::bad_alloc; using boost::shared_ptr; @@ -55,7 +57,7 @@ AudioBuffers::operator= (AudioBuffers const & other) if (this == &other) { return *this; } - + deallocate (); allocate (other._channels, other._frames); copy_from (&other, other._frames, 0, 0); @@ -72,15 +74,18 @@ AudioBuffers::~AudioBuffers () void AudioBuffers::allocate (int channels, int frames) { + DCPOMATIC_ASSERT (frames >= 0); + DCPOMATIC_ASSERT (channels >= 0); + _channels = channels; _frames = frames; _allocated_frames = frames; - + _data = static_cast (malloc (_channels * sizeof (float *))); if (!_data) { throw bad_alloc (); } - + for (int i = 0; i < _channels; ++i) { _data[i] = static_cast (malloc (frames * sizeof (float))); if (!_data[i]) { @@ -105,18 +110,26 @@ AudioBuffers::deallocate () float* AudioBuffers::data (int c) const { - assert (c >= 0 && c < _channels); + DCPOMATIC_ASSERT (c >= 0 && c < _channels); return _data[c]; } /** Set the number of frames that these AudioBuffers will report themselves - * as having. + * as having. If we reduce the number of frames, the `lost' frames will + * be silenced. * @param f Frames; must be less than or equal to the number of allocated frames. */ void AudioBuffers::set_frames (int f) { - assert (f <= _allocated_frames); + DCPOMATIC_ASSERT (f <= _allocated_frames); + + for (int c = 0; c < _channels; ++c) { + for (int i = f; i < _frames; ++i) { + _data[c][i] = 0; + } + } + _frames = f; } @@ -135,8 +148,8 @@ AudioBuffers::make_silent () void AudioBuffers::make_silent (int c) { - assert (c >= 0 && c < _channels); - + DCPOMATIC_ASSERT (c >= 0 && c < _channels); + for (int i = 0; i < _frames; ++i) { _data[c][i] = 0; } @@ -145,7 +158,7 @@ AudioBuffers::make_silent (int c) void AudioBuffers::make_silent (int from, int frames) { - assert ((from + frames) <= _allocated_frames); + DCPOMATIC_ASSERT ((from + frames) <= _allocated_frames); for (int c = 0; c < _channels; ++c) { for (int i = from; i < (from + frames); ++i) { @@ -163,11 +176,16 @@ AudioBuffers::make_silent (int from, int frames) void AudioBuffers::copy_from (AudioBuffers const * from, int frames_to_copy, int read_offset, int write_offset) { - assert (from->channels() == channels()); + if (frames_to_copy == 0) { + /* Prevent the asserts from firing if there is nothing to do */ + return; + } - assert (from); - assert (read_offset >= 0 && (read_offset + frames_to_copy) <= from->_allocated_frames); - assert (write_offset >= 0 && (write_offset + frames_to_copy) <= _allocated_frames); + DCPOMATIC_ASSERT (from->channels() == channels()); + + DCPOMATIC_ASSERT (from); + DCPOMATIC_ASSERT (read_offset >= 0 && (read_offset + frames_to_copy) <= from->_allocated_frames); + DCPOMATIC_ASSERT (write_offset >= 0 && (write_offset + frames_to_copy) <= _allocated_frames); for (int i = 0; i < _channels; ++i) { memcpy (_data[i] + write_offset, from->_data[i] + read_offset, frames_to_copy * sizeof(float)); @@ -179,41 +197,43 @@ 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) { if (frames == 0) { return; } - - assert (from >= 0); - assert (from < _frames); - assert (to >= 0); - assert (to < _frames); - assert (frames > 0); - assert (frames <= _frames); - assert ((from + frames) <= _frames); - assert ((to + frames) <= _allocated_frames); - + + DCPOMATIC_ASSERT (from >= 0); + DCPOMATIC_ASSERT (from < _frames); + DCPOMATIC_ASSERT (to >= 0); + DCPOMATIC_ASSERT (to < _frames); + DCPOMATIC_ASSERT (frames > 0); + DCPOMATIC_ASSERT (frames <= _frames); + DCPOMATIC_ASSERT ((from + frames) <= _frames); + DCPOMATIC_ASSERT ((to + frames) <= _allocated_frames); + for (int i = 0; i < _channels; ++i) { memmove (_data[i] + to, _data[i] + from, frames * sizeof(float)); } } -/** Add data from from `from', `from_channel' to our channel `to_channel' */ +/** Add data from from `from', `from_channel' to our channel `to_channel'. + * @param gain Linear gain to apply to the data before it is added. + */ void -AudioBuffers::accumulate_channel (AudioBuffers const * from, int from_channel, int to_channel) +AudioBuffers::accumulate_channel (AudioBuffers const * from, int from_channel, int to_channel, float gain) { int const N = frames (); - assert (from->frames() == N); - assert (to_channel <= _channels); + DCPOMATIC_ASSERT (from->frames() == N); + DCPOMATIC_ASSERT (to_channel <= _channels); float* s = from->data (from_channel); float* d = _data[to_channel]; for (int i = 0; i < N; ++i) { - *d++ += *s++; + *d++ += (*s++) * gain; } } @@ -243,7 +263,9 @@ AudioBuffers::ensure_size (int frames) void AudioBuffers::accumulate_frames (AudioBuffers const * from, int read_offset, int write_offset, int frames) { - assert (_channels == from->channels ()); + DCPOMATIC_ASSERT (_channels == from->channels ()); + DCPOMATIC_ASSERT (read_offset >= 0); + DCPOMATIC_ASSERT (write_offset >= 0); for (int i = 0; i < _channels; ++i) { for (int j = 0; j < frames; ++j) { @@ -252,3 +274,41 @@ AudioBuffers::accumulate_frames (AudioBuffers const * from, int read_offset, int } } +/** @param dB gain in dB */ +void +AudioBuffers::apply_gain (float dB) +{ + float const linear = pow (10, dB / 20); + + for (int i = 0; i < _channels; ++i) { + for (int j = 0; j < _frames; ++j) { + _data[i][j] *= linear; + } + } +} + +/** @param c Channel index. + * @return AudioBuffers object containing only channel `c' from this AudioBuffers. + */ +shared_ptr +AudioBuffers::channel (int c) const +{ + shared_ptr o (new AudioBuffers (1, frames ())); + o->copy_channel_from (this, c, 0); + return o; +} + +void +AudioBuffers::copy_channel_from (AudioBuffers const * from, int from_channel, int to_channel) +{ + DCPOMATIC_ASSERT (from->frames() == frames()); + memcpy (data(to_channel), from->data(from_channel), frames() * sizeof (float)); +} + +shared_ptr +AudioBuffers::clone () const +{ + shared_ptr b (new AudioBuffers (channels (), frames ())); + b->copy_from (this, frames (), 0, 0); + return b; +}