dcpomatic.git
2 years agoWIP: more 1771-resample-glitches-take4
Carl Hetherington [Thu, 6 May 2021 22:21:16 +0000 (00:21 +0200)]
WIP: more

2 years agofixup! WIP: allow Piece to take multiple content/decoder.
Carl Hetherington [Wed, 5 May 2021 20:27:01 +0000 (22:27 +0200)]
fixup! WIP: allow Piece to take multiple content/decoder.

2 years agoWIP: allow Piece to take multiple content/decoder.
Carl Hetherington [Tue, 4 May 2021 23:17:36 +0000 (01:17 +0200)]
WIP: allow Piece to take multiple content/decoder.

2 years agoMove some checks from Player to Piece.
Carl Hetherington [Tue, 4 May 2021 21:37:27 +0000 (23:37 +0200)]
Move some checks from Player to Piece.

2 years agoRemove Frame from PieceAudio.
Carl Hetherington [Tue, 4 May 2021 21:26:56 +0000 (23:26 +0200)]
Remove Frame from PieceAudio.

2 years agoRefer to Piece audio streams by index instead of pointer.
Carl Hetherington [Tue, 4 May 2021 21:20:02 +0000 (23:20 +0200)]
Refer to Piece audio streams by index instead of pointer.

2 years agoMake resampled_audio_to_dcp private.
Carl Hetherington [Tue, 4 May 2021 20:33:30 +0000 (22:33 +0200)]
Make resampled_audio_to_dcp private.

2 years agoRename piece_audio -> audio.
Carl Hetherington [Tue, 4 May 2021 20:29:11 +0000 (22:29 +0200)]
Rename piece_audio -> audio.

2 years agoMake content_video_to_dcp private.
Carl Hetherington [Tue, 4 May 2021 20:23:27 +0000 (22:23 +0200)]
Make content_video_to_dcp private.

2 years agoMake dcp_to_content_time() private.
Carl Hetherington [Tue, 4 May 2021 20:19:19 +0000 (22:19 +0200)]
Make dcp_to_content_time() private.

2 years agoRemove Piece::_done in favour of a method.
Carl Hetherington [Tue, 4 May 2021 20:14:26 +0000 (22:14 +0200)]
Remove Piece::_done in favour of a method.

2 years agoRename ContentAtmos -> PieceAtmos and pass atmos through Piece.
Carl Hetherington [Tue, 4 May 2021 11:34:50 +0000 (13:34 +0200)]
Rename ContentAtmos -> PieceAtmos and pass atmos through Piece.

2 years agoRename ContentText and subclasses to PieceText... and pass subtitles through Piece.
Carl Hetherington [Tue, 4 May 2021 09:05:36 +0000 (11:05 +0200)]
Rename ContentText and subclasses to PieceText... and pass subtitles through Piece.

2 years agoAdd collect() for Player.
Carl Hetherington [Mon, 3 May 2021 20:27:05 +0000 (22:27 +0200)]
Add collect() for Player.

2 years agoAdd AudioMapping::equals()
Carl Hetherington [Mon, 3 May 2021 20:26:45 +0000 (22:26 +0200)]
Add AudioMapping::equals()

2 years agoWhitespace tidying.
Carl Hetherington [Mon, 3 May 2021 20:26:17 +0000 (22:26 +0200)]
Whitespace tidying.

2 years agoAdd failing test for transcoding adjacent audio content.
Carl Hetherington [Sun, 2 May 2021 00:33:44 +0000 (02:33 +0200)]
Add failing test for transcoding adjacent audio content.

2 years agoFix crashes in shuffler tests.
Carl Hetherington [Sat, 1 May 2021 17:34:30 +0000 (19:34 +0200)]
Fix crashes in shuffler tests.

2 years agoAdd some missing includes / forward references.
Carl Hetherington [Sat, 1 May 2021 17:34:17 +0000 (19:34 +0200)]
Add some missing includes / forward references.

2 years agoMove Resampler into Piece.
Carl Hetherington [Thu, 29 Apr 2021 21:53:12 +0000 (23:53 +0200)]
Move Resampler into Piece.

