+/* Test insertion of black frames between separate bits of video content */
+BOOST_AUTO_TEST_CASE (player_black_fill_test)
+{
+ shared_ptr<Film> film = new_test_film ("black_fill_test");
+ film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
+ film->set_name ("black_fill_test");
+ film->set_container (Ratio::from_id ("185"));
+ film->set_sequence (false);
+ shared_ptr<ImageContent> contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
+ shared_ptr<ImageContent> contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
+
+ film->examine_and_add_content (contentA);
+ film->examine_and_add_content (contentB);
+ wait_for_jobs ();
+
+ contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+ contentA->video->set_length (3);
+ contentA->set_position (DCPTime::from_frames (2, film->video_frame_rate ()));
+ contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+ contentB->video->set_length (1);
+ contentB->set_position (DCPTime::from_frames (7, film->video_frame_rate ()));
+
+ film->make_dcp ();
+
+ wait_for_jobs ();
+
+ boost::filesystem::path ref;
+ ref = "test";
+ ref /= "data";
+ ref /= "black_fill_test";
+
+ boost::filesystem::path check;
+ check = "build";
+ check /= "test";
+ check /= "black_fill_test";
+ check /= film->dcp_name();
+
+ check_dcp (ref.string(), check.string());
+}
+
+/** Check behaviour with an awkward playlist whose data does not end on a video frame start */
+BOOST_AUTO_TEST_CASE (player_subframe_test)
+{
+ shared_ptr<Film> 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<Content> A = content_factory(film, "test/data/flat_red.png").front();
+ film->examine_and_add_content (A);
+ BOOST_REQUIRE (!wait_for_jobs ());
+ shared_ptr<Content> 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);
+
+ BOOST_CHECK (A->full_length() == DCPTime::from_frames(3 * 24, 24));
+ BOOST_CHECK (B->full_length() == DCPTime(289920));
+ /* Length should be rounded up from B's length to the next video frame */
+ BOOST_CHECK (film->length() == DCPTime::from_frames(3 * 24 + 1, 24));
+
+ shared_ptr<Player> player (new Player (film, film->playlist ()));
+ player->setup_pieces ();
+ BOOST_REQUIRE_EQUAL (player->_black._periods.size(), 1);
+ BOOST_CHECK (player->_black._periods.front() == DCPTimePeriod(DCPTime::from_frames(3 * 24, 24), DCPTime::from_frames(3 * 24 + 1, 24)));
+ BOOST_REQUIRE_EQUAL (player->_silent._periods.size(), 1);
+ BOOST_CHECK (player->_silent._periods.front() == DCPTimePeriod(DCPTime(289920), DCPTime::from_frames(3 * 24 + 1, 24)));
+}