From 392d675f5799671abbcf1a9a47820321bcbdcca2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 15 Oct 2019 22:04:53 +0000 Subject: Fix assertion failure on making a VF, in certain circumstances. These circumstances were a VF which refers to at least one complete reel of audio from a OV before adding more audio of its own. --- src/lib/writer.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/lib/writer.cc b/src/lib/writer.cc index ca412dd3f..f9009be37 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -268,8 +268,11 @@ Writer::write (shared_ptr audio, DCPTime const time) /* Easy case: we can write all the audio to this reel */ _audio_reel->write (audio); t = end; + } else if (_audio_reel->period().to <= t) { + /* This reel is entirely before the start of our audio; just skip the reel */ + ++_audio_reel; } else { - /* Split the audio into two and write the first part */ + /* This audio is over a reel boundary; split the audio into two and write the first part */ DCPTime part_lengths[2] = { _audio_reel->period().to - t, end - _audio_reel->period().to -- cgit v1.2.3