Change video content scaling so that it either:

[dcpomatic.git] / test / silence_padding_test.cc

diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index 2bc0c3bb66c3bfacad9471342deaa5423cf2431b..dcabf29555f69f0614bcac15145d2f81cd3b327c 100644 (file)
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -52,11 +52,11 @@ test_silence_padding (int channels)
 
        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());
+}