X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fempty_test.cc;h=029e83966b85be624a189ef009e523838fc33269;hb=27522823a54e240b58fa4f104e84d40167f576c2;hp=71397273942bbbe8312ec90bc1b4a42ffd0a8ff8;hpb=7a3f4f1b6411f7d15bf00e863fb5e70a5d930dd8;p=dcpomatic.git diff --git a/test/empty_test.cc b/test/empty_test.cc index 713972739..029e83966 100644 --- a/test/empty_test.cc +++ b/test/empty_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2017 Carl Hetherington + Copyright (C) 2017-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -24,67 +24,79 @@ #include "lib/video_content.h" #include "lib/image_content.h" #include "lib/empty.h" +#include "lib/player.h" +#include "lib/decoder.h" #include "test.h" #include +using std::list; using boost::shared_ptr; +using namespace dcpomatic; + +bool +has_video (shared_ptr content) +{ + 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")); + shared_ptr film = new_test_film2 ("empty_test1"); film->set_sequence (false); - shared_ptr contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png")); - shared_ptr contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png")); + shared_ptr contentA (new ImageContent("test/data/simple_testcard_640x480.png")); + shared_ptr contentB (new ImageContent("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 (); + /* 0 1 2 3 4 5 6 7 + * A A A B + */ contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); contentA->video->set_length (3); - contentA->set_position (DCPTime::from_frames (2, vfr)); + contentA->set_position (film, DCPTime::from_frames (2, vfr)); contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); contentB->video->set_length (1); - contentB->set_position (DCPTime::from_frames (7, vfr)); + contentB->set_position (film, DCPTime::from_frames (7, vfr)); - Empty black (film->content(), film->length(), bind(&Content::video, _1)); + Empty black (film, film->playlist(), bind(&has_video, _1), film->playlist()->length(film)); 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)); + list::const_iterator 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")); + shared_ptr film = new_test_film2 ("empty_test2"); film->set_sequence (false); - shared_ptr contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png")); - shared_ptr contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png")); + shared_ptr contentA (new ImageContent("test/data/simple_testcard_640x480.png")); + shared_ptr contentB (new ImageContent("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 (); + /* 0 1 2 3 4 5 6 7 + * A A A B + */ contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); contentA->video->set_length (3); - contentA->set_position (DCPTime(0)); + contentA->set_position (film, DCPTime(0)); contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); contentB->video->set_length (1); - contentB->set_position (DCPTime::from_frames (7, vfr)); + contentB->set_position (film, DCPTime::from_frames(7, vfr)); - Empty black (film->content(), film->length(), bind(&Content::video, _1)); + Empty black (film, film->playlist(), bind(&has_video, _1), film->playlist()->length(film)); BOOST_REQUIRE_EQUAL (black._periods.size(), 1); BOOST_CHECK (black._periods.front().from == DCPTime::from_frames(3, vfr)); BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(7, vfr)); @@ -99,3 +111,39 @@ 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) +{ + shared_ptr film = new_test_film2 ("empty_test3"); + 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")); + + 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_scale (VideoContentScale (Ratio::from_id ("185"))); + 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 playlist (new Playlist); + playlist->add (film, contentB); + Empty black (film, playlist, bind(&has_video, _1), playlist->length(film)); + BOOST_REQUIRE_EQUAL (black._periods.size(), 1); + 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)); +} +