From 8259e2771f85c33c531a83fe1a78668f158208da Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 2 Sep 2018 23:39:01 +0100 Subject: Hopefully-correct PKL and AssetMap when using Interop PNG subtitles. --- test/data/write_interop_subtitle_test3.xml | 2 -- test/ref/write_interop_subtitle_test3/ASSETMAP | 2 ++ test/ref/write_interop_subtitle_test3/pkl.xml | 2 ++ test/ref/write_interop_subtitle_test3/subs.xml | 2 ++ test/write_subtitle_test.cc | 48 +++++++++++++++++++++----- 5 files changed, 45 insertions(+), 11 deletions(-) delete mode 100644 test/data/write_interop_subtitle_test3.xml create mode 100644 test/ref/write_interop_subtitle_test3/ASSETMAP create mode 100644 test/ref/write_interop_subtitle_test3/pkl.xml create mode 100644 test/ref/write_interop_subtitle_test3/subs.xml (limited to 'test') diff --git a/test/data/write_interop_subtitle_test3.xml b/test/data/write_interop_subtitle_test3.xml deleted file mode 100644 index 7ba72e47..00000000 --- a/test/data/write_interop_subtitle_test3.xml +++ /dev/null @@ -1,2 +0,0 @@ - -a6c58cff-3e1e-4b38-acec-a42224475ef6Test1EN822bd341-c751-45b1-94d2-410e4ffcff1b.png 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 @@ + +urn:uuid:5bdc7da4-eaf1-43e6-854f-7a1175edf94aCreated by libdcp1.6.1devel12018-09-02T04:45:18+00:00libdcp1.6.1devellibdcp1.6.1develurn:uuid:8d98d2e1-d2a1-458f-b96b-295e5b5d0860truepkl_8d98d2e1-d2a1-458f-b96b-295e5b5d0860.xml10993urn:uuid:9f134b47-ab8d-4c3c-adbf-f494b1544283cpl_9f134b47-ab8d-4c3c-adbf-f494b1544283.xml10970urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6subs.xml10414urn:uuid:822bd341-c751-45b1-94d2-410e4ffcff1b822bd341-c751-45b1-94d2-410e4ffcff1b.png1044935 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 @@ + +urn:uuid:8d98d2e1-d2a1-458f-b96b-295e5b5d0860Created by libdcp1.6.1devel2018-09-02T04:45:18+00:00libdcp1.6.1devellibdcp1.6.1develurn:uuid:9f134b47-ab8d-4c3c-adbf-f494b15442839f134b47-ab8d-4c3c-adbf-f494b1544283X3ymjtLWzUZ0Av4L7y2/2X3wlB0=970text/xml;asdcpKind=CPLurn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6a6c58cff-3e1e-4b38-acec-a42224475ef6+k1Lnon0dJab5s8+wucSdGVy3Go=414text/xml;asdcpKind=Subtitleurn:uuid:822bd341-c751-45b1-94d2-410e4ffcff1bw0Xc4TUYpao08I0yPSDfFkaEwdg=44935image/png diff --git a/test/ref/write_interop_subtitle_test3/subs.xml b/test/ref/write_interop_subtitle_test3/subs.xml new file mode 100644 index 00000000..7ba72e47 --- /dev/null +++ b/test/ref/write_interop_subtitle_test3/subs.xml @@ -0,0 +1,2 @@ + +a6c58cff-3e1e-4b38-acec-a42224475ef6Test1EN822bd341-c751-45b1-94d2-410e4ffcff1b.png 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 @@ -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 c (new dcp::InteropSubtitleAsset()); + c->set_reel_number ("1"); + c->set_language ("EN"); + c->set_movie_title ("Test"); - c.add ( + c->add ( shared_ptr ( 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 reel (new dcp::Reel()); + reel->add(shared_ptr(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 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() ); 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() + ); + + 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() + ); } /* Write some subtitle content as SMPTE XML and check that it is right */ -- cgit v1.2.3