diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-09-20 00:11:25 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-09-20 00:35:08 +0200 |
| commit | 400e34c23ba9ec240358cd028f90fba38bbf1560 (patch) | |
| tree | 923e3d3ce9b38c5c601e366be7bfcc0b6c3c1c69 /src | |
| parent | 44662dcbb5cb5543ff1810b4a92115e447553c9d (diff) | |
Add a warning log when an assertion gets hit.
Forward-ported from 4141f01e25abd5050db09ff85da47ff059909669 in master.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/player.cc | 6 |
1 files changed, 5 insertions, 1 deletions
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()) { |
