This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch master
in repository ffmpeg.

commit 5e31ccacab22774ca16d4e1b126f0801e826b87d
Author:     James Almer <[email protected]>
AuthorDate: Sun Sep 27 12:41:59 2026 -0300
Commit:     James Almer <[email protected]>
CommitDate: Sun Sep 27 18:38:11 2026 -0300

    tests/fate/swresample: add rematrix test for the new layouts
    
    Signed-off-by: James Almer <[email protected]>
---
 tests/fate/libswresample.mak                       |  8 ++++++--
 ...rematrix-22.2-5.1.4 => swr-rematrix-22.2-5.1.6} | 10 +++++----
 ...rematrix-22.2-9.1.4 => swr-rematrix-22.2-7.1.6} | 16 +++++++--------
 tests/ref/fate/swr-rematrix-5.1.6-5.1              |  6 ++++++
 tests/ref/fate/swr-rematrix-5.1.6-5.1.2            |  8 ++++++++
 tests/ref/fate/swr-rematrix-5.1.6-5.1.4            | 10 +++++++++
 tests/ref/fate/swr-rematrix-5.1.6-7.1              |  8 ++++++++
 tests/ref/fate/swr-rematrix-5.1.6-mono             |  1 +
 tests/ref/fate/swr-rematrix-5.1.6-stereo           |  2 ++
 ...swr-rematrix-7.1-5.1 => swr-rematrix-7.1.6-5.1} | 12 +++++------
 ...matrix-7.1.4-5.1.2 => swr-rematrix-7.1.6-5.1.2} | 16 +++++++--------
 ...matrix-7.1.2-5.1.4 => swr-rematrix-7.1.6-5.1.4} | 20 +++++++++---------
 tests/ref/fate/swr-rematrix-7.1.6-5.1.6            | 12 +++++++++++
 ...r-rematrix-7.1.2-7.1 => swr-rematrix-7.1.6-7.1} | 16 +++++++--------
 ...matrix-7.2.3-7.1.2 => swr-rematrix-7.1.6-7.1.2} | 20 +++++++++---------
 ...matrix-7.2.3-7.1.4 => swr-rematrix-7.1.6-7.1.4} | 24 +++++++++++-----------
 ...rematrix-7.1.2-mono => swr-rematrix-7.1.6-mono} |  2 +-
 ...trix-7.1.2-stereo => swr-rematrix-7.1.6-stereo} |  4 ++--
 ...matrix-9.1.6-7.1.4 => swr-rematrix-9.1.6-5.1.6} |  8 ++++----
 ...matrix-9.1.6-9.1.4 => swr-rematrix-9.1.6-7.1.6} |  8 ++++----
 20 files changed, 132 insertions(+), 79 deletions(-)

diff --git a/tests/fate/libswresample.mak b/tests/fate/libswresample.mak
index d23525edbc..532d529b51 100644
--- a/tests/fate/libswresample.mak
+++ b/tests/fate/libswresample.mak
@@ -1106,12 +1106,14 @@ fate-swr-custom-rematrix: REF = 
2a14a44deb4ae26e3b474ddbfbc048f8
 
 FATE_SWR += $(FATE_SWR_CUSTOM_REMATRIX-yes)
 
-FATE_SWR_22_2_LAYOUTS   = 9.1.6 9.1.4 7.2.3 7.1.4 7.1.2 5.1.4 5.1.2 7.1 5.1 
stereo mono
-FATE_SWR_9_1_6_LAYOUTS  = 9.1.4 7.2.3 7.1.4 7.1.2 5.1.4 5.1.2 7.1 5.1 stereo 
mono
+FATE_SWR_22_2_LAYOUTS   = 9.1.6 9.1.4 7.2.3 7.1.6 7.1.4 7.1.2 5.1.6 5.1.4 
5.1.2 7.1 5.1 stereo mono
+FATE_SWR_9_1_6_LAYOUTS  = 9.1.4 7.2.3 7.1.6 7.1.4 7.1.2 5.1.6 5.1.4 5.1.2 7.1 
5.1 stereo mono
 FATE_SWR_9_1_4_LAYOUTS  = 7.2.3 7.1.4 7.1.2 5.1.4 5.1.2 7.1 5.1 stereo mono
 FATE_SWR_7_2_3_LAYOUTS  = 7.1.4 7.1.2 5.1.4 5.1.2 7.1 5.1 stereo mono
