X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_buffers.cc;h=4c3c2d4a7a20515b8f58d4acbf17d1feb18b2039;hp=71422944decbe544473b7e8479148c0e445ae7cd;hb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;hpb=4dbc6ef917aeceb906b1ef1caf6911033e7e2c54 diff --git a/src/lib/audio_buffers.cc b/src/lib/audio_buffers.cc index 71422944d..4c3c2d4a7 100644 --- a/src/lib/audio_buffers.cc +++ b/src/lib/audio_buffers.cc @@ -1,24 +1,26 @@ /* Copyright (C) 2012-2013 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 . */ #include "audio_buffers.h" #include "dcpomatic_assert.h" +#include #include #include #include @@ -26,12 +28,13 @@ 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. * @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); } @@ -57,7 +60,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,7 +75,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); @@ -80,12 +83,12 @@ AudioBuffers::allocate (int channels, int frames) _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]) { @@ -120,7 +123,7 @@ 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); @@ -129,7 +132,7 @@ AudioBuffers::set_frames (int f) _data[c][i] = 0; } } - + _frames = f; } @@ -149,14 +152,14 @@ void AudioBuffers::make_silent (int c) { DCPOMATIC_ASSERT (c >= 0 && c < _channels); - + for (int i = 0; i < _frames; ++i) { _data[c][i] = 0; } } void -AudioBuffers::make_silent (int from, int frames) +AudioBuffers::make_silent (int32_t from, int32_t frames) { DCPOMATIC_ASSERT ((from + frames) <= _allocated_frames); @@ -174,13 +177,13 @@ 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 */ return; } - + DCPOMATIC_ASSERT (from->channels() == channels()); DCPOMATIC_ASSERT (from); @@ -197,14 +200,14 @@ 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 from, int32_t to, int32_t frames) { if (frames == 0) { return; } - + DCPOMATIC_ASSERT (from >= 0); DCPOMATIC_ASSERT (from < _frames); DCPOMATIC_ASSERT (to >= 0); @@ -213,7 +216,7 @@ AudioBuffers::move (int from, int to, int frames) 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)); } @@ -241,12 +244,23 @@ 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]) { @@ -261,7 +275,7 @@ AudioBuffers::ensure_size (int frames) } void -AudioBuffers::accumulate_frames (AudioBuffers const * from, int read_offset, int write_offset, int frames) +AudioBuffers::accumulate_frames (AudioBuffers const * from, int32_t read_offset, int32_t write_offset, int32_t frames) { DCPOMATIC_ASSERT (_channels == from->channels ()); DCPOMATIC_ASSERT (read_offset >= 0); @@ -279,7 +293,7 @@ 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; @@ -293,7 +307,7 @@ AudioBuffers::apply_gain (float dB) shared_ptr AudioBuffers::channel (int c) const { - shared_ptr o (new AudioBuffers (1, frames ())); + shared_ptr o = make_shared (1, frames ()); o->copy_channel_from (this, c, 0); return o; } @@ -308,7 +322,7 @@ AudioBuffers::copy_channel_from (AudioBuffers const * from, int from_channel, in shared_ptr AudioBuffers::clone () const { - shared_ptr b (new AudioBuffers (channels (), frames ())); + shared_ptr b = make_shared (channels (), frames ()); b->copy_from (this, frames (), 0, 0); return b; }