dcpomatic.git
6 years agoTweak error threshold for an image comparison involving subtitles.
Carl Hetherington [Wed, 28 Feb 2018 00:52:42 +0000 (00:52 +0000)]
Tweak error threshold for an image comparison involving subtitles.

6 years agoFix crash if quick_refresh() fails.
Carl Hetherington [Wed, 28 Feb 2018 00:13:54 +0000 (00:13 +0000)]
Fix crash if quick_refresh() fails.

6 years agoRemove some unused code.
Carl Hetherington [Tue, 27 Feb 2018 22:56:42 +0000 (22:56 +0000)]
Remove some unused code.

6 years agoTry again to make private_data path canonical.
Carl Hetherington [Tue, 27 Feb 2018 22:38:31 +0000 (22:38 +0000)]
Try again to make private_data path canonical.

6 years agoAdd a hint to warn about the stereo-to-5.1 upmixers.
Carl Hetherington [Tue, 27 Feb 2018 22:36:09 +0000 (22:36 +0000)]
Add a hint to warn about the stereo-to-5.1 upmixers.

6 years agoRemove relative path elements from test location.
Carl Hetherington [Tue, 27 Feb 2018 20:25:13 +0000 (20:25 +0000)]
Remove relative path elements from test location.

6 years agoMerge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Tue, 27 Feb 2018 15:34:50 +0000 (15:34 +0000)]
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

6 years agoAdd a load of explicit keywords.
Carl Hetherington [Tue, 27 Feb 2018 15:34:45 +0000 (15:34 +0000)]
Add a load of explicit keywords.

6 years agoAdd an explicit.
Carl Hetherington [Tue, 27 Feb 2018 14:31:43 +0000 (14:31 +0000)]
Add an explicit.

6 years agoRemove duplicate variables.
Carl Hetherington [Tue, 27 Feb 2018 14:26:42 +0000 (14:26 +0000)]
Remove duplicate variables.

6 years agoTweak warnings and add some more.
Carl Hetherington [Tue, 27 Feb 2018 14:26:34 +0000 (14:26 +0000)]
Tweak warnings and add some more.

6 years agoBump libdcp/libsub to release versions and rtaudio-cdist at least to a fixed revision.
Carl Hetherington [Tue, 27 Feb 2018 00:27:40 +0000 (00:27 +0000)]
Bump libdcp/libsub to release versions and rtaudio-cdist at least to a fixed revision.

6 years agoMerge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Mon, 26 Feb 2018 20:56:44 +0000 (20:56 +0000)]
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

6 years agoMake a backup of configuration when we load in a Version 2 file, and bump our config...
Carl Hetherington [Mon, 26 Feb 2018 13:14:31 +0000 (13:14 +0000)]
Make a backup of configuration when we load in a Version 2 file, and bump our config file version to 3.

6 years agoMissing 18.04 dependencies.
Carl Hetherington [Mon, 26 Feb 2018 01:30:09 +0000 (01:30 +0000)]
Missing 18.04 dependencies.

6 years agoMangle version number.
Carl Hetherington [Mon, 26 Feb 2018 00:16:19 +0000 (00:16 +0000)]
Mangle version number.

6 years agoFix previous.
Carl Hetherington [Mon, 26 Feb 2018 00:15:54 +0000 (00:15 +0000)]
Fix previous.

6 years agoTry to allow build for ubuntu 18.04.
Carl Hetherington [Sun, 25 Feb 2018 23:31:03 +0000 (23:31 +0000)]
Try to allow build for ubuntu 18.04.

6 years agoUpdated es_ES translation from Manuel AC.
Carl Hetherington [Sun, 25 Feb 2018 20:51:47 +0000 (20:51 +0000)]
Updated es_ES translation from Manuel AC.

6 years agoBump libdcp for build fix.
Carl Hetherington [Sun, 25 Feb 2018 01:10:34 +0000 (01:10 +0000)]
Bump libdcp for build fix.

