X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fmap_cli_test.cc;h=ed2a7e5ec5aad4ede1d3dba538abe39646bab74c;hb=591c89275bfa26c3b2e1b0f1926909fc4bf5b219;hp=1267e9b4ccb3064b66cb5666d3efb889656d8017;hpb=4d795ebc688f711e8ff3e475537a85e941326cca;p=dcpomatic.git diff --git a/test/map_cli_test.cc b/test/map_cli_test.cc index 1267e9b4c..ed2a7e5ec 100644 --- a/test/map_cli_test.cc +++ b/test/map_cli_test.cc @@ -116,6 +116,38 @@ BOOST_AUTO_TEST_CASE(map_simple_dcp_copy) } +/** Map a single DCP into a new DCP, referring to the CPL by ID */ +BOOST_AUTO_TEST_CASE(map_simple_dcp_copy_by_id) +{ + string const name = "map_simple_dcp_copy_by_id"; + string const out = String::compose("build/test/%1_out", name); + + auto content = content_factory("test/data/flat_red.png"); + auto film = new_test_film2(name + "_in", content); + make_and_verify_dcp(film); + + dcp::CPL cpl(find_cpl(film->dir(film->dcp_name()))); + + vector const args = { + "map_cli", + "-o", out, + "-d", film->dir(film->dcp_name()).string(), + cpl.id() + }; + + boost::filesystem::remove_all(out); + + vector output_messages; + auto error = run(args, output_messages); + BOOST_CHECK(!error); + + verify_dcp(out, {}); + + BOOST_CHECK(boost::filesystem::is_regular_file(find_prefix(out, "j2c_"))); + BOOST_CHECK(boost::filesystem::is_regular_file(find_prefix(out, "pcm_"))); +} + + /** Map a single DCP into a new DCP using the symlink option */ BOOST_AUTO_TEST_CASE(map_simple_dcp_copy_with_symlinks) { @@ -191,6 +223,7 @@ BOOST_AUTO_TEST_CASE(map_simple_interop_dcp_with_subs) auto subs = content_factory("test/data/15s.srt").front(); auto film = new_test_film2(name + "_in", { picture, subs }); film->set_interop(true); + subs->only_text()->set_language(dcp::LanguageTag("de")); make_and_verify_dcp(film, {dcp::VerificationNote::Code::INVALID_STANDARD}); vector const args = { @@ -222,12 +255,11 @@ test_map_ov_vf_copy(vector extra_args = {}) make_and_verify_dcp(ov_film); auto const ov_dir = ov_film->dir(ov_film->dcp_name()); - auto vf_ov = make_shared(ov_dir); auto vf_sound = content_factory("test/data/sine_440.wav").front(); auto vf_film = new_test_film2(name + "_vf", { vf_ov, vf_sound }); vf_ov->set_reference_video(true); - make_and_verify_dcp(vf_film, {dcp::VerificationNote::Code::EXTERNAL_ASSET}); + make_and_verify_dcp(vf_film, {dcp::VerificationNote::Code::EXTERNAL_ASSET}, false); auto const vf_dir = vf_film->dir(vf_film->dcp_name()); @@ -283,7 +315,7 @@ BOOST_AUTO_TEST_CASE(map_ov_vf_copy_multiple_reference) vf_ov2->set_position(vf_film, vf_ov1->end(vf_film)); vf_ov1->set_reference_video(true); vf_ov2->set_reference_video(true); - make_and_verify_dcp(vf_film, {dcp::VerificationNote::Code::EXTERNAL_ASSET}); + make_and_verify_dcp(vf_film, {dcp::VerificationNote::Code::EXTERNAL_ASSET}, false); auto const vf_dir = vf_film->dir(vf_film->dcp_name()); @@ -379,6 +411,7 @@ test_two_cpls_each_with_subs(string name, bool interop) auto subs = content_factory("test/data/15s.srt").front(); films[i] = new_test_film2(String::compose("%1_%2_in", name, i), { picture, subs }); films[i]->set_interop(interop); + subs->only_text()->set_language(dcp::LanguageTag("de")); make_and_verify_dcp(films[i], acceptable_errors); } @@ -504,3 +537,77 @@ BOOST_AUTO_TEST_CASE(map_multireel_interop_ov_and_vf_adding_ccaps) } +BOOST_AUTO_TEST_CASE(map_uses_config_for_issuer_and_creator) +{ + ConfigRestorer cr; + + Config::instance()->set_dcp_issuer("ostrabagalous"); + Config::instance()->set_dcp_creator("Fred"); + + string const name = "map_uses_config_for_issuer_and_creator"; + string const out = String::compose("build/test/%1_out", name); + + auto content = content_factory("test/data/flat_red.png"); + auto film = new_test_film2(name + "_in", content); + make_and_verify_dcp(film); + + vector const args = { + "map_cli", + "-o", out, + "-d", film->dir(film->dcp_name()).string(), + find_cpl(film->dir(film->dcp_name())).string() + }; + + boost::filesystem::remove_all(out); + + vector output_messages; + auto error = run(args, output_messages); + BOOST_CHECK(!error); + + cxml::Document assetmap("AssetMap"); + assetmap.read_file(film->dir(film->dcp_name()) / "ASSETMAP.xml"); + BOOST_CHECK(assetmap.string_child("Issuer") == "ostrabagalous"); + BOOST_CHECK(assetmap.string_child("Creator") == "Fred"); + + cxml::Document pkl("PackingList"); + pkl.read_file(find_prefix(out, "pkl_")); + BOOST_CHECK(pkl.string_child("Issuer") == "ostrabagalous"); + BOOST_CHECK(pkl.string_child("Creator") == "Fred"); +} + + +BOOST_AUTO_TEST_CASE(map_handles_interop_png_subs) +{ + string const name = "map_handles_interop_png_subs"; + auto arrietty = content_factory(TestPaths::private_data() / "arrietty_JP-EN.mkv")[0]; + auto film = new_test_film2(name + "_input", { arrietty }); + film->set_interop(true); + arrietty->set_trim_end(dcpomatic::ContentTime::from_seconds(110)); + arrietty->text[0]->set_use(true); + arrietty->text[0]->set_language(dcp::LanguageTag("de")); + make_and_verify_dcp( + film, + { + dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME, + dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, + dcp::VerificationNote::Code::INVALID_STANDARD + }); + + auto const out = boost::filesystem::path("build") / "test" / (name + "_output"); + + vector const args = { + "map_cli", + "-o", out.string(), + "-d", film->dir(film->dcp_name()).string(), + find_cpl(film->dir(film->dcp_name())).string() + }; + + boost::filesystem::remove_all(out); + + vector output_messages; + auto error = run(args, output_messages); + BOOST_CHECK(!error); + + verify_dcp(out, { dcp::VerificationNote::Code::INVALID_STANDARD }); +} +