X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdecryption_test.cc;h=65f1fe878df95b2ef0ecbad4202207d8b229ea2d;hb=d0ed9dd836b270d6bf75b302535de0f0f8f376e5;hp=f80bb900b18907cecc07b7bf8e348b7dbbc3525e;hpb=7702e5d643440e75369078863b34f8a574ee4143;p=libdcp.git diff --git a/test/decryption_test.cc b/test/decryption_test.cc index f80bb900..65f1fe87 100644 --- a/test/decryption_test.cc +++ b/test/decryption_test.cc @@ -1,47 +1,73 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2019 Carl Hetherington - 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 . + + 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 #include "dcp.h" #include "mono_picture_frame.h" #include "cpl.h" #include "decrypted_kdm.h" #include "encrypted_kdm.h" -#include "argb_frame.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 "openjpeg_image.h" +#include "rgb_xyz.h" +#include "colour_conversion.h" +#include +#include +using std::pair; +using std::make_pair; using boost::dynamic_pointer_cast; using boost::shared_ptr; +using boost::scoped_array; -static shared_ptr +pair get_frame (dcp::DCP const & dcp) { shared_ptr reel = dcp.cpls().front()->reels().front (); - shared_ptr picture = reel->main_picture()->mxf (); + shared_ptr picture = reel->main_picture()->asset (); BOOST_CHECK (picture); - shared_ptr mono_picture = dynamic_pointer_cast (picture); - shared_ptr j2k_frame = mono_picture->get_frame (0); - return j2k_frame->argb_frame (); + shared_ptr mono_picture = dynamic_pointer_cast (picture); + shared_ptr reader = mono_picture->start_read (); + shared_ptr j2k_frame = reader->get_frame (0); + shared_ptr 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, xyz->size().width * 4); + return make_pair (argb, xyz->size ()); } /** Decrypt an encrypted test DCP and check that its first frame is the same as the unencrypted version */ @@ -60,27 +86,39 @@ BOOST_AUTO_TEST_CASE (decryption_test) BOOST_CHECK_EQUAL (encrypted.encrypted (), true); dcp::DecryptedKDM kdm ( - dcp::EncryptedKDM ("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::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 plaintext_frame = get_frame (plaintext); - shared_ptr encrypted_frame = get_frame (encrypted); + pair plaintext_frame = get_frame (plaintext); + pair 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::DecryptedKDM kdm ( - dcp::EncryptedKDM ("test/data/target.pem.crt.de5d4eba-e683-41ca-bdda-aa4ad96af3f4.kdm.xml"), - "test/data/private.key" + 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") ); }