From: Carl Hetherington <cth@carlh.net>
Date: Mon, 29 Apr 2024 20:34:51 +0000 (+0200)
Subject: Fix silent stereo mixdown exports when the project audio channel count is > 6.
X-Git-Tag: v2.16.82~1
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=4401895dfbb25834d4385621824e72ae19c8962c;p=dcpomatic.git

Fix silent stereo mixdown exports when the project audio channel count is > 6.

This became much more of a problem when we started defaulting to 8 channels
in projects.
---

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 60241b233..c1170f098 100644
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -102,7 +102,7 @@ FFmpegEncoder::stereo_map() const
 		map.set(dcp::Channel::CENTRE, 1, overall_gain * minus_3dB);
 		map.set(dcp::Channel::LS,     0, overall_gain);
 		break;
-	case 6:
+	default:
 		map.set(dcp::Channel::LEFT,   0, overall_gain);
 		map.set(dcp::Channel::RIGHT,  1, overall_gain);
 		map.set(dcp::Channel::CENTRE, 0, overall_gain * minus_3dB);
@@ -111,7 +111,6 @@ FFmpegEncoder::stereo_map() const
 		map.set(dcp::Channel::RS,     1, overall_gain);
 		break;
 	}
-	/* XXX: maybe we should do something better for >6 channel DCPs */
 	return map;
 }