X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_merger.cc;h=1cc5ff0a19de156bdee0e7e6a6dd3da56e47dc49;hp=4bed4b3a5850539f8617f3ecb4a348889eacb2a8;hb=386e25f3b9d3fa59cbdeed458d9b3e0d21e338b8;hpb=17e80bc37eea735629e13f068005653428c44cce

diff --git a/src/lib/audio_merger.cc b/src/lib/audio_merger.cc
index 4bed4b3a5..1cc5ff0a1 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,30 +57,39 @@ 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 */
+			DCPOMATIC_ASSERT (i.audio->frames() > 0);
 			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);
-			out.push_back (make_pair (audio, i.time));
-			i.audio->trim_start (audio->frames ());
-			i.time += DCPTime::from_frames(audio->frames(), _frame_rate);
-			new_buffers.push_back (i);
+			/* 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);
+				DCPOMATIC_ASSERT (i.audio->frames() > 0);
+				new_buffers.push_back (i);
+			}
 		} else {
 			/* Not involved */
+			DCPOMATIC_ASSERT (i.audio->frames() > 0);
 			new_buffers.push_back (i);
 		}
 	}
 
 	_buffers = new_buffers;
+
+	for (list<pair<shared_ptr<AudioBuffers>, DCPTime> >::const_iterator i = out.begin(); i != out.end(); ++i) {
+		DCPOMATIC_ASSERT (i->first->frames() > 0);
+	}
+
 	return out;
 }
 
@@ -87,7 +97,7 @@ 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));
 
@@ -129,6 +139,7 @@ AudioMerger::push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time)
 
 		if (before == _buffers.end() && after == _buffers.end()) {
 			/* New buffer */
+			DCPOMATIC_ASSERT (part->frames() > 0);
 			_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 */
@@ -146,3 +157,9 @@ AudioMerger::push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time)
 		}
 	}
 }
+
+void
+AudioMerger::clear ()
+{
+	_buffers.clear ();
+}