libdcp.git
8 years agoFix tests to match reality.
Carl Hetherington [Tue, 30 Jun 2015 08:25:28 +0000 (09:25 +0100)]
Fix tests to match reality.

8 years agoReturn to DCP-o-matic v1's gamma correction for Rec 601/709.
Carl Hetherington [Mon, 29 Jun 2015 22:40:29 +0000 (23:40 +0100)]
Return to DCP-o-matic v1's gamma correction for Rec 601/709.

Dennis points out that `there definitely *is* no right answer for
BT.709 gamma' and `your formula [the DCP-o-matic v2 gamma function
before this commmit] is what I'm calling the inverse of the BT.709
camera transfer function.  The EBU would not have bothered to write:
"Therefore the monitor gamma is not, and never has been, the inverse
of the camera gamma." if no-one ever thought of using it'.

At least the 2.2 gamma of v1 should not surprise anybody.

9 years agoMerge.
Carl Hetherington [Wed, 24 Jun 2015 21:23:41 +0000 (22:23 +0100)]
Merge.

9 years agoThinko in previous.
Carl Hetherington [Wed, 24 Jun 2015 15:56:22 +0000 (16:56 +0100)]
Thinko in previous.

9 years agoFix various SNAFUs with Font ID handling.
Carl Hetherington [Wed, 24 Jun 2015 14:05:19 +0000 (15:05 +0100)]
Fix various SNAFUs with Font ID handling.

9 years agoGive Data a loading constructor.
Carl Hetherington [Wed, 24 Jun 2015 13:14:02 +0000 (14:14 +0100)]
Give Data a loading constructor.

9 years agoNo-op: whitespace.
Carl Hetherington [Wed, 24 Jun 2015 13:13:37 +0000 (14:13 +0100)]
No-op: whitespace.

9 years agoNo-op: whitespace.
Carl Hetherington [Wed, 24 Jun 2015 00:06:04 +0000 (01:06 +0100)]
No-op: whitespace.

9 years agoNo-op; whitespace and a comment typo.
Carl Hetherington [Wed, 24 Jun 2015 00:04:32 +0000 (01:04 +0100)]
No-op; whitespace and a comment typo.

9 years agoFix several missing binary specifiers to fopen.
Carl Hetherington [Thu, 18 Jun 2015 18:50:19 +0000 (19:50 +0100)]
Fix several missing binary specifiers to fopen.

9 years agoMerge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
Carl Hetherington [Tue, 16 Jun 2015 18:12:13 +0000 (19:12 +0100)]
Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0

9 years agoFix a warning.
Carl Hetherington [Tue, 16 Jun 2015 18:12:06 +0000 (19:12 +0100)]
Fix a warning.

9 years agoSpeculative build fix.
Carl Hetherington [Tue, 16 Jun 2015 18:12:01 +0000 (19:12 +0100)]
Speculative build fix.

9 years agoMerge branch '.0' of git.carlh.net:git/libdcp into 1.0
Carl Hetherington [Tue, 16 Jun 2015 15:45:39 +0000 (16:45 +0100)]
Merge branch '.0' of git.carlh.net:git/libdcp into 1.0

9 years agoFix build on some platforms.
Carl Hetherington [Tue, 16 Jun 2015 15:45:32 +0000 (16:45 +0100)]
Fix build on some platforms.

9 years agoTry to remove encryption test's dependency on LIBDCP_VERSION; update test refs accord...
Carl Hetherington [Sat, 13 Jun 2015 15:16:08 +0000 (16:16 +0100)]
Try to remove encryption test's dependency on LIBDCP_VERSION; update test refs accordingly.

9 years agoBump version
Carl Hetherington [Sat, 13 Jun 2015 14:18:35 +0000 (15:18 +0100)]
Bump version

9 years agoBump version v1.1.0
Carl Hetherington [Sat, 13 Jun 2015 14:18:35 +0000 (15:18 +0100)]
Bump version

9 years agoFix erroneous suffix.
Carl Hetherington [Fri, 12 Jun 2015 07:53:50 +0000 (08:53 +0100)]
Fix erroneous suffix.

