projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix incorrect extension on interop subtitle files (#2270).
[dcpomatic.git]
/
test
/
audio_mapping_test.cc
diff --git
a/test/audio_mapping_test.cc
b/test/audio_mapping_test.cc
index 0565429fb4859fef1136c80a2751a2028c27c32c..8599c6af561911ad67756d015e5bd4b8f4edb219 100644
(file)
--- 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.
This file is part of DCP-o-matic.
@@
-18,19
+18,23
@@
*/
*/
+
/** @file test/audio_mapping_test.cc
* @brief Test AudioMapping class.
* @ingroup selfcontained
*/
/** @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 <boost/test/unit_test.hpp>
#include "lib/audio_mapping.h"
#include "lib/util.h"
+
using std::list;
using std::string;
using boost::optional;
using std::list;
using std::string;
using boost::optional;
+
BOOST_AUTO_TEST_CASE (audio_mapping_test)
{
AudioMapping none;
BOOST_AUTO_TEST_CASE (audio_mapping_test)
{
AudioMapping none;
@@
-43,12
+47,12
@@
BOOST_AUTO_TEST_CASE (audio_mapping_test)
for (int i = 0; i < 4; ++i) {
for (int j = 0; j < MAX_DCP_AUDIO_CHANNELS; ++j) {
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 ();
- BOOST_CHECK_EQUAL (mapped.size(), 1);
+
auto
mapped = four.mapped_output_channels ();
+ BOOST_CHECK_EQUAL (mapped.size(), 1
U
);
BOOST_CHECK_EQUAL (mapped.front(), 1);
four.make_zero ();
BOOST_CHECK_EQUAL (mapped.front(), 1);
four.make_zero ();
@@
-60,17
+64,19
@@
BOOST_AUTO_TEST_CASE (audio_mapping_test)
}
}
}
}
+
static void
static void
-guess_check (
string
filename, int output_channel)
+guess_check (
boost::filesystem::path
filename, int output_channel)
{
AudioMapping m (1, 8);
{
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) {
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_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);
BOOST_AUTO_TEST_CASE (audio_mapping_guess_test)
{
guess_check ("stuff_L_nonsense.wav", 0);
@@
-87,6
+93,9
@@
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);
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 acccount */
+ guess_check ("-Lfe-/foo_L.wav", 0);
}
}