Another thinko fix.

[dcpomatic.git] / src / lib / audio_buffers.cc

diff --git a/src/lib/audio_buffers.cc b/src/lib/audio_buffers.cc
index aea581a07311ea151d1508cd1a26b60dcd448009..63204dd6a8684fd50897e68dff0b6b8d15ea30c5 100644 (file)
--- a/src/lib/audio_buffers.cc
+++ b/src/lib/audio_buffers.cc
@@ -125,12 +125,9 @@ 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;
 }
 
@@ -151,9 +148,10 @@ 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.
@@ -166,9 +164,10 @@ 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));
        }
 }
 
@@ -224,6 +223,9 @@ AudioBuffers::move (int32_t frames, int32_t from, int32_t to)
 }
 
 /** 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
@@ -267,12 +269,13 @@ 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.