9 years agoFix thinko which broke xyz->rgb conversion.
Carl Hetherington [Thu, 11 Jun 2015 15:18:42 +0000 (16:18 +0100)]
Fix thinko which broke xyz->rgb conversion.

9 years agoFix possible assert failure.
Carl Hetherington [Thu, 11 Jun 2015 12:52:39 +0000 (13:52 +0100)]
Fix possible assert failure.

9 years agoPass a note rather than failing an assert on clamping XYZ values after conversion.
Carl Hetherington [Thu, 11 Jun 2015 12:45:58 +0000 (13:45 +0100)]
Pass a note rather than failing an assert on clamping XYZ values after conversion.

9 years agoRename XYZImage -> OpenJPEGImage.
Carl Hetherington [Wed, 10 Jun 2015 14:05:48 +0000 (15:05 +0100)]
Rename XYZImage -> OpenJPEGImage.

9 years agoSome non-DCP JPEG2000 images are not 12-bit.
Carl Hetherington [Wed, 10 Jun 2015 13:44:48 +0000 (14:44 +0100)]
Some non-DCP JPEG2000 images are not 12-bit.

9 years agoSupport decompression of JP2 as well as JPEG2000 codestreams.
Carl Hetherington [Wed, 10 Jun 2015 12:20:55 +0000 (13:20 +0100)]
Support decompression of JP2 as well as JPEG2000 codestreams.

9 years agoFix comment.
Carl Hetherington [Wed, 10 Jun 2015 12:20:43 +0000 (13:20 +0100)]
Fix comment.

9 years agoRename Font -> FontAsset; add dcpdumpsub tool.
Carl Hetherington [Wed, 10 Jun 2015 09:55:22 +0000 (10:55 +0100)]
Rename Font -> FontAsset; add dcpdumpsub tool.

9 years agoOptionally allow subtitle issue dates to differ.
Carl Hetherington [Wed, 10 Jun 2015 08:54:28 +0000 (09:54 +0100)]
Optionally allow subtitle issue dates to differ.

9 years agoDon't complain if SMPTE subtitle <LoadFont> URNs are different.
Carl Hetherington [Wed, 10 Jun 2015 08:28:31 +0000 (09:28 +0100)]
Don't complain if SMPTE subtitle <LoadFont> URNs are different.

9 years agoFixes to equals().
Carl Hetherington [Tue, 9 Jun 2015 15:30:15 +0000 (16:30 +0100)]
Fixes to equals().

9 years agoAdd --reel-annotation-texts to dcpdiff.
Carl Hetherington [Tue, 9 Jun 2015 14:56:44 +0000 (15:56 +0100)]
Add --reel-annotation-texts to dcpdiff.

9 years agoHandle storing/recovery of fonts in SMPTE MXF files.
Carl Hetherington [Tue, 9 Jun 2015 13:02:20 +0000 (14:02 +0100)]
Handle storing/recovery of fonts in SMPTE MXF files.

9 years agoAs I understand it all SMPTE subtitles are MXF-wrapped.
Carl Hetherington [Tue, 9 Jun 2015 10:40:59 +0000 (11:40 +0100)]
As I understand it all SMPTE subtitles are MXF-wrapped.

9 years agoBasically-working interop subtitle font handling.
Carl Hetherington [Tue, 9 Jun 2015 10:13:02 +0000 (11:13 +0100)]
Basically-working interop subtitle font handling.

9 years agoMerge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
Carl Hetherington [Mon, 8 Jun 2015 22:28:17 +0000 (23:28 +0100)]
Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0

9 years agoRequire only DCP::add() for the CPL; other assets found by looking in the CPL.
Carl Hetherington [Mon, 8 Jun 2015 14:40:19 +0000 (15:40 +0100)]
Require only DCP::add() for the CPL; other assets found by looking in the CPL.

9 years agoAdd some setters.
Carl Hetherington [Mon, 8 Jun 2015 14:06:04 +0000 (15:06 +0100)]
Add some setters.

9 years agoRemove slightly strange InteropSubtitleAsset constructor; add default one for SMPTESu...
Carl Hetherington [Mon, 8 Jun 2015 14:04:43 +0000 (15:04 +0100)]
Remove slightly strange InteropSubtitleAsset constructor; add default one for SMPTESubtitleAsset.