2 years agoRename ContentAudio -> PieceAudio and pass audio through Piece.
Carl Hetherington [Thu, 29 Apr 2021 19:43:44 +0000 (21:43 +0200)]
Rename ContentAudio -> PieceAudio and pass audio through Piece.

2 years agoRename ContentVideo -> PieceVideo and pass video through Piece.
Carl Hetherington [Mon, 26 Apr 2021 22:56:47 +0000 (00:56 +0200)]
Rename ContentVideo -> PieceVideo and pass video through Piece.

2 years agoC++11 tidying and scoped_ptr for Player::_shuffler.
Carl Hetherington [Mon, 26 Apr 2021 20:25:22 +0000 (22:25 +0200)]
C++11 tidying and scoped_ptr for Player::_shuffler.

2 years agoComment fix.
Carl Hetherington [Mon, 26 Apr 2021 18:29:42 +0000 (20:29 +0200)]
Comment fix.

2 years agoC++11 tidying.
Carl Hetherington [Mon, 26 Apr 2021 17:38:59 +0000 (19:38 +0200)]
C++11 tidying.

2 years agoPut a weak_ptr<Film> into Piece to tidy up calls a lot.
Carl Hetherington [Sun, 25 Apr 2021 23:30:10 +0000 (01:30 +0200)]
Put a weak_ptr<Film> into Piece to tidy up calls a lot.

2 years agoSpot butler exceptions during test.
Carl Hetherington [Sun, 25 Apr 2021 23:16:53 +0000 (01:16 +0200)]
Spot butler exceptions during test.

2 years agoAdd Piece::period().
Carl Hetherington [Sun, 25 Apr 2021 19:40:14 +0000 (21:40 +0200)]
Add Piece::period().

2 years agoMake Piece::ignore_video private.
Carl Hetherington [Sun, 25 Apr 2021 17:40:52 +0000 (19:40 +0200)]
Make Piece::ignore_video private.

2 years agoMake Piece::decoder private.
Carl Hetherington [Sun, 25 Apr 2021 16:07:10 +0000 (18:07 +0200)]
Make Piece::decoder private.

2 years agoAdd Piece:fonts().
Carl Hetherington [Sun, 25 Apr 2021 15:58:48 +0000 (17:58 +0200)]
Add Piece:fonts().

2 years agoMake Piece::done private.
Carl Hetherington [Sun, 25 Apr 2021 15:53:13 +0000 (17:53 +0200)]
Make Piece::done private.

2 years agoAdd Piece::decoder_before().
Carl Hetherington [Sun, 25 Apr 2021 15:45:38 +0000 (17:45 +0200)]
Add Piece::decoder_before().

2 years agoAdd Piece::seek().
Carl Hetherington [Sun, 25 Apr 2021 15:33:20 +0000 (17:33 +0200)]
Add Piece::seek().

2 years agoAdd and use Piece::has_text().
Carl Hetherington [Sun, 25 Apr 2021 14:49:14 +0000 (16:49 +0200)]
Add and use Piece::has_text().

2 years agoMake Piece::frc private.
Carl Hetherington [Sat, 24 Apr 2021 21:26:20 +0000 (23:26 +0200)]
Make Piece::frc private.

2 years agoMake Piece::content private.
Carl Hetherington [Sat, 24 Apr 2021 21:22:51 +0000 (23:22 +0200)]
Make Piece::content private.

2 years agoAdd content parameter to Piece::content_time_to_dcp().
Carl Hetherington [Sat, 24 Apr 2021 20:47:48 +0000 (22:47 +0200)]
Add content parameter to Piece::content_time_to_dcp().

2 years agoAdd Piece::reference_dcp_audio().
Carl Hetherington [Fri, 23 Apr 2021 23:16:51 +0000 (01:16 +0200)]
Add Piece::reference_dcp_audio().

2 years agoAdd Piece::pass().
Carl Hetherington [Fri, 23 Apr 2021 23:02:39 +0000 (01:02 +0200)]
Add Piece::pass().

2 years agoAdd Piece::decoder_position().
Carl Hetherington [Fri, 23 Apr 2021 22:43:49 +0000 (00:43 +0200)]
Add Piece::decoder_position().

