X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fround_trip_test.cc;h=45b2cbadd361a8425a75cc9a5fee3b8c9b12e678;hb=ea629ead13e819b4ff5d5b5eba7b57520e8107e3;hp=dcaa6939999326d39b2c6b0b4ca8a70d43df6718;hpb=989f182558193a51e0a26603fb2ca59f827216a0;p=libdcp.git

diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index dcaa6939..45b2cbad 100644
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -17,22 +17,22 @@
 
 */
 
-#include "certificates.h"
+#include "certificate.h"
 #include "decrypted_kdm.h"
 #include "encrypted_kdm.h"
-#include "signer.h"
-#include "mono_picture_mxf.h"
-#include "sound_mxf.h"
+#include "certificate_chain.h"
+#include "mono_picture_asset.h"
+#include "sound_asset.h"
 #include "reel.h"
 #include "test.h"
 #include "cpl.h"
 #include "mono_picture_frame.h"
 #include "certificate_chain.h"
-#include "mono_picture_mxf_writer.h"
+#include "mono_picture_asset_writer.h"
 #include "reel_picture_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "file.h"
-#include "xyz_image.h"
+#include "openjpeg_image.h"
 #include "rgb_xyz.h"
 #include "colour_conversion.h"
 #include <boost/test/unit_test.hpp>
@@ -40,19 +40,20 @@
 #include <iostream>
 
 using std::list;
+using std::vector;
 using boost::shared_ptr;
 using boost::scoped_array;
 
-/* Build an encrypted picture MXF and a KDM for it and check that the KDM can be decrypted */
+/** Build an encrypted picture asset and a KDM for it and check that the KDM can be decrypted */
 BOOST_AUTO_TEST_CASE (round_trip_test)
 {
-	shared_ptr<dcp::Signer> signer (new dcp::Signer ("openssl"));
+	shared_ptr<dcp::CertificateChain> signer (new dcp::CertificateChain ("openssl"));
 
 	boost::filesystem::path work_dir = "build/test/round_trip_test";
 	boost::filesystem::create_directory (work_dir);
 
-	shared_ptr<dcp::MonoPictureMXF> mxf_A (new dcp::MonoPictureMXF (dcp::Fraction (24, 1)));
-	shared_ptr<dcp::PictureMXFWriter> writer = mxf_A->start_write (work_dir / "video.mxf", dcp::SMPTE, false);
+	shared_ptr<dcp::MonoPictureAsset> asset_A (new dcp::MonoPictureAsset (dcp::Fraction (24, 1)));
+	shared_ptr<dcp::PictureAssetWriter> writer = asset_A->start_write (work_dir / "video.mxf", dcp::SMPTE, false);
 	dcp::File j2c ("test/data/32x32_red_square.j2c");
 	for (int i = 0; i < 24; ++i) {
 		writer->write (j2c.data (), j2c.size ());
@@ -61,11 +62,11 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 
 	dcp::Key key;
 
-	mxf_A->set_key (key);
+	asset_A->set_key (key);
 
 	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
 	shared_ptr<dcp::Reel> reel (new dcp::Reel ());
-	reel->add (shared_ptr<dcp::ReelMonoPictureAsset> (new dcp::ReelMonoPictureAsset (mxf_A, 0)));
+	reel->add (shared_ptr<dcp::ReelMonoPictureAsset> (new dcp::ReelMonoPictureAsset (asset_A, 0)));
 	cpl->add (reel);
 
 	/* A KDM using our certificate chain's leaf key pair */
@@ -81,10 +82,10 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 
 	boost::filesystem::path const kdm_file = work_dir / "kdm.xml";
 
-	kdm_A.encrypt(signer, signer->certificates().leaf(), dcp::MODIFIED_TRANSITIONAL_1).as_xml (kdm_file);
+	kdm_A.encrypt(signer, signer->leaf(), vector<dcp::Certificate>(), dcp::MODIFIED_TRANSITIONAL_1).as_xml (kdm_file);
 
 	/* Reload the KDM, using our private key to decrypt it */
-	dcp::DecryptedKDM kdm_B (dcp::EncryptedKDM (dcp::file_to_string (kdm_file)), signer->key ());
+	dcp::DecryptedKDM kdm_B (dcp::EncryptedKDM (dcp::file_to_string (kdm_file)), signer->key().get ());
 
 	/* Check that the decrypted KDMKeys are the same as the ones we started with */
 	BOOST_CHECK_EQUAL (kdm_A.keys().size(), kdm_B.keys().size());
@@ -98,22 +99,22 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 		++j;
 	}
 
-	/* Reload the picture MXF */
-	shared_ptr<dcp::MonoPictureMXF> mxf_B (
-		new dcp::MonoPictureMXF (work_dir / "video.mxf")
+	/* Reload the picture asset */
+	shared_ptr<dcp::MonoPictureAsset> asset_B (
+		new dcp::MonoPictureAsset (work_dir / "video.mxf")
 		);
 
 	BOOST_CHECK (!kdm_B.keys().empty ());
-	mxf_B->set_key (kdm_B.keys().front().key());
+	asset_B->set_key (kdm_B.keys().front().key());
 
-	shared_ptr<dcp::XYZImage> xyz_A = mxf_A->get_frame(0)->xyz_image ();
-	shared_ptr<dcp::XYZImage> xyz_B = mxf_B->get_frame(0)->xyz_image ();
+	shared_ptr<dcp::OpenJPEGImage> xyz_A = asset_A->get_frame(0)->xyz_image ();
+	shared_ptr<dcp::OpenJPEGImage> xyz_B = asset_B->get_frame(0)->xyz_image ();
 
 	scoped_array<uint8_t> frame_A (new uint8_t[xyz_A->size().width * xyz_A->size().height * 4]);
-	dcp::xyz_to_rgba (xyz_A, dcp::ColourConversion::xyz_to_srgb(), frame_A.get());
-	
+	dcp::xyz_to_rgba (xyz_A, dcp::ColourConversion::srgb_to_xyz(), frame_A.get());
+
 	scoped_array<uint8_t> frame_B (new uint8_t[xyz_B->size().width * xyz_B->size().height * 4]);
-	dcp::xyz_to_rgba (xyz_B, dcp::ColourConversion::xyz_to_srgb(), frame_B.get());
+	dcp::xyz_to_rgba (xyz_B, dcp::ColourConversion::srgb_to_xyz(), frame_B.get());
 
 	BOOST_CHECK_EQUAL (xyz_A->size().width, xyz_B->size().width);
 	BOOST_CHECK_EQUAL (xyz_A->size().height, xyz_B->size().height);