From: Carl Hetherington <cth@carlh.net>
Date: Thu, 19 Sep 2019 22:11:25 +0000 (+0200)
Subject: Add a warning log when an assertion gets hit.
X-Git-Tag: v2.15.20~5
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=400e34c23ba9ec240358cd028f90fba38bbf1560

Add a warning log when an assertion gets hit.

Forward-ported from 4141f01e25abd5050db09ff85da47ff059909669 in master.
---

diff --git a/src/lib/player.cc b/src/lib/player.cc
index fd9ffb9ed..b3fba1aec 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -649,7 +649,11 @@ Player::pass ()
 			/* Sometimes the thing that happened last finishes fractionally before
 			   or after this silence.  Bodge the start time of the silence to fix it.
 			*/
-			DCPOMATIC_ASSERT (labs(period.from.get() - _last_audio_time->get()) < 2);
+			int64_t const error = labs(period.from.get() - _last_audio_time->get());
+			if (error >= 2) {
+				_film->log()->log(String::compose("Silence starting before or after last audio by %1", error), LogEntry::TYPE_ERROR);
+			}
+			DCPOMATIC_ASSERT (error < 2);
 			period.from = *_last_audio_time;
 		}
 		if (period.duration() > one_video_frame()) {