9 years agoBetter error checking.
Carl Hetherington [Mon, 8 Jun 2015 12:12:58 +0000 (13:12 +0100)]
Better error checking.

9 years agoDon't read crytographic key unless the asset is encrypted.
Carl Hetherington [Mon, 8 Jun 2015 12:12:45 +0000 (13:12 +0100)]
Don't read crytographic key unless the asset is encrypted.

9 years agoUse boost::filesystem::extension.
Carl Hetherington [Mon, 8 Jun 2015 12:12:12 +0000 (13:12 +0100)]
Use boost::filesystem::extension.

9 years agoFix LD_LIBRARY_PATHs.
Carl Hetherington [Mon, 8 Jun 2015 12:11:58 +0000 (13:11 +0100)]
Fix LD_LIBRARY_PATHs.

9 years agoRemove some commented-out bits.
Carl Hetherington [Mon, 8 Jun 2015 09:44:43 +0000 (10:44 +0100)]
Remove some commented-out bits.

9 years agoFix subs_in_out to support SMPTE.
Carl Hetherington [Mon, 8 Jun 2015 09:43:32 +0000 (10:43 +0100)]
Fix subs_in_out to support SMPTE.

9 years agoExpand read_smpte_subtitle_test somewhat.
Carl Hetherington [Mon, 8 Jun 2015 09:17:35 +0000 (10:17 +0100)]
Expand read_smpte_subtitle_test somewhat.

9 years agoRename some tests.
Carl Hetherington [Mon, 8 Jun 2015 08:59:21 +0000 (09:59 +0100)]
Rename some tests.

9 years agoComments.
Carl Hetherington [Mon, 8 Jun 2015 08:56:38 +0000 (09:56 +0100)]
Comments.

9 years agoSome comments and test tweaks.
Carl Hetherington [Mon, 8 Jun 2015 08:55:20 +0000 (09:55 +0100)]
Some comments and test tweaks.

9 years agoDoxygen tweaks.
Carl Hetherington [Sun, 7 Jun 2015 23:32:50 +0000 (00:32 +0100)]
Doxygen tweaks.

9 years agoTiny optimisation; Object default constructor calls make_uuid.
Carl Hetherington [Sun, 7 Jun 2015 23:32:41 +0000 (00:32 +0100)]
Tiny optimisation; Object default constructor calls make_uuid.

9 years agoBits of tidying; comments.
Carl Hetherington [Fri, 5 Jun 2015 18:14:54 +0000 (19:14 +0100)]
Bits of tidying; comments.

9 years agoUpdate Doxyfile.
Carl Hetherington [Fri, 5 Jun 2015 17:50:11 +0000 (18:50 +0100)]
Update Doxyfile.

9 years agoReelEncryptableAsset -> ReelMXF.
Carl Hetherington [Fri, 5 Jun 2015 17:49:22 +0000 (18:49 +0100)]
ReelEncryptableAsset -> ReelMXF.

9 years agoMake ReelEncryptableAsset like MXF.
Carl Hetherington [Fri, 5 Jun 2015 17:41:44 +0000 (18:41 +0100)]
Make ReelEncryptableAsset like MXF.

9 years agoComment tweak.
Carl Hetherington [Fri, 5 Jun 2015 17:25:27 +0000 (18:25 +0100)]
Comment tweak.

9 years agoSmall tidy-ups and comments.
Carl Hetherington [Fri, 5 Jun 2015 17:13:20 +0000 (18:13 +0100)]
Small tidy-ups and comments.

9 years agoInitial work on SMPTE subtitles.
Carl Hetherington [Thu, 4 Jun 2015 11:25:48 +0000 (12:25 +0100)]
Initial work on SMPTE subtitles.

9 years agoFix rebase onto 1.0.
Carl Hetherington [Fri, 5 Jun 2015 13:42:28 +0000 (14:42 +0100)]
Fix rebase onto 1.0.

9 years agoRename some mxf variables to asset.
Carl Hetherington [Thu, 4 Jun 2015 23:24:27 +0000 (00:24 +0100)]
Rename some mxf variables to asset.