6 years agoHandle errors in subtitle XML better (#1209).
Carl Hetherington [Sun, 25 Feb 2018 00:40:30 +0000 (00:40 +0000)]
Handle errors in subtitle XML better (#1209).

6 years agoSpeed some operations by re-using the last PlayerVideo but with
Carl Hetherington [Sat, 24 Feb 2018 01:05:14 +0000 (01:05 +0000)]
Speed some operations by re-using the last PlayerVideo but with
updated metadata (where possible).  Helps with #1194.

6 years agoUpdated fr_FR translation from Thierry Journet.
Carl Hetherington [Sat, 24 Feb 2018 23:13:51 +0000 (23:13 +0000)]
Updated fr_FR translation from Thierry Journet.

6 years agoAnother subtitle fix.
Carl Hetherington [Fri, 23 Feb 2018 19:55:23 +0000 (19:55 +0000)]
Another subtitle fix.

6 years agoFix thinko in previous.
Carl Hetherington [Fri, 23 Feb 2018 01:21:12 +0000 (01:21 +0000)]
Fix thinko in previous.

6 years agoFix implementation of delay in 7758260; it needs to apply to
Carl Hetherington [Fri, 23 Feb 2018 00:57:04 +0000 (00:57 +0000)]
Fix implementation of delay in 7758260; it needs to apply to
anything passed to emit_video(), not just things that come from
decoders.

6 years agoFix duplicate frames when padding.
Carl Hetherington [Fri, 23 Feb 2018 00:29:44 +0000 (00:29 +0000)]
Fix duplicate frames when padding.

6 years agoBump libdcp.
Carl Hetherington [Thu, 22 Feb 2018 10:15:58 +0000 (10:15 +0000)]
Bump libdcp.

6 years agoFix crash on decoding incomplete DCP content (e.g. on loading a VF with subtitles...
Carl Hetherington [Wed, 21 Feb 2018 23:13:10 +0000 (23:13 +0000)]
Fix crash on decoding incomplete DCP content (e.g. on loading a VF with subtitles into the player).

6 years agoAdd a 2-frame `delay' on content arriving at the player to give
Carl Hetherington [Tue, 20 Feb 2018 23:34:59 +0000 (23:34 +0000)]
Add a 2-frame `delay' on content arriving at the player to give
subtitle content the chance to catch up.  Fixes problems observed
when overlaying a DCP subtitle onto an existing DCP and then seeking
into the first subtitle.  After the seek the decoder positions were:

DCP: 0.
subtitle: first subtitle time.

This causes the DCP decoder to be pass()ed first and so the subtitle
for the video frame has not arrived yet.

I hope this does not cause unpredicted side effects...

6 years agoAdd a possible pure virtual method.
Carl Hetherington [Tue, 20 Feb 2018 23:34:32 +0000 (23:34 +0000)]
Add a possible pure virtual method.

6 years agoHold lock for the whole of Butler::video(). Fixes jumpy nudge-seek
Carl Hetherington [Sun, 18 Feb 2018 01:26:03 +0000 (01:26 +0000)]
Hold lock for the whole of Butler::video().  Fixes jumpy nudge-seek
when playing DCPs.

Before, the lock was only held to check _pending_seek_position.
With that arrangement, this sequence was possible:
1. video arrives, check _pending_seek_position, decide it's ok, release lock
2. Butler::seek called, sets _pending_seek_position, clears _video
3. video that arrived in #1 is put into _video by ::video()
4. that video is given to an awaiting get_video() call.
This clearly subverts the attempts not to accept new video data while
a seek is pending.

6 years agoFix missing subtitles in the player when they are added with a VF.
Carl Hetherington [Sun, 18 Feb 2018 00:34:01 +0000 (00:34 +0000)]
Fix missing subtitles in the player when they are added with a VF.

6 years agoSet up seek position correctly when a seek skips over a reel in
Carl Hetherington [Sun, 18 Feb 2018 00:33:26 +0000 (00:33 +0000)]
Set up seek position correctly when a seek skips over a reel in
a DCP.

6 years agoFix crash on importing an encrypted DCP.
Carl Hetherington [Sat, 17 Feb 2018 00:25:11 +0000 (00:25 +0000)]
Fix crash on importing an encrypted DCP.

6 years agoFix up test.
Carl Hetherington [Sat, 17 Feb 2018 00:23:06 +0000 (00:23 +0000)]
Fix up test.

6 years agoMake import_dcp_test more fussy to expose a bug with importing encrypted DCPs without...
Carl Hetherington [Sat, 17 Feb 2018 00:04:57 +0000 (00:04 +0000)]
Make import_dcp_test more fussy to expose a bug with importing encrypted DCPs without a KDM.

6 years agoAdd log for assertion failure.
Carl Hetherington [Fri, 16 Feb 2018 23:52:39 +0000 (23:52 +0000)]
Add log for assertion failure.

6 years agoAudioDecoder::_positions is at the resampled rate, if applicable;
Carl Hetherington [Fri, 16 Feb 2018 21:54:01 +0000 (21:54 +0000)]
AudioDecoder::_positions is at the resampled rate, if applicable;
fix its initial setup.  Fixes problems when seeking deep into
resampled content; before this commit the audio time stamps got
out of whack sufficiently that the butler would fill with video
before any audio made it past the range checks.

6 years agoDon't rename main thread as its name appears in top, it turns out.
Carl Hetherington [Fri, 16 Feb 2018 20:34:48 +0000 (20:34 +0000)]
Don't rename main thread as its name appears in top, it turns out.

6 years agoName threads on Linux.
Carl Hetherington [Fri, 16 Feb 2018 20:24:37 +0000 (20:24 +0000)]
Name threads on Linux.

6 years agoTry to include dcpomatic2_kdm_cli in the KDM creator .app.
Carl Hetherington [Thu, 15 Feb 2018 12:02:44 +0000 (12:02 +0000)]
Try to include dcpomatic2_kdm_cli in the KDM creator .app.

6 years agoBuild fixes.
Carl Hetherington [Wed, 14 Feb 2018 23:27:27 +0000 (23:27 +0000)]
Build fixes.

6 years agoAdd Mart Jansink as author.
Carl Hetherington [Wed, 14 Feb 2018 23:23:16 +0000 (23:23 +0000)]
Add Mart Jansink as author.

6 years agoAdapt for changes to disable_forensic variable types in libdcp.
Carl Hetherington [Wed, 14 Feb 2018 23:17:24 +0000 (23:17 +0000)]
Adapt for changes to disable_forensic variable types in libdcp.

6 years agoTidy up option parsing a little.
Carl Hetherington [Wed, 14 Feb 2018 23:10:45 +0000 (23:10 +0000)]
Tidy up option parsing a little.

6 years agoWhitespace and small stylistic tweaks.
Carl Hetherington [Wed, 14 Feb 2018 22:40:12 +0000 (22:40 +0000)]
Whitespace and small stylistic tweaks.

6 years agoDon't disable forensic marking by default.
Mart Jansink [Tue, 13 Feb 2018 12:29:25 +0000 (13:29 +0100)]
Don't disable forensic marking by default.

6 years agoCorrectly handle multiple cinemas and multiple screens per cinema.
Mart Jansink [Mon, 12 Feb 2018 21:01:42 +0000 (22:01 +0100)]
Correctly handle multiple cinemas and multiple screens per cinema.

6 years agoOptionally write the KDMs to the stdout.
Mart Jansink [Mon, 12 Feb 2018 17:16:18 +0000 (18:16 +0100)]
Optionally write the KDMs to the stdout.

6 years agoMake the KDM's id available to the filename format.
Mart Jansink [Mon, 12 Feb 2018 14:38:35 +0000 (15:38 +0100)]
Make the KDM's id available to the filename format.

6 years agoOptionally provide a custom filename and container name format via the CLI arguments.
Mart Jansink [Mon, 12 Feb 2018 17:15:59 +0000 (18:15 +0100)]
Optionally provide a custom filename and container name format via the CLI arguments.

6 years agoAllow cinemas and DKDMs to be specified manually via the CLI arguments.
Mart Jansink [Mon, 12 Feb 2018 13:38:35 +0000 (14:38 +0100)]
Allow cinemas and DKDMs to be specified manually via the CLI arguments.

6 years agoAllow the missing full "valid-duration" argument.
Mart Jansink [Fri, 9 Feb 2018 13:35:01 +0000 (14:35 +0100)]
Allow the missing full "valid-duration" argument.

6 years agoAdd the "Multiple Modified Transitional 1" KDM formulation.
Mart Jansink [Fri, 9 Feb 2018 10:22:44 +0000 (11:22 +0100)]
Add the "Multiple Modified Transitional 1" KDM formulation.

6 years agoMissing setup of configured decode reduction (#1195).
Carl Hetherington [Tue, 13 Feb 2018 10:49:23 +0000 (10:49 +0000)]
Missing setup of configured decode reduction (#1195).

6 years agoAdd some tolerance when checking audio references.
Carl Hetherington [Tue, 13 Feb 2018 10:47:22 +0000 (10:47 +0000)]
Add some tolerance when checking audio references.

6 years agoRecover test config after config_test.cc runs.
Carl Hetherington [Tue, 13 Feb 2018 01:10:03 +0000 (01:10 +0000)]
Recover test config after config_test.cc runs.

6 years agoMake Config::read() fallback match Config::set_defaults() for
Carl Hetherington [Tue, 13 Feb 2018 01:08:14 +0000 (01:08 +0000)]
Make Config::read() fallback match Config::set_defaults() for
_default_dcp_content_type.

6 years agoAdd SWS_ACCURATE_RND to sws flags. Without this, conversions to RGB in
Carl Hetherington [Mon, 12 Feb 2018 23:47:02 +0000 (23:47 +0000)]
Add SWS_ACCURATE_RND to sws flags.  Without this, conversions to RGB in
crop_scale_window_test leave the 6 pixels at the right side of the image
uninitialised (sws_scale doesn't fill them in with anything) so you get
garbage in the output.  SWS_ACCURATE_RND fixes it.  There are whisperings
that this is slow, so the impact of this patch may need to be measured
in some "real" situations.

6 years agoAdd commented-out valgrind line which can be used with gdb.
Carl Hetherington [Mon, 12 Feb 2018 23:46:45 +0000 (23:46 +0000)]
Add commented-out valgrind line which can be used with gdb.

6 years agoTone some debug messages down slightly.
Carl Hetherington [Mon, 12 Feb 2018 23:21:34 +0000 (23:21 +0000)]
Tone some debug messages down slightly.

6 years agoManual updates.
Carl Hetherington [Mon, 12 Feb 2018 21:42:08 +0000 (21:42 +0000)]
Manual updates.

6 years agoBump version
Carl Hetherington [Mon, 12 Feb 2018 00:59:29 +0000 (00:59 +0000)]
Bump version

6 years agoBump version v2.11.55
Carl Hetherington [Mon, 12 Feb 2018 00:59:29 +0000 (00:59 +0000)]
Bump version

6 years agoMore set_interop().
Carl Hetherington [Mon, 12 Feb 2018 00:58:52 +0000 (00:58 +0000)]
More set_interop().

6 years agoBump libdcp for SMPTE subtitle MXF-vs-XML ID fix.
Carl Hetherington [Mon, 12 Feb 2018 00:26:00 +0000 (00:26 +0000)]
Bump libdcp for SMPTE subtitle MXF-vs-XML ID fix.

6 years agoFix interop/SMPTE confusion.
Carl Hetherington [Mon, 12 Feb 2018 00:25:49 +0000 (00:25 +0000)]
Fix interop/SMPTE confusion.

6 years agoMore missing set_interop().
Carl Hetherington [Sun, 11 Feb 2018 00:28:19 +0000 (00:28 +0000)]
More missing set_interop().

6 years agoTry to fix test.
Carl Hetherington [Sun, 11 Feb 2018 00:19:51 +0000 (00:19 +0000)]
Try to fix test.

6 years agoBump version
Carl Hetherington [Sat, 10 Feb 2018 23:15:17 +0000 (23:15 +0000)]
Bump version

6 years agoBump version v2.11.54
Carl Hetherington [Sat, 10 Feb 2018 23:15:17 +0000 (23:15 +0000)]
Bump version

6 years agoSave decoding resolution reduction between launches (#1195).
Carl Hetherington [Sat, 10 Feb 2018 22:43:09 +0000 (22:43 +0000)]
Save decoding resolution reduction between launches (#1195).

6 years agoUse av_guess_frame_rate rather than av_stream_get_r_frame_rate;
Carl Hetherington [Sat, 10 Feb 2018 21:39:18 +0000 (21:39 +0000)]
Use av_guess_frame_rate rather than av_stream_get_r_frame_rate;
helps with #1030.  I hope this isn't a bad idea; this commit
should be reverted if there any hints of misread video frame rates.

6 years agoBump version
Carl Hetherington [Sat, 10 Feb 2018 02:05:48 +0000 (02:05 +0000)]
Bump version

6 years agoBump version v2.11.53
Carl Hetherington [Sat, 10 Feb 2018 02:05:47 +0000 (02:05 +0000)]
Bump version

6 years agoFix odd behaviour when analysing single bits of audio which start at non-zero positio...
Carl Hetherington [Sat, 10 Feb 2018 02:05:14 +0000 (02:05 +0000)]
Fix odd behaviour when analysing single bits of audio which start at non-zero positions (#1203).

6 years agoAlways pre-roll when seeking in DCPs; I don't think the performance
Carl Hetherington [Fri, 9 Feb 2018 17:07:16 +0000 (17:07 +0000)]
Always pre-roll when seeking in DCPs; I don't think the performance
hit is anything to worry about (especially compared to the time taken
to decode the next frame).

6 years agoBump version
Carl Hetherington [Fri, 9 Feb 2018 01:58:44 +0000 (01:58 +0000)]
Bump version

6 years agoBump version v2.11.52
Carl Hetherington [Fri, 9 Feb 2018 01:58:44 +0000 (01:58 +0000)]
Bump version

6 years agoFix one cause of assertion failures in audio_buffers (#1193).
Carl Hetherington [Fri, 9 Feb 2018 01:45:23 +0000 (01:45 +0000)]
Fix one cause of assertion failures in audio_buffers (#1193).

6 years agoFix letterbox/pillarbox in player (#1196).
Carl Hetherington [Fri, 9 Feb 2018 01:32:39 +0000 (01:32 +0000)]
Fix letterbox/pillarbox in player (#1196).

6 years agoUpdated ru_RU translation from Igor Voytovich.
Carl Hetherington [Fri, 9 Feb 2018 01:00:37 +0000 (01:00 +0000)]
Updated ru_RU translation from Igor Voytovich.

6 years agoBump version
Carl Hetherington [Thu, 8 Feb 2018 20:58:12 +0000 (20:58 +0000)]
Bump version

6 years agoBump version v2.11.51
Carl Hetherington [Thu, 8 Feb 2018 20:58:12 +0000 (20:58 +0000)]
Bump version

6 years agotypeid() doesn't seem to downcast, so just check types in the take_settings_from...
Carl Hetherington [Thu, 8 Feb 2018 20:57:03 +0000 (20:57 +0000)]
typeid() doesn't seem to downcast, so just check types in the take_settings_from methods (#1192).

6 years agoMerge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Thu, 8 Feb 2018 20:42:05 +0000 (20:42 +0000)]
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

6 years agoPass DCP subtitles before video so that they are present when the video frame looks...
Carl Hetherington [Thu, 8 Feb 2018 20:41:57 +0000 (20:41 +0000)]
Pass DCP subtitles before video so that they are present when the video frame looks for them.

6 years agoBump version
Carl Hetherington [Wed, 7 Feb 2018 22:37:19 +0000 (22:37 +0000)]
Bump version

6 years agoBump version v2.11.50
Carl Hetherington [Wed, 7 Feb 2018 22:37:19 +0000 (22:37 +0000)]
Bump version

6 years agoNew test.
Carl Hetherington [Wed, 7 Feb 2018 22:03:28 +0000 (22:03 +0000)]
New test.

6 years agoBump libdcp for subtitle time rounding fix.
Carl Hetherington [Wed, 7 Feb 2018 21:46:25 +0000 (21:46 +0000)]
Bump libdcp for subtitle time rounding fix.

6 years agoFix ignore/referencing logic.
Carl Hetherington [Wed, 7 Feb 2018 20:14:19 +0000 (20:14 +0000)]
Fix ignore/referencing logic.

6 years agoSlightly better log message.
Carl Hetherington [Wed, 7 Feb 2018 20:14:12 +0000 (20:14 +0000)]
Slightly better log message.

6 years agoFix failure to parse subtitle files with OS X line endings.
Carl Hetherington [Tue, 6 Feb 2018 20:03:59 +0000 (20:03 +0000)]
Fix failure to parse subtitle files with OS X line endings.

6 years agoBump version
Carl Hetherington [Tue, 6 Feb 2018 01:57:54 +0000 (01:57 +0000)]
Bump version

6 years agoBump version v2.11.49
Carl Hetherington [Tue, 6 Feb 2018 01:57:54 +0000 (01:57 +0000)]
Bump version

6 years agoIgnore video/audio when it is referenced; should help with #1191.
Carl Hetherington [Tue, 6 Feb 2018 01:57:28 +0000 (01:57 +0000)]
Ignore video/audio when it is referenced; should help with #1191.

6 years agoMissing setup of sensitivity in DCP panel.
Carl Hetherington [Mon, 5 Feb 2018 22:37:08 +0000 (22:37 +0000)]
Missing setup of sensitivity in DCP panel.

6 years agoAdd nascent ar_LB to cscript to fix RPM builds.
Carl Hetherington [Mon, 5 Feb 2018 20:35:04 +0000 (20:35 +0000)]
Add nascent ar_LB to cscript to fix RPM builds.