From: Carl Hetherington <cth@carlh.net>
Date: Tue, 7 Jan 2020 12:30:56 +0000 (+0100)
Subject: Extend the amount of allowed disagreement between the audio
X-Git-Tag: v2.15.40~2
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=77c30a110a321b3b69259381a7f30c5c25f4da7c

Extend the amount of allowed disagreement between the audio
coming from the content and the calculated periods of silence.

It sees that there is some scope for disagreements here when
trim start/end times are rounded to frame boundaries.

Fixes #1708.
---

diff --git a/src/lib/player.cc b/src/lib/player.cc
index c88be5826..79db7cc2c 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -652,7 +652,8 @@ Player::pass ()
 			   remove a little silence at the end of some content.
 			*/
 			int64_t const error = labs(period.from.get() - _last_audio_time->get());
-			int64_t const too_much_error = 4;
+			/* Let's not worry about less than a frame at 24fps */
+			int64_t const too_much_error = DCPTime::from_frames(1, 24).get();
 			if (error >= too_much_error) {
 				_film->log()->log(String::compose("Silence starting before or after last audio by %1", error), LogEntry::TYPE_ERROR);
 			}