9 years agoRename ReelMXFAsset -> ReelEncryptableAsset.
Carl Hetherington [Thu, 4 Jun 2015 23:18:00 +0000 (00:18 +0100)]
Rename ReelMXFAsset -> ReelEncryptableAsset.

9 years agoMXF -> Asset in lots of places.
Carl Hetherington [Thu, 4 Jun 2015 23:05:32 +0000 (00:05 +0100)]
MXF -> Asset in lots of places.

9 years agoUnpick MXF from the class hierarchy.
Carl Hetherington [Thu, 4 Jun 2015 21:55:10 +0000 (22:55 +0100)]
Unpick MXF from the class hierarchy.

9 years agoMake read_writer_info do more stuff, and return id.
Carl Hetherington [Thu, 4 Jun 2015 21:32:52 +0000 (22:32 +0100)]
Make read_writer_info do more stuff, and return id.

9 years agoKeep encryption context in MXFWriter.
Carl Hetherington [Thu, 4 Jun 2015 21:24:26 +0000 (22:24 +0100)]
Keep encryption context in MXFWriter.

9 years agoUse boost::optional for key id instead of an empty string.
Carl Hetherington [Thu, 4 Jun 2015 20:55:00 +0000 (21:55 +0100)]
Use boost::optional for key id instead of an empty string.

9 years agoMake fill_writer_info protected.
Carl Hetherington [Thu, 4 Jun 2015 20:18:54 +0000 (21:18 +0100)]
Make fill_writer_info protected.

9 years agoTake pkl_type out of MXF.
Carl Hetherington [Thu, 4 Jun 2015 17:10:12 +0000 (18:10 +0100)]
Take pkl_type out of MXF.

9 years agoMove edit rate and intrinsic duration out of MXF.
Carl Hetherington [Thu, 4 Jun 2015 16:16:22 +0000 (17:16 +0100)]
Move edit rate and intrinsic duration out of MXF.

9 years agoRename some stuff Content -> Asset.
Carl Hetherington [Thu, 4 Jun 2015 15:48:08 +0000 (16:48 +0100)]
Rename some stuff Content -> Asset.

9 years agoRemove unnecessary Content class.
Carl Hetherington [Thu, 4 Jun 2015 15:42:03 +0000 (16:42 +0100)]
Remove unnecessary Content class.

9 years agoFix test refs.
Carl Hetherington [Fri, 5 Jun 2015 13:31:31 +0000 (14:31 +0100)]
Fix test refs.

9 years agoFix apparently broken test certificate chain (root certificate had wrong dnQualifier).
Carl Hetherington [Fri, 5 Jun 2015 13:22:48 +0000 (14:22 +0100)]
Fix apparently broken test certificate chain (root certificate had wrong dnQualifier).

9 years agoencryption_test should add assets to the DCP.
Carl Hetherington [Fri, 5 Jun 2015 13:14:41 +0000 (14:14 +0100)]
encryption_test should add assets to the DCP.

9 years agoSpeculative change from master to X509IssuerName order.
Carl Hetherington [Fri, 5 Jun 2015 13:14:19 +0000 (14:14 +0100)]
Speculative change from master to X509IssuerName order.

9 years agoFix ordering of KeyId tag in SMPTE CPLs.
Carl Hetherington [Fri, 5 Jun 2015 00:51:24 +0000 (01:51 +0100)]
Fix ordering of KeyId tag in SMPTE CPLs.

9 years agoRationalise naming of test outputs; fix missing check of dcp_test2.
Carl Hetherington [Fri, 5 Jun 2015 00:26:06 +0000 (01:26 +0100)]
Rationalise naming of test outputs; fix missing check of dcp_test2.

9 years agoto_* to as_* in a few method names.
Carl Hetherington [Thu, 4 Jun 2015 11:32:37 +0000 (12:32 +0100)]
to_* to as_* in a few method names.

9 years agoHopefully finished with TO_PORT.
Carl Hetherington [Thu, 4 Jun 2015 11:15:05 +0000 (12:15 +0100)]
Hopefully finished with TO_PORT.

9 years agoSupport optional milliseconds in LocalTime.
Carl Hetherington [Thu, 4 Jun 2015 10:59:21 +0000 (11:59 +0100)]
Support optional milliseconds in LocalTime.

