Carl Hetherington [Wed, 7 Jan 2015 00:26:29 +0000 (00:26 +0000)]
Bump version
Carl Hetherington [Tue, 6 Jan 2015 23:41:42 +0000 (23:41 +0000)]
Header guard.
Carl Hetherington [Tue, 6 Jan 2015 15:59:57 +0000 (15:59 +0000)]
Add some writer-loop debugging from 1.x; ignore out-of-order frames when they come from decoders; fix hang if there are unsequenced images in the writer queue when we want to stop.
Carl Hetherington [Tue, 6 Jan 2015 15:58:43 +0000 (15:58 +0000)]
Header guard.
Carl Hetherington [Tue, 6 Jan 2015 15:58:34 +0000 (15:58 +0000)]
Default to logging at DEBUG level.
Carl Hetherington [Tue, 6 Jan 2015 15:58:20 +0000 (15:58 +0000)]
Add log TYPE_DEBUG from 1.x.
Carl Hetherington [Tue, 6 Jan 2015 13:09:01 +0000 (13:09 +0000)]
Fix a few scripts for v2.
Carl Hetherington [Tue, 6 Jan 2015 10:40:56 +0000 (10:40 +0000)]
Remove erroneous entry.
Carl Hetherington [Mon, 5 Jan 2015 20:09:18 +0000 (20:09 +0000)]
Fix repeat_frame_test reference.
Carl Hetherington [Mon, 5 Jan 2015 14:41:12 +0000 (14:41 +0000)]
Missing files.
Carl Hetherington [Mon, 5 Jan 2015 14:40:38 +0000 (14:40 +0000)]
Increase stored-frames limit; fix skip_frame_test reference.
Carl Hetherington [Mon, 5 Jan 2015 14:14:43 +0000 (14:14 +0000)]
Fix incorrect use of FrameRateChange::factor(); if we are skipping, for
example, factor will be 0.5 and so to convert some frames in the DCP
to frames in the content we must divide by factor (i.e. multiply by 2)
to get the content frame.
Carl Hetherington [Mon, 5 Jan 2015 09:56:16 +0000 (09:56 +0000)]
Fix error reporting by transcode job; no need to set job state inside TranscodeJob as Job does it.
Carl Hetherington [Mon, 5 Jan 2015 00:56:48 +0000 (00:56 +0000)]
Assert in one case where memory usage can build up a lot.
Carl Hetherington [Sun, 4 Jan 2015 23:10:39 +0000 (23:10 +0000)]
Fix loading of 1.x metadata.
Carl Hetherington [Sun, 4 Jan 2015 20:04:20 +0000 (20:04 +0000)]
Fix recover test digest since colour conversion digests changed again.
Carl Hetherington [Sun, 4 Jan 2015 19:02:22 +0000 (19:02 +0000)]
Update test results.
Carl Hetherington [Sun, 4 Jan 2015 14:12:49 +0000 (14:12 +0000)]
Adapt for changes to libdcp.
Carl Hetherington [Sun, 4 Jan 2015 01:42:39 +0000 (01:42 +0000)]
Ignore AVERROR_INVALIDDATA from av_read_frame() as it can apparently mean that there is still data to be processed.
Carl Hetherington [Sun, 4 Jan 2015 01:13:13 +0000 (01:13 +0000)]
Fix loading of SMPTE subtitles that are not MXF-wrapped.
Carl Hetherington [Sat, 3 Jan 2015 23:08:27 +0000 (23:08 +0000)]
Various libdcp API changes.
Carl Hetherington [Sat, 3 Jan 2015 18:05:58 +0000 (18:05 +0000)]
Happy new year.
Carl Hetherington [Sat, 3 Jan 2015 16:13:48 +0000 (16:13 +0000)]
Supporter.
Carl Hetherington [Sun, 28 Dec 2014 01:00:25 +0000 (01:00 +0000)]
Basic adaptations for changes to libdcp1 colour conversion handling.
Carl Hetherington [Tue, 23 Dec 2014 00:07:21 +0000 (00:07 +0000)]
Fix warning and add comment.
Carl Hetherington [Tue, 23 Dec 2014 00:03:11 +0000 (00:03 +0000)]
Remove unused code.
Carl Hetherington [Mon, 22 Dec 2014 23:35:43 +0000 (23:35 +0000)]
Remove some unused code.
Carl Hetherington [Mon, 22 Dec 2014 13:13:33 +0000 (13:13 +0000)]
Removed Paul's code.
Carl Hetherington [Mon, 22 Dec 2014 03:58:05 +0000 (03:58 +0000)]
Remove POSIX backtraces; move ScopedTemporary into its own file.
Carl Hetherington [Mon, 22 Dec 2014 02:52:28 +0000 (02:52 +0000)]
Missing files.
Carl Hetherington [Mon, 22 Dec 2014 02:49:27 +0000 (02:49 +0000)]
Adapt for changing default reel number behaviour.
Carl Hetherington [Mon, 22 Dec 2014 01:58:35 +0000 (01:58 +0000)]
Missing deps and a missing API version on static libsub.
Carl Hetherington [Mon, 22 Dec 2014 01:36:31 +0000 (01:36 +0000)]
Fix windows install path.
Carl Hetherington [Mon, 22 Dec 2014 01:05:52 +0000 (01:05 +0000)]
More libsub tweaks.
Carl Hetherington [Mon, 22 Dec 2014 00:28:22 +0000 (00:28 +0000)]
More libsub pkg-config fixes.
Carl Hetherington [Mon, 22 Dec 2014 00:22:26 +0000 (00:22 +0000)]
Fix libsub pkg-config filename.
Carl Hetherington [Sun, 21 Dec 2014 03:05:06 +0000 (03:05 +0000)]
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Carl Hetherington [Sun, 21 Dec 2014 03:05:02 +0000 (03:05 +0000)]
We need libsub1.
Carl Hetherington [Sun, 21 Dec 2014 02:20:48 +0000 (02:20 +0000)]
Fix build.
Carl Hetherington [Sun, 21 Dec 2014 02:14:48 +0000 (02:14 +0000)]
Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
Carl Hetherington [Sun, 21 Dec 2014 02:14:37 +0000 (02:14 +0000)]
Don't create subtitle content if there is an empty fonts list.
Carl Hetherington [Sun, 21 Dec 2014 02:01:22 +0000 (02:01 +0000)]
Revert most of vertical positioning stuff from previous commit.
Carl Hetherington [Sun, 21 Dec 2014 01:50:07 +0000 (01:50 +0000)]
Update xml_subtitle_test result now that subtitles are being compared; improve placement in SubRip decoder.
Carl Hetherington [Sun, 21 Dec 2014 00:32:37 +0000 (00:32 +0000)]
Fix typos on hand-applying patch.
Carl Hetherington [Sat, 20 Dec 2014 23:55:23 +0000 (23:55 +0000)]
Missing file.
Carl Hetherington [Sat, 20 Dec 2014 23:39:13 +0000 (23:39 +0000)]
Missing include.
Carl Hetherington [Sat, 20 Dec 2014 23:37:57 +0000 (23:37 +0000)]
Hand-apply
d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert()s with thrown exceptions.
Carl Hetherington [Sat, 20 Dec 2014 22:49:43 +0000 (22:49 +0000)]
Carl Hetherington [Sat, 20 Dec 2014 22:48:54 +0000 (22:48 +0000)]
Carl Hetherington [Sat, 20 Dec 2014 22:29:59 +0000 (22:29 +0000)]
Missing files.
Carl Hetherington [Sat, 20 Dec 2014 22:29:21 +0000 (22:29 +0000)]
Basic pass-through of font information when using DCP subtitles.
Carl Hetherington [Thu, 18 Dec 2014 17:22:56 +0000 (17:22 +0000)]
Forward-port fixes to Show DCP from master.
Carl Hetherington [Wed, 17 Dec 2014 14:25:26 +0000 (14:25 +0000)]
Disable copy-as-name button with no Film.
Carl Hetherington [Tue, 16 Dec 2014 12:38:58 +0000 (12:38 +0000)]
Allow setting of font files.
Carl Hetherington [Tue, 16 Dec 2014 11:16:48 +0000 (11:16 +0000)]
Save and load subtitle font details.
Carl Hetherington [Mon, 15 Dec 2014 16:56:18 +0000 (16:56 +0000)]
Start of Fonts dialog for setting up subtitle fonts.
Carl Hetherington [Mon, 15 Dec 2014 15:15:37 +0000 (15:15 +0000)]
Typo.
Carl Hetherington [Mon, 15 Dec 2014 14:22:40 +0000 (14:22 +0000)]
More fixes for newer libdcp.
Carl Hetherington [Mon, 15 Dec 2014 13:59:15 +0000 (13:59 +0000)]
Modify for new libdcp API.
Carl Hetherington [Mon, 15 Dec 2014 11:14:37 +0000 (11:14 +0000)]
Hand-apply
96593d0ea6eb7b01ee97c8292c4546fc56d3da9d; only write metadata before encode in the main front-end, not the cli/batch processors.
Carl Hetherington [Mon, 15 Dec 2014 11:13:15 +0000 (11:13 +0000)]
Catch exceptions when getting video for the view.
Carl Hetherington [Mon, 15 Dec 2014 11:09:59 +0000 (11:09 +0000)]
Carl Hetherington [Mon, 15 Dec 2014 11:08:58 +0000 (11:08 +0000)]
Hand-apply
e9b7f3df544697d6af9d926d32405a797841960a; add 'copy to name' button to allow editing of ISDCF names after creation rather than the 'replace on disable' hack.
Carl Hetherington [Mon, 15 Dec 2014 11:04:45 +0000 (11:04 +0000)]
Hand-apply
9e173bdda26f32a1da7afc38d5dcf8ed63e7d3cf; fix a few missing checks on the return value of ShowModal (#449).
Carl Hetherington [Mon, 15 Dec 2014 11:01:40 +0000 (11:01 +0000)]
Hand-apply
d1bffe67820adaa10654f722b15eebdd773b3680; remove unnecessary JobWrapper stuff.
Carl Hetherington [Mon, 15 Dec 2014 10:58:01 +0000 (10:58 +0000)]
Hand-apply
155b4b9f615f42b5cc26e2953860aba34b17bbc0; allow build of Windows debug version using gdb.
Carl Hetherington [Mon, 15 Dec 2014 10:33:09 +0000 (10:33 +0000)]
Fix previous.
Carl Hetherington [Mon, 15 Dec 2014 10:31:48 +0000 (10:31 +0000)]
Hand-apply
75be314ee89fb2f4e783b4079f7fabf69e79d636 from master; fix hidden content appearing (#418).
Carl Hetherington [Mon, 15 Dec 2014 10:31:13 +0000 (10:31 +0000)]
Add TO_PORT.
Carl Hetherington [Mon, 15 Dec 2014 09:48:14 +0000 (09:48 +0000)]
Merge.
Carl Hetherington [Mon, 15 Dec 2014 09:47:55 +0000 (09:47 +0000)]
More stuff to port.
Carl Hetherington [Sun, 14 Dec 2014 23:56:27 +0000 (23:56 +0000)]
to port.
Carl Hetherington [Sun, 14 Dec 2014 17:09:06 +0000 (17:09 +0000)]
Bump version
Carl Hetherington [Sun, 14 Dec 2014 17:09:06 +0000 (17:09 +0000)]
Bump version
Carl Hetherington [Sun, 14 Dec 2014 16:28:19 +0000 (16:28 +0000)]
Missing OS X dependency.
Carl Hetherington [Sun, 14 Dec 2014 01:08:33 +0000 (01:08 +0000)]
to-port.
Carl Hetherington [Fri, 12 Dec 2014 09:13:17 +0000 (09:13 +0000)]
Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
Carl Hetherington [Fri, 12 Dec 2014 09:13:04 +0000 (09:13 +0000)]
Add things to port.
Carl Hetherington [Thu, 11 Dec 2014 22:57:23 +0000 (22:57 +0000)]
Bump version
Carl Hetherington [Thu, 11 Dec 2014 22:57:23 +0000 (22:57 +0000)]
Bump version
Carl Hetherington [Thu, 11 Dec 2014 20:02:14 +0000 (20:02 +0000)]
OS X build fix.
Carl Hetherington [Thu, 11 Dec 2014 16:53:12 +0000 (16:53 +0000)]
Bump version
Carl Hetherington [Thu, 11 Dec 2014 16:53:12 +0000 (16:53 +0000)]
Bump version
Carl Hetherington [Thu, 11 Dec 2014 16:52:14 +0000 (16:52 +0000)]
Fix another cocked up merge.
Carl Hetherington [Thu, 11 Dec 2014 16:47:48 +0000 (16:47 +0000)]
Merge.
Carl Hetherington [Thu, 11 Dec 2014 15:20:33 +0000 (15:20 +0000)]
Add language property to SubtitleContent and use it in output DCP subtitle files.
Carl Hetherington [Thu, 11 Dec 2014 15:20:33 +0000 (15:20 +0000)]
Initial UI / backend storage.
Carl Hetherington [Wed, 10 Dec 2014 00:56:48 +0000 (00:56 +0000)]
Trim unused stuff.
Carl Hetherington [Tue, 9 Dec 2014 23:58:07 +0000 (23:58 +0000)]
Disable tests which depend on variable font rendering.
Carl Hetherington [Tue, 9 Dec 2014 23:00:37 +0000 (23:00 +0000)]
Fix test.
Carl Hetherington [Tue, 9 Dec 2014 22:18:48 +0000 (22:18 +0000)]
Fix fill_2d not doing what it is specified to do.
Carl Hetherington [Tue, 9 Dec 2014 20:56:42 +0000 (20:56 +0000)]
Forward-port DCA footer fix from master.
Carl Hetherington [Tue, 9 Dec 2014 20:48:23 +0000 (20:48 +0000)]
Tweak test check.
Carl Hetherington [Tue, 9 Dec 2014 16:30:31 +0000 (16:30 +0000)]
Various fixes pointed out by tests.
Carl Hetherington [Tue, 9 Dec 2014 11:10:34 +0000 (11:10 +0000)]
Update TO_PORT.
Carl Hetherington [Tue, 9 Dec 2014 11:10:00 +0000 (11:10 +0000)]
Hand-apply
22c79dac4ae2b01b448cc5886f8e8ff3a0cfb69b from master; fix broken still image support.
Carl Hetherington [Tue, 9 Dec 2014 11:06:47 +0000 (11:06 +0000)]
Include trimming.
Carl Hetherington [Tue, 9 Dec 2014 11:00:32 +0000 (11:00 +0000)]
Update TO_PORT.
Carl Hetherington [Tue, 9 Dec 2014 11:00:22 +0000 (11:00 +0000)]
Hand apply
5e96dbee6de3b4baf82083e5c7169f27e6051c5b from master; give a nicer error when writing config fails.
Carl Hetherington [Mon, 8 Dec 2014 13:21:21 +0000 (13:21 +0000)]
Hand-apply
63142d58947cf10ed6f6eaeb42508eaa374a6a93 from master; fix calls to new digest() call.