Supporters update.

[dcpomatic.git] / test / ffmpeg_audio_test.cc

diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc
index 6bdadce97e1027b6211c042fbd0a9571bd2ed7a3..b2a83aad8a48e52e09b3db59159cdc133234a4ff 100644 (file)
--- a/test/ffmpeg_audio_test.cc
+++ b/test/ffmpeg_audio_test.cc
@@ -25,14 +25,15 @@
  */
 
 
-#include "lib/ffmpeg_content.h"
-#include "lib/film.h"
+#include "lib/constants.h"
+#include "lib/content_factory.h"
 #include "lib/dcp_content_type.h"
-#include "lib/video_content.h"
-#include "lib/ratio.h"
 #include "lib/ffmpeg_content.h"
-#include "lib/content_factory.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/film.h"
 #include "lib/player.h"
+#include "lib/ratio.h"
+#include "lib/video_content.h"
 #include "test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
@@ -46,7 +47,6 @@
 
 using std::make_shared;
 using std::string;
-using std::shared_ptr;
 
 
 BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
@@ -58,8 +58,10 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
 
        BOOST_REQUIRE (!wait_for_jobs());
 
+       int constexpr audio_channels = 6;
+
        film->set_container (Ratio::from_id ("185"));
-       film->set_audio_channels (6);
+       film->set_audio_channels(audio_channels);
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
        make_and_verify_dcp (film);
 
@@ -71,7 +73,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
 
        auto sound_asset = check.cpls().front()->reels().front()->main_sound ();
        BOOST_CHECK (sound_asset);
-       BOOST_CHECK_EQUAL (sound_asset->asset()->channels (), 6);
+       BOOST_REQUIRE_EQUAL(sound_asset->asset()->channels (), audio_channels);
 
        /* Sample index in the DCP */
        int n = 0;
@@ -81,46 +83,17 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
        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 + 0] | (d[i + 1] << 8);
-                               BOOST_CHECK_EQUAL (sample, 0);
+               for (int offset = 0; offset < sound_frame->size(); offset += (3 * sound_asset->asset()->channels())) {
+                       for (auto channel = 0; channel < audio_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);
+                               }
                        }
-
-                       if (sound_asset->asset()->channels() > 1) {
-                               /* R should be silent */
-                               int const sample = d[i + 2] | (d[i + 3] << 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 + 9] | (d[i + 10] << 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);
-                               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);
-                               BOOST_CHECK_EQUAL (sample, 0);
-                       }
-
                        ++n;
                }
        }
@@ -131,7 +104,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
 BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2)
 {
        auto film = new_test_film2 ("ffmpeg_audio_test2");
-       auto content = content_factory(TestPaths::private_data() / "wayne.mkv").front();
+       auto content = content_factory(TestPaths::private_data() / "wayne.mkv")[0];
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs ());
 
@@ -144,7 +117,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2)
 BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3)
 {
        auto film = new_test_film2 ("ffmpeg_audio_test3");
-       auto content = content_factory(TestPaths::private_data() / "wayne.mkv").front();
+       auto content = content_factory(TestPaths::private_data() / "wayne.mkv")[0];
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs ());
 
@@ -158,7 +131,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3)
 BOOST_AUTO_TEST_CASE (ffmpeg_audio_test4)
 {
        auto film = new_test_film2 ("ffmpeg_audio_test4");
-       auto content = content_factory(TestPaths::private_data() / "Actuellement aout 2020.wmv").front();
+       auto content = content_factory(TestPaths::private_data() / "Actuellement aout 2020.wmv")[0];
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs ());