From d13e90a87afd438e1fe79ba94bef0ef0ae6f8101 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 1 Jul 2013 15:50:49 +0100 Subject: Fix deadlock. --- src/lib/film.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib') diff --git a/src/lib/film.cc b/src/lib/film.cc index 217673a7f..1d4d050bc 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -695,7 +695,7 @@ Film::read_metadata () _dirty = false; - _log->log (String::compose ("Loaded film with use_content_audio = %1", use_content_audio ())); + _log->log (String::compose ("Loaded film with use_content_audio = %1", _use_content_audio)); } libdcp::Size -- cgit v1.2.3 From a42d1523bd0d92748d44c067a61aab0a2f63c9b9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 1 Jul 2013 15:50:56 +0100 Subject: Try to fix end trims again. --- src/lib/trimmer.cc | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/lib') diff --git a/src/lib/trimmer.cc b/src/lib/trimmer.cc index 1ec9e2a5b..99f04793f 100644 --- a/src/lib/trimmer.cc +++ b/src/lib/trimmer.cc @@ -62,8 +62,15 @@ Trimmer::Trimmer ( the current set of regression tests). This could be removed if a) the regression tests are regenerated and b) I can work out what DCP length should be. + + There is also a problem whereby black video frames inserted + at the start of the output by the matcher are not taken into account, + so if black frames are inserted it means more gets trimmed off the + end than should be. Hack around this in similar fashion with the + _video_end = INT_MAX line. */ if (video_trim_end == 0) { + _video_end = INT_MAX; _audio_end = INT64_MAX; } } -- cgit v1.2.3