dcpomatic.git
9 years agoMerge master.
Carl Hetherington [Thu, 10 Jul 2014 19:38:28 +0000 (20:38 +0100)]
Merge master.

9 years agoUpdate test reference.
Carl Hetherington [Thu, 10 Jul 2014 15:50:42 +0000 (16:50 +0100)]
Update test reference.

9 years agoFix previous.
Carl Hetherington [Thu, 10 Jul 2014 15:37:22 +0000 (16:37 +0100)]
Fix previous.

9 years agoPrevent erroneous creation of subtitle MXF where there are no subtitles.
Carl Hetherington [Thu, 10 Jul 2014 15:28:03 +0000 (16:28 +0100)]
Prevent erroneous creation of subtitle MXF where there are no subtitles.

9 years agoVarious fixes for DCP subtitles, and a test or two.
Carl Hetherington [Thu, 10 Jul 2014 15:15:13 +0000 (16:15 +0100)]
Various fixes for DCP subtitles, and a test or two.

9 years agoMerge.
Carl Hetherington [Thu, 10 Jul 2014 14:58:21 +0000 (15:58 +0100)]
Merge.

9 years agoHopefully fix KDM email corruption.
Carl Hetherington [Thu, 10 Jul 2014 14:57:48 +0000 (15:57 +0100)]
Hopefully fix KDM email corruption.

