X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fsilence_padding_test.cc;h=dcabf29555f69f0614bcac15145d2f81cd3b327c;hp=5ece7d9cd180ec45e22d1b16f2c2c9af5d4a00ae;hb=15a83d720780d58f905d40f8493cdcb86596eaee;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f

diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index 5ece7d9cd..dcabf2955 100644
--- 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"
@@ -35,12 +36,10 @@
 #include <dcp/reel_sound_asset.h>
 #include <dcp/sound_asset_reader.h>
 #include <boost/test/unit_test.hpp>
-#include <boost/make_shared.hpp>
 
 using std::string;
 using boost::lexical_cast;
 using boost::shared_ptr;
-using boost::make_shared;
 
 static void
 test_silence_padding (int channels)
@@ -51,13 +50,13 @@ test_silence_padding (int channels)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_name (film_name);
 
-	shared_ptr<FFmpegContent> content = make_shared<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;
@@ -82,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);
 			}
 
@@ -100,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);
 			}
 
@@ -129,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());
+}