X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Freels_test.cc;h=bd7b1c06a05c8c9f6372fa9b2d604aa804797444;hp=6178c88ac71f2d2eccdb9b4082fe7ff1a17daeb2;hb=200ec2f7a660e81893252148acacd90949238df5;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05 diff --git a/test/reels_test.cc b/test/reels_test.cc index 6178c88ac..bd7b1c06a 100644 --- a/test/reels_test.cc +++ b/test/reels_test.cc @@ -18,6 +18,11 @@ */ +/** @file test/reels_test.cc + * @brief Check manipulation of reels in various ways. + * @ingroup specific + */ + #include "lib/film.h" #include "lib/ratio.h" #include "lib/ffmpeg_content.h" @@ -26,11 +31,13 @@ #include "lib/dcp_content.h" #include "lib/video_content.h" #include "lib/text_subtitle_content.h" +#include "lib/content_factory.h" #include "test.h" #include #include using std::list; +using std::cout; using boost::shared_ptr; /** Test Film::reels() */ @@ -43,21 +50,21 @@ BOOST_AUTO_TEST_CASE (reels_test1) shared_ptr B (new FFmpegContent (film, "test/data/test.mp4")); film->examine_and_add_content (B); wait_for_jobs (); - BOOST_CHECK_EQUAL (A->full_length(), DCPTime (288000)); + BOOST_CHECK_EQUAL (A->full_length().get(), 288000); film->set_reel_type (REELTYPE_SINGLE); list r = film->reels (); BOOST_CHECK_EQUAL (r.size(), 1); - BOOST_CHECK_EQUAL (r.front().from, DCPTime (0)); - BOOST_CHECK_EQUAL (r.front().to, DCPTime (288000 * 2)); + 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.front().from, DCPTime (0)); - BOOST_CHECK_EQUAL (r.front().to, DCPTime (288000)); - BOOST_CHECK_EQUAL (r.back().from, DCPTime (288000)); - BOOST_CHECK_EQUAL (r.back().to, DCPTime (288000 * 2)); + BOOST_CHECK_EQUAL (r.front().from.get(), 0); + BOOST_CHECK_EQUAL (r.front().to.get(), 288000); + BOOST_CHECK_EQUAL (r.back().from.get(), 288000); + BOOST_CHECK_EQUAL (r.back().to.get(), 288000 * 2); film->set_j2k_bandwidth (100000000); film->set_reel_type (REELTYPE_BY_LENGTH); @@ -66,14 +73,14 @@ BOOST_AUTO_TEST_CASE (reels_test1) r = film->reels (); BOOST_CHECK_EQUAL (r.size(), 3); list::const_iterator i = r.begin (); - BOOST_CHECK_EQUAL (i->from, DCPTime (0)); - BOOST_CHECK_EQUAL (i->to, DCPTime::from_frames (60, 24)); + BOOST_CHECK_EQUAL (i->from.get(), 0); + BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_frames(60, 24).get()); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime::from_frames (60, 24)); - BOOST_CHECK_EQUAL (i->to, DCPTime::from_frames (120, 24)); + BOOST_CHECK_EQUAL (i->from.get(), DCPTime::from_frames(60, 24).get()); + BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_frames(120, 24).get()); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime::from_frames (120, 24)); - BOOST_CHECK_EQUAL (i->to, DCPTime::from_frames (144, 24)); + BOOST_CHECK_EQUAL (i->from.get(), DCPTime::from_frames(120, 24).get()); + 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 @@ -84,7 +91,7 @@ BOOST_AUTO_TEST_CASE (reels_test2) shared_ptr film = new_test_film ("reels_test2"); film->set_name ("reels_test2"); film->set_container (Ratio::from_id ("185")); - film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test")); + film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); { shared_ptr c (new ImageContent (film, "test/data/flat_red.png")); @@ -118,24 +125,24 @@ BOOST_AUTO_TEST_CASE (reels_test2) 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_pretty_name ("Test")); + 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 ()))); film2->examine_and_add_content (c); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs ()); list r = film2->reels (); BOOST_CHECK_EQUAL (r.size(), 3); list::const_iterator i = r.begin (); - BOOST_CHECK_EQUAL (i->from, DCPTime (0)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000)); + BOOST_CHECK_EQUAL (i->from.get(), 0); + BOOST_CHECK_EQUAL (i->to.get(), 96000); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime (96000)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 2)); + BOOST_CHECK_EQUAL (i->from.get(), 96000); + BOOST_CHECK_EQUAL (i->to.get(), 96000 * 2); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 2)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 3)); + BOOST_CHECK_EQUAL (i->from.get(), 96000 * 2); + BOOST_CHECK_EQUAL (i->to.get(), 96000 * 3); c->set_reference_video (true); c->set_reference_audio (true); @@ -152,7 +159,7 @@ 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_pretty_name ("Test")); + 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")); @@ -164,17 +171,17 @@ BOOST_AUTO_TEST_CASE (reels_test3) list reels = film->reels(); BOOST_REQUIRE_EQUAL (reels.size(), 4); list::const_iterator i = reels.begin (); - BOOST_CHECK_EQUAL (i->from, DCPTime (0)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000)); + BOOST_CHECK_EQUAL (i->from.get(), 0); + BOOST_CHECK_EQUAL (i->to.get(), 96000); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime (96000)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 2)); + BOOST_CHECK_EQUAL (i->from.get(), 96000); + BOOST_CHECK_EQUAL (i->to.get(), 96000 * 2); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 2)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 3)); + BOOST_CHECK_EQUAL (i->from.get(), 96000 * 2); + BOOST_CHECK_EQUAL (i->to.get(), 96000 * 3); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 3)); - BOOST_CHECK_EQUAL (i->to, sub->full_length().round_up (film->video_frame_rate())); + BOOST_CHECK_EQUAL (i->from.get(), 96000 * 3); + BOOST_CHECK_EQUAL (i->to.get(), sub->full_length().ceil(film->video_frame_rate()).get()); } /** Check creation of a multi-reel DCP with a single .srt subtitle file; @@ -185,7 +192,7 @@ 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_pretty_name ("Test")); + film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); /* 4 piece of 1s-long content */ @@ -204,20 +211,161 @@ BOOST_AUTO_TEST_CASE (reels_test4) list reels = film->reels(); BOOST_REQUIRE_EQUAL (reels.size(), 4); list::const_iterator i = reels.begin (); - BOOST_CHECK_EQUAL (i->from, DCPTime (0)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000)); + BOOST_CHECK_EQUAL (i->from.get(), 0); + BOOST_CHECK_EQUAL (i->to.get(), 96000); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime (96000)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 2)); + BOOST_CHECK_EQUAL (i->from.get(), 96000); + BOOST_CHECK_EQUAL (i->to.get(), 96000 * 2); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 2)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 3)); + BOOST_CHECK_EQUAL (i->from.get(), 96000 * 2); + BOOST_CHECK_EQUAL (i->to.get(), 96000 * 3); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 3)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 4)); + BOOST_CHECK_EQUAL (i->from.get(), 96000 * 3); + BOOST_CHECK_EQUAL (i->to.get(), 96000 * 4); film->make_dcp (); wait_for_jobs (); check_dcp ("test/data/reels_test4", film->dir (film->dcp_name())); } + +BOOST_AUTO_TEST_CASE (reels_test5) +{ + shared_ptr film = new_test_film ("reels_test4"); + shared_ptr dcp (new DCPContent (film, "test/data/reels_test4")); + film->examine_and_add_content (dcp); + wait_for_jobs (); + + /* Set to 123 but it will be rounded up to the next frame (4000) */ + dcp->set_position(DCPTime(123)); + + { + list p = dcp->reels (); + BOOST_REQUIRE_EQUAL (p.size(), 4); + 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))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 192000), DCPTime(4000 + 288000))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 288000), DCPTime(4000 + 384000))); + } + + { + dcp->set_trim_start (ContentTime::from_seconds (0.5)); + list p = dcp->reels (); + BOOST_REQUIRE_EQUAL (p.size(), 4); + 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))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 144000), DCPTime(4000 + 240000))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 240000), DCPTime(4000 + 336000))); + } + + { + dcp->set_trim_end (ContentTime::from_seconds (0.5)); + list p = dcp->reels (); + BOOST_REQUIRE_EQUAL (p.size(), 4); + 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))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 144000), DCPTime(4000 + 240000))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 240000), DCPTime(4000 + 288000))); + } + + { + dcp->set_trim_start (ContentTime::from_seconds (1.5)); + list p = dcp->reels (); + BOOST_REQUIRE_EQUAL (p.size(), 3); + 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))); + 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 (film, "test/data/test2.mp4")); + film->examine_and_add_content (A); + BOOST_REQUIRE (!wait_for_jobs ()); + + film->set_j2k_bandwidth (100000000); + 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 ()); +} + +/** Check the case where the last bit of audio hangs over the end of the video + * 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(film, "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(); + film->examine_and_add_content (B); + BOOST_REQUIRE (!wait_for_jobs ()); + film->set_video_frame_rate (24); + A->video->set_length (3 * 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))); + + film->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs ()); +} + +/** 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 (film, "test/data/test2.mp4")); + film->examine_and_add_content (A); + BOOST_REQUIRE (!wait_for_jobs ()); + + A->set_trim_end (ContentTime::from_seconds (1)); + cout << to_string(A->length_after_trim()) << "\n"; + film->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs ()); +} + +/** 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(film, "test/data/flat_red.png")); + film->examine_and_add_content(A); + BOOST_REQUIRE(!wait_for_jobs()); + A->video->set_length(5 * 24); + film->set_video_frame_rate(24); + film->make_dcp(); + BOOST_REQUIRE(!wait_for_jobs()); + + shared_ptr film2 = new_test_film2("reels_test9b"); + shared_ptr B(new DCPContent(film2, 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()); + B->set_reference_video(true); + B->set_reference_audio(true); + BOOST_REQUIRE(!wait_for_jobs()); + film2->set_reel_type(REELTYPE_BY_VIDEO_CONTENT); + film2->write_metadata(); + film2->make_dcp(); + BOOST_REQUIRE(!wait_for_jobs()); +}