2 years agoAdd Piece::video_frame_type().
Carl Hetherington [Fri, 23 Apr 2021 22:29:40 +0000 (00:29 +0200)]
Add Piece::video_frame_type().

2 years agoAdd Piece::decoder_for().
Carl Hetherington [Fri, 23 Apr 2021 21:48:20 +0000 (23:48 +0200)]
Add Piece::decoder_for().

2 years agoAdd Piece::audio_gain().
Carl Hetherington [Fri, 23 Apr 2021 21:37:12 +0000 (23:37 +0200)]
Add Piece::audio_gain().

2 years agoAdd Piece::resampled_audio_frame_rate().
Carl Hetherington [Fri, 23 Apr 2021 21:29:00 +0000 (23:29 +0200)]
Add Piece::resampled_audio_frame_rate().

2 years agoAdd Piece::player_video().
Carl Hetherington [Fri, 23 Apr 2021 21:20:04 +0000 (23:20 +0200)]
Add Piece::player_video().

2 years agoAdd Piece::end().
Carl Hetherington [Fri, 23 Apr 2021 21:03:33 +0000 (23:03 +0200)]
Add Piece::end().

2 years agoAdd Piece::position().
Carl Hetherington [Fri, 23 Apr 2021 20:49:58 +0000 (22:49 +0200)]
Add Piece::position().

2 years agoAdd Piece::frame_rate_change().
Carl Hetherington [Fri, 23 Apr 2021 20:47:24 +0000 (22:47 +0200)]
Add Piece::frame_rate_change().

2 years agoAdd Piece::use_video().
Carl Hetherington [Fri, 23 Apr 2021 20:42:19 +0000 (22:42 +0200)]
Add Piece::use_video().

2 years agoMove time calculation methods from Player into Piece.
Carl Hetherington [Fri, 23 Apr 2021 20:40:05 +0000 (22:40 +0200)]
Move time calculation methods from Player into Piece.

2 years agoRemove some unused methods.
Carl Hetherington [Fri, 23 Apr 2021 20:14:49 +0000 (22:14 +0200)]
Remove some unused methods.

2 years agoTiny C++11 tidy-up.
Carl Hetherington [Fri, 23 Apr 2021 20:03:09 +0000 (22:03 +0200)]
Tiny C++11 tidy-up.

2 years agoMove stream states into Piece.
Carl Hetherington [Sun, 25 Apr 2021 22:26:22 +0000 (00:26 +0200)]
Move stream states into Piece.

2 years agoAdd some more tests.
Carl Hetherington [Wed, 5 May 2021 21:01:34 +0000 (23:01 +0200)]
Add some more tests.

2 years agoAdd Content::full_length_content and make full_length_dcp use it.
Carl Hetherington [Thu, 6 May 2021 09:26:47 +0000 (11:26 +0200)]
Add Content::full_length_content and make full_length_dcp use it.

2 years agoRename Content::full_length -> Content::full_length_dcp
Carl Hetherington [Thu, 6 May 2021 09:03:45 +0000 (11:03 +0200)]
Rename Content::full_length -> Content::full_length_dcp

2 years agoAdd some missing overrides.
Carl Hetherington [Thu, 6 May 2021 08:35:44 +0000 (10:35 +0200)]
Add some missing overrides.

2 years agoMissing override statements. v2.15.141
Carl Hetherington [Fri, 7 May 2021 06:07:05 +0000 (08:07 +0200)]
Missing override statements.

2 years agopot/merge.
Carl Hetherington [Thu, 6 May 2021 22:32:45 +0000 (00:32 +0200)]
pot/merge.

2 years agoC++11 tidying.
Carl Hetherington [Mon, 3 May 2021 09:17:34 +0000 (11:17 +0200)]
C++11 tidying.

2 years agoAdd pixel format 0 (AV_PIX_FMT_YUV420P) to make_part_black().
Carl Hetherington [Sun, 2 May 2021 23:38:11 +0000 (01:38 +0200)]
Add pixel format 0 (AV_PIX_FMT_YUV420P) to make_part_black().

Remainder of fix for #1984.

2 years agoTest output tweaks.
Carl Hetherington [Sun, 2 May 2021 23:37:46 +0000 (01:37 +0200)]
Test output tweaks.

