X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fvf_kdm_test.cc;h=bbaa3d6d2c2163325b5387e812bd08a6e5db354c;hb=1e77753ef4119b6d7df7d2255b1a1d8d6af951de;hp=ba4bf6b22a3bada28feb293d72135cfc53d3be17;hpb=e662323cc920e3d7b477c5b149211434c1a4929c;p=dcpomatic.git

diff --git a/test/vf_kdm_test.cc b/test/vf_kdm_test.cc
index ba4bf6b22..bbaa3d6d2 100644
--- a/test/vf_kdm_test.cc
+++ b/test/vf_kdm_test.cc
@@ -18,6 +18,11 @@
 
 */
 
+/** @file  test/vf_kdm_test.cc
+ *  @brief Test encrypted VF creation and import
+ *  @ingroup specific
+ */
+
 #include "test.h"
 #include "lib/film.h"
 #include "lib/dcp_subtitle_content.h"
@@ -27,10 +32,12 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/config.h"
 #include "lib/cross.h"
+#include "lib/screen.h"
 #include <dcp/cpl.h>
 #include <boost/test/unit_test.hpp>
 
 using std::vector;
+using std::string;
 using boost::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (vf_kdm_test)
@@ -41,6 +48,7 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 	A->set_container (Ratio::from_id ("185"));
 	A->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	A->set_name ("frobozz");
+	A->set_interop (true);
 
 	shared_ptr<FFmpegContent> c (new FFmpegContent (A, "test/data/test.mp4"));
 	A->examine_and_add_content (c);
@@ -56,11 +64,12 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 
 	dcp::EncryptedKDM A_kdm = A->make_kdm (
 		Config::instance()->decryption_chain()->leaf (),
-		vector<dcp::Certificate> (),
+		vector<string>(),
 		A_dcp.cpls().front()->file().get(),
 		dcp::LocalTime ("2014-07-21T00:00:00+00:00"),
 		dcp::LocalTime ("2024-07-21T00:00:00+00:00"),
-		dcp::MODIFIED_TRANSITIONAL_1
+		dcp::MODIFIED_TRANSITIONAL_1,
+		true, 0
 		);
 
 	/* Import A into a new project, with the required KDM, and make a VF that refers to it */
@@ -69,6 +78,7 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 	B->set_container (Ratio::from_id ("185"));
 	B->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	B->set_name ("frobozz");
+	B->set_interop (true);
 
 	shared_ptr<DCPContent> d (new DCPContent (B, "build/test/vf_kdm_test_ov/" + A->dcp_name()));
 	d->add_kdm (A_kdm);
@@ -84,11 +94,12 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 
 	dcp::EncryptedKDM B_kdm = B->make_kdm (
 		Config::instance()->decryption_chain()->leaf (),
-		vector<dcp::Certificate> (),
+		vector<string>(),
 		B_dcp.cpls().front()->file().get(),
 		dcp::LocalTime ("2014-07-21T00:00:00+00:00"),
 		dcp::LocalTime ("2024-07-21T00:00:00+00:00"),
-		dcp::MODIFIED_TRANSITIONAL_1
+		dcp::MODIFIED_TRANSITIONAL_1,
+		true, 0
 		);
 
 	/* Import the OV and VF into a new project with the KDM that was created for the VF.
@@ -99,6 +110,7 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 	C->set_container (Ratio::from_id ("185"));
 	C->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	C->set_name ("frobozz");
+	C->set_interop (true);
 
 	shared_ptr<DCPContent> e (new DCPContent (C, "build/test/vf_kdm_test_vf/" + B->dcp_name()));
 	e->add_kdm (B_kdm);