X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdecryption_test.cc;h=65f1fe878df95b2ef0ecbad4202207d8b229ea2d;hb=a8d652b787b986ec5552816ec24367d98243f6fa;hp=0080fe3e7547f11912be088712d5e5fdeec3824c;hpb=b223c577907878025ea926caf138f8008ac1c6bf;p=libdcp.git

diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index 0080fe3e..65f1fe87 100644
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -1,20 +1,34 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include "dcp.h"
@@ -22,11 +36,12 @@
 #include "cpl.h"
 #include "decrypted_kdm.h"
 #include "encrypted_kdm.h"
-#include "mono_picture_mxf.h"
+#include "mono_picture_asset.h"
+#include "mono_picture_asset_reader.h"
 #include "reel_picture_asset.h"
 #include "reel.h"
 #include "test.h"
-#include "xyz_image.h"
+#include "openjpeg_image.h"
 #include "rgb_xyz.h"
 #include "colour_conversion.h"
 #include <boost/test/unit_test.hpp>
@@ -42,15 +57,16 @@ pair<uint8_t*, dcp::Size>
 get_frame (dcp::DCP const & dcp)
 {
 	shared_ptr<const dcp::Reel> reel = dcp.cpls().front()->reels().front ();
-	shared_ptr<dcp::PictureMXF> picture = reel->main_picture()->mxf ();
+	shared_ptr<dcp::PictureAsset> picture = reel->main_picture()->asset ();
 	BOOST_CHECK (picture);
 
-	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);
-	shared_ptr<dcp::XYZImage> xyz = j2k_frame->xyz_image();
+	shared_ptr<const dcp::MonoPictureAsset> mono_picture = dynamic_pointer_cast<const dcp::MonoPictureAsset> (picture);
+	shared_ptr<const dcp::MonoPictureAssetReader> reader = mono_picture->start_read ();
+	shared_ptr<const dcp::MonoPictureFrame> j2k_frame = reader->get_frame (0);
+	shared_ptr<dcp::OpenJPEGImage> 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::srgb_to_xyz(), argb);
+	dcp::xyz_to_rgba (j2k_frame->xyz_image(), dcp::ColourConversion::srgb_to_xyz(), argb, xyz->size().width * 4);
 	return make_pair (argb, xyz->size ());
 }
 
@@ -75,7 +91,7 @@ BOOST_AUTO_TEST_CASE (decryption_test)
 			),
 		dcp::file_to_string ("test/data/private.key")
 		);
-	
+
 	encrypted.add (kdm);
 
 	pair<uint8_t *, dcp::Size> plaintext_frame = get_frame (plaintext);
@@ -84,7 +100,7 @@ BOOST_AUTO_TEST_CASE (decryption_test)
 	/* Check that plaintext and encrypted are the same */
 
 	BOOST_CHECK_EQUAL (plaintext_frame.second, encrypted_frame.second);
-	
+
 	BOOST_CHECK_EQUAL (
 		memcmp (
 			plaintext_frame.first,