X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fround_trip_test.cc;h=10b7b6fe04a219859374c823fb514c54c910bd00;hb=1b6f847eddca54ed223b22858c19c987aa61c2df;hp=7ba501e60edffd0c042731c161ecd48dc529555d;hpb=56e7a6f1768036df852a45d939b9adc038b17057;p=libdcp.git diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc index 7ba501e6..10b7b6fe 100644 --- a/test/round_trip_test.cc +++ b/test/round_trip_test.cc @@ -1,54 +1,75 @@ /* - 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 "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 "argb_frame.h" #include "certificate_chain.h" -#include "mono_picture_mxf_writer.h" +#include "mono_picture_asset_writer.h" +#include "mono_picture_asset_reader.h" #include "reel_picture_asset.h" #include "reel_mono_picture_asset.h" #include "file.h" +#include "openjpeg_image.h" +#include "rgb_xyz.h" +#include "colour_conversion.h" #include +#include #include using std::list; +using std::vector; +using std::string; 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 signer (new dcp::Signer ("openssl")); + shared_ptr signer (new dcp::CertificateChain (boost::filesystem::path ("openssl"))); boost::filesystem::path work_dir = "build/test/round_trip_test"; boost::filesystem::create_directory (work_dir); - shared_ptr mxf_A (new dcp::MonoPictureMXF (dcp::Fraction (24, 1))); - shared_ptr writer = mxf_A->start_write (work_dir / "video.mxf", dcp::SMPTE, false); + shared_ptr asset_A (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE)); + shared_ptr writer = asset_A->start_write (work_dir / "video.mxf", false); dcp::File j2c ("test/data/32x32_red_square.j2c"); for (int i = 0; i < 24; ++i) { writer->write (j2c.data (), j2c.size ()); @@ -57,18 +78,24 @@ BOOST_AUTO_TEST_CASE (round_trip_test) dcp::Key key; - mxf_A->set_key (key); + asset_A->set_key (key); shared_ptr cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE)); shared_ptr reel (new dcp::Reel ()); - reel->add (shared_ptr (new dcp::ReelMonoPictureAsset (mxf_A, 0))); + reel->add (shared_ptr (new dcp::ReelMonoPictureAsset (asset_A, 0))); cpl->add (reel); + dcp::LocalTime start; + start.set_year (start.year() + 1); + dcp::LocalTime end; + end.set_year (end.year() + 2); + /* A KDM using our certificate chain's leaf key pair */ dcp::DecryptedKDM kdm_A ( cpl, - dcp::LocalTime ("2013-01-01T00:00:00+00:00"), - dcp::LocalTime ("2013-01-08T00:00:00+00:00"), + key, + start, + end, "libdcp", "test", "2012-07-17T04:45:18+00:00" @@ -76,10 +103,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::MODIFIED_TRANSITIONAL_1, true, 0).as_xml (kdm_file); /* Reload the KDM, using our private key to decrypt it */ - dcp::DecryptedKDM kdm_B (dcp::EncryptedKDM (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()); @@ -93,17 +120,24 @@ BOOST_AUTO_TEST_CASE (round_trip_test) ++j; } - /* Reload the picture MXF */ - shared_ptr mxf_B ( - new dcp::MonoPictureMXF (work_dir / "video.mxf") + /* Reload the picture asset */ + shared_ptr 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 xyz_A = asset_A->start_read()->get_frame(0)->xyz_image (); + shared_ptr xyz_B = asset_B->start_read()->get_frame(0)->xyz_image (); + + scoped_array frame_A (new uint8_t[xyz_A->size().width * xyz_A->size().height * 4]); + dcp::xyz_to_rgba (xyz_A, dcp::ColourConversion::srgb_to_xyz(), frame_A.get(), xyz_A->size().width * 4); + + scoped_array frame_B (new uint8_t[xyz_B->size().width * xyz_B->size().height * 4]); + dcp::xyz_to_rgba (xyz_B, dcp::ColourConversion::srgb_to_xyz(), frame_B.get(), xyz_B->size().width * 4); - shared_ptr frame_A = mxf_A->get_frame(0)->argb_frame (); - shared_ptr frame_B = mxf_B->get_frame(0)->argb_frame (); - BOOST_CHECK_EQUAL (frame_A->size().width, frame_B->size().width); - BOOST_CHECK_EQUAL (frame_A->size().height, frame_B->size().height); - BOOST_CHECK_EQUAL (memcmp (frame_A->data(), frame_B->data(), frame_A->size().width * frame_A->size().height), 0); + BOOST_CHECK_EQUAL (xyz_A->size().width, xyz_B->size().width); + BOOST_CHECK_EQUAL (xyz_A->size().height, xyz_B->size().height); + BOOST_CHECK_EQUAL (memcmp (frame_A.get(), frame_B.get(), xyz_A->size().width * xyz_A->size().height * 4), 0); }