Supporters update.

[dcpomatic.git] / test / silence_padding_test.cc

diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index 28218e22fa0f9f7e6205cd577fa61e8620a9ac73..86db117c6c734b10fbaaad447b94b3212dd310f2 100644 (file)
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -43,12 +43,11 @@
 
 using std::make_shared;
 using std::string;
-using std::shared_ptr;
 using boost::lexical_cast;
 
 
 static void
-test_silence_padding (int channels)
+test_silence_padding(int channels, dcp::Standard standard)
 {
        string const film_name = "silence_padding_test_" + lexical_cast<string> (channels);
        auto film = new_test_film2 (
@@ -58,8 +57,18 @@ test_silence_padding (int channels)
                        make_shared<FFmpegContent>("test/data/staircase.wav")
                });
 
+       if (standard == dcp::Standard::INTEROP) {
+               film->set_interop(true);
+       }
        film->set_audio_channels (channels);
-       make_and_verify_dcp (film);
+
+       std::vector<dcp::VerificationNote::Code> codes;
+       if (standard == dcp::Standard::INTEROP) {
+               codes.push_back(dcp::VerificationNote::Code::INVALID_STANDARD);
+       }
+       auto const dcp_inspect = channels == 2 || channels == 6 || channels >= 8;
+       auto const clairmeta = (channels % 2) == 0;
+       make_and_verify_dcp(film, codes, dcp_inspect, clairmeta);
 
        boost::filesystem::path path = "build/test";
        path /= film_name;
@@ -76,61 +85,43 @@ test_silence_padding (int channels)
        /* DCP sound asset frame */
        int frame = 0;
 
+       auto const asset_channels = sound_asset->asset()->channels();
+       if (standard == dcp::Standard::SMPTE) {
+               DCP_ASSERT(asset_channels == MAX_DCP_AUDIO_CHANNELS)
+       } else {
+               DCP_ASSERT(asset_channels == channels);
+       }
+
        while (n < sound_asset->asset()->intrinsic_duration()) {
                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 + 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 + 4] | (d[i + 5] << 8);
-                               BOOST_CHECK_EQUAL (sample, 0);
-                       }
-
-                       if (sound_asset->asset()->channels() > 2) {
-                               /* Mono input so it will appear on centre */
-                               int const sample = d[i + 7] | (d[i + 8] << 8);
-                               BOOST_CHECK_EQUAL (sample, n);
-                       }
-
-                       if (sound_asset->asset()->channels() > 3) {
-                               /* Lfe should be silent */
-                               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 + 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 + 16] | (d[i + 17] << 8);
-                               BOOST_CHECK_EQUAL (sample, 0);
+               for (int offset = 0; offset < sound_frame->size(); offset += (3 * asset_channels)) {
+
+                       for (auto channel = 0; channel < asset_channels; ++channel) {
+                               auto const sample = d[offset + channel * 3 + 1] | (d[offset + channel * 3 + 2] << 8);
+                               if (channel == 2) {
+                                       /* Input should be on centre */
+                                       BOOST_CHECK_EQUAL(sample, n);
+                               } else {
+                                       /* Everything else should be silent */
+                                       BOOST_CHECK_EQUAL(sample, 0);
+                               }
                        }
 
                        ++n;
                }
        }
-
 }
 
 
 BOOST_AUTO_TEST_CASE (silence_padding_test)
 {
        for (int i = 1; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
-               test_silence_padding (i);
+               test_silence_padding(i, dcp::Standard::INTEROP);
        }
+
+       test_silence_padding(MAX_DCP_AUDIO_CHANNELS, dcp::Standard::SMPTE);
 }