From fefa8053a9921bb309aa856a6e1b305a8cba6a12 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 8 May 2017 15:20:59 +0100 Subject: [PATCH] Fix assertion failure if rounding reduces remaining frames to 0. --- src/lib/player.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/player.cc b/src/lib/player.cc index 11440ec5e..fd83886db 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -794,7 +794,9 @@ Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_a return; } else if (end > piece->content->end()) { Frame const remaining_frames = DCPTime(piece->content->end() - time).frames_round(_film->audio_frame_rate()); - DCPOMATIC_ASSERT (remaining_frames > 0); + if (remaining_frames == 0) { + return; + } shared_ptr cut (new AudioBuffers (content_audio.audio->channels(), remaining_frames)); cut->copy_from (content_audio.audio.get(), remaining_frames, 0, 0); content_audio.audio = cut; -- 2.30.2