X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_test.cc;h=71564238ab829387848018a11d8345aa0c0320da;hb=c1d296b163ddf88a5b387f98e7e77988a242a996;hp=fb3a605c694c537bf1688088b5aa31a5d5e876ad;hpb=b9c5e3f74550917676e14324791d6ba4d0c07cac;p=libdcp.git diff --git a/test/dcp_test.cc b/test/dcp_test.cc index fb3a605c..71564238 100644 --- a/test/dcp_test.cc +++ b/test/dcp_test.cc @@ -67,9 +67,12 @@ BOOST_AUTO_TEST_CASE (dcp_test1) { RNGFixer fixer; - make_simple("build/test/DCP/dcp_test1")->write_xml( - dcp::Standard::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "A Test DCP" - ); + 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 */ } @@ -89,7 +92,7 @@ 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"); - auto cpl = make_shared("A Test DCP", dcp::ContentKind::FEATURE); + 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") ); @@ -98,9 +101,9 @@ BOOST_AUTO_TEST_CASE (dcp_test2) 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::Standard::SMPTE)); + 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); + auto picture_writer = mp->start_write ("build/test/DCP/dcp_test2/video.mxf", false); dcp::ArrayData j2c ("test/data/flat_red.j2c"); for (int i = 0; i < 24; ++i) { /* Left */ @@ -110,20 +113,20 @@ BOOST_AUTO_TEST_CASE (dcp_test2) } picture_writer->finalize (); - shared_ptr ms (new dcp::SoundAsset(dcp::Fraction(24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::Standard::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"); 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; } @@ -138,7 +141,11 @@ BOOST_AUTO_TEST_CASE (dcp_test2) d.add (cpl); - d.write_xml (dcp::Standard::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp"); + 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 */ } @@ -217,7 +224,7 @@ test_rewriting_sound(string name, bool modify) } } } - writer->write (out, sf->samples()); + writer->write(out, sf->channels(), sf->samples()); for (int j = 0; j < sf->channels(); ++j) { delete[] out[j]; } @@ -227,11 +234,11 @@ test_rewriting_sound(string name, bool modify) reel->add(make_shared(sound, 0)); reel->add(simple_markers()); - auto cpl = make_shared("A Test DCP", dcp::ContentKind::TRAILER); + auto cpl = make_shared("A Test DCP", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE); cpl->add (reel); B.add (cpl); - B.write_xml (dcp::Standard::SMPTE); + B.write_xml (); dcp::EqualityOptions eq; eq.reel_hashes_can_differ = true; @@ -270,7 +277,7 @@ 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"); - auto cpl = make_shared("A Test DCP", dcp::ContentKind::FEATURE); + 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") ); @@ -290,7 +297,7 @@ BOOST_AUTO_TEST_CASE (dcp_test5) 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"); SF_INFO info; info.format = 0; @@ -301,7 +308,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; } @@ -309,21 +316,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); - d.write_xml (dcp::Standard::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp"); + 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 */ } @@ -334,8 +343,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()); @@ -347,9 +356,12 @@ BOOST_AUTO_TEST_CASE (dcp_test7) { RNGFixer fix; - make_simple("build/test/DCP/dcp_test7")->write_xml( - dcp::Standard::INTEROP, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp" - ); + 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 */ } @@ -360,7 +372,7 @@ 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); } @@ -370,3 +382,118 @@ 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); +} +