X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Freels_test.cc;h=573289718117ac12cb096b77274a8fd624e12c6d;hb=5d937606cf96d163be98920fa5619114a28eec9d;hp=99f9d70c82734da75798638cb0fb7dfaf03d64a4;hpb=83d63558045e9c7e2a9d33074af518043c0907e5;p=dcpomatic.git diff --git a/test/reels_test.cc b/test/reels_test.cc index 99f9d70c8..573289718 100644 --- a/test/reels_test.cc +++ b/test/reels_test.cc @@ -59,13 +59,13 @@ BOOST_AUTO_TEST_CASE (reels_test1) film->set_reel_type (REELTYPE_SINGLE); list r = film->reels (); - BOOST_CHECK_EQUAL (r.size(), 1); + 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); r = film->reels (); - BOOST_CHECK_EQUAL (r.size(), 2); + BOOST_CHECK_EQUAL (r.size(), 2U); BOOST_CHECK_EQUAL (r.front().from.get(), 0); BOOST_CHECK_EQUAL (r.front().to.get(), 288000); BOOST_CHECK_EQUAL (r.back().from.get(), 288000); @@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE (reels_test1) /* 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(), 3); + BOOST_CHECK_EQUAL (r.size(), 3U); list::const_iterator i = r.begin (); BOOST_CHECK_EQUAL (i->from.get(), 0); BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_frames(60, 24).get()); @@ -121,6 +121,7 @@ BOOST_AUTO_TEST_CASE (reels_test2) } film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + BOOST_CHECK_EQUAL (film->reels().size(), 3U); BOOST_REQUIRE (!wait_for_jobs()); film->make_dcp (); @@ -139,7 +140,7 @@ BOOST_AUTO_TEST_CASE (reels_test2) BOOST_REQUIRE (!wait_for_jobs ()); list r = film2->reels (); - BOOST_CHECK_EQUAL (r.size(), 3); + BOOST_CHECK_EQUAL (r.size(), 3U); list::const_iterator i = r.begin (); BOOST_CHECK_EQUAL (i->from.get(), 0); BOOST_CHECK_EQUAL (i->to.get(), 96000); @@ -175,7 +176,7 @@ BOOST_AUTO_TEST_CASE (reels_test3) BOOST_REQUIRE (!wait_for_jobs()); list reels = film->reels(); - BOOST_REQUIRE_EQUAL (reels.size(), 4); + BOOST_REQUIRE_EQUAL (reels.size(), 4U); list::const_iterator i = reels.begin (); BOOST_CHECK_EQUAL (i->from.get(), 0); BOOST_CHECK_EQUAL (i->to.get(), 96000); @@ -216,7 +217,7 @@ BOOST_AUTO_TEST_CASE (reels_test4) BOOST_REQUIRE (!wait_for_jobs()); list reels = film->reels(); - BOOST_REQUIRE_EQUAL (reels.size(), 4); + BOOST_REQUIRE_EQUAL (reels.size(), 4U); list::const_iterator i = reels.begin (); BOOST_CHECK_EQUAL (i->from.get(), 0); BOOST_CHECK_EQUAL (i->to.get(), 96000); @@ -249,7 +250,7 @@ BOOST_AUTO_TEST_CASE (reels_test5) { list p = dcp->reels (film); - BOOST_REQUIRE_EQUAL (p.size(), 4); + BOOST_REQUIRE_EQUAL (p.size(), 4U); list::const_iterator i = p.begin(); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 96000))); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 96000), DCPTime(4000 + 192000))); @@ -260,7 +261,7 @@ BOOST_AUTO_TEST_CASE (reels_test5) { dcp->set_trim_start (ContentTime::from_seconds (0.5)); list p = dcp->reels (film); - BOOST_REQUIRE_EQUAL (p.size(), 4); + BOOST_REQUIRE_EQUAL (p.size(), 4U); list::const_iterator i = p.begin(); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000))); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000))); @@ -271,7 +272,7 @@ BOOST_AUTO_TEST_CASE (reels_test5) { dcp->set_trim_end (ContentTime::from_seconds (0.5)); list p = dcp->reels (film); - BOOST_REQUIRE_EQUAL (p.size(), 4); + BOOST_REQUIRE_EQUAL (p.size(), 4U); list::const_iterator i = p.begin(); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000))); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000))); @@ -282,7 +283,7 @@ BOOST_AUTO_TEST_CASE (reels_test5) { dcp->set_trim_start (ContentTime::from_seconds (1.5)); list p = dcp->reels (film); - BOOST_REQUIRE_EQUAL (p.size(), 3); + BOOST_REQUIRE_EQUAL (p.size(), 3U); list::const_iterator i = p.begin(); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000))); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000))); @@ -325,12 +326,12 @@ BOOST_AUTO_TEST_CASE (reels_test7) film->examine_and_add_content (B); BOOST_REQUIRE (!wait_for_jobs ()); film->set_video_frame_rate (24); - A->video->set_length (3 * 24); + A->video->set_length (2 * 24); film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); - BOOST_REQUIRE_EQUAL (film->reels().size(), 2); - BOOST_CHECK (film->reels().front() == DCPTimePeriod(DCPTime(0), DCPTime::from_frames(3 * 24, 24))); - BOOST_CHECK (film->reels().back() == DCPTimePeriod(DCPTime::from_frames(3 * 24, 24), DCPTime::from_frames(3 * 24 + 1, 24))); + 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 ()); @@ -438,7 +439,7 @@ BOOST_AUTO_TEST_CASE (reels_test11) BOOST_CHECK_EQUAL (A->end(film).get(), DCPTime::from_seconds(1 + 10).get()); list r = film->reels (); - BOOST_CHECK_EQUAL (r.size(), 2); + 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()); BOOST_CHECK_EQUAL (r.back().from.get(), DCPTime::from_seconds(1).get()); @@ -470,7 +471,7 @@ BOOST_AUTO_TEST_CASE (reels_test12) B->set_position (film, DCPTime::from_seconds(14)); list r = film->reels (); - BOOST_REQUIRE_EQUAL (r.size(), 4); + BOOST_REQUIRE_EQUAL (r.size(), 4U); list::const_iterator i = r.begin (); BOOST_CHECK_EQUAL (i->from.get(), 0); @@ -492,6 +493,14 @@ no_op () } +static void +dump_notes (list const & notes) +{ + BOOST_FOREACH (dcp::VerificationNote i, notes) { + std::cout << dcp::note_to_string(i) << "\n"; + } +} + /** Using less than 1 second's worth of content should not result in a reel * of less than 1 second's duration. @@ -506,12 +515,20 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short1) 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()); vector dirs; dirs.push_back (film->dir(film->dcp_name(false))); - BOOST_REQUIRE (dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd).empty()); + list const 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 @@ -539,5 +556,62 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short2) vector dirs; dirs.push_back (film->dir(film->dcp_name(false))); - BOOST_REQUIRE (dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd).empty()); + list 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 + * <1s reels. + */ +BOOST_AUTO_TEST_CASE (reels_should_not_be_short3) +{ + shared_ptr film = new_test_film2 ("reels_should_not_be_short3"); + film->set_video_frame_rate (24); + 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()); + + vector dirs; + list const notes = dcp::verify(dirs, 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 + * 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"); + film->set_video_frame_rate (24); + 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_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()); + dump_notes (notes); + BOOST_REQUIRE (notes.empty()); +} +