🎥 Make videos programmatically with React
`@remotion/media`: Fix 5.1 audio downmixing
JonnyBurger01e437c71756
diff --git a/packages/media/src/convert-audiodata/resample-audiodata.ts b/packages/media/src/convert-audiodata/resample-audiodata.tsindex 419cd1753f..ab23d8b30a 100644--- a/packages/media/src/convert-audiodata/resample-audiodata.ts+++ b/packages/media/src/convert-audiodata/resample-audiodata.ts@@ -21,6 +21,10 @@ const fixFloatingPoint = (value: number) => {return value;};+const clampToS16 = (value: number) => {+ return Math.max(-32768, Math.min(32767, value));+};+export const resampleAudioData = ({srcNumberOfChannels,sourceChannels,@@ -122,15 +126,16 @@ export const resampleAudioData = ({const l = getSourceValues(start, end, 0);const r = getSourceValues(start, end, 1);const c = getSourceValues(start, end, 2);- const sl = getSourceValues(start, end, 3);- const sr = getSourceValues(start, end, 4);+ const sl = getSourceValues(start, end, 4);+ const sr = getSourceValues(start, end, 5);const sq = Math.sqrt(1 / 2);- const l2 = l + sq * (c + sl);- const r2 = r + sq * (c + sr);+ const norm = 1 / (1 + sq + sq);+ const l2 = (l + sq * (c + sl)) * norm;+ const r2 = (r + sq * (c + sr)) * norm;- destination[newFrameIndex * 2 + 0] = l2;- destination[newFrameIndex * 2 + 1] = r2;+ destination[newFrameIndex * 2 + 0] = clampToS16(l2);+ destination[newFrameIndex * 2 + 1] = clampToS16(r2);}// Discrete fallback: direct mapping with zero-fill or dropdiff --git a/packages/media/src/test/extract-audio-resampling.test.ts b/packages/media/src/test/extract-audio-resampling.test.tsindex 1f961b2297..4a83fa35da 100644--- a/packages/media/src/test/extract-audio-resampling.test.ts+++ b/packages/media/src/test/extract-audio-resampling.test.ts@@ -61,3 +61,20 @@ test('resamples Mediabunny AudioSamples as one continuous frame', async () => {expect(maximumError).toBeLessThanOrEqual(2);});++test('downmixes 5.1 audio without overflowing and excludes the LFE channel', () => {+ const sourceChannels = new Int16Array([+ 32767, 32767, 32767, -32768, 32767, 32767, 0, 0, 0, 32767, 32767, -32768,+ ]);+ const destination = new Int16Array(4);++ resampleAudioData({+ srcNumberOfChannels: 6,+ sourceChannels,+ destination,+ targetFrames: 2,+ chunkSize: 1,+ });++ expect(Array.from(destination)).toEqual([32767, 32767, 9597, -9597]);+});