X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_buffers.cc;h=cfe762659ebdb6d91128557b35cccb3c08c56144;hb=001ba1644fc6aa54f91fcaaa62ae7e5de2313bc1;hp=4c3c2d4a7a20515b8f58d4acbf17d1feb18b2039;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git diff --git a/src/lib/audio_buffers.cc b/src/lib/audio_buffers.cc index 4c3c2d4a7..cfe762659 100644 --- a/src/lib/audio_buffers.cc +++ b/src/lib/audio_buffers.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington + Copyright (C) 2012-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -18,9 +18,9 @@ */ +#include "util.h" #include "audio_buffers.h" #include "dcpomatic_assert.h" -#include #include #include #include @@ -28,7 +28,6 @@ using std::bad_alloc; using boost::shared_ptr; -using boost::make_shared; /** Construct an AudioBuffers. Audio data is undefined after this constructor. * @param channels Number of channels. @@ -54,6 +53,12 @@ AudioBuffers::AudioBuffers (boost::shared_ptr other) copy_from (other.get(), other->_frames, 0, 0); } +AudioBuffers::AudioBuffers (boost::shared_ptr other, int32_t frames_to_copy, int32_t read_offset) +{ + allocate (other->_channels, frames_to_copy); + copy_from (other.get(), frames_to_copy, read_offset, 0); +} + AudioBuffers & AudioBuffers::operator= (AudioBuffers const & other) { @@ -127,16 +132,13 @@ 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; - } + if (f < _frames) { + make_silent (f, _frames - f); } - _frames = f; } -/** Make all samples on all channels silent */ +/** Make all frames silent */ void AudioBuffers::make_silent () { @@ -153,20 +155,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 (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)); } } @@ -200,9 +208,8 @@ AudioBuffers::copy_from (AudioBuffers const * from, int32_t frames_to_copy, int3 * @param to Offset to move to. * @param frames Number of frames to move. */ - void -AudioBuffers::move (int32_t from, int32_t to, int32_t frames) +AudioBuffers::move (int32_t frames, int32_t from, int32_t to) { if (frames == 0) { return; @@ -223,6 +230,9 @@ AudioBuffers::move (int32_t from, int32_t to, int32_t 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 @@ -266,24 +276,32 @@ AudioBuffers::ensure_size (int32_t frames) 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, int32_t read_offset, int32_t write_offset, int32_t 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]; } } } @@ -292,7 +310,7 @@ AudioBuffers::accumulate_frames (AudioBuffers const * from, int32_t read_offset, void AudioBuffers::apply_gain (float dB) { - float const linear = pow (10, dB / 20); + float const linear = db_to_linear (dB); for (int i = 0; i < _channels; ++i) { for (int j = 0; j < _frames; ++j) { @@ -307,11 +325,16 @@ AudioBuffers::apply_gain (float dB) shared_ptr AudioBuffers::channel (int c) const { - shared_ptr o = make_shared (1, frames ()); + shared_ptr o (new AudioBuffers (1, frames ())); o->copy_channel_from (this, c, 0); 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) { @@ -319,10 +342,30 @@ 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 { - shared_ptr b = make_shared (channels (), frames ()); + shared_ptr b (new AudioBuffers (channels (), frames ())); 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); +}