Reported-by: Carsten Kurz
9 years agoBump version
Carl Hetherington [Thu, 10 Jul 2014 14:37:26 +0000 (15:37 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Thu, 10 Jul 2014 14:37:26 +0000 (15:37 +0100)]
Bump version

9 years agoDocs.
Carl Hetherington [Thu, 10 Jul 2014 10:43:17 +0000 (11:43 +0100)]
Docs.

9 years agoDocs.
Carl Hetherington [Thu, 10 Jul 2014 10:36:19 +0000 (11:36 +0100)]
Docs.

9 years agoDoc update.
Carl Hetherington [Thu, 10 Jul 2014 10:29:26 +0000 (11:29 +0100)]
Doc update.

9 years agoBasics of DCP subtitle import.
Carl Hetherington [Thu, 10 Jul 2014 10:27:26 +0000 (11:27 +0100)]
Basics of DCP subtitle import.

9 years agoDecode DCP audio too.
Carl Hetherington [Thu, 10 Jul 2014 09:01:18 +0000 (10:01 +0100)]
Decode DCP audio too.

9 years agoBasics of direct write of J2K data without encode/decode.
Carl Hetherington [Thu, 10 Jul 2014 08:40:56 +0000 (09:40 +0100)]
Basics of direct write of J2K data without encode/decode.

9 years agoSplit up image_proxy.{cc,h}
Carl Hetherington [Wed, 9 Jul 2014 16:05:26 +0000 (17:05 +0100)]
Split up image_proxy.{cc,h}

9 years agoUse a new ImageProxy to hold J2K data from DCP content.
Carl Hetherington [Wed, 9 Jul 2014 15:41:53 +0000 (16:41 +0100)]
Use a new ImageProxy to hold J2K data from DCP content.

9 years agoSave and re-load DCP content.
Carl Hetherington [Wed, 9 Jul 2014 12:48:35 +0000 (13:48 +0100)]
Save and re-load DCP content.

9 years agoFix DCP name in editor; fix use of DCP entry points.
Carl Hetherington [Wed, 9 Jul 2014 09:17:49 +0000 (10:17 +0100)]
Fix DCP name in editor; fix use of DCP entry points.

9 years agoBasics of DCP import.
Carl Hetherington [Wed, 9 Jul 2014 08:36:58 +0000 (09:36 +0100)]
Basics of DCP import.

9 years agoSmall clean up to video examiner use.
Carl Hetherington [Tue, 8 Jul 2014 13:23:08 +0000 (14:23 +0100)]
Small clean up to video examiner use.

9 years agoConversion of frame index to FFmpeg time must always use the original or detected...
Carl Hetherington [Tue, 8 Jul 2014 09:03:58 +0000 (10:03 +0100)]
Conversion of frame index to FFmpeg time must always use the original or detected FFmpeg video frame rate.

9 years agoRemove unused variable.
Carl Hetherington [Tue, 8 Jul 2014 09:03:02 +0000 (10:03 +0100)]
Remove unused variable.

9 years agoMerge master.
Carl Hetherington [Tue, 8 Jul 2014 08:13:48 +0000 (09:13 +0100)]
Merge master.

9 years agoMake XML subtitle work at the very minimal level.
Carl Hetherington [Fri, 4 Jul 2014 15:34:13 +0000 (16:34 +0100)]
Make XML subtitle work at the very minimal level.

9 years agoAdd 'starting' option to subtitles_during().
Carl Hetherington [Fri, 4 Jul 2014 10:43:55 +0000 (11:43 +0100)]
Add 'starting' option to subtitles_during().

9 years agoHopefully improve subtitle decoder seeking etc.
Carl Hetherington [Wed, 2 Jul 2014 17:10:58 +0000 (18:10 +0100)]
Hopefully improve subtitle decoder seeking etc.

9 years agoUpdated de_DE translation.
Carl Hetherington [Wed, 2 Jul 2014 15:46:37 +0000 (16:46 +0100)]
Updated de_DE translation.

Signed-off-by: Carsten Kurz
9 years agoRearrange Player subtitle handling a bit.
Carl Hetherington [Wed, 2 Jul 2014 13:19:21 +0000 (14:19 +0100)]
Rearrange Player subtitle handling a bit.

9 years agoClarify that Encoder really just manages video encoding.
Carl Hetherington [Wed, 2 Jul 2014 08:47:11 +0000 (09:47 +0100)]
Clarify that Encoder really just manages video encoding.

9 years agoSplit EncodedData classes into their own file.
Carl Hetherington [Tue, 1 Jul 2014 17:56:20 +0000 (18:56 +0100)]
Split EncodedData classes into their own file.

9 years agoOnly burn subtitles if it is turned on.
Carl Hetherington [Tue, 1 Jul 2014 16:03:16 +0000 (17:03 +0100)]
Only burn subtitles if it is turned on.

9 years agoAdd burn subtitles option to Film.
Carl Hetherington [Tue, 1 Jul 2014 15:41:13 +0000 (16:41 +0100)]
Add burn subtitles option to Film.

9 years agoOnly enable viewing of subtitles with SubRip.
Carl Hetherington [Tue, 1 Jul 2014 15:17:23 +0000 (16:17 +0100)]
Only enable viewing of subtitles with SubRip.

9 years agoOptimise filter graphs with no filters.
Carl Hetherington [Tue, 1 Jul 2014 15:05:28 +0000 (16:05 +0100)]
Optimise filter graphs with no filters.

9 years agoTypo fix.
Carl Hetherington [Tue, 1 Jul 2014 15:05:22 +0000 (16:05 +0100)]
Typo fix.

9 years agoTidy up a bit.
Carl Hetherington [Tue, 1 Jul 2014 14:18:36 +0000 (15:18 +0100)]
Tidy up a bit.

9 years agoRemove FFmpegDecoder minimal_run and care on seeking, as the VideoDecoder/AudioDecode...
Carl Hetherington [Tue, 1 Jul 2014 14:05:13 +0000 (15:05 +0100)]
Remove FFmpegDecoder minimal_run and care on seeking, as the VideoDecoder/AudioDecoder has to cope with stuff per-stream anyway.

9 years agoDCPVideoFrame -> DCPVideo and PlayerVideoFrame -> PlayerVideo.
Carl Hetherington [Tue, 1 Jul 2014 13:28:04 +0000 (14:28 +0100)]
DCPVideoFrame -> DCPVideo and PlayerVideoFrame -> PlayerVideo.

9 years agoAdd a Type to Time.
Carl Hetherington [Tue, 1 Jul 2014 13:13:10 +0000 (14:13 +0100)]
Add a Type to Time.

9 years agoMerge master.
Carl Hetherington [Tue, 1 Jul 2014 12:59:50 +0000 (13:59 +0100)]
Merge master.

9 years agowhile (1) -> while (true)
Carl Hetherington [Tue, 1 Jul 2014 12:43:41 +0000 (13:43 +0100)]
while (1) -> while (true)

9 years agoTry to fix windows build.
Carl Hetherington [Tue, 1 Jul 2014 08:51:17 +0000 (09:51 +0100)]
Try to fix windows build.

9 years agoFix build.
Carl Hetherington [Tue, 1 Jul 2014 00:03:45 +0000 (01:03 +0100)]
Fix build.

9 years agoFix problems with AudioDecoder when seeks to not subsequently give exactly what we...
Carl Hetherington [Mon, 30 Jun 2014 18:41:29 +0000 (19:41 +0100)]
Fix problems with AudioDecoder when seeks to not subsequently give exactly what we asked for.

9 years agoDoc tweaks.
Carl Hetherington [Mon, 30 Jun 2014 13:25:13 +0000 (14:25 +0100)]
Doc tweaks.

9 years agoMerge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Mon, 30 Jun 2014 13:17:08 +0000 (14:17 +0100)]
Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

