X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Freels_test.cc;h=10fdc6c1ba440d845273dc724f64d4bcff1369af;hp=573289718117ac12cb096b77274a8fd624e12c6d;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hpb=5d937606cf96d163be98920fa5619114a28eec9d diff --git a/test/reels_test.cc b/test/reels_test.cc index 573289718..10fdc6c1b 100644 --- a/test/reels_test.cc +++ b/test/reels_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2020 Carl Hetherington + Copyright (C) 2015-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,52 +18,61 @@ */ + /** @file test/reels_test.cc * @brief Check manipulation of reels in various ways. - * @ingroup specific + * @ingroup feature */ -#include "lib/film.h" -#include "lib/ratio.h" + +#include "lib/content_factory.h" +#include "lib/dcp_content.h" +#include "lib/dcp_content_type.h" #include "lib/ffmpeg_content.h" +#include "lib/film.h" #include "lib/image_content.h" -#include "lib/dcp_content_type.h" -#include "lib/dcp_content.h" -#include "lib/video_content.h" +#include "lib/make_dcp.h" +#include "lib/ratio.h" #include "lib/string_text_file_content.h" -#include "lib/content_factory.h" +#include "lib/video_content.h" #include "test.h" +#include +#include +#include +#include #include -#include #include -using std::list; + using std::cout; -using std::vector; +using std::function; +using std::list; +using std::make_shared; +using std::shared_ptr; using std::string; -using boost::shared_ptr; -using boost::function; +using std::vector; using namespace dcpomatic; + /** Test Film::reels() */ BOOST_AUTO_TEST_CASE (reels_test1) { - shared_ptr film = new_test_film ("reels_test1"); + auto film = new_test_film ("reels_test1"); film->set_container (Ratio::from_id ("185")); - shared_ptr A (new FFmpegContent("test/data/test.mp4")); + auto A = make_shared("test/data/test.mp4"); film->examine_and_add_content (A); - shared_ptr B (new FFmpegContent("test/data/test.mp4")); + auto B = make_shared("test/data/test.mp4"); film->examine_and_add_content (B); BOOST_REQUIRE (!wait_for_jobs()); BOOST_CHECK_EQUAL (A->full_length(film).get(), 288000); - film->set_reel_type (REELTYPE_SINGLE); - list r = film->reels (); + film->set_reel_type (ReelType::SINGLE); + auto r = film->reels (); BOOST_CHECK_EQUAL (r.size(), 1U); BOOST_CHECK_EQUAL (r.front().from.get(), 0); BOOST_CHECK_EQUAL (r.front().to.get(), 288000 * 2); - film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + film->set_reel_type (ReelType::BY_VIDEO_CONTENT); r = film->reels (); BOOST_CHECK_EQUAL (r.size(), 2U); BOOST_CHECK_EQUAL (r.front().from.get(), 0); @@ -72,12 +81,12 @@ BOOST_AUTO_TEST_CASE (reels_test1) BOOST_CHECK_EQUAL (r.back().to.get(), 288000 * 2); film->set_j2k_bandwidth (100000000); - film->set_reel_type (REELTYPE_BY_LENGTH); + film->set_reel_type (ReelType::BY_LENGTH); /* This is just over 2.5s at 100Mbit/s; should correspond to 60 frames */ film->set_reel_length (31253154); r = film->reels (); BOOST_CHECK_EQUAL (r.size(), 3U); - list::const_iterator i = r.begin (); + auto i = r.begin (); BOOST_CHECK_EQUAL (i->from.get(), 0); BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_frames(60, 24).get()); ++i; @@ -88,12 +97,13 @@ BOOST_AUTO_TEST_CASE (reels_test1) BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_frames(144, 24).get()); } + /** Make a short DCP with multi reels split by video content, then import * this into a new project and make a new DCP referencing it. */ BOOST_AUTO_TEST_CASE (reels_test2) { - shared_ptr film = new_test_film ("reels_test2"); + auto film = new_test_film ("reels_test2"); film->set_name ("reels_test2"); film->set_container (Ratio::from_id ("185")); film->set_interop (false); @@ -120,28 +130,21 @@ BOOST_AUTO_TEST_CASE (reels_test2) c->video->set_length (24); } - film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + film->set_reel_type (ReelType::BY_VIDEO_CONTENT); BOOST_CHECK_EQUAL (film->reels().size(), 3U); BOOST_REQUIRE (!wait_for_jobs()); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); + make_and_verify_dcp (film); check_dcp ("test/data/reels_test2", film->dir (film->dcp_name())); - shared_ptr film2 = new_test_film ("reels_test2b"); - film2->set_name ("reels_test2b"); - film2->set_container (Ratio::from_id ("185")); - film2->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); - film2->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + auto c = make_shared(film->dir(film->dcp_name())); + auto film2 = new_test_film2 ("reels_test2b", {c}); + film2->set_reel_type (ReelType::BY_VIDEO_CONTENT); - shared_ptr c (new DCPContent(film->dir(film->dcp_name()))); - film2->examine_and_add_content (c); - BOOST_REQUIRE (!wait_for_jobs ()); - - list r = film2->reels (); + auto r = film2->reels (); BOOST_CHECK_EQUAL (r.size(), 3U); - list::const_iterator i = r.begin (); + auto i = r.begin (); BOOST_CHECK_EQUAL (i->from.get(), 0); BOOST_CHECK_EQUAL (i->to.get(), 96000); ++i; @@ -154,30 +157,23 @@ BOOST_AUTO_TEST_CASE (reels_test2) c->set_reference_video (true); c->set_reference_audio (true); - film2->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); + make_and_verify_dcp (film2, {dcp::VerificationNote::Code::EXTERNAL_ASSET}); } -/** Check that REELTYPE_BY_VIDEO_CONTENT adds an extra reel, if necessary, at the end + +/** Check that ReelType::BY_VIDEO_CONTENT adds an extra reel, if necessary, at the end * of all the video content to mop up anything afterward. */ BOOST_AUTO_TEST_CASE (reels_test3) { - shared_ptr film = new_test_film ("reels_test3"); - film->set_name ("reels_test3"); - film->set_container (Ratio::from_id ("185")); - film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); - film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); - - shared_ptr dcp (new DCPContent("test/data/reels_test2")); - film->examine_and_add_content (dcp); - shared_ptr sub (new StringTextFileContent("test/data/subrip.srt")); - film->examine_and_add_content (sub); - BOOST_REQUIRE (!wait_for_jobs()); + auto dcp = make_shared("test/data/reels_test2"); + auto sub = make_shared("test/data/subrip.srt"); + auto film = new_test_film2 ("reels_test3", {dcp, sub}); + film->set_reel_type (ReelType::BY_VIDEO_CONTENT); - list reels = film->reels(); + auto reels = film->reels(); BOOST_REQUIRE_EQUAL (reels.size(), 4U); - list::const_iterator i = reels.begin (); + auto i = reels.begin (); BOOST_CHECK_EQUAL (i->from.get(), 0); BOOST_CHECK_EQUAL (i->to.get(), 96000); ++i; @@ -191,16 +187,14 @@ BOOST_AUTO_TEST_CASE (reels_test3) BOOST_CHECK_EQUAL (i->to.get(), sub->full_length(film).ceil(film->video_frame_rate()).get()); } + /** Check creation of a multi-reel DCP with a single .srt subtitle file; * make sure that the reel subtitle timing is done right. */ BOOST_AUTO_TEST_CASE (reels_test4) { - shared_ptr film = new_test_film ("reels_test4"); - film->set_name ("reels_test4"); - film->set_container (Ratio::from_id ("185")); - film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); - film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + auto film = new_test_film2 ("reels_test4"); + film->set_reel_type (ReelType::BY_VIDEO_CONTENT); film->set_interop (false); /* 4 piece of 1s-long content */ @@ -212,13 +206,13 @@ BOOST_AUTO_TEST_CASE (reels_test4) content[i]->video->set_length (24); } - shared_ptr subs (new StringTextFileContent("test/data/subrip3.srt")); + auto subs = make_shared("test/data/subrip3.srt"); film->examine_and_add_content (subs); BOOST_REQUIRE (!wait_for_jobs()); - list reels = film->reels(); + auto reels = film->reels(); BOOST_REQUIRE_EQUAL (reels.size(), 4U); - list::const_iterator i = reels.begin (); + auto i = reels.begin (); BOOST_CHECK_EQUAL (i->from.get(), 0); BOOST_CHECK_EQUAL (i->to.get(), 96000); ++i; @@ -231,27 +225,31 @@ BOOST_AUTO_TEST_CASE (reels_test4) BOOST_CHECK_EQUAL (i->from.get(), 96000 * 3); BOOST_CHECK_EQUAL (i->to.get(), 96000 * 4); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); + make_and_verify_dcp ( + film, + { + dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, + dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME, + dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION + }); check_dcp ("test/data/reels_test4", film->dir (film->dcp_name())); } + BOOST_AUTO_TEST_CASE (reels_test5) { - shared_ptr film = new_test_film ("reels_test5"); + auto dcp = make_shared("test/data/reels_test4"); + auto film = new_test_film2 ("reels_test5", {dcp}); film->set_sequence (false); - shared_ptr dcp (new DCPContent("test/data/reels_test4")); - film->examine_and_add_content (dcp); - BOOST_REQUIRE (!wait_for_jobs ()); /* Set to 2123 but it will be rounded up to the next frame (4000) */ dcp->set_position(film, DCPTime(2123)); { - list p = dcp->reels (film); + auto p = dcp->reels (film); BOOST_REQUIRE_EQUAL (p.size(), 4U); - list::const_iterator i = p.begin(); + auto i = p.begin(); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 96000))); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 96000), DCPTime(4000 + 192000))); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 192000), DCPTime(4000 + 288000))); @@ -260,9 +258,9 @@ BOOST_AUTO_TEST_CASE (reels_test5) { dcp->set_trim_start (ContentTime::from_seconds (0.5)); - list p = dcp->reels (film); + auto p = dcp->reels (film); BOOST_REQUIRE_EQUAL (p.size(), 4U); - list::const_iterator i = p.begin(); + auto i = p.begin(); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000))); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000))); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 144000), DCPTime(4000 + 240000))); @@ -271,9 +269,9 @@ BOOST_AUTO_TEST_CASE (reels_test5) { dcp->set_trim_end (ContentTime::from_seconds (0.5)); - list p = dcp->reels (film); + auto p = dcp->reels (film); BOOST_REQUIRE_EQUAL (p.size(), 4U); - list::const_iterator i = p.begin(); + auto i = p.begin(); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000))); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000))); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 144000), DCPTime(4000 + 240000))); @@ -282,102 +280,90 @@ BOOST_AUTO_TEST_CASE (reels_test5) { dcp->set_trim_start (ContentTime::from_seconds (1.5)); - list p = dcp->reels (film); + auto p = dcp->reels (film); BOOST_REQUIRE_EQUAL (p.size(), 3U); - list::const_iterator i = p.begin(); + auto i = p.begin(); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000))); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000))); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 144000), DCPTime(4000 + 192000))); } } + /** Check reel split with a muxed video/audio source */ BOOST_AUTO_TEST_CASE (reels_test6) { - shared_ptr film = new_test_film ("reels_test6"); - film->set_name ("reels_test6"); - film->set_container (Ratio::from_id ("185")); - film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); - shared_ptr A (new FFmpegContent("test/data/test2.mp4")); - film->examine_and_add_content (A); - BOOST_REQUIRE (!wait_for_jobs ()); + auto A = make_shared("test/data/test2.mp4"); + auto film = new_test_film2 ("reels_test6", {A}); film->set_j2k_bandwidth (100000000); - film->set_reel_type (REELTYPE_BY_LENGTH); + film->set_reel_type (ReelType::BY_LENGTH); /* This is just over 2.5s at 100Mbit/s; should correspond to 60 frames */ film->set_reel_length (31253154); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs ()); + make_and_verify_dcp ( + film, + { + dcp::VerificationNote::Code::INVALID_INTRINSIC_DURATION, + dcp::VerificationNote::Code::INVALID_DURATION, + }); } + /** Check the case where the last bit of audio hangs over the end of the video - * and we are using REELTYPE_BY_VIDEO_CONTENT. + * and we are using ReelType::BY_VIDEO_CONTENT. */ BOOST_AUTO_TEST_CASE (reels_test7) { - shared_ptr film = new_test_film ("reels_test7"); - film->set_name ("reels_test7"); - film->set_container (Ratio::from_id ("185")); - film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); - shared_ptr A = content_factory("test/data/flat_red.png").front(); - film->examine_and_add_content (A); - BOOST_REQUIRE (!wait_for_jobs ()); - shared_ptr B = content_factory("test/data/awkward_length.wav").front(); - film->examine_and_add_content (B); - BOOST_REQUIRE (!wait_for_jobs ()); + auto A = content_factory("test/data/flat_red.png").front(); + auto B = content_factory("test/data/awkward_length.wav").front(); + auto film = new_test_film2 ("reels_test7", { A, B }); film->set_video_frame_rate (24); A->video->set_length (2 * 24); - film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + film->set_reel_type (ReelType::BY_VIDEO_CONTENT); BOOST_REQUIRE_EQUAL (film->reels().size(), 2U); BOOST_CHECK (film->reels().front() == DCPTimePeriod(DCPTime(0), DCPTime::from_frames(2 * 24, 24))); BOOST_CHECK (film->reels().back() == DCPTimePeriod(DCPTime::from_frames(2 * 24, 24), DCPTime::from_frames(3 * 24 + 1, 24))); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs ()); + make_and_verify_dcp (film); } + /** Check a reels-related error; make_dcp() would raise a ProgrammingError */ BOOST_AUTO_TEST_CASE (reels_test8) { - shared_ptr film = new_test_film ("reels_test8"); - film->set_name ("reels_test8"); - film->set_container (Ratio::from_id ("185")); - film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); - shared_ptr A (new FFmpegContent("test/data/test2.mp4")); - film->examine_and_add_content (A); - BOOST_REQUIRE (!wait_for_jobs ()); + auto A = make_shared("test/data/test2.mp4"); + auto film = new_test_film2 ("reels_test8", {A}); A->set_trim_end (ContentTime::from_seconds (1)); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs ()); + make_and_verify_dcp (film); } + /** Check another reels-related error; make_dcp() would raise a ProgrammingError */ BOOST_AUTO_TEST_CASE (reels_test9) { - shared_ptr film = new_test_film2("reels_test9a"); - shared_ptr A(new FFmpegContent("test/data/flat_red.png")); - film->examine_and_add_content(A); - BOOST_REQUIRE(!wait_for_jobs()); + auto A = make_shared("test/data/flat_red.png"); + auto film = new_test_film2("reels_test9a", {A}); A->video->set_length(5 * 24); film->set_video_frame_rate(24); - film->make_dcp(); - BOOST_REQUIRE(!wait_for_jobs()); + make_and_verify_dcp (film); - shared_ptr film2 = new_test_film2("reels_test9b"); - shared_ptr B(new DCPContent(film->dir(film->dcp_name()))); - film2->examine_and_add_content(B); - film2->examine_and_add_content(content_factory("test/data/dcp_sub4.xml").front()); + auto B = make_shared(film->dir(film->dcp_name())); + auto film2 = new_test_film2("reels_test9b", {B, content_factory("test/data/dcp_sub4.xml").front()}); B->set_reference_video(true); B->set_reference_audio(true); - BOOST_REQUIRE(!wait_for_jobs()); - film2->set_reel_type(REELTYPE_BY_VIDEO_CONTENT); + film2->set_reel_type(ReelType::BY_VIDEO_CONTENT); film2->write_metadata(); - film2->make_dcp(); - BOOST_REQUIRE(!wait_for_jobs()); + make_and_verify_dcp ( + film2, + { + dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, + dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME + }); } + /** Another reels-related error; make_dcp() would raise a ProgrammingError * in AudioBuffers::allocate due to an attempt to allocate a negatively-sized buffer. * This was triggered by a VF where there are referenced audio reels followed by @@ -387,58 +373,51 @@ BOOST_AUTO_TEST_CASE (reels_test9) BOOST_AUTO_TEST_CASE (reels_test10) { /* Make the OV */ - shared_ptr ov = new_test_film2("reels_test10_ov"); - shared_ptr A(new FFmpegContent("test/data/flat_red.png")); - ov->examine_and_add_content (A); - BOOST_REQUIRE (!wait_for_jobs()); + auto A = make_shared("test/data/flat_red.png"); + auto B = make_shared("test/data/flat_red.png"); + auto ov = new_test_film2("reels_test10_ov", {A, B}); A->video->set_length (5 * 24); - - shared_ptr B(new FFmpegContent("test/data/flat_red.png")); - ov->examine_and_add_content (B); - BOOST_REQUIRE (!wait_for_jobs()); B->video->set_length (5 * 24); - ov->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); - ov->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); + ov->set_reel_type (ReelType::BY_VIDEO_CONTENT); + make_and_verify_dcp (ov); ov->write_metadata (); /* Now try to make the VF; this used to fail */ - shared_ptr vf = new_test_film2("reels_test10_vf"); - shared_ptr ov_dcp(new DCPContent(ov->dir(ov->dcp_name()))); - vf->examine_and_add_content (ov_dcp); - BOOST_REQUIRE (!wait_for_jobs()); - vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + auto ov_dcp = make_shared(ov->dir(ov->dcp_name())); + auto vf = new_test_film2("reels_test10_vf", {ov_dcp, content_factory("test/data/15s.srt").front()}); + vf->set_reel_type (ReelType::BY_VIDEO_CONTENT); ov_dcp->set_reference_video (true); ov_dcp->set_reference_audio (true); - vf->examine_and_add_content (content_factory("test/data/15s.srt").front()); - BOOST_REQUIRE (!wait_for_jobs()); - vf->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); - vf->write_metadata (); + make_and_verify_dcp ( + vf, + { + dcp::VerificationNote::Code::EXTERNAL_ASSET, + dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, + dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME, + dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION, + }); } -/** Another reels error; REELTYPE_BY_VIDEO_CONTENT when the first content is not + +/** Another reels error; ReelType::BY_VIDEO_CONTENT when the first content is not * at time 0. */ BOOST_AUTO_TEST_CASE (reels_test11) { - shared_ptr film = new_test_film2 ("reels_test11"); + auto A = make_shared("test/data/flat_red.png"); + auto film = new_test_film2 ("reels_test11", {A}); film->set_video_frame_rate (24); - shared_ptr A(new FFmpegContent("test/data/flat_red.png")); - film->examine_and_add_content (A); - BOOST_REQUIRE (!wait_for_jobs()); A->video->set_length (240); A->set_video_frame_rate (24); A->set_position (film, DCPTime::from_seconds(1)); - film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); + film->set_reel_type (ReelType::BY_VIDEO_CONTENT); + make_and_verify_dcp (film); BOOST_CHECK_EQUAL (A->position().get(), DCPTime::from_seconds(1).get()); BOOST_CHECK_EQUAL (A->end(film).get(), DCPTime::from_seconds(1 + 10).get()); - list r = film->reels (); + auto r = film->reels (); BOOST_CHECK_EQUAL (r.size(), 2U); BOOST_CHECK_EQUAL (r.front().from.get(), 0); BOOST_CHECK_EQUAL (r.front().to.get(), DCPTime::from_seconds(1).get()); @@ -446,33 +425,30 @@ BOOST_AUTO_TEST_CASE (reels_test11) BOOST_CHECK_EQUAL (r.back().to.get(), DCPTime::from_seconds(1 + 10).get()); } + /** For VFs to work right we have to make separate reels for empty bits between * video content. */ BOOST_AUTO_TEST_CASE (reels_test12) { - shared_ptr film = new_test_film2 ("reels_test12"); + auto A = make_shared("test/data/flat_red.png"); + auto B = make_shared("test/data/flat_red.png"); + auto film = new_test_film2 ("reels_test12", {A, B}); film->set_video_frame_rate (24); - film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + film->set_reel_type (ReelType::BY_VIDEO_CONTENT); film->set_sequence (false); - shared_ptr A(new FFmpegContent("test/data/flat_red.png")); - film->examine_and_add_content (A); - BOOST_REQUIRE (!wait_for_jobs()); A->video->set_length (240); A->set_video_frame_rate (24); A->set_position (film, DCPTime::from_seconds(1)); - shared_ptr B(new FFmpegContent("test/data/flat_red.png")); - film->examine_and_add_content (B); - BOOST_REQUIRE (!wait_for_jobs()); B->video->set_length (120); B->set_video_frame_rate (24); B->set_position (film, DCPTime::from_seconds(14)); - list r = film->reels (); + auto r = film->reels (); BOOST_REQUIRE_EQUAL (r.size(), 4U); - list::const_iterator i = r.begin (); + auto i = r.begin (); BOOST_CHECK_EQUAL (i->from.get(), 0); BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_seconds(1).get()); @@ -487,6 +463,7 @@ BOOST_AUTO_TEST_CASE (reels_test12) BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_seconds(19).get()); } + static void no_op () { @@ -494,9 +471,9 @@ no_op () } static void -dump_notes (list const & notes) +dump_notes (vector const & notes) { - BOOST_FOREACH (dcp::VerificationNote i, notes) { + for (auto i: notes) { std::cout << dcp::note_to_string(i) << "\n"; } } @@ -507,111 +484,166 @@ dump_notes (list const & notes) */ BOOST_AUTO_TEST_CASE (reels_should_not_be_short1) { - shared_ptr film = new_test_film2 ("reels_should_not_be_short1"); + auto A = make_shared("test/data/flat_red.png"); + auto B = make_shared("test/data/flat_red.png"); + auto film = new_test_film2 ("reels_should_not_be_short1", {A, B}); film->set_video_frame_rate (24); - shared_ptr A(new FFmpegContent("test/data/flat_red.png")); - film->examine_and_add_content (A); - BOOST_REQUIRE (!wait_for_jobs()); A->video->set_length (23); - shared_ptr B(new FFmpegContent("test/data/flat_red.png")); - film->examine_and_add_content (B); - BOOST_REQUIRE (!wait_for_jobs()); B->video->set_length (23); B->set_position (film, DCPTime::from_frames(23, 24)); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); + make_and_verify_dcp (film); - vector dirs; - dirs.push_back (film->dir(film->dcp_name(false))); - list const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); + vector dirs = { film->dir(film->dcp_name(false)) }; + auto notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); dump_notes (notes); BOOST_REQUIRE (notes.empty()); } + /** Leaving less than 1 second's gap between two pieces of content with - * REELTYPE_BY_VIDEO_CONTENT should not make a <1s reel. + * ReelType::BY_VIDEO_CONTENT should not make a <1s reel. */ BOOST_AUTO_TEST_CASE (reels_should_not_be_short2) { - shared_ptr film = new_test_film2 ("reels_should_not_be_short2"); + auto A = make_shared("test/data/flat_red.png"); + auto B = make_shared("test/data/flat_red.png"); + auto film = new_test_film2 ("reels_should_not_be_short2", {A, B}); film->set_video_frame_rate (24); - film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + film->set_reel_type (ReelType::BY_VIDEO_CONTENT); - shared_ptr A(new FFmpegContent("test/data/flat_red.png")); - film->examine_and_add_content (A); - BOOST_REQUIRE (!wait_for_jobs()); A->video->set_length (240); - shared_ptr B(new FFmpegContent("test/data/flat_red.png")); - film->examine_and_add_content (B); - BOOST_REQUIRE (!wait_for_jobs()); B->video->set_length (240); B->set_position (film, DCPTime::from_seconds(10.2)); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); + make_and_verify_dcp (film); - vector dirs; - dirs.push_back (film->dir(film->dcp_name(false))); - list const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); + vector dirs = { film->dir(film->dcp_name(false)) }; + auto const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); dump_notes (notes); BOOST_REQUIRE (notes.empty()); } -/** Setting REELTYPE_BY_LENGTH and using a small length value should not make + +/** Setting ReelType::BY_LENGTH and using a small length value should not make * <1s reels. */ BOOST_AUTO_TEST_CASE (reels_should_not_be_short3) { - shared_ptr film = new_test_film2 ("reels_should_not_be_short3"); + auto A = make_shared("test/data/flat_red.png"); + auto film = new_test_film2 ("reels_should_not_be_short3", {A}); film->set_video_frame_rate (24); - film->set_reel_type (REELTYPE_BY_LENGTH); + film->set_reel_type (ReelType::BY_LENGTH); film->set_reel_length (1024 * 1024 * 10); - shared_ptr A(new FFmpegContent("test/data/flat_red.png")); - film->examine_and_add_content (A); - BOOST_REQUIRE (!wait_for_jobs()); A->video->set_length (240); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); + make_and_verify_dcp (film); - vector dirs; - list const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); + auto const notes = dcp::verify({}, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); dump_notes (notes); BOOST_REQUIRE (notes.empty()); } -/** Having one piece of content less than 1s long in REELTYPE_BY_VIDEO_CONTENT + +/** Having one piece of content less than 1s long in ReelType::BY_VIDEO_CONTENT * should not make a reel less than 1s long. */ BOOST_AUTO_TEST_CASE (reels_should_not_be_short4) { - shared_ptr film = new_test_film2 ("reels_should_not_be_short4"); + auto A = make_shared("test/data/flat_red.png"); + auto B = make_shared("test/data/flat_red.png"); + auto film = new_test_film2 ("reels_should_not_be_short4", {A, B}); film->set_video_frame_rate (24); - film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + film->set_reel_type (ReelType::BY_VIDEO_CONTENT); - shared_ptr A(new FFmpegContent("test/data/flat_red.png")); - film->examine_and_add_content (A); - BOOST_REQUIRE (!wait_for_jobs()); A->video->set_length (240); - shared_ptr B(new FFmpegContent("test/data/flat_red.png")); - film->examine_and_add_content (B); - BOOST_REQUIRE (!wait_for_jobs()); B->video->set_length (23); B->set_position (film, DCPTime::from_frames(240, 24)); - film->make_dcp (); + BOOST_CHECK_EQUAL (film->reels().size(), 1U); + BOOST_CHECK (film->reels().front() == dcpomatic::DCPTimePeriod(dcpomatic::DCPTime(), dcpomatic::DCPTime::from_frames(263, 24))); + + film->write_metadata (); + make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE); BOOST_REQUIRE (!wait_for_jobs()); - vector dirs; - dirs.push_back (film->dir(film->dcp_name(false))); - list const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); + vector dirs = { film->dir(film->dcp_name(false)) }; + auto const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); dump_notes (notes); BOOST_REQUIRE (notes.empty()); } + +/** Create a long DCP A then insert it repeatedly into a new project, trimming it differently each time. + * Make a DCP B from that project which refers to A and splits into reels. This was found to go wrong + * when looking at #2268. + */ +BOOST_AUTO_TEST_CASE (repeated_dcp_into_reels) +{ + /* Make a 20s DCP */ + auto A = make_shared("test/data/flat_red.png"); + auto film1 = new_test_film2("repeated_dcp_into_reels1", { A }); + auto constexpr frame_rate = 24; + auto constexpr length_in_seconds = 20; + auto constexpr total_frames = frame_rate * length_in_seconds; + film1->set_video_frame_rate(frame_rate); + A->video->set_length(total_frames); + make_and_verify_dcp(film1); + + /* Make a new project that includes this long DCP 4 times, each + * trimmed to a quarter of the original, i.e. + * /----------------------|----------------------|----------------------|----------------------\ + * | 1st quarter of film1 | 2nd quarter of film1 | 3rd quarter of film1 | 4th quarter of film1 | + * \----------------------|----------------------|----------------------|_---------------------/ + */ + + shared_ptr original_dcp[4] = { + make_shared(film1->dir(film1->dcp_name(false))), + make_shared(film1->dir(film1->dcp_name(false))), + make_shared(film1->dir(film1->dcp_name(false))), + make_shared(film1->dir(film1->dcp_name(false))) + }; + + auto film2 = new_test_film2("repeated_dcp_into_reels2", { original_dcp[0], original_dcp[1], original_dcp[2], original_dcp[3] }); + film2->set_reel_type(ReelType::BY_VIDEO_CONTENT); + film2->set_video_frame_rate(frame_rate); + film2->set_sequence(false); + + for (int i = 0; i < 4; ++i) { + original_dcp[i]->set_position(film2, DCPTime::from_frames(total_frames * i / 4, frame_rate)); + original_dcp[i]->set_trim_start(ContentTime::from_frames(total_frames * i / 4, frame_rate)); + original_dcp[i]->set_trim_end (ContentTime::from_frames(total_frames * (4 - i - 1) / 4, frame_rate)); + original_dcp[i]->set_reference_video(true); + original_dcp[i]->set_reference_audio(true); + } + + make_and_verify_dcp(film2, { dcp::VerificationNote::Code::EXTERNAL_ASSET }); + + dcp::DCP check1(film1->dir(film1->dcp_name())); + check1.read(); + BOOST_REQUIRE(!check1.cpls().empty()); + BOOST_REQUIRE(!check1.cpls()[0]->reels().empty()); + auto picture = check1.cpls()[0]->reels()[0]->main_picture()->asset(); + BOOST_REQUIRE(picture); + auto sound = check1.cpls()[0]->reels()[0]->main_sound()->asset(); + BOOST_REQUIRE(sound); + + dcp::DCP check2(film2->dir(film2->dcp_name())); + check2.read(); + BOOST_REQUIRE(!check2.cpls().empty()); + auto cpl = check2.cpls()[0]; + BOOST_REQUIRE_EQUAL(cpl->reels().size(), 4U); + for (int i = 0; i < 4; ++i) { + BOOST_REQUIRE_EQUAL(cpl->reels()[i]->main_picture()->entry_point().get_value_or(0), total_frames * i / 4); + BOOST_REQUIRE_EQUAL(cpl->reels()[i]->main_picture()->duration().get_value_or(0), total_frames / 4); + BOOST_REQUIRE_EQUAL(cpl->reels()[i]->main_picture()->id(), picture->id()); + BOOST_REQUIRE_EQUAL(cpl->reels()[i]->main_sound()->entry_point().get_value_or(0), total_frames * i / 4); + BOOST_REQUIRE_EQUAL(cpl->reels()[i]->main_sound()->duration().get_value_or(0), total_frames / 4); + BOOST_REQUIRE_EQUAL(cpl->reels()[i]->main_sound()->id(), sound->id()); + } +}