X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Freels_test.cc;h=7bf48a9cbc1d22e33d6da433cd538fa3b0eac048;hp=bf40aa3a11d20fd5d6f64bff6b49faca578bd652;hb=ec06bc09c3ee7e69fb99056d8b665b733021e6a7;hpb=83bda33c161b267ae35e474f0bfb16a1bb7ad281

diff --git a/test/reels_test.cc b/test/reels_test.cc
index bf40aa3a1..7bf48a9cb 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -492,6 +492,14 @@ no_op ()
 
 }
 
+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.
@@ -511,7 +519,9 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short1)
 
 	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
@@ -539,7 +549,9 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short2)
 
 	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
@@ -560,8 +572,39 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short3)
 	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());
 }