dcpomatic.git
6 years agoMove ports around to allow master/server to coexist (#962).
Carl Hetherington [Thu, 27 Apr 2017 14:07:21 +0000 (15:07 +0100)]
Move ports around to allow master/server to coexist (#962).

6 years agopot/merge.
Carl Hetherington [Thu, 27 Apr 2017 10:57:31 +0000 (11:57 +0100)]
pot/merge.

6 years agoDistinguish master DoM encode threads count from the server count.
Carl Hetherington [Thu, 27 Apr 2017 10:57:15 +0000 (11:57 +0100)]
Distinguish master DoM encode threads count from the server count.

6 years agoMissing file.
Carl Hetherington [Thu, 27 Apr 2017 10:40:52 +0000 (11:40 +0100)]
Missing file.

6 years agoUse orange for audio peaks that are quite near clipping and red for those that are...
Carl Hetherington [Wed, 26 Apr 2017 09:04:06 +0000 (10:04 +0100)]
Use orange for audio peaks that are quite near clipping and red for those that are very close (#1054).

6 years agoInitial work on removing storage of subtitle times.
Carl Hetherington [Wed, 26 Apr 2017 14:29:21 +0000 (15:29 +0100)]
Initial work on removing storage of subtitle times.

6 years agoTry to fix build with older boosts.
Carl Hetherington [Thu, 27 Apr 2017 08:23:16 +0000 (09:23 +0100)]
Try to fix build with older boosts.

6 years agoNicer fix for previous commit.
Carl Hetherington [Wed, 26 Apr 2017 10:02:46 +0000 (11:02 +0100)]
Nicer fix for previous commit.

6 years agoFix video flickering when seeking near the end of the film.
Carl Hetherington [Wed, 26 Apr 2017 10:01:44 +0000 (11:01 +0100)]
Fix video flickering when seeking near the end of the film.

6 years agoAdd 1.43:1 (IMAX) ratio.
Carl Hetherington [Wed, 26 Apr 2017 09:26:57 +0000 (10:26 +0100)]
Add 1.43:1 (IMAX) ratio.

6 years agoCopy config.xml and cinemas.xml if they fail to load so data is not lost.
Carl Hetherington [Wed, 26 Apr 2017 09:13:49 +0000 (10:13 +0100)]
Copy config.xml and cinemas.xml if they fail to load so data is not lost.

6 years agoTidy up _last_video_time to make it more like _last_audio_time.
Carl Hetherington [Sun, 23 Apr 2017 22:11:48 +0000 (23:11 +0100)]
Tidy up _last_video_time to make it more like _last_audio_time.

6 years agoFix seeking; seek all decoders even if they have no content at the
Carl Hetherington [Sun, 23 Apr 2017 22:08:37 +0000 (23:08 +0100)]
Fix seeking; seek all decoders even if they have no content at the
seek position, and make Player cope with the FFmpegDecoder emitting
pre-roll data.  This seems nicer than making FFmpegDecoder do it.

6 years agoDiscard audio received before the time of the last accurate seek.
Carl Hetherington [Sun, 23 Apr 2017 20:23:21 +0000 (21:23 +0100)]
Discard audio received before the time of the last accurate seek.

6 years agoCope better with the butler thread throwing an exception; give up
Carl Hetherington [Sun, 23 Apr 2017 20:22:19 +0000 (21:22 +0100)]
Cope better with the butler thread throwing an exception; give up
on doing anything else with it.

Fix thread running waiting for audio when it is disabled.

6 years agoAdd AudioMerger::clear() method.
Carl Hetherington [Sun, 23 Apr 2017 20:21:39 +0000 (21:21 +0100)]
Add AudioMerger::clear() method.

6 years agoCope better with the butler thread throwing an exception; stop the butler doing anyth...
Carl Hetherington [Sun, 23 Apr 2017 19:30:10 +0000 (20:30 +0100)]
Cope better with the butler thread throwing an exception; stop the butler doing anything so that the exception can be reported.

7 years agoThrow exceptions raised while waiting for the butler to deliver video.
Carl Hetherington [Fri, 21 Apr 2017 10:36:04 +0000 (11:36 +0100)]
Throw exceptions raised while waiting for the butler to deliver video.

7 years agoAdd assert.
Carl Hetherington [Fri, 21 Apr 2017 08:32:54 +0000 (09:32 +0100)]
Add assert.

7 years agoFix locale location for 17.04.
Carl Hetherington [Thu, 20 Apr 2017 21:56:51 +0000 (22:56 +0100)]
Fix locale location for 17.04.

7 years agoMore deps for 17.04.
Carl Hetherington [Thu, 20 Apr 2017 21:29:41 +0000 (22:29 +0100)]
More deps for 17.04.

7 years agoAdd dependencies for Ubuntu 17.04.
Carl Hetherington [Thu, 20 Apr 2017 21:15:01 +0000 (22:15 +0100)]
Add dependencies for Ubuntu 17.04.

7 years agoTry DirectSound on Windows.
Carl Hetherington [Wed, 19 Apr 2017 19:31:10 +0000 (20:31 +0100)]
Try DirectSound on Windows.

7 years agoConfig option to disable preview audio.
Carl Hetherington [Wed, 19 Apr 2017 09:56:44 +0000 (10:56 +0100)]
Config option to disable preview audio.

7 years agoFix memory leak.
Carl Hetherington [Wed, 19 Apr 2017 09:36:24 +0000 (10:36 +0100)]
Fix memory leak.

7 years agoVarious fixes to seeking with audio.
Carl Hetherington [Wed, 19 Apr 2017 08:24:59 +0000 (09:24 +0100)]
Various fixes to seeking with audio.

7 years agoNo-op; white space.
Carl Hetherington [Tue, 18 Apr 2017 21:16:18 +0000 (22:16 +0100)]
No-op; white space.

7 years agoShould clear audio too when seeking.
Carl Hetherington [Tue, 18 Apr 2017 21:13:57 +0000 (22:13 +0100)]
Should clear audio too when seeking.

7 years agoTurn off play button on stop.
Carl Hetherington [Tue, 18 Apr 2017 21:13:47 +0000 (22:13 +0100)]
Turn off play button on stop.

7 years agoTake audio device latency into account.
Carl Hetherington [Tue, 18 Apr 2017 11:00:30 +0000 (12:00 +0100)]
Take audio device latency into account.

7 years agoFix video timing and stop the viewer at the end of the film.
Carl Hetherington [Tue, 18 Apr 2017 09:57:19 +0000 (10:57 +0100)]
Fix video timing and stop the viewer at the end of the film.

7 years agoNew method.
Carl Hetherington [Tue, 18 Apr 2017 09:56:59 +0000 (10:56 +0100)]
New method.

7 years agoTidy up slightly.
Carl Hetherington [Tue, 18 Apr 2017 09:56:51 +0000 (10:56 +0100)]
Tidy up slightly.

7 years agoconst correctness.
Carl Hetherington [Tue, 18 Apr 2017 09:56:30 +0000 (10:56 +0100)]
const correctness.

7 years agoconst correctness.
Carl Hetherington [Tue, 18 Apr 2017 09:56:19 +0000 (10:56 +0100)]
const correctness.

7 years agoDon't return 'no video' from get_video() until the player has finished and we have...
Carl Hetherington [Tue, 18 Apr 2017 09:29:43 +0000 (10:29 +0100)]
Don't return 'no video' from get_video() until the player has finished and we have exhausted our store.

7 years agoAdd sound output configuration.
Carl Hetherington [Tue, 18 Apr 2017 09:05:56 +0000 (10:05 +0100)]
Add sound output configuration.

7 years agoRemove some debug code.
Carl Hetherington [Tue, 18 Apr 2017 09:05:34 +0000 (10:05 +0100)]
Remove some debug code.

7 years agoFix display when all content is removed. Fix sensitivity of jump-to-selected checkbox.
Carl Hetherington [Tue, 18 Apr 2017 09:05:22 +0000 (10:05 +0100)]
Fix display when all content is removed.  Fix sensitivity of jump-to-selected checkbox.

7 years agoClear out ring buffers when the player's output changes.
Carl Hetherington [Tue, 18 Apr 2017 09:05:01 +0000 (10:05 +0100)]
Clear out ring buffers when the player's output changes.

7 years agoReset _last_*_time as required.
Carl Hetherington [Mon, 17 Apr 2017 23:10:22 +0000 (00:10 +0100)]
Reset _last_*_time as required.

7 years agoHandle butler thread exceptions properly.
Carl Hetherington [Mon, 17 Apr 2017 23:07:07 +0000 (00:07 +0100)]
Handle butler thread exceptions properly.

7 years agoRemove redundant cast.
Carl Hetherington [Mon, 17 Apr 2017 23:03:05 +0000 (00:03 +0100)]
Remove redundant cast.

7 years agoMore audio readahead.
Carl Hetherington [Mon, 17 Apr 2017 23:01:00 +0000 (00:01 +0100)]
More audio readahead.

7 years agoSmall cleanup.
Carl Hetherington [Mon, 17 Apr 2017 22:59:08 +0000 (23:59 +0100)]
Small cleanup.

7 years agoTry to fix Win32 debug build.
Carl Hetherington [Mon, 10 Apr 2017 10:12:17 +0000 (11:12 +0100)]
Try to fix Win32 debug build.

7 years agoAttempt to fix Win32 build.
Carl Hetherington [Mon, 10 Apr 2017 08:59:25 +0000 (09:59 +0100)]
Attempt to fix Win32 build.

7 years agoFix mis-merge.
Carl Hetherington [Mon, 10 Apr 2017 08:39:05 +0000 (09:39 +0100)]
Fix mis-merge.

7 years agoAdd hack script.
Carl Hetherington [Mon, 10 Apr 2017 08:38:42 +0000 (09:38 +0100)]
Add hack script.

7 years agoSeveral fixes to audio.
Carl Hetherington [Sun, 9 Apr 2017 21:43:56 +0000 (22:43 +0100)]
Several fixes to audio.

7 years agoAnother mis-merge.
Carl Hetherington [Fri, 7 Apr 2017 23:45:45 +0000 (00:45 +0100)]
Another mis-merge.

7 years agoFix mis-merge.
Carl Hetherington [Fri, 7 Apr 2017 23:42:01 +0000 (00:42 +0100)]
Fix mis-merge.

7 years agoTry to stop Butler deadlocking on quit.
Carl Hetherington [Mon, 3 Apr 2017 11:50:59 +0000 (12:50 +0100)]
Try to stop Butler deadlocking on quit.

7 years agoFirst bits of audio support.
Carl Hetherington [Wed, 15 Mar 2017 23:39:25 +0000 (23:39 +0000)]
First bits of audio support.

7 years agoFix some library paths.
Carl Hetherington [Tue, 14 Mar 2017 13:53:17 +0000 (13:53 +0000)]
Fix some library paths.

7 years agoSeemingly basically working butler for video.
Carl Hetherington [Wed, 8 Mar 2017 00:11:50 +0000 (00:11 +0000)]
Seemingly basically working butler for video.

7 years agoInitial butler work.
Carl Hetherington [Tue, 7 Mar 2017 19:27:33 +0000 (19:27 +0000)]
Initial butler work.

7 years agoVarious Doxygen fixes.
Carl Hetherington [Thu, 2 Mar 2017 15:37:13 +0000 (15:37 +0000)]
Various Doxygen fixes.

7 years agoAdd some more bits to the torture test.
Carl Hetherington [Thu, 2 Mar 2017 11:21:47 +0000 (11:21 +0000)]
Add some more bits to the torture test.

7 years agoNaming tweaks.
Carl Hetherington [Thu, 2 Mar 2017 00:31:54 +0000 (00:31 +0000)]
Naming tweaks.

7 years agoHandle end-trim correctly in player; there is scope to make this more efficient by...
Carl Hetherington [Thu, 2 Mar 2017 00:01:18 +0000 (00:01 +0000)]
Handle end-trim correctly in player; there is scope to make this more efficient by adjusting decoders.

7 years agoDoxygen tweaks.
Carl Hetherington [Wed, 1 Mar 2017 22:01:54 +0000 (22:01 +0000)]
Doxygen tweaks.

7 years agoFirst bits of torture test.
Carl Hetherington [Wed, 1 Mar 2017 21:05:56 +0000 (21:05 +0000)]
First bits of torture test.

7 years agoSmall but innocuous offset bugs.
Carl Hetherington [Wed, 1 Mar 2017 21:01:30 +0000 (21:01 +0000)]
Small but innocuous offset bugs.

7 years agolatex-format test README.
Carl Hetherington [Wed, 1 Mar 2017 21:01:12 +0000 (21:01 +0000)]
latex-format test README.

7 years agoRemove old test.
Carl Hetherington [Wed, 1 Mar 2017 11:56:28 +0000 (11:56 +0000)]
Remove old test.

7 years agoFix bugs in test.
Carl Hetherington [Wed, 1 Mar 2017 11:56:23 +0000 (11:56 +0000)]
Fix bugs in test.

7 years agoFix crash brought on by previous.
Carl Hetherington [Wed, 1 Mar 2017 11:43:20 +0000 (11:43 +0000)]
Fix crash brought on by previous.

7 years agoRestore upmixer_a_test and fix resampler flushing.
Carl Hetherington [Wed, 1 Mar 2017 11:36:17 +0000 (11:36 +0000)]
Restore upmixer_a_test and fix resampler flushing.

7 years agoRemove some debug code.
Carl Hetherington [Wed, 1 Mar 2017 10:45:41 +0000 (10:45 +0000)]
Remove some debug code.

7 years agoRemove video_decoder_fill_test as it was specialised to the old code.
Carl Hetherington [Wed, 1 Mar 2017 10:45:21 +0000 (10:45 +0000)]
Remove video_decoder_fill_test as it was specialised to the old code.

7 years agoRestore ffmpeg_decoder_sequential_test.
Carl Hetherington [Wed, 1 Mar 2017 10:44:43 +0000 (10:44 +0000)]
Restore ffmpeg_decoder_sequential_test.

7 years agoTweak class declaration.
Carl Hetherington [Wed, 1 Mar 2017 10:44:29 +0000 (10:44 +0000)]
Tweak class declaration.

7 years agoRestore ffmpeg_decoder_seek_test.
Carl Hetherington [Wed, 1 Mar 2017 10:04:17 +0000 (10:04 +0000)]
Restore ffmpeg_decoder_seek_test.

7 years agoRestore dcp_subtitle_test.
Carl Hetherington [Wed, 1 Mar 2017 09:34:06 +0000 (09:34 +0000)]
Restore dcp_subtitle_test.

7 years agoRemove another old test.
Carl Hetherington [Wed, 1 Mar 2017 09:21:56 +0000 (09:21 +0000)]
Remove another old test.

7 years agoRemove seek zero test as I think it's fairly specific to the old code.
Carl Hetherington [Tue, 28 Feb 2017 11:41:10 +0000 (11:41 +0000)]
Remove seek zero test as I think it's fairly specific to the old code.

7 years agoRestore player_test and move black_fill_test into it.
Carl Hetherington [Tue, 28 Feb 2017 11:39:26 +0000 (11:39 +0000)]
Restore player_test and move black_fill_test into it.

7 years agoSome comments and a few small cleanups.
Carl Hetherington [Tue, 28 Feb 2017 11:09:38 +0000 (11:09 +0000)]
Some comments and a few small cleanups.

7 years agoAdd a note to the design docs.
Carl Hetherington [Mon, 27 Feb 2017 22:57:52 +0000 (22:57 +0000)]
Add a note to the design docs.

7 years agoRemove debug code.
Carl Hetherington [Mon, 27 Feb 2017 22:41:59 +0000 (22:41 +0000)]
Remove debug code.

7 years agoRemove some unnecessary test data; fix VF kdm test to use interop as per reference.
Carl Hetherington [Mon, 27 Feb 2017 22:40:50 +0000 (22:40 +0000)]
Remove some unnecessary test data; fix VF kdm test to use interop as per reference.

7 years agoFix zero-sized buffers coming out of audio merger.
Carl Hetherington [Mon, 27 Feb 2017 11:50:06 +0000 (11:50 +0000)]
Fix zero-sized buffers coming out of audio merger.

7 years agoFix test startup script in some environments.
Carl Hetherington [Mon, 27 Feb 2017 10:23:57 +0000 (10:23 +0000)]
Fix test startup script in some environments.

7 years agoFix merging of audio in various circumstances.
Carl Hetherington [Sun, 26 Feb 2017 01:40:30 +0000 (01:40 +0000)]
Fix merging of audio in various circumstances.

7 years agoSlightly better test report.
Carl Hetherington [Fri, 24 Feb 2017 09:41:36 +0000 (09:41 +0000)]
Slightly better test report.

7 years agoFix skip-frame.
Carl Hetherington [Thu, 23 Feb 2017 23:14:48 +0000 (23:14 +0000)]
Fix skip-frame.

7 years agoReinstate ffmpeg_audio_only_test.
Carl Hetherington [Thu, 23 Feb 2017 22:33:38 +0000 (22:33 +0000)]
Reinstate ffmpeg_audio_only_test.

7 years agoFix render subtitle references.
Carl Hetherington [Thu, 23 Feb 2017 21:43:48 +0000 (21:43 +0000)]
Fix render subtitle references.

7 years agoResampler test doesn't check anything.
Carl Hetherington [Thu, 23 Feb 2017 21:40:27 +0000 (21:40 +0000)]
Resampler test doesn't check anything.

7 years agoDon't emit zero-sample buffers.
Carl Hetherington [Thu, 23 Feb 2017 21:40:16 +0000 (21:40 +0000)]
Don't emit zero-sample buffers.

7 years agoFix test for changes to content_factory.
Carl Hetherington [Thu, 23 Feb 2017 16:45:41 +0000 (16:45 +0000)]
Fix test for changes to content_factory.

7 years agoFix recover test hash; not sure why.
Carl Hetherington [Thu, 23 Feb 2017 16:45:32 +0000 (16:45 +0000)]
Fix recover test hash; not sure why.

7 years agoFix audio when it spans reel boundaries.
Carl Hetherington [Thu, 23 Feb 2017 11:42:48 +0000 (11:42 +0000)]
Fix audio when it spans reel boundaries.

7 years agoFix comment.
Carl Hetherington [Thu, 23 Feb 2017 00:57:20 +0000 (00:57 +0000)]
Fix comment.

7 years agoFix ISDCF name test.
Carl Hetherington [Wed, 22 Feb 2017 14:27:25 +0000 (14:27 +0000)]
Fix ISDCF name test.

7 years agoFix film metadata test.
Carl Hetherington [Wed, 22 Feb 2017 14:26:04 +0000 (14:26 +0000)]
Fix film metadata test.

7 years agoFix black fill when first content is not at 0.
Carl Hetherington [Wed, 22 Feb 2017 14:20:49 +0000 (14:20 +0000)]
Fix black fill when first content is not at 0.

7 years agoMore fixes to when to pull from the audio merger.
Carl Hetherington [Wed, 22 Feb 2017 14:09:50 +0000 (14:09 +0000)]
More fixes to when to pull from the audio merger.

7 years agoFix pull timing; fix units of ReelWriter::total_written_audio_frames.
Carl Hetherington [Wed, 22 Feb 2017 13:40:17 +0000 (13:40 +0000)]
Fix pull timing; fix units of ReelWriter::total_written_audio_frames.