X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_merger.cc;h=74bb7717d4719fcde04d54bce70e29304435adbe;hb=143cfcf6c9e8c0a0879652d0d741ec268e8d9541;hp=ecfdfdc27ba54bc0b6cdd65f12a3f185c26297c1;hpb=0a2fe723109c6a8fbb61ea5721b5a475e4b480d0;p=dcpomatic.git

diff --git a/src/lib/audio_merger.cc b/src/lib/audio_merger.cc
index ecfdfdc27..74bb7717d 100644
--- 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,14 +67,16 @@ 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))));
-			audio->copy_from (i.audio.get(), audio->frames(), 0, 0);
-			DCPOMATIC_ASSERT (audio->frames() > 0);
-			out.push_back (make_pair (audio, i.time));
-			i.audio->trim_start (audio->frames ());
-			i.time += DCPTime::from_frames(audio->frames(), _frame_rate);
-			DCPOMATIC_ASSERT (i.audio->frames() > 0);
-			new_buffers.push_back (i);
+			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);
+			}
 		} else {
 			/* Not involved */
 			DCPOMATIC_ASSERT (i.audio->frames() > 0);
@@ -96,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));
@@ -134,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);
@@ -157,3 +157,9 @@ AudioMerger::push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time)
 		}
 	}
 }
+
+void
+AudioMerger::clear ()
+{
+	_buffers.clear ();
+}