X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fempty_test.cc;h=b186954b3790916098cc0b5a2d88bf6fc444ce67;hb=8f955150ff2b642109552dd234089f9a038bb3d6;hp=890185267d7a61636375396d6f7c4f7cdf25ee26;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git diff --git a/test/empty_test.cc b/test/empty_test.cc index 890185267..b186954b3 100644 --- a/test/empty_test.cc +++ b/test/empty_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2017 Carl Hetherington + Copyright (C) 2017-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,84 +18,97 @@ */ -#include "lib/film.h" + +/** @file test/empty_test.cc + * @brief Test the creation of Empty objects. + * @ingroup feature + */ + + #include "lib/dcp_content_type.h" -#include "lib/ratio.h" -#include "lib/video_content.h" -#include "lib/image_content.h" +#include "lib/decoder.h" #include "lib/empty.h" +#include "lib/film.h" +#include "lib/image_content.h" #include "lib/player.h" -#include "lib/decoder.h" +#include "lib/ratio.h" +#include "lib/video_content.h" #include "test.h" #include -using boost::shared_ptr; + +using std::list; +using std::make_shared; +using std::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif +using namespace dcpomatic; + bool -has_video (shared_ptr piece) +has_video (shared_ptr content) { - return piece->decoder && piece->decoder->video; + return static_cast(content->video); } + BOOST_AUTO_TEST_CASE (empty_test1) { - shared_ptr film = new_test_film ("empty_test1"); - film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); - film->set_name ("empty_test1"); - film->set_container (Ratio::from_id ("185")); + auto film = new_test_film2 ("empty_test1"); film->set_sequence (false); - shared_ptr contentA (new ImageContent("test/data/simple_testcard_640x480.png")); - shared_ptr contentB (new ImageContent("test/data/simple_testcard_640x480.png")); + auto contentA = make_shared("test/data/simple_testcard_640x480.png"); + auto contentB = make_shared("test/data/simple_testcard_640x480.png"); film->examine_and_add_content (contentA); film->examine_and_add_content (contentB); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); int const vfr = film->video_frame_rate (); - contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); + /* 0 1 2 3 4 5 6 7 + * A A A B + */ contentA->video->set_length (3); - contentA->set_position (film, DCPTime::from_frames (2, vfr)); - contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); + contentA->set_position (film, DCPTime::from_frames(2, vfr)); contentB->video->set_length (1); - contentB->set_position (film, DCPTime::from_frames (7, vfr)); - - shared_ptr player (new Player(film, film->playlist())); - Empty black (film, player->_pieces, bind(&has_video, _1)); - BOOST_REQUIRE_EQUAL (black._periods.size(), 2); - BOOST_CHECK (black._periods.front().from == DCPTime()); - BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(2, vfr)); - BOOST_CHECK (black._periods.back().from == DCPTime::from_frames(5, vfr)); - BOOST_CHECK (black._periods.back().to == DCPTime::from_frames(7, vfr)); + contentB->set_position (film, DCPTime::from_frames(7, vfr)); + + Empty black (film, film->playlist(), bind(&has_video, _1), film->playlist()->length(film)); + BOOST_REQUIRE_EQUAL (black._periods.size(), 2U); + auto i = black._periods.begin(); + BOOST_CHECK (i->from == DCPTime::from_frames(0, vfr)); + BOOST_CHECK (i->to == DCPTime::from_frames(2, vfr)); + ++i; + BOOST_CHECK (i->from == DCPTime::from_frames(5, vfr)); + BOOST_CHECK (i->to == DCPTime::from_frames(7, vfr)); } + /** Some tests where the first empty period is not at time 0 */ BOOST_AUTO_TEST_CASE (empty_test2) { - shared_ptr film = new_test_film ("empty_test1"); - film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); - film->set_name ("empty_test1"); - film->set_container (Ratio::from_id ("185")); + auto film = new_test_film2 ("empty_test2"); film->set_sequence (false); - shared_ptr contentA (new ImageContent("test/data/simple_testcard_640x480.png")); - shared_ptr contentB (new ImageContent("test/data/simple_testcard_640x480.png")); + auto contentA = make_shared("test/data/simple_testcard_640x480.png"); + auto contentB = make_shared("test/data/simple_testcard_640x480.png"); film->examine_and_add_content (contentA); film->examine_and_add_content (contentB); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); int const vfr = film->video_frame_rate (); - contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); + /* 0 1 2 3 4 5 6 7 + * A A A B + */ contentA->video->set_length (3); contentA->set_position (film, DCPTime(0)); - contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); contentB->video->set_length (1); contentB->set_position (film, DCPTime::from_frames(7, vfr)); - shared_ptr player (new Player(film, film->playlist())); - Empty black (film, player->_pieces, bind(&has_video, _1)); - BOOST_REQUIRE_EQUAL (black._periods.size(), 1); + Empty black (film, film->playlist(), bind(&has_video, _1), film->playlist()->length(film)); + BOOST_REQUIRE_EQUAL (black._periods.size(), 1U); BOOST_CHECK (black._periods.front().from == DCPTime::from_frames(3, vfr)); BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(7, vfr)); @@ -109,3 +122,62 @@ BOOST_AUTO_TEST_CASE (empty_test2) black.set_position (DCPTime::from_frames (7, vfr)); BOOST_CHECK (black.done ()); } + + +/** Test for when the film's playlist is not the same as the one passed into Empty */ +BOOST_AUTO_TEST_CASE (empty_test3) +{ + auto film = new_test_film2 ("empty_test3"); + film->set_sequence (false); + auto contentA = make_shared("test/data/simple_testcard_640x480.png"); + auto contentB = make_shared("test/data/simple_testcard_640x480.png"); + + film->examine_and_add_content (contentA); + film->examine_and_add_content (contentB); + BOOST_REQUIRE (!wait_for_jobs()); + + int const vfr = film->video_frame_rate (); + + /* 0 1 2 3 4 5 6 7 + * A A A B + */ + contentA->video->set_length (3); + contentA->set_position (film, DCPTime(0)); + contentB->video->set_length (1); + contentB->set_position (film, DCPTime::from_frames(7, vfr)); + + auto playlist = make_shared(); + playlist->add (film, contentB); + Empty black (film, playlist, bind(&has_video, _1), playlist->length(film)); + BOOST_REQUIRE_EQUAL (black._periods.size(), 1U); + BOOST_CHECK (black._periods.front().from == DCPTime::from_frames(0, vfr)); + BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(7, vfr)); + + /* position should initially be the start of the first empty period */ + BOOST_CHECK (black.position() == DCPTime::from_frames(0, vfr)); +} + + +BOOST_AUTO_TEST_CASE (empty_test_with_overlapping_content) +{ + auto film = new_test_film2 ("empty_test_with_overlapping_content"); + film->set_sequence (false); + auto contentA = make_shared("test/data/simple_testcard_640x480.png"); + auto contentB = make_shared("test/data/simple_testcard_640x480.png"); + + film->examine_and_add_content (contentA); + film->examine_and_add_content (contentB); + BOOST_REQUIRE (!wait_for_jobs()); + + int const vfr = film->video_frame_rate (); + + contentA->video->set_length (vfr * 3); + contentA->set_position (film, DCPTime()); + contentB->video->set_length (vfr * 1); + contentB->set_position (film, DCPTime::from_seconds(1)); + + Empty black(film, film->playlist(), bind(&has_video, _1), film->playlist()->length(film)); + + BOOST_REQUIRE (black._periods.empty()); +} +