X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Freels_test.cc;h=c6fb21977ed108bffc7ec4ad7a6d8aacdedff1d2;hp=70552a70360eb67bd54d17c842997b1169243bdb;hb=c41fcae660993fcf731266b1774fe94d169bf640;hpb=c53c3e9f3d08478a391bfa1989772378609af693 diff --git a/test/reels_test.cc b/test/reels_test.cc index 70552a703..c6fb21977 100644 --- a/test/reels_test.cc +++ b/test/reels_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2016 Carl Hetherington + Copyright (C) 2015-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -30,27 +30,32 @@ #include "lib/dcp_content_type.h" #include "lib/dcp_content.h" #include "lib/video_content.h" -#include "lib/plain_text_content.h" +#include "lib/string_text_file_content.h" #include "lib/content_factory.h" #include "test.h" #include #include +#include using std::list; using std::cout; +using std::vector; +using std::string; using boost::shared_ptr; +using boost::function; +using namespace dcpomatic; /** Test Film::reels() */ BOOST_AUTO_TEST_CASE (reels_test1) { shared_ptr film = new_test_film ("reels_test1"); film->set_container (Ratio::from_id ("185")); - shared_ptr A (new FFmpegContent (film, "test/data/test.mp4")); + shared_ptr A (new FFmpegContent("test/data/test.mp4")); film->examine_and_add_content (A); - shared_ptr B (new FFmpegContent (film, "test/data/test.mp4")); + shared_ptr B (new FFmpegContent("test/data/test.mp4")); film->examine_and_add_content (B); - wait_for_jobs (); - BOOST_CHECK_EQUAL (A->full_length().get(), 288000); + BOOST_REQUIRE (!wait_for_jobs()); + BOOST_CHECK_EQUAL (A->full_length(film).get(), 288000); film->set_reel_type (REELTYPE_SINGLE); list r = film->reels (); @@ -95,31 +100,31 @@ BOOST_AUTO_TEST_CASE (reels_test2) film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); { - shared_ptr c (new ImageContent (film, "test/data/flat_red.png")); + shared_ptr c (new ImageContent("test/data/flat_red.png")); film->examine_and_add_content (c); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); c->video->set_length (24); } { - shared_ptr c (new ImageContent (film, "test/data/flat_green.png")); + shared_ptr c (new ImageContent("test/data/flat_green.png")); film->examine_and_add_content (c); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); c->video->set_length (24); } { - shared_ptr c (new ImageContent (film, "test/data/flat_blue.png")); + shared_ptr c (new ImageContent("test/data/flat_blue.png")); film->examine_and_add_content (c); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); c->video->set_length (24); } film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); check_dcp ("test/data/reels_test2", film->dir (film->dcp_name())); @@ -129,7 +134,7 @@ BOOST_AUTO_TEST_CASE (reels_test2) film2->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); film2->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); - shared_ptr c (new DCPContent (film2, film->dir (film->dcp_name ()))); + shared_ptr c (new DCPContent(film->dir(film->dcp_name()))); film2->examine_and_add_content (c); BOOST_REQUIRE (!wait_for_jobs ()); @@ -149,7 +154,7 @@ BOOST_AUTO_TEST_CASE (reels_test2) c->set_reference_audio (true); film2->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); } /** Check that REELTYPE_BY_VIDEO_CONTENT adds an extra reel, if necessary, at the end @@ -163,11 +168,11 @@ BOOST_AUTO_TEST_CASE (reels_test3) film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); - shared_ptr dcp (new DCPContent (film, "test/data/reels_test2")); + shared_ptr dcp (new DCPContent("test/data/reels_test2")); film->examine_and_add_content (dcp); - shared_ptr sub (new PlainTextContent (film, "test/data/subrip.srt")); + shared_ptr sub (new StringTextFileContent("test/data/subrip.srt")); film->examine_and_add_content (sub); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); list reels = film->reels(); BOOST_REQUIRE_EQUAL (reels.size(), 4); @@ -182,7 +187,7 @@ BOOST_AUTO_TEST_CASE (reels_test3) BOOST_CHECK_EQUAL (i->to.get(), 96000 * 3); ++i; BOOST_CHECK_EQUAL (i->from.get(), 96000 * 3); - BOOST_CHECK_EQUAL (i->to.get(), sub->full_length().ceil(film->video_frame_rate()).get()); + 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; @@ -200,15 +205,15 @@ BOOST_AUTO_TEST_CASE (reels_test4) /* 4 piece of 1s-long content */ shared_ptr content[4]; for (int i = 0; i < 4; ++i) { - content[i].reset (new ImageContent (film, "test/data/flat_green.png")); + content[i].reset (new ImageContent("test/data/flat_green.png")); film->examine_and_add_content (content[i]); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); content[i]->video->set_length (24); } - shared_ptr subs (new PlainTextContent (film, "test/data/subrip3.srt")); + shared_ptr subs (new StringTextFileContent("test/data/subrip3.srt")); film->examine_and_add_content (subs); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); list reels = film->reels(); BOOST_REQUIRE_EQUAL (reels.size(), 4); @@ -226,7 +231,7 @@ BOOST_AUTO_TEST_CASE (reels_test4) BOOST_CHECK_EQUAL (i->to.get(), 96000 * 4); film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); check_dcp ("test/data/reels_test4", film->dir (film->dcp_name())); } @@ -235,15 +240,15 @@ BOOST_AUTO_TEST_CASE (reels_test5) { shared_ptr film = new_test_film ("reels_test5"); film->set_sequence (false); - shared_ptr dcp (new DCPContent (film, "test/data/reels_test4")); + 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(DCPTime(2123)); + dcp->set_position(film, DCPTime(2123)); { - list p = dcp->reels (); + list p = dcp->reels (film); BOOST_REQUIRE_EQUAL (p.size(), 4); list::const_iterator i = p.begin(); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 96000))); @@ -254,7 +259,7 @@ BOOST_AUTO_TEST_CASE (reels_test5) { dcp->set_trim_start (ContentTime::from_seconds (0.5)); - list p = dcp->reels (); + list p = dcp->reels (film); BOOST_REQUIRE_EQUAL (p.size(), 4); list::const_iterator i = p.begin(); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000))); @@ -265,7 +270,7 @@ BOOST_AUTO_TEST_CASE (reels_test5) { dcp->set_trim_end (ContentTime::from_seconds (0.5)); - list p = dcp->reels (); + list p = dcp->reels (film); BOOST_REQUIRE_EQUAL (p.size(), 4); list::const_iterator i = p.begin(); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000))); @@ -276,7 +281,7 @@ BOOST_AUTO_TEST_CASE (reels_test5) { dcp->set_trim_start (ContentTime::from_seconds (1.5)); - list p = dcp->reels (); + list p = dcp->reels (film); BOOST_REQUIRE_EQUAL (p.size(), 3); list::const_iterator i = p.begin(); BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000))); @@ -292,7 +297,7 @@ BOOST_AUTO_TEST_CASE (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 (film, "test/data/test2.mp4")); + shared_ptr A (new FFmpegContent("test/data/test2.mp4")); film->examine_and_add_content (A); BOOST_REQUIRE (!wait_for_jobs ()); @@ -313,10 +318,10 @@ BOOST_AUTO_TEST_CASE (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(film, "test/data/flat_red.png").front(); + 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(film, "test/data/awkward_length.wav").front(); + shared_ptr B = content_factory("test/data/awkward_length.wav").front(); film->examine_and_add_content (B); BOOST_REQUIRE (!wait_for_jobs ()); film->set_video_frame_rate (24); @@ -338,7 +343,7 @@ BOOST_AUTO_TEST_CASE (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 (film, "test/data/test2.mp4")); + shared_ptr A (new FFmpegContent("test/data/test2.mp4")); film->examine_and_add_content (A); BOOST_REQUIRE (!wait_for_jobs ()); @@ -351,7 +356,7 @@ BOOST_AUTO_TEST_CASE (reels_test8) BOOST_AUTO_TEST_CASE (reels_test9) { shared_ptr film = new_test_film2("reels_test9a"); - shared_ptr A(new FFmpegContent(film, "test/data/flat_red.png")); + 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(5 * 24); @@ -360,9 +365,9 @@ BOOST_AUTO_TEST_CASE (reels_test9) BOOST_REQUIRE(!wait_for_jobs()); shared_ptr film2 = new_test_film2("reels_test9b"); - shared_ptr B(new DCPContent(film2, film->dir(film->dcp_name()))); + shared_ptr B(new DCPContent(film->dir(film->dcp_name()))); film2->examine_and_add_content(B); - film2->examine_and_add_content(content_factory(film, "test/data/dcp_sub4.xml").front()); + film2->examine_and_add_content(content_factory("test/data/dcp_sub4.xml").front()); B->set_reference_video(true); B->set_reference_audio(true); BOOST_REQUIRE(!wait_for_jobs()); @@ -371,3 +376,220 @@ BOOST_AUTO_TEST_CASE (reels_test9) film2->make_dcp(); BOOST_REQUIRE(!wait_for_jobs()); } + +/** 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 + * VF audio. When the VF audio arrives the Writer did not correctly skip over the + * referenced reels. + */ +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()); + 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->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); + 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 (); +} + +/** 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"); + 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()); + 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 (); + BOOST_CHECK_EQUAL (r.size(), 2); + 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()); + 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"); + film->set_video_frame_rate (24); + 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 (); + BOOST_REQUIRE_EQUAL (r.size(), 4); + list::const_iterator i = r.begin (); + + BOOST_CHECK_EQUAL (i->from.get(), 0); + BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_seconds(1).get()); + ++i; + BOOST_CHECK_EQUAL (i->from.get(), DCPTime::from_seconds(1).get()); + BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_seconds(11).get()); + ++i; + BOOST_CHECK_EQUAL (i->from.get(), DCPTime::from_seconds(11).get()); + BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_seconds(14).get()); + ++i; + BOOST_CHECK_EQUAL (i->from.get(), DCPTime::from_seconds(14).get()); + BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_seconds(19).get()); +} + +static void +no_op () +{ + +} + + +/** Using less than 1 second's worth of content should not result in a reel + * of less than 1 second's duration. + */ +BOOST_AUTO_TEST_CASE (reels_should_not_be_short1) +{ + shared_ptr film = new_test_film2 ("reels_should_not_be_short1"); + 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); + + 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()); +} + +/** Leaving less than 1 second's gap between two pieces of content with + * 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"); + 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 (240); + B->set_position (film, DCPTime::from_seconds(10.2)); + + 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()); +} + +/** 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; + 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()); +} + +/** 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))); + BOOST_REQUIRE (dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd).empty()); +} +