X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fsilence_padding_test.cc;h=dcabf29555f69f0614bcac15145d2f81cd3b327c;hp=6c7d0b5ff79ec2721eafe469a477556cf67927a1;hb=5ff6b15ef3c58a046fb9eec0273c5e7322988a14;hpb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0

diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index 6c7d0b5ff..dcabf2955 100644
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -50,13 +50,13 @@ test_silence_padding (int channels)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_name (film_name);
 
-	shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/staircase.wav"));
+	shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/staircase.wav"));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	film->set_audio_channels (channels);
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	boost::filesystem::path path = "build/test";
 	path /= film_name;
@@ -128,3 +128,21 @@ BOOST_AUTO_TEST_CASE (silence_padding_test)
 		test_silence_padding (i);
 	}
 }
+
+/** Test a situation that used to crash because of a sub-sample rounding confusion
+ *  caused by a trim.
+ */
+
+BOOST_AUTO_TEST_CASE (silence_padding_test2)
+{
+	shared_ptr<Film> film = new_test_film2 ("silence_padding_test2");
+	shared_ptr<FFmpegContent> content (new FFmpegContent(TestPaths::private_data / "cars.mov"));
+	film->examine_and_add_content (content);
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	film->set_video_frame_rate (24);
+	content->set_trim_start (dcpomatic::ContentTime(4003));
+
+	film->make_dcp ();
+	BOOST_REQUIRE (!wait_for_jobs());
+}