- shared_ptr<AudioBuffers> audio (new AudioBuffers (i.audio->channels(), DCPTime(time - i.time).frames_floor(_frame_rate)));
- 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);
+ 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) {
+ auto audio = make_shared<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);
+ }