From: Carl Hetherington <cth@carlh.net>
Date: Wed, 18 Jan 2023 16:05:37 +0000 (+0100)
Subject: Support Dolby-style WAV back surround names when guessing mappings (#2427).
X-Git-Tag: v2.16.41~9
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=37d2bf172e9061f24c874d5416bd3c8f9719c823

Support Dolby-style WAV back surround names when guessing mappings (#2427).
---

diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index cd5c1fc7e..ca2425862 100644
--- a/src/lib/audio_mapping.cc
+++ b/src/lib/audio_mapping.cc
@@ -107,9 +107,11 @@ AudioMapping::make_default (AudioProcessor const * processor, optional<boost::fi
 		ChannelRegex(".*[\\._-]LFE[\\._-].*", 3),
 		ChannelRegex(".*[\\._-]Lss[\\._-].*", 4),
 		ChannelRegex(".*[\\._-]Lsr[\\._-].*", 6),
+		ChannelRegex(".*[\\._-]Lrs[\\._-].*", 6),
 		ChannelRegex(".*[\\._-]Ls[\\._-].*", 4),
 		ChannelRegex(".*[\\._-]Rss[\\._-].*", 5),
 		ChannelRegex(".*[\\._-]Rsr[\\._-].*", 7),
+		ChannelRegex(".*[\\._-]Rrs[\\._-].*", 7),
 		ChannelRegex(".*[\\._-]Rs[\\._-].*", 5),
 	};
 
diff --git a/test/audio_mapping_test.cc b/test/audio_mapping_test.cc
index 4e1042759..37f3d2476 100644
--- a/test/audio_mapping_test.cc
+++ b/test/audio_mapping_test.cc
@@ -97,6 +97,10 @@ BOOST_AUTO_TEST_CASE (audio_mapping_guess_test)
 
 	/* 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);
 }