diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-01-17 18:45:19 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-01-17 20:16:52 +0100 |
| commit | 0a5615c17edf6d9c51d9269c824d6caf71f710e5 (patch) | |
| tree | 469e07adb1e3a4971b5a622f97bff59b0ed5554d /test/ref/DCP/dcp_test1 | |
| parent | 59e22e6d9ff4fc180f79df64da2a27f44a982b51 (diff) | |
Use optional for ReelAsset _annotation_text.v1.8.6
Not only is this tag optional in Interop and SMPTE, but it would
appear that if it is present but empty a DCP will not play back
on Sony SRX320 / LMT3000 systems (DoM bug #2124).
Here we use optional<>, as seems to make sense, and also refuse
to write empty tags (instead omitting the tag entirely).
Diffstat (limited to 'test/ref/DCP/dcp_test1')
3 files changed, 3 insertions, 6 deletions
diff --git a/test/ref/DCP/dcp_test1/ASSETMAP.xml b/test/ref/DCP/dcp_test1/ASSETMAP.xml index 10083feb..ee780c7c 100644 --- a/test/ref/DCP/dcp_test1/ASSETMAP.xml +++ b/test/ref/DCP/dcp_test1/ASSETMAP.xml @@ -26,7 +26,7 @@ <Path>cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml</Path> <VolumeIndex>1</VolumeIndex> <Offset>0</Offset> - <Length>8762</Length> + <Length>8630</Length> </Chunk> </ChunkList> </Asset> diff --git a/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml index ae0f23be..01eea88d 100644 --- a/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml +++ b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml @@ -18,7 +18,6 @@ <AssetList> <MainMarkers> <Id>urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bff</Id> - <AnnotationText></AnnotationText> <EditRate>24 1</EditRate> <IntrinsicDuration>24</IntrinsicDuration> <EntryPoint>0</EntryPoint> @@ -36,7 +35,6 @@ </MainMarkers> <MainPicture> <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id> - <AnnotationText></AnnotationText> <EditRate>24 1</EditRate> <IntrinsicDuration>24</IntrinsicDuration> <EntryPoint>0</EntryPoint> @@ -47,7 +45,6 @@ </MainPicture> <MainSound> <Id>urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85</Id> - <AnnotationText></AnnotationText> <EditRate>24 1</EditRate> <IntrinsicDuration>24</IntrinsicDuration> <EntryPoint>0</EntryPoint> diff --git a/test/ref/DCP/dcp_test1/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml b/test/ref/DCP/dcp_test1/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml index 3f285d23..cf753574 100644 --- a/test/ref/DCP/dcp_test1/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml +++ b/test/ref/DCP/dcp_test1/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml @@ -9,8 +9,8 @@ <Asset> <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id> <AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText> - <Hash>c1DRq6GaSzV2brF0YnSNed46nqk=</Hash> - <Size>8762</Size> + <Hash>6pkiSEIBuZW7KEY73GrNNw8UjDE=</Hash> + <Size>8630</Size> <Type>text/xml</Type> </Asset> <Asset> |