9 years agoTry imb- and ims-prefixes for Doremi ceritificates, not just dcp2000- (#375).
Carl Hetherington [Mon, 30 Jun 2014 13:16:51 +0000 (14:16 +0100)]
Try imb- and ims-prefixes for Doremi ceritificates, not just dcp2000- (#375).

9 years agoMerge master.
Carl Hetherington [Mon, 30 Jun 2014 12:57:52 +0000 (13:57 +0100)]
Merge master.

9 years agoBump version
Carl Hetherington [Mon, 30 Jun 2014 09:43:17 +0000 (10:43 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Mon, 30 Jun 2014 09:43:16 +0000 (10:43 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Fri, 27 Jun 2014 23:54:23 +0000 (00:54 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Fri, 27 Jun 2014 23:54:23 +0000 (00:54 +0100)]
Bump version

9 years agoFix merge.
Carl Hetherington [Fri, 27 Jun 2014 23:54:09 +0000 (00:54 +0100)]
Fix merge.

9 years agoFix merge.
Carl Hetherington [Fri, 27 Jun 2014 23:53:41 +0000 (00:53 +0100)]
Fix merge.

9 years agoBump version
Carl Hetherington [Fri, 27 Jun 2014 23:53:18 +0000 (00:53 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Fri, 27 Jun 2014 23:53:18 +0000 (00:53 +0100)]
Bump version

9 years agoFix crash on analysing audio (and possibly DCP creation) with resampled
Carl Hetherington [Fri, 27 Jun 2014 23:39:02 +0000 (00:39 +0100)]
Fix crash on analysing audio (and possibly DCP creation) with resampled
content.

Reported-by: Matthias Damm
9 years agoSupport building with wxWidgets 3.0.x.
Carl Hetherington [Fri, 27 Jun 2014 14:37:44 +0000 (15:37 +0100)]
Support building with wxWidgets 3.0.x.

9 years agoMerge 1.70.0-hotfix branch into master.
Carl Hetherington [Fri, 27 Jun 2014 12:28:08 +0000 (13:28 +0100)]
Merge 1.70.0-hotfix branch into master.

9 years agoBump version
Carl Hetherington [Fri, 27 Jun 2014 12:25:45 +0000 (13:25 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Fri, 27 Jun 2014 12:25:44 +0000 (13:25 +0100)]
Bump version

9 years agoFix the up/down buttons in the content list.
Carl Hetherington [Fri, 27 Jun 2014 12:23:09 +0000 (13:23 +0100)]
Fix the up/down buttons in the content list.

Reported-by: Daniel Chauvet
9 years agoFix incorrect behaviour of Playlist::move_later.
Carl Hetherington [Fri, 27 Jun 2014 12:22:42 +0000 (13:22 +0100)]
Fix incorrect behaviour of Playlist::move_later.

9 years agoUpdate metadata reference file.
Carl Hetherington [Fri, 27 Jun 2014 10:18:42 +0000 (11:18 +0100)]
Update metadata reference file.

9 years agoFix confusion about subtitle codec pointers.
Carl Hetherington [Fri, 27 Jun 2014 10:16:37 +0000 (11:16 +0100)]
Fix confusion about subtitle codec pointers.

9 years agoFix segfault when tests fail.
Carl Hetherington [Fri, 27 Jun 2014 10:16:25 +0000 (11:16 +0100)]
Fix segfault when tests fail.

9 years agoMerge master.
Carl Hetherington [Thu, 26 Jun 2014 22:36:24 +0000 (23:36 +0100)]
Merge master.

9 years agoBump version
Carl Hetherington [Thu, 26 Jun 2014 18:30:39 +0000 (19:30 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Thu, 26 Jun 2014 18:30:39 +0000 (19:30 +0100)]
Bump version

9 years agoSupport different KDM formulations.
Carl Hetherington [Thu, 26 Jun 2014 18:15:56 +0000 (19:15 +0100)]
Support different KDM formulations.

9 years agoAllow user to set video frame rate of video sources (to override the detected one).
Carl Hetherington [Thu, 26 Jun 2014 13:35:33 +0000 (14:35 +0100)]
Allow user to set video frame rate of video sources (to override the detected one).

9 years agoUse full/empty conditions rather than just a single condition for the server and...
Carl Hetherington [Thu, 26 Jun 2014 10:04:02 +0000 (11:04 +0100)]
Use full/empty conditions rather than just a single condition for the server and encoder.

9 years agoBump version
Carl Hetherington [Thu, 26 Jun 2014 09:26:32 +0000 (10:26 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Thu, 26 Jun 2014 09:26:32 +0000 (10:26 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Wed, 25 Jun 2014 22:21:21 +0000 (23:21 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Wed, 25 Jun 2014 22:21:21 +0000 (23:21 +0100)]
Bump version

9 years agoMerge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Wed, 25 Jun 2014 22:09:42 +0000 (23:09 +0100)]
Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

9 years agoMore build fixes.
Carl Hetherington [Wed, 25 Jun 2014 22:09:37 +0000 (23:09 +0100)]
More build fixes.

9 years agoBump version
Carl Hetherington [Wed, 25 Jun 2014 21:13:36 +0000 (22:13 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Wed, 25 Jun 2014 21:13:36 +0000 (22:13 +0100)]
Bump version

9 years agoSupport pixel format 46 in make_black().
Carl Hetherington [Wed, 25 Jun 2014 15:19:53 +0000 (16:19 +0100)]
Support pixel format 46 in make_black().

9 years agoMissing commit.
Carl Hetherington [Wed, 25 Jun 2014 14:55:16 +0000 (15:55 +0100)]
Missing commit.

9 years agoMore debian unstable hacks.
Carl Hetherington [Wed, 25 Jun 2014 11:46:39 +0000 (12:46 +0100)]
More debian unstable hacks.

9 years agoPass --debian-unstable to trigger linking hacks as required.
Carl Hetherington [Wed, 25 Jun 2014 09:44:19 +0000 (10:44 +0100)]
Pass --debian-unstable to trigger linking hacks as required.

9 years agoMore attempts to fix various debian builds.
Carl Hetherington [Wed, 25 Jun 2014 09:42:48 +0000 (10:42 +0100)]
More attempts to fix various debian builds.

9 years agoTry to fix debian unstable deps.
Carl Hetherington [Wed, 25 Jun 2014 08:19:01 +0000 (09:19 +0100)]
Try to fix debian unstable deps.

9 years agoMore attempts to build on Debian unstable.
Carl Hetherington [Tue, 24 Jun 2014 21:48:13 +0000 (22:48 +0100)]
More attempts to build on Debian unstable.

9 years agoAttempt to fix static link on Debian unstable.
Carl Hetherington [Tue, 24 Jun 2014 15:53:31 +0000 (16:53 +0100)]
Attempt to fix static link on Debian unstable.

9 years agopot-merge.
Carl Hetherington [Tue, 24 Jun 2014 13:54:24 +0000 (14:54 +0100)]
pot-merge.

9 years agoUpdate comment.
Carl Hetherington [Tue, 24 Jun 2014 10:12:40 +0000 (11:12 +0100)]
Update comment.

9 years agoUpdate ChangeLog.
Carl Hetherington [Tue, 24 Jun 2014 10:12:22 +0000 (11:12 +0100)]
Update ChangeLog.

9 years agoOnly emit Changed when things are added to or removed from the playlist.
Carl Hetherington [Tue, 24 Jun 2014 10:12:11 +0000 (11:12 +0100)]
Only emit Changed when things are added to or removed from the playlist.

9 years agoRe-assign timeline tracks when things are moved about.
Carl Hetherington [Tue, 24 Jun 2014 09:06:25 +0000 (10:06 +0100)]
Re-assign timeline tracks when things are moved about.

9 years agoSome comments.
Carl Hetherington [Mon, 23 Jun 2014 21:33:40 +0000 (22:33 +0100)]
Some comments.

9 years agoMore manual adjustments wrt scaling.
Carl Hetherington [Mon, 23 Jun 2014 18:39:03 +0000 (19:39 +0100)]
More manual adjustments wrt scaling.

9 years agoAdd supporter.
Carl Hetherington [Mon, 23 Jun 2014 18:15:17 +0000 (19:15 +0100)]
Add supporter.

9 years agoAdd some stuff about video processing.
Carl Hetherington [Mon, 23 Jun 2014 16:02:06 +0000 (17:02 +0100)]
Add some stuff about video processing.

9 years agoBe more careful when mangling DCP names to fit ISDCF.
Carl Hetherington [Mon, 23 Jun 2014 13:50:51 +0000 (14:50 +0100)]
Be more careful when mangling DCP names to fit ISDCF.

Reported-by: Jonathan Jensen
9 years agoMerge master.
Carl Hetherington [Mon, 23 Jun 2014 00:02:24 +0000 (01:02 +0100)]
Merge master.