Make a new AudioBuffers constructor and use it to avoid some use of the more complica...

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

diff --git a/src/lib/audio_merger.cc b/src/lib/audio_merger.cc
index 8a69dee5204036381253a4f23e54ba12892587e6..74bb7717d4719fcde04d54bce70e29304435adbe 100644 (file)
--- a/src/lib/audio_merger.cc
+++ b/src/lib/audio_merger.cc
@@ -33,6 +33,7 @@ using std::cout;
 using std::make_pair;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 AudioMerger::AudioMerger (int frame_rate)
        : _frame_rate (frame_rate)
@@ -56,11 +57,9 @@ AudioMerger::pull (DCPTime time)
 {
        list<pair<shared_ptr<AudioBuffers>, DCPTime> > out;
 
-       DCPTimePeriod period (_last_pull, time);
-       _buffers.sort (AudioMerger::BufferComparator());
-
        list<Buffer> new_buffers;
 
+       _buffers.sort (AudioMerger::BufferComparator());
        BOOST_FOREACH (Buffer i, _buffers) {
                if (i.period().to <= time) {
                        /* Completely within the pull period */
@@ -68,13 +67,13 @@ AudioMerger::pull (DCPTime time)
                        out.push_back (make_pair (i.audio, i.time));
                } else if (i.time < time) {
                        /* Overlaps the end of the pull period */
-                       shared_ptr<AudioBuffers> audio (new AudioBuffers (i.audio->channels(), frames(DCPTime(time - i.time))));
-                       /* Though time > i.time, audio->frames() could be 0 if the difference in time is less than one frame */
-                       if (audio->frames() > 0) {
-                               audio->copy_from (i.audio.get(), audio->frames(), 0, 0);
-                               out.push_back (make_pair (audio, i.time));
-                               i.audio->trim_start (audio->frames ());
-                               i.time += DCPTime::from_frames(audio->frames(), _frame_rate);
+                       int32_t const overlap = frames(DCPTime(time - i.time));
+                       /* Though time > i.time, overlap could be 0 if the difference in time is less than one frame */
+                       if (overlap > 0) {
+                               shared_ptr<AudioBuffers> audio(new AudioBuffers(i.audio, overlap, 0));
+                               out.push_back (make_pair(audio, i.time));
+                               i.audio->trim_start (overlap);
+                               i.time += DCPTime::from_frames(overlap, _frame_rate);
                                DCPOMATIC_ASSERT (i.audio->frames() > 0);
                                new_buffers.push_back (i);
                        }
@@ -98,7 +97,6 @@ AudioMerger::pull (DCPTime time)
 void
 AudioMerger::push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time)
 {
-       DCPOMATIC_ASSERT (time >= _last_pull);
        DCPOMATIC_ASSERT (audio->frames() > 0);
 
        DCPTimePeriod period (time, time + DCPTime::from_frames (audio->frames(), _frame_rate));
@@ -136,13 +134,13 @@ AudioMerger::push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time)
                }
 
                /* Get the part of audio that we want to use */
-               shared_ptr<AudioBuffers> part (new AudioBuffers (audio->channels(), frames(i.to) - frames(i.from)));
-               part->copy_from (audio.get(), part->frames(), frames(DCPTime(i.from - time)), 0);
+               shared_ptr<AudioBuffers> part (new AudioBuffers(audio, frames(i.to) - frames(i.from), frames(DCPTime(i.from - time))));
 
                if (before == _buffers.end() && after == _buffers.end()) {
-                       /* New buffer */
-                       DCPOMATIC_ASSERT (part->frames() > 0);
-                       _buffers.push_back (Buffer (part, time, _frame_rate));
+                       if (part->frames() > 0) {
+                               /* New buffer */
+                               _buffers.push_back (Buffer (part, time, _frame_rate));
+                       }
                } else if (before != _buffers.end() && after == _buffers.end()) {
                        /* We have an existing buffer before this one; append new data to it */
                        before->audio->append (part);
@@ -164,5 +162,4 @@ void
 AudioMerger::clear ()
 {
        _buffers.clear ();
-       _last_pull = DCPTime ();
 }