2 years agoAdd export test DCP -> h264 to trigger #1984.
Carl Hetherington [Sun, 2 May 2021 23:37:21 +0000 (01:37 +0200)]
Add export test DCP -> h264 to trigger #1984.

2 years agoAdd pixel format 66 (AV_PIX_FMT_YUV422P10LE) to make_part_black().
Carl Hetherington [Sun, 2 May 2021 09:30:16 +0000 (11:30 +0200)]
Add pixel format 66 (AV_PIX_FMT_YUV422P10LE) to make_part_black().

Part of fix for #1984.

2 years agoAdd export test DCP -> prores to trigger #1984.
Carl Hetherington [Sun, 2 May 2021 09:29:56 +0000 (11:29 +0200)]
Add export test DCP -> prores to trigger #1984.

2 years agoC++11 tidying.
Carl Hetherington [Sun, 2 May 2021 09:27:14 +0000 (11:27 +0200)]
C++11 tidying.

2 years agoAdd new line to pixfmts.c
Carl Hetherington [Sun, 2 May 2021 09:26:55 +0000 (11:26 +0200)]
Add new line to pixfmts.c

2 years agoAdd Groet Han as a tester.
Carl Hetherington [Sun, 2 May 2021 08:12:31 +0000 (10:12 +0200)]
Add Groet Han as a tester.

2 years agoBuild with FFmpeg 4.4 and switch to the new send/receive APIs.
Carl Hetherington [Sat, 1 May 2021 17:32:15 +0000 (19:32 +0200)]
Build with FFmpeg 4.4 and switch to the new send/receive APIs.

2 years agoPort filter graphs to new FFmpeg API.
Carl Hetherington [Fri, 30 Apr 2021 17:36:01 +0000 (19:36 +0200)]
Port filter graphs to new FFmpeg API.

2 years agoUpgrade to FFmpeg 4.4.
Carl Hetherington [Thu, 29 Apr 2021 21:02:03 +0000 (23:02 +0200)]
Upgrade to FFmpeg 4.4.

2 years agoSwitch encoding to ffmpeg send/receive API.
Carl Hetherington [Thu, 29 Apr 2021 20:59:45 +0000 (22:59 +0200)]
Switch encoding to ffmpeg send/receive API.

2 years agoSwitch decoding to ffmpeg send/receive API.
Carl Hetherington [Wed, 28 Apr 2021 22:27:49 +0000 (00:27 +0200)]
Switch decoding to ffmpeg send/receive API.

2 years agoRemove some FFmpeg-related warnings by directly accessing AVFrame.
Carl Hetherington [Wed, 28 Apr 2021 18:14:39 +0000 (20:14 +0200)]
Remove some FFmpeg-related warnings by directly accessing AVFrame.

2 years agoTidy up some error handling a little.
Carl Hetherington [Wed, 28 Apr 2021 08:50:08 +0000 (10:50 +0200)]
Tidy up some error handling a little.

2 years agoRemove some FFmpeg-related warnings by using AVStream::codecpar.
Carl Hetherington [Wed, 28 Apr 2021 06:47:43 +0000 (08:47 +0200)]
Remove some FFmpeg-related warnings by using AVStream::codecpar.

2 years agoC++11 tidying.
Carl Hetherington [Fri, 30 Apr 2021 23:31:35 +0000 (01:31 +0200)]
C++11 tidying.

2 years agoRemove Monitor / EDID code that was used for the swaroop variant.
Carl Hetherington [Thu, 29 Apr 2021 09:03:38 +0000 (11:03 +0200)]
Remove Monitor / EDID code that was used for the swaroop variant.

2 years agoC++11 tidying.
Carl Hetherington [Thu, 29 Apr 2021 07:14:20 +0000 (09:14 +0200)]
C++11 tidying.

2 years agoRemove use of boost::noncopyable.
Carl Hetherington [Thu, 29 Apr 2021 06:31:23 +0000 (08:31 +0200)]
Remove use of boost::noncopyable.

3 years agoReduce disk usage of interrupt_encoder_test.
Carl Hetherington [Tue, 27 Apr 2021 08:57:50 +0000 (10:57 +0200)]
Reduce disk usage of interrupt_encoder_test.

