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 9791b71722e3bd92b430d27b13916780074330fe..dcabf29555f69f0614bcac15145d2f81cd3b327c 100644 (file)
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -20,6 +20,7 @@
 
 /** @file  test/silence_padding_test.cc
  *  @brief Test the padding (with silence) of a mono source to a 6-channel DCP.
+ *  @ingroup specific
  */
 
 #include "lib/ffmpeg_content.h"
@@ -49,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;
@@ -80,13 +81,13 @@ test_silence_padding (int channels)
 
                        if (sound_asset->asset()->channels() > 0) {
                                /* L should be silent */
-                               int const sample = d[i + 0] | (d[i + 1] << 8);
+                               int const sample = d[i + 1] | (d[i + 2] << 8);
                                BOOST_CHECK_EQUAL (sample, 0);
                        }
 
                        if (sound_asset->asset()->channels() > 1) {
                                /* R should be silent */
-                               int const sample = d[i + 2] | (d[i + 3] << 8);
+                               int const sample = d[i + 4] | (d[i + 5] << 8);
                                BOOST_CHECK_EQUAL (sample, 0);
                        }
 
@@ -98,20 +99,20 @@ test_silence_padding (int channels)
 
                        if (sound_asset->asset()->channels() > 3) {
                                /* Lfe should be silent */
-                               int const sample = d[i + 9] | (d[i + 10] << 8);
+                               int const sample = d[i + 10] | (d[i + 11] << 8);
                                BOOST_CHECK_EQUAL (sample, 0);
                        }
 
                        if (sound_asset->asset()->channels() > 4) {
                                /* Ls should be silent */
-                               int const sample = d[i + 11] | (d[i + 12] << 8);
+                               int const sample = d[i + 13] | (d[i + 14] << 8);
                                BOOST_CHECK_EQUAL (sample, 0);
                        }
 
 
                        if (sound_asset->asset()->channels() > 5) {
                                /* Rs should be silent */
-                               int const sample = d[i + 13] | (d[i + 14] << 8);
+                               int const sample = d[i + 16] | (d[i + 17] << 8);
                                BOOST_CHECK_EQUAL (sample, 0);
                        }
 
@@ -127,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());
+}