X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_test.cc;h=5456092c9838ae1844adebb1c85a84230a15037e;hb=refs%2Fheads%2Fsmaller-ccap;hp=87879af777a6081c35a2969a2eea175d7fc0d8c5;hpb=2f874428086c0bd47e6efa31970be9f442e087f4;p=libdcp.git diff --git a/test/dcp_test.cc b/test/dcp_test.cc index 87879af7..5456092c 100644 --- a/test/dcp_test.cc +++ b/test/dcp_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2019 Carl Hetherington + Copyright (C) 2013-2020 Carl Hetherington This file is part of libdcp. @@ -31,118 +31,62 @@ files in the program, then also delete it here. */ + +#include "atmos_asset.h" +#include "compose.hpp" +#include "cpl.h" #include "dcp.h" +#include "equality_options.h" #include "metadata.h" -#include "cpl.h" #include "mono_picture_asset.h" -#include "stereo_picture_asset.h" #include "picture_asset_writer.h" -#include "sound_asset_writer.h" -#include "sound_asset.h" -#include "atmos_asset.h" #include "reel.h" -#include "test.h" -#include "file.h" +#include "reel_atmos_asset.h" +#include "reel_markers_asset.h" #include "reel_mono_picture_asset.h" -#include "reel_stereo_picture_asset.h" +#include "reel_picture_asset.h" #include "reel_sound_asset.h" -#include "reel_atmos_asset.h" +#include "reel_stereo_picture_asset.h" +#include "sound_asset.h" +#include "sound_asset_writer.h" +#include "stereo_picture_asset.h" +#include "test.h" #include #include #include -using std::string; -using boost::shared_ptr; - -static shared_ptr -make_simple (boost::filesystem::path path) -{ - Kumu::cth_test = true; - /* Some known metadata */ - dcp::XMLMetadata xml_meta; - xml_meta.annotation_text = "A Test DCP"; - xml_meta.issuer = "OpenDCP 0.0.25"; - xml_meta.creator = "OpenDCP 0.0.25"; - xml_meta.issue_date = "2012-07-17T04:45:18+00:00"; - dcp::MXFMetadata mxf_meta; - mxf_meta.company_name = "OpenDCP"; - mxf_meta.product_name = "OpenDCP"; - mxf_meta.product_version = "0.0.25"; - - /* We're making build/test/DCP/dcp_test1 */ - boost::filesystem::remove_all (path); - boost::filesystem::create_directories (path); - shared_ptr d (new dcp::DCP (path)); - shared_ptr cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE)); - cpl->set_content_version_id ("urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11"); - cpl->set_content_version_label_text ("content-version-label-text"); - cpl->set_metadata (xml_meta); - - shared_ptr mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE)); - mp->set_metadata (mxf_meta); - shared_ptr picture_writer = mp->start_write (path / "video.mxf", false); - dcp::File j2c ("test/data/32x32_red_square.j2c"); - for (int i = 0; i < 24; ++i) { - picture_writer->write (j2c.data (), j2c.size ()); - } - picture_writer->finalize (); - - shared_ptr ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1, dcp::SMPTE)); - ms->set_metadata (mxf_meta); - shared_ptr sound_writer = ms->start_write (path / "audio.mxf"); - - SF_INFO info; - info.format = 0; - SNDFILE* sndfile = sf_open ("test/data/1s_24-bit_48k_silence.wav", SFM_READ, &info); - BOOST_CHECK (sndfile); - float buffer[4096*6]; - float* channels[1]; - channels[0] = buffer; - while (1) { - sf_count_t N = sf_readf_float (sndfile, buffer, 4096); - sound_writer->write (channels, N); - if (N < 4096) { - break; - } - } - - sound_writer->finalize (); - - cpl->add (shared_ptr ( - new dcp::Reel ( - shared_ptr (new dcp::ReelMonoPictureAsset (mp, 0)), - shared_ptr (new dcp::ReelSoundAsset (ms, 0)) - ) - )); +using std::dynamic_pointer_cast; +using std::make_shared; +using std::shared_ptr; +using std::string; +using std::vector; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif - d->add (cpl); - return d; -} /** Test creation of a 2D SMPTE DCP from very simple inputs */ BOOST_AUTO_TEST_CASE (dcp_test1) { - dcp::XMLMetadata xml_meta; - xml_meta.annotation_text = "Created by libdcp"; - xml_meta.issuer = "OpenDCP 0.0.25"; - xml_meta.creator = "OpenDCP 0.0.25"; - xml_meta.issue_date = "2012-07-17T04:45:18+00:00"; - make_simple("build/test/DCP/dcp_test1")->write_xml (dcp::SMPTE, xml_meta); + RNGFixer fixer; + + auto dcp = make_simple("build/test/DCP/dcp_test1"); + dcp->set_issuer("OpenDCP 0.0.25"); + dcp->set_creator("OpenDCP 0.0.25"); + dcp->set_issue_date("2012-07-17T04:45:18+00:00"); + dcp->set_annotation_text("A Test DCP"); + dcp->write_xml(); + /* build/test/DCP/dcp_test1 is checked against test/ref/DCP/dcp_test1 by run/tests */ } /** Test creation of a 3D DCP from very simple inputs */ BOOST_AUTO_TEST_CASE (dcp_test2) { - Kumu::cth_test = true; + RNGFixer fix; /* Some known metadata */ - dcp::XMLMetadata xml_meta; - xml_meta.annotation_text = "A Test DCP"; - xml_meta.issuer = "OpenDCP 0.0.25"; - xml_meta.creator = "OpenDCP 0.0.25"; - xml_meta.issue_date = "2012-07-17T04:45:18+00:00"; dcp::MXFMetadata mxf_meta; mxf_meta.company_name = "OpenDCP"; mxf_meta.product_name = "OpenDCP"; @@ -152,15 +96,19 @@ BOOST_AUTO_TEST_CASE (dcp_test2) boost::filesystem::remove_all ("build/test/DCP/dcp_test2"); boost::filesystem::create_directories ("build/test/DCP/dcp_test2"); dcp::DCP d ("build/test/DCP/dcp_test2"); - shared_ptr cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE)); - cpl->set_content_version_id ("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); - cpl->set_content_version_label_text ("81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); - cpl->set_metadata (xml_meta); - - shared_ptr mp (new dcp::StereoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE)); + auto cpl = make_shared("A Test DCP", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE); + cpl->set_content_version ( + dcp::ContentVersion("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00", "81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00") + ); + cpl->set_issuer ("OpenDCP 0.0.25"); + cpl->set_creator ("OpenDCP 0.0.25"); + cpl->set_issue_date ("2012-07-17T04:45:18+00:00"); + cpl->set_annotation_text ("A Test DCP"); + + auto mp = make_shared(dcp::Fraction (24, 1), dcp::Standard::SMPTE); mp->set_metadata (mxf_meta); - shared_ptr picture_writer = mp->start_write ("build/test/DCP/dcp_test2/video.mxf", false); - dcp::File j2c ("test/data/32x32_red_square.j2c"); + auto picture_writer = mp->start_write("build/test/DCP/dcp_test2/video.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW); + dcp::ArrayData j2c ("test/data/flat_red.j2c"); for (int i = 0; i < 24; ++i) { /* Left */ picture_writer->write (j2c.data (), j2c.size ()); @@ -169,20 +117,20 @@ BOOST_AUTO_TEST_CASE (dcp_test2) } picture_writer->finalize (); - shared_ptr ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1, dcp::SMPTE)); + auto ms = make_shared(dcp::Fraction(24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::Standard::SMPTE); ms->set_metadata (mxf_meta); - shared_ptr sound_writer = ms->start_write ("build/test/DCP/dcp_test2/audio.mxf"); + auto sound_writer = ms->start_write("build/test/DCP/dcp_test2/audio.mxf", {}, dcp::SoundAsset::AtmosSync::DISABLED, dcp::SoundAsset::MCASubDescriptors::ENABLED); SF_INFO info; info.format = 0; - SNDFILE* sndfile = sf_open ("test/data/1s_24-bit_48k_silence.wav", SFM_READ, &info); + auto sndfile = sf_open ("test/data/1s_24-bit_48k_silence.wav", SFM_READ, &info); BOOST_CHECK (sndfile); float buffer[4096*6]; float* channels[1]; channels[0] = buffer; - while (1) { - sf_count_t N = sf_readf_float (sndfile, buffer, 4096); - sound_writer->write (channels, N); + while (true) { + auto N = sf_readf_float (sndfile, buffer, 4096); + sound_writer->write(channels, 1, N); if (N < 4096) { break; } @@ -190,17 +138,18 @@ BOOST_AUTO_TEST_CASE (dcp_test2) sound_writer->finalize (); - cpl->add (shared_ptr ( - new dcp::Reel ( - shared_ptr (new dcp::ReelStereoPictureAsset (mp, 0)), - shared_ptr (new dcp::ReelSoundAsset (ms, 0)) - ) + cpl->add (make_shared( + make_shared(mp, 0), + make_shared(ms, 0) )); d.add (cpl); - xml_meta.annotation_text = "Created by libdcp"; - d.write_xml (dcp::SMPTE, xml_meta); + d.set_issuer("OpenDCP 0.0.25"); + d.set_creator("OpenDCP 0.0.25"); + d.set_issue_date("2012-07-17T04:45:18+00:00"); + d.set_annotation_text("Created by libdcp"); + d.write_xml(); /* build/test/DCP/dcp_test2 is checked against test/ref/DCP/dcp_test2 by run/tests */ } @@ -233,17 +182,96 @@ BOOST_AUTO_TEST_CASE (dcp_test4) BOOST_CHECK (!A.equals (B, dcp::EqualityOptions(), boost::bind (¬e, _1, _2))); } +static +void +test_rewriting_sound(string name, bool modify) +{ + using namespace boost::filesystem; + + dcp::DCP A ("test/ref/DCP/dcp_test1"); + A.read (); + + BOOST_REQUIRE (!A.cpls().empty()); + BOOST_REQUIRE (!A.cpls().front()->reels().empty()); + auto A_picture = dynamic_pointer_cast(A.cpls().front()->reels().front()->main_picture()); + BOOST_REQUIRE (A_picture); + auto A_sound = dynamic_pointer_cast(A.cpls().front()->reels().front()->main_sound()); + + string const picture = "j2c_5279f9aa-94d7-42a6-b0e0-e4eaec4e2a15.mxf"; + + remove_all ("build/test/" + name); + dcp::DCP B ("build/test/" + name); + auto reel = make_shared(); + + BOOST_REQUIRE (A_picture->mono_asset()); + BOOST_REQUIRE (A_picture->mono_asset()->file()); + copy_file (A_picture->mono_asset()->file().get(), path("build") / "test" / name / picture); + reel->add(make_shared(make_shared(path("build") / "test" / name / picture), 0)); + + auto reader = A_sound->asset()->start_read(); + auto sound = make_shared(A_sound->asset()->edit_rate(), A_sound->asset()->sampling_rate(), A_sound->asset()->channels(), dcp::LanguageTag("en-US"), dcp::Standard::SMPTE); + auto writer = sound->start_write(path("build") / "test" / name / "pcm_8246f87f-e1df-4c42-a290-f3b3069ff021.mxf", {}, dcp::SoundAsset::AtmosSync::DISABLED, dcp::SoundAsset::MCASubDescriptors::ENABLED); + + bool need_to_modify = modify; + for (int i = 0; i < A_sound->asset()->intrinsic_duration(); ++i) { + auto sf = reader->get_frame (i); + float* out[sf->channels()]; + for (int j = 0; j < sf->channels(); ++j) { + out[j] = new float[sf->samples()]; + } + for (int j = 0; j < sf->samples(); ++j) { + for (int k = 0; k < sf->channels(); ++k) { + out[k][j] = static_cast(sf->get(k, j)) / (1 << 23); + if (need_to_modify) { + out[k][j] += 1.0 / (1 << 23); + need_to_modify = false; + } + } + } + writer->write(out, sf->channels(), sf->samples()); + for (int j = 0; j < sf->channels(); ++j) { + delete[] out[j]; + } + } + writer->finalize(); + + reel->add(make_shared(sound, 0)); + reel->add(simple_markers()); + + auto cpl = make_shared("A Test DCP", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE); + cpl->add (reel); + + B.add (cpl); + B.write_xml (); + + dcp::EqualityOptions eq; + eq.reel_hashes_can_differ = true; + eq.max_audio_sample_error = 0; + if (modify) { + BOOST_CHECK (!A.equals(B, eq, boost::bind(¬e, _1, _2))); + } else { + BOOST_CHECK (A.equals(B, eq, boost::bind(¬e, _1, _2))); + } +} + +/** Test comparison of a DCP with another that has the same picture and the same (but re-written) sound */ +BOOST_AUTO_TEST_CASE (dcp_test9) +{ + test_rewriting_sound ("dcp_test9", false); +} + +/** Test comparison of a DCP with another that has the same picture and very slightly modified sound */ +BOOST_AUTO_TEST_CASE (dcp_test10) +{ + test_rewriting_sound ("dcp_test10", true); +} + /** Test creation of a 2D DCP with an Atmos track */ BOOST_AUTO_TEST_CASE (dcp_test5) { - Kumu::cth_test = true; + RNGFixer fix; /* Some known metadata */ - dcp::XMLMetadata xml_meta; - xml_meta.annotation_text = "A Test DCP"; - xml_meta.issuer = "OpenDCP 0.0.25"; - xml_meta.creator = "OpenDCP 0.0.25"; - xml_meta.issue_date = "2012-07-17T04:45:18+00:00"; dcp::MXFMetadata mxf_meta; mxf_meta.company_name = "OpenDCP"; mxf_meta.product_name = "OpenDCP"; @@ -253,23 +281,27 @@ BOOST_AUTO_TEST_CASE (dcp_test5) boost::filesystem::remove_all ("build/test/DCP/dcp_test5"); boost::filesystem::create_directories ("build/test/DCP/dcp_test5"); dcp::DCP d ("build/test/DCP/dcp_test5"); - shared_ptr cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE)); - cpl->set_content_version_id ("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); - cpl->set_content_version_label_text ("81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); - cpl->set_metadata (xml_meta); - - shared_ptr mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE)); + auto cpl = make_shared("A Test DCP", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE); + cpl->set_content_version ( + dcp::ContentVersion("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00", "81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00") + ); + cpl->set_issuer ("OpenDCP 0.0.25"); + cpl->set_creator ("OpenDCP 0.0.25"); + cpl->set_issue_date ("2012-07-17T04:45:18+00:00"); + cpl->set_annotation_text ("A Test DCP"); + + auto mp = make_shared(dcp::Fraction (24, 1), dcp::Standard::SMPTE); mp->set_metadata (mxf_meta); - shared_ptr picture_writer = mp->start_write ("build/test/DCP/dcp_test5/video.mxf", false); - dcp::File j2c ("test/data/32x32_red_square.j2c"); + auto picture_writer = mp->start_write("build/test/DCP/dcp_test5/video.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW); + dcp::ArrayData j2c ("test/data/flat_red.j2c"); for (int i = 0; i < 24; ++i) { picture_writer->write (j2c.data (), j2c.size ()); } picture_writer->finalize (); - shared_ptr ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1, dcp::SMPTE)); + auto ms = make_shared(dcp::Fraction(24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::Standard::SMPTE); ms->set_metadata (mxf_meta); - shared_ptr sound_writer = ms->start_write ("build/test/DCP/dcp_test5/audio.mxf"); + auto sound_writer = ms->start_write("build/test/DCP/dcp_test5/audio.mxf", {}, dcp::SoundAsset::AtmosSync::DISABLED, dcp::SoundAsset::MCASubDescriptors::ENABLED); SF_INFO info; info.format = 0; @@ -280,7 +312,7 @@ BOOST_AUTO_TEST_CASE (dcp_test5) channels[0] = buffer; while (true) { sf_count_t N = sf_readf_float (sndfile, buffer, 4096); - sound_writer->write (channels, N); + sound_writer->write(channels, 1, N); if (N < 4096) { break; } @@ -288,22 +320,23 @@ BOOST_AUTO_TEST_CASE (dcp_test5) sound_writer->finalize (); - shared_ptr am (new dcp::AtmosAsset (private_test / "20160218_NameOfFilm_FTR_OV_EN_A_dcs_r01.mxf")); + auto am = make_shared(private_test / "20160218_NameOfFilm_FTR_OV_EN_A_dcs_r01.mxf"); - cpl->add (shared_ptr ( - new dcp::Reel ( - shared_ptr (new dcp::ReelMonoPictureAsset (mp, 0)), - shared_ptr (new dcp::ReelSoundAsset (ms, 0)), - shared_ptr (), - shared_ptr (), - shared_ptr (new dcp::ReelAtmosAsset (am, 0)) - ) - )); + cpl->add(make_shared( + make_shared(mp, 0), + make_shared(ms, 0), + shared_ptr(), + shared_ptr(), + make_shared(am, 0) + )); d.add (cpl); - xml_meta.annotation_text = "Created by libdcp"; - d.write_xml (dcp::SMPTE, xml_meta); + d.set_issuer("OpenDCP 0.0.25"); + d.set_creator("OpenDCP 0.0.25"); + d.set_issue_date("2012-07-17T04:45:18+00:00"); + d.set_annotation_text("Created by libdcp"); + d.write_xml(); /* build/test/DCP/dcp_test5 is checked against test/ref/DCP/dcp_test5 by run/tests */ } @@ -314,8 +347,8 @@ BOOST_AUTO_TEST_CASE (dcp_test6) dcp::DCP dcp ("test/ref/DCP/dcp_test5"); dcp.read (); - BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1); - BOOST_REQUIRE_EQUAL (dcp.cpls().front()->reels().size(), 1); + BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U); + BOOST_REQUIRE_EQUAL (dcp.cpls()[0]->reels().size(), 1U); BOOST_CHECK (dcp.cpls().front()->reels().front()->main_picture()); BOOST_CHECK (dcp.cpls().front()->reels().front()->main_sound()); BOOST_CHECK (!dcp.cpls().front()->reels().front()->main_subtitle()); @@ -325,20 +358,189 @@ BOOST_AUTO_TEST_CASE (dcp_test6) /** Test creation of a 2D Interop DCP from very simple inputs */ BOOST_AUTO_TEST_CASE (dcp_test7) { - dcp::XMLMetadata xml_meta; - xml_meta.annotation_text = "Created by libdcp"; - xml_meta.issuer = "OpenDCP 0.0.25"; - xml_meta.creator = "OpenDCP 0.0.25"; - xml_meta.issue_date = "2012-07-17T04:45:18+00:00"; - make_simple("build/test/DCP/dcp_test7")->write_xml (dcp::INTEROP, xml_meta); + RNGFixer fix; + + auto dcp = make_simple("build/test/DCP/dcp_test7", 1, 24, dcp::Standard::INTEROP); + dcp->set_issuer("OpenDCP 0.0.25"); + dcp->set_creator("OpenDCP 0.0.25"); + dcp->set_issue_date("2012-07-17T04:45:18+00:00"); + dcp->set_annotation_text("Created by libdcp"); + dcp->write_xml(); + /* build/test/DCP/dcp_test7 is checked against test/ref/DCP/dcp_test7 by run/tests */ } -/** Test reading of a DCP with multiple PKLs */ +/** Test reading of a DCP with multiple CPLs */ BOOST_AUTO_TEST_CASE (dcp_test8) { dcp::DCP dcp (private_test / "data/SMPTE_TST-B1PB2P_S_EN-EN-CCAP_5171-HI-VI_2K_ISDCF_20151123_DPPT_SMPTE_combo/"); dcp.read (); - BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 2); + BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 2U); +} + + +/** Test reading a DCP whose ASSETMAP contains assets not used by any PKL */ +BOOST_AUTO_TEST_CASE (dcp_things_in_assetmap_not_in_pkl) +{ + dcp::DCP dcp ("test/data/extra_assetmap"); + BOOST_CHECK_NO_THROW (dcp.read()); +} + + +/** Test that writing the XML for a DCP with no CPLs throws */ +BOOST_AUTO_TEST_CASE (dcp_with_no_cpls) +{ + dcp::DCP dcp ("build/test/dcp_with_no_cpls"); + BOOST_REQUIRE_THROW (dcp.write_xml(), dcp::MiscError); +} + + +/** Test that writing the XML for a DCP with Interop CPLs makes a SMPTE assetmap */ +BOOST_AUTO_TEST_CASE (dcp_with_interop_cpls) +{ + boost::filesystem::path path = "build/test/dcp_with_interop_cpls"; + boost::filesystem::remove_all (path); + dcp::DCP dcp (path); + auto cpl1 = make_shared("", dcp::ContentKind::FEATURE, dcp::Standard::INTEROP); + cpl1->add(make_shared()); + dcp.add(cpl1); + auto cpl2 = make_shared("", dcp::ContentKind::FEATURE, dcp::Standard::INTEROP); + cpl2->add(make_shared()); + dcp.add(cpl2); + dcp.write_xml (); + BOOST_REQUIRE (boost::filesystem::exists(path / "ASSETMAP")); + BOOST_REQUIRE (!boost::filesystem::exists(path / "ASSETMAP.xml")); +} + + +/** Test that writing the XML for a DCP with SMPTE CPLs makes a SMPTE assetmap */ +BOOST_AUTO_TEST_CASE (dcp_with_smpte_cpls) +{ + boost::filesystem::path path = "build/test/dcp_with_smpte_cpls"; + boost::filesystem::remove_all (path); + dcp::DCP dcp (path); + auto cpl1 = make_shared("", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE); + cpl1->add(make_shared()); + dcp.add(cpl1); + auto cpl2 = make_shared("", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE); + cpl2->add(make_shared()); + dcp.add(cpl2); + dcp.write_xml (); + BOOST_REQUIRE (!boost::filesystem::exists(path / "ASSETMAP")); + BOOST_REQUIRE (boost::filesystem::exists(path / "ASSETMAP.xml")); +} + + +/** Test that writing the XML for a DCP with mixed-standard CPLs throws */ +BOOST_AUTO_TEST_CASE (dcp_with_mixed_cpls) +{ + dcp::DCP dcp ("build/test/dcp_with_mixed_cpls"); + dcp.add(make_shared("", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE)); + dcp.add(make_shared("", dcp::ContentKind::FEATURE, dcp::Standard::INTEROP)); + dcp.add(make_shared("", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE)); + BOOST_REQUIRE_THROW (dcp.write_xml(), dcp::MiscError); +} + + +BOOST_AUTO_TEST_CASE (dcp_add_kdm_test) +{ + /* Some CPLs, each with a reel */ + + shared_ptr cpls[] = { + make_shared("", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE), + make_shared("", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE), + make_shared("", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE) + }; + + shared_ptr reels[] = { + make_shared(), + make_shared(), + make_shared() + }; + + for (auto i = 0; i < 3; ++i) { + cpls[i]->add(reels[i]); + } + + dcp::DCP dcp ("build/test/dcp_add_kdm_test"); + dcp.add(cpls[0]); + dcp.add(cpls[1]); + dcp.add(cpls[2]); + + /* Simple KDM with one key that should be given to cpls[0] */ + + auto kdm_1 = dcp::DecryptedKDM({}, {}, "", "", ""); + auto kdm_1_uuid = dcp::make_uuid(); + kdm_1.add_key (dcp::DecryptedKDMKey(string("MDIK"), kdm_1_uuid, dcp::Key(), cpls[0]->id(), dcp::Standard::SMPTE)); + dcp.add (kdm_1); + BOOST_REQUIRE_EQUAL (reels[0]->_kdms.size(), 1U); + BOOST_CHECK_EQUAL (reels[0]->_kdms[0].keys().size(), 1U); + BOOST_CHECK_EQUAL (reels[0]->_kdms[0].keys()[0].id(), kdm_1_uuid); + BOOST_CHECK_EQUAL (reels[1]->_kdms.size(), 0U); + BOOST_CHECK_EQUAL (reels[2]->_kdms.size(), 0U); + + /* KDM with two keys that should be given to cpls[1] and cpls[2] */ + + auto kdm_2 = dcp::DecryptedKDM({}, {}, "", "", ""); + auto kdm_2_uuid_1 = dcp::make_uuid(); + kdm_2.add_key (dcp::DecryptedKDMKey(string("MDIK"), kdm_2_uuid_1, dcp::Key(), cpls[1]->id(), dcp::Standard::SMPTE)); + auto kdm_2_uuid_2 = dcp::make_uuid(); + kdm_2.add_key (dcp::DecryptedKDMKey(string("MDIK"), kdm_2_uuid_2, dcp::Key(), cpls[2]->id(), dcp::Standard::SMPTE)); + dcp.add (kdm_2); + /* Unchanged from previous test */ + BOOST_CHECK (reels[0]->_kdms.size() == 1); + /* kdm_2 should have been added to both the other CPLs */ + BOOST_REQUIRE_EQUAL (reels[1]->_kdms.size(), 1U); + BOOST_REQUIRE_EQUAL (reels[1]->_kdms[0].keys().size(), 2U); + BOOST_CHECK_EQUAL (reels[1]->_kdms[0].keys()[0].id(), kdm_2_uuid_1); + BOOST_CHECK_EQUAL (reels[1]->_kdms[0].keys()[1].id(), kdm_2_uuid_2); + BOOST_REQUIRE_EQUAL (reels[2]->_kdms.size(), 1U); + BOOST_REQUIRE_EQUAL (reels[2]->_kdms[0].keys().size(), 2U); + BOOST_CHECK_EQUAL (reels[2]->_kdms[0].keys()[0].id(), kdm_2_uuid_1); + BOOST_CHECK_EQUAL (reels[2]->_kdms[0].keys()[1].id(), kdm_2_uuid_2); +} + + +BOOST_AUTO_TEST_CASE(hashes_preserved_when_loading_corrupted_dcp) +{ + boost::filesystem::path const dir = "build/test/hashes_preserved_when_loading_corrupted_dcp"; + boost::filesystem::remove_all(dir); + + auto dcp = make_simple(dir / "1"); + dcp->write_xml(); + + auto asset_1_id = dcp::MonoPictureAsset(dir / "1" / "video.mxf").id(); + auto asset_1_hash = dcp::MonoPictureAsset(dir / "1" / "video.mxf").hash(); + + /* Replace the hash in the CPL (the one that corresponds to the actual file) + * with an incorrect one new_hash. + */ + string new_hash; + { + Editor editor(find_file(dir / "1", "cpl_")); + auto const after = "24"; + editor.delete_lines_after(after, 1); + + if (asset_1_hash[0] == 'A') { + new_hash = 'B' + asset_1_hash.substr(1); + } else { + new_hash = 'A' + asset_1_hash.substr(1); + } + + editor.insert(after, dcp::String::compose(" %1", new_hash)); + } + + dcp::DCP read_back(dir / "1"); + read_back.read(); + + BOOST_REQUIRE_EQUAL(read_back.cpls().size(), 1U); + auto cpl = read_back.cpls()[0]; + BOOST_REQUIRE_EQUAL(cpl->reels().size(), 1U); + auto reel = cpl->reels()[0]; + BOOST_REQUIRE(reel->main_picture()); + /* Now the asset should think it has the wrong hash written to the PKL file; it shouldn't have + * checked the file again. + */ + BOOST_CHECK_EQUAL(reel->main_picture()->asset_ref()->hash(), new_hash); }