3 years agoMissing delete of some constructors.
Carl Hetherington [Sun, 25 Apr 2021 14:40:36 +0000 (16:40 +0200)]
Missing delete of some constructors.

3 years agoFix text wrapping in nag dialog (especially on macOS) (#1978).
Carl Hetherington [Fri, 23 Apr 2021 22:34:57 +0000 (00:34 +0200)]
Fix text wrapping in nag dialog (especially on macOS) (#1978).

3 years agoUse new Windows long filename workaround with disk writer (#1755).
Carl Hetherington [Thu, 22 Apr 2021 20:25:54 +0000 (22:25 +0200)]
Use new Windows long filename workaround with disk writer (#1755).

3 years agoDo less logging during tests, but also log some details of what test is
Carl Hetherington [Tue, 20 Apr 2021 23:06:57 +0000 (01:06 +0200)]
Do less logging during tests, but also log some details of what test is
running on Windows.

3 years agoFix fopen() on windows to cope with long filenames (part of #1755).
Carl Hetherington [Tue, 20 Apr 2021 20:53:46 +0000 (22:53 +0200)]
Fix fopen() on windows to cope with long filenames (part of #1755).

3 years agoMore test fixes.
Carl Hetherington [Fri, 23 Apr 2021 15:43:56 +0000 (17:43 +0200)]
More test fixes.

3 years agoFix test for random noise addition.
Carl Hetherington [Fri, 23 Apr 2021 13:22:26 +0000 (15:22 +0200)]
Fix test for random noise addition.

3 years agoAdd some new check methods.
Carl Hetherington [Fri, 23 Apr 2021 13:22:18 +0000 (15:22 +0200)]
Add some new check methods.

3 years agoUpdate test reference.
Carl Hetherington [Fri, 23 Apr 2021 13:22:13 +0000 (15:22 +0200)]
Update test reference.

3 years agoCope with noise being added to small JPEG2000 images.
Carl Hetherington [Fri, 23 Apr 2021 10:15:28 +0000 (12:15 +0200)]
Cope with noise being added to small JPEG2000 images.

3 years agoRename some test data.
Carl Hetherington [Fri, 23 Apr 2021 10:15:20 +0000 (12:15 +0200)]
Rename some test data.

3 years agoIgnore the new THREED_ASSET_MARKED_AS_TWOD warning when loading DCPs.
Carl Hetherington [Fri, 23 Apr 2021 10:15:06 +0000 (12:15 +0200)]
Ignore the new THREED_ASSET_MARKED_AS_TWOD warning when loading DCPs.

3 years agoFix missing libdcp warning message.
Carl Hetherington [Thu, 22 Apr 2021 23:17:16 +0000 (01:17 +0200)]
Fix missing libdcp warning message.

3 years agoI can't convince myself that _canvas_mutex is doing anything useful, so remove it.
Carl Hetherington [Thu, 22 Apr 2021 23:10:19 +0000 (01:10 +0200)]
I can't convince myself that _canvas_mutex is doing anything useful, so remove it.

3 years agoMake the GL thread access the canvas size in a less ridiculous way.
Carl Hetherington [Thu, 22 Apr 2021 23:09:38 +0000 (01:09 +0200)]
Make the GL thread access the canvas size in a less ridiculous way.

3 years agoClose down the FilmViewer before its GUI elements get destroyed (#1982).
Carl Hetherington [Thu, 22 Apr 2021 23:08:17 +0000 (01:08 +0200)]
Close down the FilmViewer before its GUI elements get destroyed (#1982).

Otherwise this happens when we're already in the middle of destroying
the UI.

3 years agoBump libdcp for fix to #1976.
Carl Hetherington [Thu, 22 Apr 2021 20:01:04 +0000 (22:01 +0200)]
Bump libdcp for fix to #1976.

This is an incorrect error when verifying 3D Interop DCPs.

3 years agoRemove configuration option for minimum frame size.
Carl Hetherington [Thu, 22 Apr 2021 13:54:25 +0000 (15:54 +0200)]
Remove configuration option for minimum frame size.

Replace it with a fixed 16KB as per #1902.