From 8dfef0f38cc3323bc4a5d90c9102e8d3965496a4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 22 Nov 2022 02:16:40 +0100 Subject: Fix audio glitches when merging resampled audio (#2373). --- src/lib/audio_content.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/lib') diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 05c388a3e..acd3b81b4 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -422,9 +422,11 @@ AudioContent::modify_position (shared_ptr film, DCPTime& pos) const void AudioContent::modify_trim_start(shared_ptr film, ContentTime& trim) const { - DCPOMATIC_ASSERT (!_streams.empty()); - /* XXX: we're in trouble if streams have different rates */ - trim = trim.round (_streams.front()->frame_rate()); + /* When this trim is used it the audio will have been resampled, and using the + * DCP rate here reduces the chance of rounding errors causing audio glitches + * due to errors in placement of audio frames (#2373). + */ + trim = trim.round(film ? film->audio_frame_rate() : 48000); } -- cgit v1.2.3