From 0a5615c17edf6d9c51d9269c824d6caf71f710e5 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 17 Jan 2022 18:45:19 +0100
Subject: Use optional for ReelAsset _annotation_text.

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).
---
 test/ref/write_interop_subtitle_test3/ASSETMAP                        | 2 +-
 .../pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'test/ref/write_interop_subtitle_test3')

diff --git a/test/ref/write_interop_subtitle_test3/ASSETMAP b/test/ref/write_interop_subtitle_test3/ASSETMAP
index 228a7e1c..7c901513 100644
--- a/test/ref/write_interop_subtitle_test3/ASSETMAP
+++ b/test/ref/write_interop_subtitle_test3/ASSETMAP
@@ -26,7 +26,7 @@
           <Path>cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
-          <Length>1105</Length>
+          <Length>1061</Length>
         </Chunk>
       </ChunkList>
     </Asset>
diff --git a/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml b/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml
index 664ad626..2da8e910 100644
--- a/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml
+++ b/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml
@@ -9,8 +9,8 @@
     <Asset>
       <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
       <AnnotationText>46c3eb45-15e5-47d6-8684-d8641e4dc516</AnnotationText>
-      <Hash>YkdOdaGok/Vrkq62zAkfCw1l/Y4=</Hash>
-      <Size>1105</Size>
+      <Hash>614bJ4VLsNZ6mLbdXbZXjGuoSsY=</Hash>
+      <Size>1061</Size>
       <Type>text/xml;asdcpKind=CPL</Type>
     </Asset>
     <Asset>
-- 
cgit v1.2.3