+FATE_SWR_7_1_6_LAYOUTS  = 7.1.4 7.1.2 5.1.6 5.1.4 5.1.2 7.1 5.1 stereo mono
 FATE_SWR_7_1_4_LAYOUTS  = 7.1.2 5.1.4 5.1.2 7.1 5.1 stereo mono
 FATE_SWR_7_1_2_LAYOUTS  = 5.1.4 5.1.2 7.1 5.1 stereo mono
+FATE_SWR_5_1_6_LAYOUTS  = 5.1.4 5.1.2 7.1 5.1 stereo mono
 FATE_SWR_5_1_4_LAYOUTS  = 5.1.2 7.1 5.1 stereo mono
 FATE_SWR_5_1_2_LAYOUTS  = 7.1 5.1 stereo mono
 FATE_SWR_7_1_LAYOUTS    = 5.1 stereo mono
@@ -1130,8 +1132,10 @@ $(call SWR_REMATRIX_TEST,$(FATE_SWR_22_2_LAYOUTS),22.2)
 $(call SWR_REMATRIX_TEST,$(FATE_SWR_9_1_6_LAYOUTS),9.1.6)
 $(call SWR_REMATRIX_TEST,$(FATE_SWR_9_1_4_LAYOUTS),9.1.4)
 $(call SWR_REMATRIX_TEST,$(FATE_SWR_7_2_3_LAYOUTS),7.2.3)
+$(call SWR_REMATRIX_TEST,$(FATE_SWR_7_1_6_LAYOUTS),7.1.6)
 $(call SWR_REMATRIX_TEST,$(FATE_SWR_7_1_4_LAYOUTS),7.1.4)
 $(call SWR_REMATRIX_TEST,$(FATE_SWR_7_1_2_LAYOUTS),7.1.2)
+$(call SWR_REMATRIX_TEST,$(FATE_SWR_5_1_6_LAYOUTS),5.1.6)
 $(call SWR_REMATRIX_TEST,$(FATE_SWR_5_1_4_LAYOUTS),5.1.4)
 $(call SWR_REMATRIX_TEST,$(FATE_SWR_5_1_2_LAYOUTS),5.1.2)
 $(call SWR_REMATRIX_TEST,$(FATE_SWR_7_1_LAYOUTS),7.1)
