X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fdcp_test.cc;h=347d433d7412be9f9a2531d7e23f9f010ccc8a39;hb=ab9d9fe2f33bf5fadb0132120111e0e73c86ca09;hp=b6e14d2529cfc0d3e688180be25d303a74ad1490;hpb=9eba1ff84fd89e2ff04181799f2185c8575de16d;p=libdcp.git diff --git a/test/dcp_test.cc b/test/dcp_test.cc index b6e14d25..347d433d 100644 --- a/test/dcp_test.cc +++ b/test/dcp_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Carl Hetherington + Copyright (C) 2013-2020 Carl Hetherington This file is part of libdcp. @@ -15,6 +15,20 @@ You should have received a copy of the GNU General Public License 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 "dcp.h" @@ -23,6 +37,7 @@ #include "mono_picture_asset.h" #include "stereo_picture_asset.h" #include "picture_asset_writer.h" +#include "reel_picture_asset.h" #include "sound_asset_writer.h" #include "sound_asset.h" #include "atmos_asset.h" @@ -38,97 +53,32 @@ #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: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)); - 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 (); +using std::vector; +using std::dynamic_pointer_cast; +using std::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif - 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)) - ) - )); - - 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; + + make_simple("build/test/DCP/dcp_test1")->write_xml( + dcp::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp" + ); + /* 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"; @@ -139,9 +89,13 @@ BOOST_AUTO_TEST_CASE (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); + 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"); shared_ptr mp (new dcp::StereoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE)); mp->set_metadata (mxf_meta); @@ -155,9 +109,9 @@ BOOST_AUTO_TEST_CASE (dcp_test2) } picture_writer->finalize (); - shared_ptr ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1, dcp::SMPTE)); + shared_ptr ms (new dcp::SoundAsset(dcp::Fraction(24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::SMPTE)); ms->set_metadata (mxf_meta); - shared_ptr sound_writer = ms->start_write ("build/test/DCP/dcp_test2/audio.mxf"); + shared_ptr sound_writer = ms->start_write ("build/test/DCP/dcp_test2/audio.mxf", vector()); SF_INFO info; info.format = 0; @@ -185,8 +139,7 @@ BOOST_AUTO_TEST_CASE (dcp_test2) d.add (cpl); - xml_meta.annotation_text = "Created by libdcp"; - d.write_xml (dcp::SMPTE, xml_meta); + d.write_xml (dcp::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp"); /* build/test/DCP/dcp_test2 is checked against test/ref/DCP/dcp_test2 by run/tests */ } @@ -219,17 +172,95 @@ 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) +{ + dcp::DCP A ("test/ref/DCP/dcp_test1"); + A.read (); + + BOOST_REQUIRE (!A.cpls().empty()); + BOOST_REQUIRE (!A.cpls().front()->reels().empty()); + shared_ptr A_picture = dynamic_pointer_cast(A.cpls().front()->reels().front()->main_picture()); + BOOST_REQUIRE (A_picture); + shared_ptr A_sound = dynamic_pointer_cast(A.cpls().front()->reels().front()->main_sound()); + + boost::filesystem::remove_all ("build/test/" + name); + dcp::DCP B ("build/test/" + name); + shared_ptr reel(new dcp::Reel()); + + BOOST_REQUIRE (A_picture->mono_asset()); + BOOST_REQUIRE (A_picture->mono_asset()->file()); + boost::filesystem::copy_file (A_picture->mono_asset()->file().get(), "build/test/" +name + "/picture.mxf"); + reel->add( + shared_ptr( + new dcp::ReelMonoPictureAsset(shared_ptr(new dcp::MonoPictureAsset("build/test/" + name + "/picture.mxf")), 0) + ) + ); + + shared_ptr reader = A_sound->asset()->start_read(); + shared_ptr sound(new dcp::SoundAsset(A_sound->asset()->edit_rate(), A_sound->asset()->sampling_rate(), A_sound->asset()->channels(), dcp::LanguageTag("en-US"), dcp::SMPTE)); + shared_ptr writer = sound->start_write("build/test/" + name + "/sound.mxf", vector()); + + bool need_to_modify = modify; + for (int i = 0; i < A_sound->asset()->intrinsic_duration(); ++i) { + shared_ptr 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->samples()); + for (int j = 0; j < sf->channels(); ++j) { + delete[] out[j]; + } + } + writer->finalize(); + + reel->add(shared_ptr(new dcp::ReelSoundAsset(sound, 0))); + + shared_ptr cpl(new dcp::CPL("A Test DCP", dcp::FEATURE)); + cpl->add (reel); + + B.add (cpl); + B.write_xml (dcp::SMPTE); + + 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"; @@ -240,9 +271,13 @@ BOOST_AUTO_TEST_CASE (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); + 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"); shared_ptr mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE)); mp->set_metadata (mxf_meta); @@ -253,9 +288,9 @@ BOOST_AUTO_TEST_CASE (dcp_test5) } picture_writer->finalize (); - shared_ptr ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1, dcp::SMPTE)); + shared_ptr ms (new dcp::SoundAsset(dcp::Fraction(24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::SMPTE)); ms->set_metadata (mxf_meta); - shared_ptr sound_writer = ms->start_write ("build/test/DCP/dcp_test5/audio.mxf"); + shared_ptr sound_writer = ms->start_write ("build/test/DCP/dcp_test5/audio.mxf", vector()); SF_INFO info; info.format = 0; @@ -288,8 +323,7 @@ BOOST_AUTO_TEST_CASE (dcp_test5) d.add (cpl); - xml_meta.annotation_text = "Created by libdcp"; - d.write_xml (dcp::SMPTE, xml_meta); + d.write_xml (dcp::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp"); /* build/test/DCP/dcp_test5 is checked against test/ref/DCP/dcp_test5 by run/tests */ } @@ -311,16 +345,16 @@ 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; + + make_simple("build/test/DCP/dcp_test7")->write_xml( + dcp::INTEROP, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp" + ); + /* 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/"); @@ -328,3 +362,11 @@ BOOST_AUTO_TEST_CASE (dcp_test8) BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 2); } + + +/** 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()); +}