Debug.

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

diff --git a/src/lib/audio_buffers.cc b/src/lib/audio_buffers.cc
index 546abbb54a767a9a3a4b2d039ada7f0634792d35..6183ff26e89dfbf6b8face61c12892d9d9b2ba2c 100644 (file)
--- a/src/lib/audio_buffers.cc
+++ b/src/lib/audio_buffers.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,6 +20,7 @@
 
 #include "audio_buffers.h"
 #include "dcpomatic_assert.h"
+#include "dcpomatic_log.h"
 #include <cassert>
 #include <cstring>
 #include <cmath>
@@ -43,12 +44,14 @@ AudioBuffers::AudioBuffers (int channels, int32_t frames)
 AudioBuffers::AudioBuffers (AudioBuffers const & other)
 {
        allocate (other._channels, other._frames);
+       LOG_GENERAL_NC("copy_from #5");
        copy_from (&other, other._frames, 0, 0);
 }
 
 AudioBuffers::AudioBuffers (boost::shared_ptr<const AudioBuffers> other)
 {
        allocate (other->_channels, other->_frames);
+       LOG_GENERAL_NC("copy_from #6");
        copy_from (other.get(), other->_frames, 0, 0);
 }
 
@@ -61,6 +64,7 @@ AudioBuffers::operator= (AudioBuffers const & other)
 
        deallocate ();
        allocate (other._channels, other._frames);
+       LOG_GENERAL_NC("copy_from #7");
        copy_from (&other, other._frames, 0, 0);
 
        return *this;
@@ -134,7 +138,7 @@ AudioBuffers::set_frames (int32_t f)
        _frames = f;
 }
 
-/** Make all samples on all channels silent */
+/** Make all frames silent */
 void
 AudioBuffers::make_silent ()
 {
@@ -156,6 +160,10 @@ AudioBuffers::make_silent (int c)
        }
 }
 
+/** Make some frames.
+ *  @param from Start frame.
+ *  @param frames Number of frames to silence.
+ */
 void
 AudioBuffers::make_silent (int32_t from, int32_t frames)
 {
@@ -182,6 +190,8 @@ AudioBuffers::copy_from (AudioBuffers const * from, int32_t frames_to_copy, int3
                return;
        }
 
+       LOG_GENERAL("AudioBuffers::copy_from %1 %2 %3 %4", from->_allocated_frames, frames_to_copy, read_offset, write_offset);
+
        DCPOMATIC_ASSERT (from->channels() == channels());
 
        DCPOMATIC_ASSERT (from);
@@ -198,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;
@@ -221,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
@@ -272,8 +284,14 @@ AudioBuffers::ensure_size (int32_t frames)
        _allocated_frames = frames;
 }
 
+/** 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);
@@ -311,6 +329,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)
 {
@@ -318,10 +341,32 @@ 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>
 AudioBuffers::clone () const
 {
        shared_ptr<AudioBuffers> b (new AudioBuffers (channels (), frames ()));
+       LOG_GENERAL_NC("copy_from #3");
        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<const AudioBuffers> other)
+{
+       DCPOMATIC_ASSERT (channels() == other->channels());
+       ensure_size (_frames + other->frames());
+       LOG_GENERAL_NC("copy_from #4");
+       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);
+}