Merge pull request #51 from jyrkialakuijala/main

better right-center-left computation
google · Mar 18, 2024 · 3c54fb8 · 3c54fb8
2 parents acaa70d + 8e47ef0
commit 3c54fb8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/scripts/upmix.py b/scripts/upmix.py
@@ -35,7 +35,7 @@ def run(str):
 print("playing", file)
 run('cp "' + file + '" /tmp/input.wav')
 
-run("sox /tmp/input.wav -b 24 /tmp/down-dry.wav gain -10 rate 48k trim 0 60")
+run("sox /tmp/input.wav -b 24 /tmp/down-dry.wav gain -10 rate 48k") # trim 0 60")
 
 run("./build/revolve /tmp/down-dry.wav /tmp/16speakers.wav")
 

diff --git a/speaker_experiments/revolve.cc b/speaker_experiments/revolve.cc
@@ -230,9 +230,10 @@ struct Rotators {
                   float &right,
                   float &center,
                   float &left) {
-    float aver = 0.5 * (rightr + leftr);
-    float avei = 0.5 * (righti + lefti);
-    center = rot[2][rot_ix] * aver + rot[3][rot_ix] * avei;
+    float aver = rightr + leftr;
+    float avei = righti + lefti;
+    // not sure about the 0.5 on next line -- perhaps 1.0 is better?
+    center = 0.5 * (rot[2][rot_ix] * aver + rot[3][rot_ix] * avei);
 
     rightr -= left_to_right_ratio * aver;
     righti -= left_to_right_ratio * avei;