Hopefully-correct PKL and AssetMap when using Interop PNG subtitles.

4 files changed, 43 insertions, 9 deletions

diff --git a/test/ref/write_interop_subtitle_test3/ASSETMAP b/test/ref/write_interop_subtitle_test3/ASSETMAP
new file mode 100644
index 00000000..82fe845a
--- /dev/null
+++ b/test/ref/write_interop_subtitle_test3/ASSETMAP
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<AssetMap xmlns="http://www.digicine.com/PROTO-ASDCP-AM-20040311#"><Id>urn:uuid:5bdc7da4-eaf1-43e6-854f-7a1175edf94a</Id><AnnotationText>Created by libdcp1.6.1devel</AnnotationText><VolumeCount>1</VolumeCount><IssueDate>2018-09-02T04:45:18+00:00</IssueDate><Issuer>libdcp1.6.1devel</Issuer><Creator>libdcp1.6.1devel</Creator><AssetList><Asset><Id>urn:uuid:8d98d2e1-d2a1-458f-b96b-295e5b5d0860</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_8d98d2e1-d2a1-458f-b96b-295e5b5d0860.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>993</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:9f134b47-ab8d-4c3c-adbf-f494b1544283</Id><ChunkList><Chunk><Path>cpl_9f134b47-ab8d-4c3c-adbf-f494b1544283.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>970</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id><ChunkList><Chunk><Path>subs.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>414</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:822bd341-c751-45b1-94d2-410e4ffcff1b</Id><ChunkList><Chunk><Path>822bd341-c751-45b1-94d2-410e4ffcff1b.png</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>44935</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
diff --git a/test/ref/write_interop_subtitle_test3/pkl.xml b/test/ref/write_interop_subtitle_test3/pkl.xml
new file mode 100644
index 00000000..995fabdb
--- /dev/null
+++ b/test/ref/write_interop_subtitle_test3/pkl.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PackingList xmlns="http://www.digicine.com/PROTO-ASDCP-PKL-20040311#"><Id>urn:uuid:8d98d2e1-d2a1-458f-b96b-295e5b5d0860</Id><AnnotationText>Created by libdcp1.6.1devel</AnnotationText><IssueDate>2018-09-02T04:45:18+00:00</IssueDate><Issuer>libdcp1.6.1devel</Issuer><Creator>libdcp1.6.1devel</Creator><AssetList><Asset><Id>urn:uuid:9f134b47-ab8d-4c3c-adbf-f494b1544283</Id><AnnotationText>9f134b47-ab8d-4c3c-adbf-f494b1544283</AnnotationText><Hash>X3ymjtLWzUZ0Av4L7y2/2X3wlB0=</Hash><Size>970</Size><Type>text/xml;asdcpKind=CPL</Type></Asset><Asset><Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id><AnnotationText>a6c58cff-3e1e-4b38-acec-a42224475ef6</AnnotationText><Hash>+k1Lnon0dJab5s8+wucSdGVy3Go=</Hash><Size>414</Size><Type>text/xml;asdcpKind=Subtitle</Type></Asset><Asset><Id>urn:uuid:822bd341-c751-45b1-94d2-410e4ffcff1b</Id><Hash>w0Xc4TUYpao08I0yPSDfFkaEwdg=</Hash><Size>44935</Size><Type>image/png</Type></Asset></AssetList></PackingList>
diff --git a/test/data/write_interop_subtitle_test3.xml b/test/ref/write_interop_subtitle_test3/subs.xml
index 7ba72e47..7ba72e47 100644
--- a/test/data/write_interop_subtitle_test3.xml
+++ b/test/ref/write_interop_subtitle_test3/subs.xml
diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc
index cf595faf..e57b0e7f 100644
--- a/test/write_subtitle_test.cc
+++ b/test/write_subtitle_test.cc
@@ -22,6 +22,10 @@
 #include "subtitle_string.h"
 #include "subtitle_image.h"
 #include "subtitle_asset_internal.h"
+#include "reel_subtitle_asset.h"
+#include "reel.h"
+#include "cpl.h"
+#include "dcp.h"
 #include "test.h"
 #include "util.h"
 #include <boost/test/unit_test.hpp>
@@ -312,12 +316,12 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test2)
 /* Write some subtitle content as Interop XML using bitmaps and check that it is right */
 BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
 {
-	dcp::InteropSubtitleAsset c;
-	c.set_reel_number ("1");
-	c.set_language ("EN");
-	c.set_movie_title ("Test");
+	shared_ptr<dcp::InteropSubtitleAsset> c (new dcp::InteropSubtitleAsset());
+	c->set_reel_number ("1");
+	c->set_language ("EN");
+	c->set_movie_title ("Test");
 
-	c.add (
+	c->add (
 		shared_ptr<dcp::Subtitle> (
 			new dcp::SubtitleImage (
 				dcp::Data ("test/data/sub.png"),
@@ -333,17 +337,43 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
 			)
 		);
 
-	c._id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
-
+	c->_id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
 	boost::filesystem::create_directories ("build/test/write_interop_subtitle_test3");
-	c.write ("build/test/write_interop_subtitle_test3/subs.xml");
+	c->write ("build/test/write_interop_subtitle_test3/subs.xml");
+
+	shared_ptr<dcp::Reel> reel (new dcp::Reel());
+	reel->add(shared_ptr<dcp::ReelSubtitleAsset>(new dcp::ReelSubtitleAsset(c, dcp::Fraction(24, 1), 6046, 0)));
+
+	dcp::XMLMetadata xml_meta;
+	xml_meta.issue_date = "2018-09-02T04:45:18+00:00";
+
+	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("My film", dcp::FEATURE));
+	cpl->add (reel);
+	cpl->set_metadata (xml_meta);
+	cpl->set_content_version_label_text ("foo");
+
+	dcp::DCP dcp ("build/test/write_interop_subtitle_test3");
+	dcp.add (cpl);
+	dcp.write_xml (dcp::INTEROP, xml_meta);
 
 	check_xml (
-		dcp::file_to_string("test/data/write_interop_subtitle_test3.xml"),
+		dcp::file_to_string("test/ref/write_interop_subtitle_test3/subs.xml"),
 		dcp::file_to_string("build/test/write_interop_subtitle_test3/subs.xml"),
 		list<string>()
 		);
 	check_file ("build/test/write_interop_subtitle_test3/822bd341-c751-45b1-94d2-410e4ffcff1b.png", "test/data/sub.png");
+
+	check_xml (
+		dcp::file_to_string("test/ref/write_interop_subtitle_test3/ASSETMAP"),
+		dcp::file_to_string("build/test/write_interop_subtitle_test3/ASSETMAP"),
+		list<string>()
+		);
+
+	check_xml (
+		dcp::file_to_string("test/ref/write_interop_subtitle_test3/pkl.xml"),
+		dcp::file_to_string("build/test/write_interop_subtitle_test3/pkl_8d98d2e1-d2a1-458f-b96b-295e5b5d0860.xml"),
+		list<string>()
+		);
 }
 
 /* Write some subtitle content as SMPTE XML and check that it is right */