diff --git a/tests/ref/fate/swr-rematrix-22.2-5.1.4 
b/tests/ref/fate/swr-rematrix-22.2-5.1.6
similarity index 78%
copy from tests/ref/fate/swr-rematrix-22.2-5.1.4
copy to tests/ref/fate/swr-rematrix-22.2-5.1.6
index e9f8cfc03d..df80a56ba4 100644
--- a/tests/ref/fate/swr-rematrix-22.2-5.1.4
+++ b/tests/ref/fate/swr-rematrix-22.2-5.1.6
@@ -4,7 +4,9 @@
 [LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.707107, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
 [SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.707107, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.707107, 
.SL = 1.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
 [SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.707107, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.707107, 
.SL = 0.000000, .SR = 1.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
-[TFL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 1.000000, .TFC = 
0.707107, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.707107, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
-[TFR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 
0.707107, .TFR = 1.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.707107, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
-[TBL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 1.000000, .TBC = 0.707107, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.707107, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
-[TBR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.707107, .TBR = 1.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.707107, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
+[TC] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 1.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
+[TFL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 1.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.707107, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
+[TFC] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
1.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
+[TFR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 1.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.707107, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
+[TBL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 1.000000, .TBC = 0.707107, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.707107, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
+[TBR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.707107, .TBR = 1.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.707107, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
diff --git a/tests/ref/fate/swr-rematrix-22.2-9.1.4 
b/tests/ref/fate/swr-rematrix-22.2-7.1.6
similarity index 88%
copy from tests/ref/fate/swr-rematrix-22.2-9.1.4
copy to tests/ref/fate/swr-rematrix-22.2-7.1.6
index 34f0eedc03..08da1f7c2f 100644
--- a/tests/ref/fate/swr-rematrix-22.2-9.1.4
+++ b/tests/ref/fate/swr-rematrix-22.2-7.1.6
@@ -1,14 +1,14 @@
-[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
1.000000, .BFR = 0.000000, },
-[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 1.000000, },
+[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 1.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
1.000000, .BFR = 0.000000, },
+[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 1.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 1.000000, },
 [FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 1.000000, .BFL = 
0.000000, .BFR = 0.000000, },
 [LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.707107, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
 [BL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 1.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.707107, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
 [BR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 1.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.707107, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
-[FLC] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 1.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
-[FRC] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 1.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
 [SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 1.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
 [SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 1.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
-[TFL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 1.000000, .TFC = 
0.707107, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.707107, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
-[TFR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 
0.707107, .TFR = 1.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.707107, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
-[TBL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 1.000000, .TBC = 0.707107, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.707107, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
-[TBR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.707107, .TBR = 1.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.707107, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
+[TC] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 1.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
+[TFL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 1.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.707107, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
+[TFC] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
1.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
+[TFR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 1.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.707107, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
+[TBL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 1.000000, .TBC = 0.707107, .TBR = 0.000000, 
.LFE2 = 0.000000, .TSL = 0.707107, .TSR = 0.000000, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
+[TBR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, 
.SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 
0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.707107, .TBR = 1.000000, 
.LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.707107, .BFC = 0.000000, .BFL = 
0.000000, .BFR = 0.000000, },
diff --git a/tests/ref/fate/swr-rematrix-5.1.6-5.1 
b/tests/ref/fate/swr-rematrix-5.1.6-5.1
new file mode 100644
index 0000000000..09ab077e28
--- /dev/null
+++ b/tests/ref/fate/swr-rematrix-5.1.6-5.1
@@ -0,0 +1,6 @@
+[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 1.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 1.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 1.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[BL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 1.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 1.000000, .TBR = 0.000000, },
+[BR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 1.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 1.000000, },
diff --git a/tests/ref/fate/swr-rematrix-5.1.6-5.1.2 
b/tests/ref/fate/swr-rematrix-5.1.6-5.1.2
new file mode 100644
index 0000000000..59ff935a95
--- /dev/null
+++ b/tests/ref/fate/swr-rematrix-5.1.6-5.1.2
@@ -0,0 +1,8 @@
+[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 1.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 1.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[TFL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 1.000000, .TFC = 0.707107, 
.TFR = 0.000000, .TBL = 0.707107, .TBR = 0.000000, },
+[TFR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 0.707107, 
.TFR = 1.000000, .TBL = 0.000000, .TBR = 0.707107, },
diff --git a/tests/ref/fate/swr-rematrix-5.1.6-5.1.4 
b/tests/ref/fate/swr-rematrix-5.1.6-5.1.4
new file mode 100644
index 0000000000..d4d2d24e93
--- /dev/null
+++ b/tests/ref/fate/swr-rematrix-5.1.6-5.1.4
@@ -0,0 +1,10 @@
+[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 1.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 1.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[TFL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 1.000000, .TFC = 0.707107, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[TFR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 0.707107, 
.TFR = 1.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[TBL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 1.000000, .TBR = 0.000000, },
+[TBR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 1.000000, },
diff --git a/tests/ref/fate/swr-rematrix-5.1.6-7.1 
b/tests/ref/fate/swr-rematrix-5.1.6-7.1
new file mode 100644
index 0000000000..ba220310f8
--- /dev/null
+++ b/tests/ref/fate/swr-rematrix-5.1.6-7.1
@@ -0,0 +1,8 @@
+[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 1.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 1.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 1.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[BL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 1.000000, .TBR = 0.000000, },
+[BR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 1.000000, },
+[SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 1.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
+[SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .SL 
= 0.000000, .SR = 1.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
diff --git a/tests/ref/fate/swr-rematrix-5.1.6-mono 
b/tests/ref/fate/swr-rematrix-5.1.6-mono
new file mode 100644
index 0000000000..3b275bc6c0
--- /dev/null
+++ b/tests/ref/fate/swr-rematrix-5.1.6-mono
@@ -0,0 +1 @@
+[FC] = { .FL = 0.707107, .FR = 0.707107, .FC = 1.000000, .LFE = 0.000000, .SL 
= 0.500000, .SR = 0.500000, .TC = 0.500000, .TFL = 0.707107, .TFC = 1.000000, 
.TFR = 0.707107, .TBL = 0.500000, .TBR = 0.500000, },
diff --git a/tests/ref/fate/swr-rematrix-5.1.6-stereo 
b/tests/ref/fate/swr-rematrix-5.1.6-stereo
new file mode 100644
index 0000000000..0324ee0fdf
--- /dev/null
+++ b/tests/ref/fate/swr-rematrix-5.1.6-stereo
@@ -0,0 +1,2 @@
+[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.707107, .LFE = 0.000000, .SL 
= 0.707107, .SR = 0.000000, .TC = 0.500000, .TFL = 1.000000, .TFC = 0.707107, 
.TFR = 0.000000, .TBL = 0.707107, .TBR = 0.000000, },
+[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.707107, .LFE = 0.000000, .SL 
= 0.000000, .SR = 0.707107, .TC = 0.500000, .TFL = 0.000000, .TFC = 0.707107, 
.TFR = 1.000000, .TBL = 0.000000, .TBR = 0.707107, },
diff --git a/tests/ref/fate/swr-rematrix-7.1-5.1 
b/tests/ref/fate/swr-rematrix-7.1.6-5.1
similarity index 52%
copy from tests/ref/fate/swr-rematrix-7.1-5.1
copy to tests/ref/fate/swr-rematrix-7.1.6-5.1
index d516b736e2..885d2bee10 100644
--- a/tests/ref/fate/swr-rematrix-7.1-5.1
+++ b/tests/ref/fate/swr-rematrix-7.1.6-5.1
@@ -1,6 +1,6 @@
-[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, },
-[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, },
-[FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, },
-[LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, },
-[BL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 1.000000, .BR = 0.000000, .SL = 0.707107, .SR = 0.000000, },
-[BR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 1.000000, .SL = 0.000000, .SR = 0.707107, },
+[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 1.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 1.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 1.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[BL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 1.000000, .BR = 0.000000, .SL = 0.707107, .SR = 0.000000, .TC = 0.500000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 1.000000, .TBR = 
0.000000, },
+[BR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 1.000000, .SL = 0.000000, .SR = 0.707107, .TC = 0.500000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
1.000000, },
diff --git a/tests/ref/fate/swr-rematrix-7.1.4-5.1.2 
b/tests/ref/fate/swr-rematrix-7.1.6-5.1.2
similarity index 52%
copy from tests/ref/fate/swr-rematrix-7.1.4-5.1.2
copy to tests/ref/fate/swr-rematrix-7.1.6-5.1.2
index 0c82683f9e..e8080e0c48 100644
--- a/tests/ref/fate/swr-rematrix-7.1.4-5.1.2
+++ b/tests/ref/fate/swr-rematrix-7.1.6-5.1.2
@@ -1,8 +1,8 @@
-[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
-[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
-[FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
-[LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
-[SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.707107, .BR = 0.000000, .SL = 1.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
-[SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.707107, .SL = 0.000000, .SR = 1.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBL = 0.000000, .TBR = 0.000000, },
-[TFL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 1.000000, 
.TFR = 0.000000, .TBL = 0.707107, .TBR = 0.000000, },
-[TFR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 1.000000, .TBL = 0.000000, .TBR = 0.707107, },
+[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.707107, .BR = 0.000000, .SL = 1.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.707107, .SL = 0.000000, .SR = 1.000000, .TC = 0.500000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[TFL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 1.000000, .TFC = 0.707107, .TFR = 0.000000, .TBL = 0.707107, .TBR = 
0.000000, },
+[TFR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 0.000000, .TFC = 0.707107, .TFR = 1.000000, .TBL = 0.000000, .TBR = 
0.707107, },
diff --git a/tests/ref/fate/swr-rematrix-7.1.2-5.1.4 
b/tests/ref/fate/swr-rematrix-7.1.6-5.1.4
similarity index 52%
copy from tests/ref/fate/swr-rematrix-7.1.2-5.1.4
copy to tests/ref/fate/swr-rematrix-7.1.6-5.1.4
index b6ea2a003d..691d648253 100644
--- a/tests/ref/fate/swr-rematrix-7.1.2-5.1.4
+++ b/tests/ref/fate/swr-rematrix-7.1.6-5.1.4
@@ -1,10 +1,10 @@
-[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, },
-[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, },
-[FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, },
-[LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, },
-[SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.707107, .BR = 0.000000, .SL = 1.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, },
-[SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.707107, .SL = 0.000000, .SR = 1.000000, .TFL = 0.000000, 
.TFR = 0.000000, },
-[TFL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 1.000000, 
.TFR = 0.000000, },
-[TFR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 1.000000, },
-[TBL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, },
-[TBR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, },
+[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.707107, .BR = 0.000000, .SL = 1.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.707107, .SL = 0.000000, .SR = 1.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[TFL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 1.000000, .TFC = 0.707107, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[TFR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 0.000000, .TFC = 0.707107, .TFR = 1.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[TBL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 1.000000, .TBR = 
0.000000, },
+[TBR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
1.000000, },
diff --git a/tests/ref/fate/swr-rematrix-7.1.6-5.1.6 
b/tests/ref/fate/swr-rematrix-7.1.6-5.1.6
new file mode 100644
index 0000000000..b34e6874c7
--- /dev/null
+++ b/tests/ref/fate/swr-rematrix-7.1.6-5.1.6
@@ -0,0 +1,12 @@
+[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.707107, .BR = 0.000000, .SL = 1.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.707107, .SL = 0.000000, .SR = 1.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[TC] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 1.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[TFL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 1.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[TFC] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 1.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[TFR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 1.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[TBL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 1.000000, .TBR = 
0.000000, },
+[TBR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
1.000000, },
diff --git a/tests/ref/fate/swr-rematrix-7.1.2-7.1 
b/tests/ref/fate/swr-rematrix-7.1.6-7.1
similarity index 52%
copy from tests/ref/fate/swr-rematrix-7.1.2-7.1
copy to tests/ref/fate/swr-rematrix-7.1.6-7.1
index 066cd8218c..8e8d31cdf9 100644
--- a/tests/ref/fate/swr-rematrix-7.1.2-7.1
+++ b/tests/ref/fate/swr-rematrix-7.1.6-7.1
@@ -1,8 +1,8 @@
-[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 1.000000, 
.TFR = 0.000000, },
-[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 1.000000, },
-[FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, },
-[LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, },
-[BL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 1.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, },
-[BR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 1.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, },
-[SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 1.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, },
-[SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 1.000000, .TFL = 0.000000, 
.TFR = 0.000000, },
+[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 1.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 1.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 1.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[BL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 1.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 1.000000, .TBR = 
0.000000, },
+[BR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 1.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
1.000000, },
+[SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 1.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 1.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
diff --git a/tests/ref/fate/swr-rematrix-7.2.3-7.1.2 
b/tests/ref/fate/swr-rematrix-7.1.6-7.1.2
similarity index 52%
copy from tests/ref/fate/swr-rematrix-7.2.3-7.1.2
copy to tests/ref/fate/swr-rematrix-7.1.6-7.1.2
index a3ef857f5b..7577378d59 100644
--- a/tests/ref/fate/swr-rematrix-7.2.3-7.1.2
+++ b/tests/ref/fate/swr-rematrix-7.1.6-7.1.2
@@ -1,10 +1,10 @@
-[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBC = 0.000000, .LFE2 = 0.000000, },
-[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBC = 0.000000, .LFE2 = 0.000000, },
-[FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBC = 0.000000, .LFE2 = 0.000000, },
-[LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBC = 0.000000, .LFE2 = 0.707107, },
-[BL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 1.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBC = 0.707107, .LFE2 = 0.000000, },
-[BR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 1.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBC = 0.707107, .LFE2 = 0.000000, },
-[SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 1.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBC = 0.000000, .LFE2 = 0.000000, },
-[SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 1.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBC = 0.000000, .LFE2 = 0.000000, },
-[TFL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 1.000000, 
.TFR = 0.000000, .TBC = 0.000000, .LFE2 = 0.000000, },
-[TFR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 1.000000, .TBC = 0.000000, .LFE2 = 0.000000, },
+[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[BL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 1.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[BR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 1.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 1.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 1.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[TFL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 1.000000, .TFC = 0.707107, .TFR = 0.000000, .TBL = 0.707107, .TBR = 
0.000000, },
+[TFR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 0.000000, .TFC = 0.707107, .TFR = 1.000000, .TBL = 0.000000, .TBR = 
0.707107, },
diff --git a/tests/ref/fate/swr-rematrix-7.2.3-7.1.4 
b/tests/ref/fate/swr-rematrix-7.1.6-7.1.4
similarity index 52%
copy from tests/ref/fate/swr-rematrix-7.2.3-7.1.4
copy to tests/ref/fate/swr-rematrix-7.1.6-7.1.4
index 96bec8a929..5d9ecedb7a 100644
--- a/tests/ref/fate/swr-rematrix-7.2.3-7.1.4
+++ b/tests/ref/fate/swr-rematrix-7.1.6-7.1.4
@@ -1,12 +1,12 @@
-[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBC = 0.000000, .LFE2 = 0.000000, },
-[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBC = 0.000000, .LFE2 = 0.000000, },
-[FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBC = 0.000000, .LFE2 = 0.000000, },
-[LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBC = 0.000000, .LFE2 = 0.707107, },
-[BL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 1.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBC = 0.000000, .LFE2 = 0.000000, },
-[BR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 1.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBC = 0.000000, .LFE2 = 0.000000, },
-[SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 1.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBC = 0.000000, .LFE2 = 0.000000, },
-[SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 1.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBC = 0.000000, .LFE2 = 0.000000, },
-[TFL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 1.000000, 
.TFR = 0.000000, .TBC = 0.000000, .LFE2 = 0.000000, },
-[TFR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 1.000000, .TBC = 0.000000, .LFE2 = 0.000000, },
-[TBL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBC = 0.707107, .LFE2 = 0.000000, },
-[TBR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TFL = 0.000000, 
.TFR = 0.000000, .TBC = 0.707107, .LFE2 = 0.000000, },
+[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[BL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 1.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[BR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 1.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 1.000000, .SR = 0.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 1.000000, .TC = 0.000000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[TFL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 1.000000, .TFC = 0.707107, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[TFR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 0.000000, .TFC = 0.707107, .TFR = 1.000000, .TBL = 0.000000, .TBR = 
0.000000, },
+[TBL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 1.000000, .TBR = 
0.000000, },
+[TBR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, 
.TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
1.000000, },
diff --git a/tests/ref/fate/swr-rematrix-7.1.2-mono 
b/tests/ref/fate/swr-rematrix-7.1.6-mono
similarity index 52%
copy from tests/ref/fate/swr-rematrix-7.1.2-mono
copy to tests/ref/fate/swr-rematrix-7.1.6-mono
index 299bc31d7c..3d87731edd 100644
--- a/tests/ref/fate/swr-rematrix-7.1.2-mono
+++ b/tests/ref/fate/swr-rematrix-7.1.6-mono
@@ -1 +1 @@
-[FC] = { .FL = 0.707107, .FR = 0.707107, .FC = 1.000000, .LFE = 0.000000, .BL 
= 0.500000, .BR = 0.500000, .SL = 0.500000, .SR = 0.500000, .TFL = 0.707107, 
.TFR = 0.707107, },
+[FC] = { .FL = 0.707107, .FR = 0.707107, .FC = 1.000000, .LFE = 0.000000, .BL 
= 0.500000, .BR = 0.500000, .SL = 0.500000, .SR = 0.500000, .TC = 0.500000, 
.TFL = 0.707107, .TFC = 1.000000, .TFR = 0.707107, .TBL = 0.500000, .TBR = 
0.500000, },
diff --git a/tests/ref/fate/swr-rematrix-7.1.2-stereo 
b/tests/ref/fate/swr-rematrix-7.1.6-stereo
similarity index 52%
copy from tests/ref/fate/swr-rematrix-7.1.2-stereo
copy to tests/ref/fate/swr-rematrix-7.1.6-stereo
index 050e978680..2ff447f379 100644
--- a/tests/ref/fate/swr-rematrix-7.1.2-stereo
+++ b/tests/ref/fate/swr-rematrix-7.1.6-stereo
@@ -1,2 +1,2 @@
-[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.707107, .LFE = 0.000000, .BL 
= 0.707107, .BR = 0.000000, .SL = 0.707107, .SR = 0.000000, .TFL = 1.000000, 
.TFR = 0.000000, },
-[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.707107, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.707107, .SL = 0.000000, .SR = 0.707107, .TFL = 0.000000, 
.TFR = 1.000000, },
+[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.707107, .LFE = 0.000000, .BL 
= 0.707107, .BR = 0.000000, .SL = 0.707107, .SR = 0.000000, .TC = 0.500000, 
.TFL = 1.000000, .TFC = 0.707107, .TFR = 0.000000, .TBL = 0.707107, .TBR = 
0.000000, },
+[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.707107, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.707107, .SL = 0.000000, .SR = 0.707107, .TC = 0.500000, 
.TFL = 0.000000, .TFC = 0.707107, .TFR = 1.000000, .TBL = 0.000000, .TBR = 
0.707107, },
diff --git a/tests/ref/fate/swr-rematrix-9.1.6-7.1.4 
b/tests/ref/fate/swr-rematrix-9.1.6-5.1.6
similarity index 85%
copy from tests/ref/fate/swr-rematrix-9.1.6-7.1.4
copy to tests/ref/fate/swr-rematrix-9.1.6-5.1.6
index 711bde5e20..8819454a05 100644
--- a/tests/ref/fate/swr-rematrix-9.1.6-7.1.4
+++ b/tests/ref/fate/swr-rematrix-9.1.6-5.1.6
@@ -2,11 +2,11 @@
 [FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 1.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
 [FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
 [LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
-[BL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 1.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
-[BR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 1.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
-[SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 1.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
-[SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 1.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
+[SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.707107, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 1.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
+[SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.707107, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 1.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
+[TC] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
 [TFL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 1.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.707107, .TSR = 0.000000, },
+[TFC] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
 [TFR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 1.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.707107, },
 [TBL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 1.000000, .TBR = 
0.000000, .TSL = 0.707107, .TSR = 0.000000, },
 [TBR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
1.000000, .TSL = 0.000000, .TSR = 0.707107, },
diff --git a/tests/ref/fate/swr-rematrix-9.1.6-9.1.4 
b/tests/ref/fate/swr-rematrix-9.1.6-7.1.6
similarity index 91%
copy from tests/ref/fate/swr-rematrix-9.1.6-9.1.4
copy to tests/ref/fate/swr-rematrix-9.1.6-7.1.6
index 10a0ddc6bf..64a5add95d 100644
--- a/tests/ref/fate/swr-rematrix-9.1.6-9.1.4
+++ b/tests/ref/fate/swr-rematrix-9.1.6-7.1.6
@@ -1,14 +1,14 @@
-[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
-[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
+[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 1.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
+[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 1.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
 [FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
 [LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
 [BL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 1.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
 [BR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 1.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
-[FLC] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 1.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
-[FRC] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 1.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
 [SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 1.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
 [SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 1.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
+[TC] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
 [TFL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 1.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.707107, .TSR = 0.000000, },
+[TFC] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.000000, },
 [TFR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 1.000000, .TBL = 0.000000, .TBR = 
0.000000, .TSL = 0.000000, .TSR = 0.707107, },
 [TBL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 1.000000, .TBR = 
0.000000, .TSL = 0.707107, .TSR = 0.000000, },
 [TBR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL 
= 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .SL = 0.000000, 
.SR = 0.000000, .TFL = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBR = 
1.000000, .TSL = 0.000000, .TSR = 0.707107, },

-- 
To stop receiving notification emails like this one, please contact
[email protected].
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to