Carl Hetherington [Mon, 18 Jan 2021 23:43:33 +0000 (00:43 +0100)]
Cleanup: more use of check_verify_result.
Carl Hetherington [Mon, 18 Jan 2021 23:33:51 +0000 (00:33 +0100)]
Cleanup: remove BRANCH file.
Carl Hetherington [Mon, 18 Jan 2021 23:33:14 +0000 (00:33 +0100)]
Bv2.1 10.1: if any asset is encrypted they all must be.
Carl Hetherington [Mon, 18 Jan 2021 23:32:53 +0000 (00:32 +0100)]
Rename encrypted() to any_encrypted() and add all_encrypted().
Carl Hetherington [Mon, 18 Jan 2021 23:05:44 +0000 (00:05 +0100)]
Bv2.1 9.2: PKL must be signed if it contains encrypted assets.
Carl Hetherington [Mon, 18 Jan 2021 21:53:57 +0000 (22:53 +0100)]
Bv2.1 9.1: PKL annotation text must match CPL ContentTitleText if there is only one CPL in the PKL.
Carl Hetherington [Mon, 18 Jan 2021 21:53:12 +0000 (22:53 +0100)]
Add some more access to PKL.
Carl Hetherington [Mon, 18 Jan 2021 19:13:41 +0000 (20:13 +0100)]
Bv2.1 8.7: CPLs with encrypted content must be signed.
Carl Hetherington [Mon, 18 Jan 2021 16:06:23 +0000 (17:06 +0100)]
Bv2.1 8.6.3: <ExtensionMetadata> must be present and have precise contents.
Carl Hetherington [Mon, 18 Jan 2021 12:05:11 +0000 (13:05 +0100)]
Bv2.1 8.6.{1.2}: CompositionMetadataAsset must exist and it must have some <VersionNumber>.
Carl Hetherington [Mon, 18 Jan 2021 12:03:47 +0000 (13:03 +0100)]
Add CPL::unset_version_number().
Carl Hetherington [Sun, 17 Jan 2021 23:27:34 +0000 (00:27 +0100)]
Bv2.1 8.5: FFOC and LFOC should be present and have particular values.
Carl Hetherington [Sun, 17 Jan 2021 23:24:21 +0000 (00:24 +0100)]
Require instrinsic duration of ReelMarkersAsset to be specified on construction.
We need the intrinsic duration to match other assets in the reel,
so we can't just calculate it from the markers.
Carl Hetherington [Sun, 17 Jan 2021 23:21:34 +0000 (00:21 +0100)]
Assert that entry_point and intrinsic_duration are not completely bogus.
Carl Hetherington [Sun, 17 Jan 2021 21:25:59 +0000 (22:25 +0100)]
Bv2.1 8.5: Features must have FFEC/FFMC markers.
Carl Hetherington [Sun, 17 Jan 2021 21:25:50 +0000 (22:25 +0100)]
Use feature not trailer for some tests to avoid verification errors about FFEC/FFMC.
Carl Hetherington [Sun, 17 Jan 2021 21:21:29 +0000 (22:21 +0100)]
Add CPL::set_content_kind.
Carl Hetherington [Sun, 17 Jan 2021 21:06:20 +0000 (22:06 +0100)]
Read scope attribute of ReleaseTerritory.
Carl Hetherington [Sun, 17 Jan 2021 19:26:28 +0000 (20:26 +0100)]
Check that the Editor actually edits something.
Carl Hetherington [Fri, 15 Jan 2021 22:11:47 +0000 (23:11 +0100)]
Use an enum class for Marker.
Carl Hetherington [Fri, 15 Jan 2021 21:56:38 +0000 (22:56 +0100)]
Bv2.1 8.4 We must have <Hash>es
Carl Hetherington [Fri, 15 Jan 2021 21:04:42 +0000 (22:04 +0100)]
Bv2.1 8.3.2: text tracks must have <EntryPoint> and it must be zero.
Carl Hetherington [Fri, 15 Jan 2021 21:04:23 +0000 (22:04 +0100)]
Add ReelAsset::unset_entry_point().
Carl Hetherington [Thu, 14 Jan 2021 23:17:09 +0000 (00:17 +0100)]
Bv2.1 8.3.1: MainSubtitles must be in all reels (if they are there at
all) and ClosedCaptions must have the same count on all reels.
Carl Hetherington [Thu, 14 Jan 2021 22:38:30 +0000 (23:38 +0100)]
Bv2.1 8.2: all parts of a reel must have the same duration.
Carl Hetherington [Thu, 14 Jan 2021 22:38:03 +0000 (23:38 +0100)]
Make subtitle checking robust to CPLs with no subs/ccaps in some reels.
Carl Hetherington [Thu, 14 Jan 2021 21:50:09 +0000 (22:50 +0100)]
Bv2.1 8.1: CPL <AnnotationText> should be the same as <ContentTitleText>
Carl Hetherington [Thu, 14 Jan 2021 21:38:58 +0000 (22:38 +0100)]
Bv2.1 8.1: CPL must have <AnnotationText>.
Carl Hetherington [Thu, 14 Jan 2021 21:20:06 +0000 (22:20 +0100)]
Make CPL annotation_text optional.
Carl Hetherington [Wed, 13 Jan 2021 01:20:02 +0000 (02:20 +0100)]
Fix some directory paths for tests.
Carl Hetherington [Wed, 13 Jan 2021 01:16:37 +0000 (02:16 +0100)]
Bv2.1 7.3: audio sample rate must be 48kHz.
Carl Hetherington [Tue, 12 Jan 2021 23:53:38 +0000 (00:53 +0100)]
Bv2.1 7.2.{6,7}: various limits on subtitle line and character counts.
Carl Hetherington [Tue, 12 Jan 2021 23:52:19 +0000 (00:52 +0100)]
Remove some unnecessary std:: qualifiers.
Carl Hetherington [Tue, 12 Jan 2021 16:47:23 +0000 (17:47 +0100)]
Bv2.1 7.2.{4,5}: check that subtitles are not too short, too close or
too early in the first reel.
Carl Hetherington [Mon, 11 Jan 2021 20:21:38 +0000 (21:21 +0100)]
Give simple_{picture,sound} a length parameter and fix crazy implementation of simple_sound().
Carl Hetherington [Mon, 11 Jan 2021 20:20:47 +0000 (21:20 +0100)]
Change subtitle SubtitleAsset API to return const Subtitle pointers; add subtitles_in_reel().
Carl Hetherington [Sun, 10 Jan 2021 23:16:40 +0000 (00:16 +0100)]
Replace std::list with std::vector in the API.
Carl Hetherington [Sat, 9 Jan 2021 21:01:12 +0000 (22:01 +0100)]
c++11 and other tidying.
Carl Hetherington [Sat, 9 Jan 2021 13:56:12 +0000 (14:56 +0100)]
BRANCH
Carl Hetherington [Sat, 9 Jan 2021 08:58:55 +0000 (09:58 +0100)]
Stop tests failing when libdcp version changes.
Carl Hetherington [Sat, 9 Jan 2021 00:39:08 +0000 (01:39 +0100)]
Bv2.1 7.2.4: first subtitle should be at least 4s into the DCP.
Carl Hetherington [Fri, 8 Jan 2021 23:43:24 +0000 (00:43 +0100)]
BRANCH
Carl Hetherington [Fri, 8 Jan 2021 23:38:18 +0000 (00:38 +0100)]
c++11 tidying.
Carl Hetherington [Sat, 2 Jan 2021 23:31:40 +0000 (00:31 +0100)]
Bv2.1 7.2.3: Check that subtitle <StartTime> exists and is 0.
Carl Hetherington [Mon, 14 Dec 2020 23:51:34 +0000 (00:51 +0100)]
Bv2.1 7.2.2: Check that subtitle languages are the same for all reels.
Carl Hetherington [Mon, 14 Dec 2020 23:24:12 +0000 (00:24 +0100)]
Remove unused variable.
Carl Hetherington [Mon, 14 Dec 2020 22:58:53 +0000 (23:58 +0100)]
Change the word 'disagree' to 'differ'.
Carl Hetherington [Mon, 14 Dec 2020 22:23:41 +0000 (23:23 +0100)]
Bv2.1 7.2.2: Check that subtitle Language tags are present.
Carl Hetherington [Mon, 14 Dec 2020 22:23:22 +0000 (23:23 +0100)]
Fix to allow re-writing of SMPTE subtitles.
Carl Hetherington [Sun, 13 Dec 2020 22:49:48 +0000 (23:49 +0100)]
Bv2.1 7.2.1: Check total size of all timed text fonts is not larger than 10MB.
I'm not sure if this is what Bv2.1 means, but hopefully it's close
enough.
Carl Hetherington [Sun, 13 Dec 2020 22:03:22 +0000 (23:03 +0100)]
Bv2.1 7.2.1: Check size of timed text asset is not larger than 115MB.
Carl Hetherington [Sun, 13 Dec 2020 21:36:07 +0000 (22:36 +0100)]
Update BRANCH.
Carl Hetherington [Sun, 13 Dec 2020 21:23:07 +0000 (22:23 +0100)]
Bv2.1 7.2.1: Check size of closed caption XML is not larger than 256KB.
Carl Hetherington [Sun, 13 Dec 2020 21:18:26 +0000 (22:18 +0100)]
Subtitle constructor should not be public.
Carl Hetherington [Sun, 13 Dec 2020 20:23:41 +0000 (21:23 +0100)]
Bv2.1 7.1: Check picture size and frame rate.
Carl Hetherington [Sun, 13 Dec 2020 20:22:30 +0000 (21:22 +0100)]
Extent black_image() to make images of any size.
Carl Hetherington [Sun, 13 Dec 2020 20:22:15 +0000 (21:22 +0100)]
Raise an exception to head off a weird asdcplib error with empty JPEG2000 comments.
Carl Hetherington [Sun, 13 Dec 2020 20:22:00 +0000 (21:22 +0100)]
Throw an exception on making a DCP with no reels.
Carl Hetherington [Sun, 13 Dec 2020 00:30:30 +0000 (01:30 +0100)]
Replace dcp::File with dcp::ArrayData.
Carl Hetherington [Sat, 12 Dec 2020 23:33:58 +0000 (00:33 +0100)]
Remove 32x32 test image.
Carl Hetherington [Sat, 12 Dec 2020 22:08:56 +0000 (23:08 +0100)]
Use a valid frame size for simple_picture().
Carl Hetherington [Sat, 12 Dec 2020 19:52:29 +0000 (20:52 +0100)]
Rename some notes to clarify places where size refers to bytes, not pixels.
Carl Hetherington [Sat, 12 Dec 2020 19:33:15 +0000 (20:33 +0100)]
Bv2.1 6.2.1: Check that release territory conforms to RFC 5646.
Carl Hetherington [Sat, 12 Dec 2020 19:21:28 +0000 (20:21 +0100)]
Bv2.1 6.2.1: Check that additional subtitle languages conform to RFC 5646.
Carl Hetherington [Wed, 9 Dec 2020 15:27:26 +0000 (16:27 +0100)]
Bv2.1 6.2.1: Check that closed caption reel and XML <Language> conform to RFC 5646.
Carl Hetherington [Wed, 9 Dec 2020 15:26:33 +0000 (16:26 +0100)]
Fix namespace on closed caption Language tag.
Carl Hetherington [Wed, 9 Dec 2020 13:59:29 +0000 (14:59 +0100)]
Small tweaks to how things are passed around.
Carl Hetherington [Wed, 9 Dec 2020 12:13:23 +0000 (13:13 +0100)]
Bv2.1 6.2.1: Check that the sound MXF Language tag conforms to RFC 5646.
Carl Hetherington [Wed, 9 Dec 2020 12:12:21 +0000 (13:12 +0100)]
Store sound asset language as a string, but set it as a
dcp::LanguageTag.
This makes it work the same as other language tags, and tolerates
bad values while trying not to allow them to be created.
Carl Hetherington [Wed, 9 Dec 2020 10:59:29 +0000 (11:59 +0100)]
Extract simple_sound() method.
Carl Hetherington [Wed, 9 Dec 2020 09:54:55 +0000 (10:54 +0100)]
We can always dump notes where there are none expected.
Carl Hetherington [Wed, 9 Dec 2020 09:54:38 +0000 (10:54 +0100)]
LanguageTag strings should not care about case.
Carl Hetherington [Wed, 9 Dec 2020 09:21:57 +0000 (10:21 +0100)]
Bv2.1 6.2.1: Check that subtitle XML <Language> conforms to RFC 5646.
Carl Hetherington [Wed, 9 Dec 2020 00:17:38 +0000 (01:17 +0100)]
Tiny cleanup of using prepare_directory.
Carl Hetherington [Wed, 9 Dec 2020 00:08:14 +0000 (01:08 +0100)]
Bv2.1 6.2.1: Check that subtitle reel <Language> conforms to RFC 5646.
Carl Hetherington [Tue, 8 Dec 2020 23:25:29 +0000 (00:25 +0100)]
BRANCH
Carl Hetherington [Tue, 8 Dec 2020 22:42:40 +0000 (23:42 +0100)]
Bv2.1 6.1: DCPs must be SMPTE.
Carl Hetherington [Tue, 8 Dec 2020 22:42:13 +0000 (23:42 +0100)]
Add VERIFY_BV21_ERROR.
Carl Hetherington [Tue, 8 Dec 2020 22:41:51 +0000 (23:41 +0100)]
Add BRANCH notes.
Carl Hetherington [Sun, 17 Jan 2021 12:07:56 +0000 (13:07 +0100)]
Fix macOS test environment path.
Carl Hetherington [Fri, 8 Jan 2021 20:51:10 +0000 (21:51 +0100)]
Bump libcxml.
Carl Hetherington [Fri, 8 Jan 2021 20:49:47 +0000 (21:49 +0100)]
More c++11 tidying.
Carl Hetherington [Fri, 8 Jan 2021 16:43:59 +0000 (17:43 +0100)]
c++11 tidying.
Carl Hetherington [Fri, 8 Jan 2021 16:43:49 +0000 (17:43 +0100)]
Remove use of xmldiff in tests.
Carl Hetherington [Sun, 20 Dec 2020 13:14:07 +0000 (14:14 +0100)]
std::shared_ptr
Carl Hetherington [Thu, 7 Jan 2021 23:35:07 +0000 (00:35 +0100)]
Fix test following previous commit.
Carl Hetherington [Sun, 20 Dec 2020 22:49:48 +0000 (23:49 +0100)]
Accept fonts as data blocks rather than files.
Carl Hetherington [Wed, 2 Dec 2020 09:09:30 +0000 (10:09 +0100)]
Fix equals() with image subtitles to not compare unique IDs.
Also add an option to save subtitle images to PNGs when they differ.
Carl Hetherington [Wed, 2 Dec 2020 09:09:06 +0000 (10:09 +0100)]
Add operator!= for Data.
Carl Hetherington [Sun, 29 Nov 2020 19:57:57 +0000 (20:57 +0100)]
Fix terrible SoundAsset::equals() implementation.
It would check individual bytes of samples to see if they differed
by more than the threshold. Not only is this almost useless, but
the default threshold is 256 so with the default settings it would
always say that two assets of the same length (and channels, etc.)
were the same, even if the sample data was different.
Carl Hetherington [Sun, 29 Nov 2020 19:57:09 +0000 (20:57 +0100)]
Fix SoundFrame::get().
The old version did not deal with signed-ness correctly. I think
this version is slightly dodgy in that it assumes 2s complement,
but that's probably not so bad.
Carl Hetherington [Sun, 29 Nov 2020 19:56:37 +0000 (20:56 +0100)]
Add SoundFrame::channels().
Carl Hetherington [Sun, 29 Nov 2020 19:56:11 +0000 (20:56 +0100)]
Add comment.
Carl Hetherington [Wed, 25 Nov 2020 22:32:44 +0000 (23:32 +0100)]
Add set_hash() method to ReelMXF.
Carl Hetherington [Sun, 22 Nov 2020 22:24:16 +0000 (23:24 +0100)]
Seems like an oversight that MainSubtitleLanguageList had no namespace.
Carl Hetherington [Sun, 22 Nov 2020 22:19:35 +0000 (23:19 +0100)]
Add SMPTE Bv2.1 ExtensionMetadata.
Carl Hetherington [Sat, 21 Nov 2020 01:32:08 +0000 (02:32 +0100)]
Better equality-failure error messages.
Carl Hetherington [Fri, 20 Nov 2020 23:04:01 +0000 (00:04 +0100)]
More detailed error with inequality.
Carl Hetherington [Fri, 20 Nov 2020 23:03:51 +0000 (00:03 +0100)]
Fix crash on comparing reels with and without markers.
Carl Hetherington [Fri, 20 Nov 2020 01:28:22 +0000 (02:28 +0100)]
Apply the same rules to closed captions.