}
film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+ BOOST_CHECK_EQUAL (film->reels().size(), 3);
BOOST_REQUIRE (!wait_for_jobs());
film->make_dcp ();
film->examine_and_add_content (B);
BOOST_REQUIRE (!wait_for_jobs ());
film->set_video_frame_rate (24);
- A->video->set_length (3 * 24);
+ A->video->set_length (2 * 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)));
+ BOOST_CHECK (film->reels().front() == DCPTimePeriod(DCPTime(0), DCPTime::from_frames(2 * 24, 24)));
+ BOOST_CHECK (film->reels().back() == DCPTimePeriod(DCPTime::from_frames(2 * 24, 24), DCPTime::from_frames(3 * 24 + 1, 24)));
film->make_dcp ();
BOOST_REQUIRE (!wait_for_jobs ());
}
+static void
+dump_notes (list<dcp::VerificationNote> const & notes)
+{
+ BOOST_FOREACH (dcp::VerificationNote i, notes) {
+ std::cout << dcp::note_to_string(i) << "\n";
+ }
+}
+
/** Using less than 1 second's worth of content should not result in a reel
* of less than 1 second's duration.
BOOST_REQUIRE (!wait_for_jobs());
A->video->set_length (23);
+ shared_ptr<FFmpegContent> 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(23, 24));
+
film->make_dcp ();
BOOST_REQUIRE (!wait_for_jobs());
vector<boost::filesystem::path> 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());
+ list<dcp::VerificationNote> const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd);
+ dump_notes (notes);
+ BOOST_REQUIRE (notes.empty());
}
/** Leaving less than 1 second's gap between two pieces of content with
vector<boost::filesystem::path> 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());
+ list<dcp::VerificationNote> const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd);
+ dump_notes (notes);
+ BOOST_REQUIRE (notes.empty());
}
/** Setting REELTYPE_BY_LENGTH and using a small length value should not make
film->make_dcp ();
BOOST_REQUIRE (!wait_for_jobs());
+ vector<boost::filesystem::path> dirs;
+ list<dcp::VerificationNote> const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd);
+ dump_notes (notes);
+ BOOST_REQUIRE (notes.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> 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<FFmpegContent> 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<FFmpegContent> 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<boost::filesystem::path> 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());
+ list<dcp::VerificationNote> const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd);
+ dump_notes (notes);
+ BOOST_REQUIRE (notes.empty());
}