Fill test disk partitions with random noise to expose more bugs.

[dcpomatic.git] / test / silence_padding_test.cc

diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index 5ece7d9cd180ec45e22d1b16f2c2c9af5d4a00ae..e4c640792d675bda09cfe7fd1acbe1b4c91d997f 100644 (file)
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,10 +18,13 @@
 
 */
 
+
 /** @file  test/silence_padding_test.cc
  *  @brief Test the padding (with silence) of a mono source to a 6-channel DCP.
+ *  @ingroup feature
  */
 
+
 #include "lib/ffmpeg_content.h"
 #include "lib/film.h"
 #include "lib/dcp_content_type.h"
@@ -35,29 +38,27 @@
 #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::make_shared;
 using std::string;
+using std::shared_ptr;
 using boost::lexical_cast;
-using boost::shared_ptr;
-using boost::make_shared;
+
 
 static void
 test_silence_padding (int channels)
 {
        string const film_name = "silence_padding_test_" + lexical_cast<string> (channels);
-       shared_ptr<Film> film = new_test_film (film_name);
-       film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
-       film->set_container (Ratio::from_id ("185"));
-       film->set_name (film_name);
-
-       shared_ptr<FFmpegContent> content = make_shared<FFmpegContent> (film, "test/data/staircase.wav");
-       film->examine_and_add_content (content);
-       wait_for_jobs ();
+       auto film = new_test_film2 (
+               film_name,
+               {
+                       make_shared<FFmpegContent>("test/data/flat_red.png"),
+                       make_shared<FFmpegContent>("test/data/staircase.wav")
+               });
 
        film->set_audio_channels (channels);
-       film->make_dcp ();
-       wait_for_jobs ();
+       make_and_verify_dcp (film);
 
        boost::filesystem::path path = "build/test";
        path /= film_name;
@@ -65,7 +66,7 @@ test_silence_padding (int channels)
        dcp::DCP check (path.string ());
        check.read ();
 
-       shared_ptr<const dcp::ReelSoundAsset> sound_asset = check.cpls().front()->reels().front()->main_sound ();
+       auto sound_asset = check.cpls()[0]->reels()[0]->main_sound();
        BOOST_CHECK (sound_asset);
        BOOST_CHECK_EQUAL (sound_asset->asset()->channels (), channels);
 
@@ -75,20 +76,20 @@ test_silence_padding (int channels)
        int frame = 0;
 
        while (n < sound_asset->asset()->intrinsic_duration()) {
-               shared_ptr<const dcp::SoundFrame> sound_frame = sound_asset->asset()->start_read()->get_frame (frame++);
+               auto sound_frame = sound_asset->asset()->start_read()->get_frame(frame++);
                uint8_t const * d = sound_frame->data ();
 
                for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->asset()->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 +101,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);
                        }
 
@@ -123,9 +124,30 @@ test_silence_padding (int channels)
 
 }
 
+
 BOOST_AUTO_TEST_CASE (silence_padding_test)
 {
        for (int i = 1; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
                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)
+{
+       Cleanup cl;
+
+       auto content = make_shared<FFmpegContent>(TestPaths::private_data() / "cars.mov");
+       auto film = new_test_film2 ("silence_padding_test2", { content }, &cl);
+
+       film->set_video_frame_rate (24);
+       content->set_trim_start (dcpomatic::ContentTime(4003));
+
+       make_and_verify_dcp (film);
+
+       cl.run ();
+}