9 years agoAdd halign to SubtitleString's operator<< and use it for dcpinfo.
Carl Hetherington [Wed, 3 Jun 2015 23:30:58 +0000 (00:30 +0100)]
Add halign to SubtitleString's operator<< and use it for dcpinfo.

9 years agoAdd set_h_position.
Carl Hetherington [Wed, 3 Jun 2015 22:54:36 +0000 (23:54 +0100)]
Add set_h_position.

9 years agoBasic HAlign / HPosition support.
Carl Hetherington [Wed, 3 Jun 2015 22:32:48 +0000 (23:32 +0100)]
Basic HAlign / HPosition support.

9 years agoAdd accessor.
Carl Hetherington [Wed, 3 Jun 2015 15:11:17 +0000 (16:11 +0100)]
Add accessor.

9 years agoMerge branch '1.0' of git.carlh.net:git/libdcp into 1.0
Carl Hetherington [Wed, 3 Jun 2015 15:09:44 +0000 (16:09 +0100)]
Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0

9 years agoAdd AspectAdjust to subtitles.
Carl Hetherington [Wed, 3 Jun 2015 15:09:24 +0000 (16:09 +0100)]
Add AspectAdjust to subtitles.

9 years agoNo-op; comments.
Carl Hetherington [Tue, 2 Jun 2015 00:01:00 +0000 (01:01 +0100)]
No-op; comments.

9 years agoMerge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
Carl Hetherington [Fri, 29 May 2015 18:17:24 +0000 (19:17 +0100)]
Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0

9 years agoUse markdown for README.
Carl Hetherington [Fri, 29 May 2015 18:16:12 +0000 (19:16 +0100)]
Use markdown for README.

9 years agoSome comments.
Carl Hetherington [Fri, 29 May 2015 09:36:56 +0000 (10:36 +0100)]
Some comments.

9 years agoFix comment in example code.
Carl Hetherington [Fri, 29 May 2015 09:21:50 +0000 (10:21 +0100)]
Fix comment in example code.

9 years agoImproved error messages; better equals() with corrupted MXFs.
Carl Hetherington [Wed, 27 May 2015 09:24:22 +0000 (10:24 +0100)]
Improved error messages; better equals() with corrupted MXFs.

9 years agoAdd equality option to allow reel annotation texts to differ.
Carl Hetherington [Mon, 25 May 2015 21:25:05 +0000 (22:25 +0100)]
Add equality option to allow reel annotation texts to differ.

9 years agoRename CPL/PKL files to be {cpl,pkl}_uuid.xml rather than
Carl Hetherington [Sun, 24 May 2015 23:09:58 +0000 (00:09 +0100)]
Rename CPL/PKL files to be {cpl,pkl}_uuid.xml rather than
uuid_{cpl,pkl}.xml as this seems to be more conventional.

9 years agoUpdate TO_PORT.
Carl Hetherington [Sat, 23 May 2015 16:36:39 +0000 (17:36 +0100)]
Update TO_PORT.

9 years agoPut our version of compose.hpp inside the libdcp namespace,
Carl Hetherington [Sat, 23 May 2015 16:25:01 +0000 (17:25 +0100)]
Put our version of compose.hpp inside the libdcp namespace,
otherwise libdcp will end up calling DCP-o-matic's version
on OS X, with bad results.

9 years agoSomewhat speculative reordering of Certificate::name_for_xml.
Carl Hetherington [Sat, 23 May 2015 16:21:25 +0000 (17:21 +0100)]
Somewhat speculative reordering of Certificate::name_for_xml.

9 years agoBetter Magick++ library checking.
Carl Hetherington [Sat, 23 May 2015 16:20:51 +0000 (17:20 +0100)]
Better Magick++ library checking.

9 years agoSmall thinko fix.
Carl Hetherington [Wed, 13 May 2015 21:51:02 +0000 (22:51 +0100)]
Small thinko fix.

9 years agoAdd more channels to the enum.
Carl Hetherington [Sat, 9 May 2015 23:28:51 +0000 (00:28 +0100)]
Add more channels to the enum.

9 years agoMerge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
Carl Hetherington [Wed, 6 May 2015 23:09:05 +0000 (00:09 +0100)]
Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0