X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdecryption_test.cc;h=282e74f391ad0ad63fd80374a59e44038397fcec;hb=989f182558193a51e0a26603fb2ca59f827216a0;hp=8dfeffa658d36a3e498345cb01c3cb65454e1bb2;hpb=bfb33feb40c5b014e9eae3958b1ecb8161f1d090;p=libdcp.git

diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index 8dfeffa6..282e74f3 100644
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,21 +17,28 @@
 
 */
 
-#include <boost/test/unit_test.hpp>
-#include "kdm.h"
 #include "dcp.h"
 #include "mono_picture_frame.h"
 #include "cpl.h"
-#include "argb_frame.h"
+#include "decrypted_kdm.h"
+#include "encrypted_kdm.h"
 #include "mono_picture_mxf.h"
 #include "reel_picture_asset.h"
 #include "reel.h"
 #include "test.h"
+#include "xyz_image.h"
+#include "rgb_xyz.h"
+#include "colour_conversion.h"
+#include <boost/test/unit_test.hpp>
+#include <boost/scoped_array.hpp>
 
+using std::pair;
+using std::make_pair;
 using boost::dynamic_pointer_cast;
 using boost::shared_ptr;
+using boost::scoped_array;
 
-static shared_ptr<const dcp::ARGBFrame>
+pair<uint8_t*, dcp::Size>
 get_frame (dcp::DCP const & dcp)
 {
 	shared_ptr<const dcp::Reel> reel = dcp.cpls().front()->reels().front ();
@@ -40,7 +47,11 @@ get_frame (dcp::DCP const & dcp)
 
 	shared_ptr<const dcp::MonoPictureMXF> mono_picture = dynamic_pointer_cast<const dcp::MonoPictureMXF> (picture);
 	shared_ptr<const dcp::MonoPictureFrame> j2k_frame = mono_picture->get_frame (0);
-	return j2k_frame->argb_frame ();
+	shared_ptr<dcp::XYZImage> xyz = j2k_frame->xyz_image();
+
+	uint8_t* argb = new uint8_t[xyz->size().width * xyz->size().height * 4];
+	dcp::xyz_to_rgba (j2k_frame->xyz_image(), dcp::ColourConversion::xyz_to_srgb(), argb);
+	return make_pair (argb, xyz->size ());
 }
 
 /** Decrypt an encrypted test DCP and check that its first frame is the same as the unencrypted version */
@@ -58,28 +69,40 @@ BOOST_AUTO_TEST_CASE (decryption_test)
 	encrypted.read ();
 	BOOST_CHECK_EQUAL (encrypted.encrypted (), true);
 
-	dcp::KDM kdm (
-		"test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml",
-		"test/data/private.key"
+	dcp::DecryptedKDM kdm (
+		dcp::EncryptedKDM (
+			dcp::file_to_string ("test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml")
+			),
+		dcp::file_to_string ("test/data/private.key")
 		);
-
+	
 	encrypted.add (kdm);
 
-	shared_ptr<const dcp::ARGBFrame> plaintext_frame = get_frame (plaintext);
-	shared_ptr<const dcp::ARGBFrame> encrypted_frame = get_frame (encrypted);
+	pair<uint8_t *, dcp::Size> plaintext_frame = get_frame (plaintext);
+	pair<uint8_t *, dcp::Size> encrypted_frame = get_frame (encrypted);
 
 	/* Check that plaintext and encrypted are the same */
-	BOOST_CHECK_EQUAL (plaintext_frame->stride(), encrypted_frame->stride());
-	BOOST_CHECK_EQUAL (plaintext_frame->size().width, encrypted_frame->size().width);
-	BOOST_CHECK_EQUAL (plaintext_frame->size().height, encrypted_frame->size().height);
-	BOOST_CHECK_EQUAL (memcmp (plaintext_frame->data(), encrypted_frame->data(), plaintext_frame->stride() * plaintext_frame->size().height), 0);
+
+	BOOST_CHECK_EQUAL (plaintext_frame.second, encrypted_frame.second);
+	
+	BOOST_CHECK_EQUAL (
+		memcmp (
+			plaintext_frame.first,
+			encrypted_frame.first,
+			plaintext_frame.second.width * plaintext_frame.second.height * 4
+			),
+		0
+		);
+
+	delete[] plaintext_frame.first;
+	delete[] encrypted_frame.first;
 }
 
 /** Load in a KDM that didn't work at first */
 BOOST_AUTO_TEST_CASE (failing_kdm_test)
 {
-	dcp::KDM kdm (
-		"test/data/target.pem.crt.de5d4eba-e683-41ca-bdda-aa4ad96af3f4.kdm.xml",
-		"test/data/private.key"
+	dcp::DecryptedKDM kdm (
+		dcp::EncryptedKDM (dcp::file_to_string ("test/data/target.pem.crt.de5d4eba-e683-41ca-bdda-aa4ad96af3f4.kdm.xml")),
+		dcp::file_to_string ("test/data/private.key")
 		);
 }