X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Faudio_mapping_test.cc;h=22412b26050bae8b9de001e458a26a49b4e595e7;hb=e7d8a70a16f972de2861bb1464dec6df3d26c579;hp=0acc922b6d30de2448de05c2ae71c519510c49f6;hpb=b29eb5107c5e77fe01e43010e1582e733f6ceea1;p=dcpomatic.git

diff --git a/test/audio_mapping_test.cc b/test/audio_mapping_test.cc
index 0acc922b6..22412b260 100644
--- a/test/audio_mapping_test.cc
+++ b/test/audio_mapping_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,19 +18,24 @@
 
 */
 
+
 /** @file  test/audio_mapping_test.cc
  *  @brief Test AudioMapping class.
  *  @ingroup selfcontained
  */
 
+
 #include <boost/test/unit_test.hpp>
 #include "lib/audio_mapping.h"
-#include "lib/util.h"
+#include "lib/constants.h"
+#include "lib/compose.hpp"
+
 
 using std::list;
 using std::string;
 using boost::optional;
 
+
 BOOST_AUTO_TEST_CASE (audio_mapping_test)
 {
 	AudioMapping none;
@@ -43,11 +48,11 @@ BOOST_AUTO_TEST_CASE (audio_mapping_test)
 
 	for (int i = 0; i < 4; ++i) {
 		for (int j = 0; j < MAX_DCP_AUDIO_CHANNELS; ++j) {
-			BOOST_CHECK_EQUAL (four.get (i, j), (i == 0 && j == 1) ? 1 : 0);
+			BOOST_CHECK_EQUAL (four.get(i, j), (i == 0 && j == 1) ? 1 : 0);
 		}
 	}
 
-	list<int> mapped = four.mapped_output_channels ();
+	auto mapped = four.mapped_output_channels ();
 	BOOST_CHECK_EQUAL (mapped.size(), 1U);
 	BOOST_CHECK_EQUAL (mapped.front(), 1);
 
@@ -60,17 +65,19 @@ BOOST_AUTO_TEST_CASE (audio_mapping_test)
 	}
 }
 
+
 static void
-guess_check (string filename, int output_channel)
+guess_check (boost::filesystem::path filename, int output_channel)
 {
 	AudioMapping m (1, 8);
-	m.make_default (0, optional<boost::filesystem::path>(filename));
+	m.make_default (0, filename);
 	for (int i = 0; i < 8; ++i) {
-		BOOST_TEST_INFO (filename);
+		BOOST_TEST_INFO (String::compose("%1 channel %2", filename, i));
 		BOOST_CHECK_CLOSE (m.get(0, i), i == output_channel ? 1 : 0, 0.01);
 	}
 }
 
+
 BOOST_AUTO_TEST_CASE (audio_mapping_guess_test)
 {
 	guess_check ("stuff_L_nonsense.wav", 0);
@@ -87,6 +94,57 @@ BOOST_AUTO_TEST_CASE (audio_mapping_guess_test)
 	guess_check ("ptish_Rsr_abc.wav", 7);
 	guess_check ("more_Lss_s.wav", 4);
 	guess_check ("other_Rss.aiff", 5);
+
+	/* Only the filename should be taken into account */
+	guess_check ("-Lfe-/foo_L.wav", 0);
+
+	/* Dolby-style */
+	guess_check ("jake-Lrs-good.wav", 6);
+	guess_check ("elwood-Rrs-good.wav", 7);
 }
 
 
+BOOST_AUTO_TEST_CASE(audio_mapping_take_from_larger)
+{
+	AudioMapping A(4, 9);
+	AudioMapping B(2, 3);
+
+	A.set(0, 0, 4);
+	A.set(1, 0, 8);
+	A.set(0, 1, 3);
+	A.set(1, 1, 6);
+	A.set(0, 2, 1);
+	A.set(1, 2, 9);
+
+	B.take_from(A);
+
+	BOOST_CHECK_CLOSE(B.get(0, 0), 4, 0.01);
+	BOOST_CHECK_CLOSE(B.get(1, 0), 8, 0.01);
+	BOOST_CHECK_CLOSE(B.get(0, 1), 3, 0.01);
+	BOOST_CHECK_CLOSE(B.get(1, 1), 6, 0.01);
+	BOOST_CHECK_CLOSE(B.get(0, 2), 1, 0.01);
+	BOOST_CHECK_CLOSE(B.get(1, 2), 9, 0.01);
+}
+
+
+BOOST_AUTO_TEST_CASE(audio_mapping_take_from_smaller)
+{
+	AudioMapping A(4, 9);
+	AudioMapping B(2, 3);
+
+	B.set(0, 0, 4);
+	B.set(1, 0, 8);
+	B.set(0, 1, 3);
+	B.set(1, 1, 6);
+	B.set(0, 2, 1);
+	B.set(1, 2, 9);
+
+	A.take_from(B);
+
+	BOOST_CHECK_CLOSE(A.get(0, 0), 4, 0.01);
+	BOOST_CHECK_CLOSE(A.get(1, 0), 8, 0.01);
+	BOOST_CHECK_CLOSE(A.get(0, 1), 3, 0.01);
+	BOOST_CHECK_CLOSE(A.get(1, 1), 6, 0.01);
+	BOOST_CHECK_CLOSE(A.get(0, 2), 1, 0.01);
+	BOOST_CHECK_CLOSE(A.get(1, 2), 9, 0.01);
+}