{
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 */
} 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);
+ /* 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);
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));
AudioMerger::clear ()
{
_buffers.clear ();
- _last_pull = DCPTime ();
}