X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fcontent_test.cc;h=85862af82e32e0f44328d8a556d0d49d2d1d4c23;hb=ce73eaf7875a9a3326afcd839ad85eb95879c160;hp=0815e16c2be64f18185d388cdaf38178ff6dd502;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git diff --git a/test/content_test.cc b/test/content_test.cc index 0815e16c2..85862af82 100644 --- a/test/content_test.cc +++ b/test/content_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Carl Hetherington + Copyright (C) 2017-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,11 +18,13 @@ */ + /** @file test/content_test.cc * @brief Tests which expose problems with certain pieces of content. * @ingroup completedcp */ + #include "lib/audio_content.h" #include "lib/film.h" #include "lib/dcp_content_type.h" @@ -32,75 +34,61 @@ #include "test.h" #include -using std::shared_ptr; + using namespace dcpomatic; + /** There has been garbled audio with this piece of content */ BOOST_AUTO_TEST_CASE (content_test1) { - shared_ptr film = new_test_film ("content_test1"); + auto film = new_test_film ("content_test1"); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); film->set_name ("content_test1"); film->set_container (Ratio::from_id ("185")); - shared_ptr content = content_factory(TestPaths::private_data() / "demo_sound_bug.mkv").front (); + auto content = content_factory(TestPaths::private_data() / "demo_sound_bug.mkv")[0]; film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs ()); - - boost::filesystem::path check; - - for ( - boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator("build/test/content_test1/" + film->dcp_name()); - i != boost::filesystem::directory_iterator(); - ++i) { + make_and_verify_dcp ( + film, + { dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE } + ); - if (i->path().leaf().string().substr(0, 4) == "pcm_") { - check = *i; - } - } - - check_mxf_audio_file (TestPaths::private_data() / "content_test1.mxf", check); + check_mxf_audio_file(TestPaths::private_data() / "content_test1.mxf", dcp_file(film, "pcm_")); } + /** Taking some 23.976fps content and trimming 0.5s (in content time) from the start * has failed in the past; ensure that this is fixed. */ BOOST_AUTO_TEST_CASE (content_test2) { - shared_ptr film = new_test_film2 ("content_test2"); - - shared_ptr content = content_factory("test/data/red_23976.mp4").front(); - film->examine_and_add_content (content); - BOOST_REQUIRE (!wait_for_jobs ()); - content->set_trim_start(ContentTime::from_seconds(0.5)); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs ()); + auto content = content_factory("test/data/red_23976.mp4")[0]; + auto film = new_test_film2 ("content_test2", {content}); + content->set_trim_start(film, ContentTime::from_seconds(0.5)); + make_and_verify_dcp (film); } + /** Check that position and start trim of video content is forced to a frame boundary */ BOOST_AUTO_TEST_CASE (content_test3) { - shared_ptr film = new_test_film2 ("content_test3"); + auto content = content_factory("test/data/red_24.mp4")[0]; + auto film = new_test_film2 ("content_test3", {content}); film->set_sequence (false); - shared_ptr content = content_factory("test/data/red_24.mp4").front(); - film->examine_and_add_content (content); - BOOST_REQUIRE (!wait_for_jobs ()); - /* Trim */ /* 12 frames */ - content->set_trim_start (ContentTime::from_seconds (12.0 / 24.0)); + content->set_trim_start(film, ContentTime::from_seconds (12.0 / 24.0)); BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (12.0 / 24.0)); /* 11.2 frames */ - content->set_trim_start (ContentTime::from_seconds (11.2 / 24.0)); + content->set_trim_start(film, ContentTime::from_seconds (11.2 / 24.0)); BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (11.0 / 24.0)); /* 13.9 frames */ - content->set_trim_start (ContentTime::from_seconds (13.9 / 24.0)); + content->set_trim_start(film, ContentTime::from_seconds (13.9 / 24.0)); BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (14.0 / 24.0)); /* Position */ @@ -117,7 +105,7 @@ BOOST_AUTO_TEST_CASE (content_test3) content->set_position (film, DCPTime::from_seconds(13.9 / 24.0)); BOOST_CHECK (content->position() == DCPTime::from_seconds (14.0 / 24.0)); - content->set_video_frame_rate (25); + content->set_video_frame_rate(film, 25); /* Check that trim is fixed when the content's video frame rate is `forced' */ @@ -128,9 +116,9 @@ BOOST_AUTO_TEST_CASE (content_test3) /** Content containing video will have its length rounded to the nearest video frame */ BOOST_AUTO_TEST_CASE (content_test4) { - shared_ptr film = new_test_film2 ("content_test4"); + auto film = new_test_film2 ("content_test4"); - shared_ptr video = content_factory("test/data/count300bd24.m2ts").front(); + auto video = content_factory("test/data/count300bd24.m2ts")[0]; film->examine_and_add_content (video); BOOST_REQUIRE (!wait_for_jobs()); @@ -142,37 +130,38 @@ BOOST_AUTO_TEST_CASE (content_test4) /** Content containing no video will not have its length rounded to the nearest video frame */ BOOST_AUTO_TEST_CASE (content_test5) { - shared_ptr film = new_test_film2 ("content_test5"); + auto audio = content_factory("test/data/sine_16_48_220_10.wav"); + auto film = new_test_film2 ("content_test5", audio); - shared_ptr audio = content_factory("test/data/sine_16_48_220_10.wav").front(); - film->examine_and_add_content (audio); - BOOST_REQUIRE (!wait_for_jobs()); + audio[0]->set_trim_end(dcpomatic::ContentTime(3000)); - audio->set_trim_end (dcpomatic::ContentTime(3000)); - BOOST_CHECK (audio->length_after_trim(film) == DCPTime(957000)); + BOOST_CHECK(audio[0]->length_after_trim(film) == DCPTime(957000)); } /** Sync error #1833 */ BOOST_AUTO_TEST_CASE (content_test6) { - shared_ptr film = new_test_film2 ("content_test6"); - film->examine_and_add_content (content_factory(TestPaths::private_data() / "fha.mkv").front()); - BOOST_REQUIRE (!wait_for_jobs()); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); + Cleanup cl; + + auto film = new_test_film2 ( + "content_test6", + content_factory(TestPaths::private_data() / "fha.mkv"), + &cl + ); + + make_and_verify_dcp (film); check_dcp (TestPaths::private_data() / "fha", film); + + cl.run (); } /** Reel length error when making the test for #1833 */ BOOST_AUTO_TEST_CASE (content_test7) { - shared_ptr film = new_test_film2 ("content_test7"); - shared_ptr content = content_factory(TestPaths::private_data() / "clapperboard.mp4").front(); - film->examine_and_add_content (content); - BOOST_REQUIRE (!wait_for_jobs()); - content->audio->set_delay (-1000); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); + auto content = content_factory(TestPaths::private_data() / "clapperboard.mp4"); + auto film = new_test_film2 ("content_test7", content); + content[0]->audio->set_delay(-1000); + make_and_verify_dcp (film, { dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_RATE_FOR_2K }); }