aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2019-03-10 21:47:05 -0700
committerChris Robinson <[email protected]>2019-03-10 21:47:05 -0700
commit0689333da8d609e87ee35c86cdb6d5c567422287 (patch)
treed609de202dd565dd97f6f3ee5502faf61c6d6565
parent2c67ab0d2cf8db4ec60118d3522213a50ca97de7 (diff)
Mirror the +90 degree elevation delays for -90 degrees
-rw-r--r--utils/makehrtf.cpp31
1 files changed, 19 insertions, 12 deletions
diff --git a/utils/makehrtf.cpp b/utils/makehrtf.cpp
index 364484ee..b0da4620 100644
--- a/utils/makehrtf.cpp
+++ b/utils/makehrtf.cpp
@@ -2361,22 +2361,29 @@ static void SynthesizeOnsets(HrirDataT *hData)
const uint oi{field.mEvStart};
if(oi <= 0) return;
- for(uint ti{0u};ti < channels;ti++)
+ /* Get the -90 degree elevation delays by mirroring the +90 degree
+ * elevation delays. The responses are on a spherical grid centered
+ * between the ears, so these should align.
+ */
+ if(channels > 1)
{
- double t{0.0};
- for(uint ai{0u};ai < field.mEvs[oi].mAzCount;ai++)
- t += field.mEvs[oi].mAzs[ai].mDelays[ti];
- field.mEvs[0].mAzs[0].mDelays[ti] = 1.32e-4 + (t / field.mEvs[oi].mAzCount);
+ field.mEvs[0].mAzs[0].mDelays[0] = field.mEvs[field.mEvCount-1].mAzs[0].mDelays[1];
+ field.mEvs[0].mAzs[0].mDelays[1] = field.mEvs[field.mEvCount-1].mAzs[0].mDelays[0];
+ }
+ else
+ field.mEvs[0].mAzs[0].mDelays[0] = field.mEvs[field.mEvCount-1].mAzs[0].mDelays[0];
- for(uint ei{1u};ei < field.mEvStart;ei++)
+ for(uint ei{1u};ei < field.mEvStart;ei++)
+ {
+ const double of{static_cast<double>(ei) / field.mEvStart};
+ for(uint ai{0u};ai < field.mEvs[ei].mAzCount;ai++)
{
- const double of{static_cast<double>(ei) / field.mEvStart};
- for(uint ai{0u};ai < field.mEvs[ei].mAzCount;ai++)
- {
- uint a0, a1;
- double af;
+ uint a0, a1;
+ double af;
- CalcAzIndices(field, oi, field.mEvs[ei].mAzs[ai].mAzimuth, &a0, &a1, &af);
+ CalcAzIndices(field, oi, field.mEvs[ei].mAzs[ai].mAzimuth, &a0, &a1, &af);
+ for(uint ti{0u};ti < channels;ti++)
+ {
double other{Lerp(field.mEvs[oi].mAzs[a0].mDelays[ti],
field.mEvs[oi].mAzs[a1].mDelays[ti], af)};
field.mEvs[ei].mAzs[ai].mDelays[ti] = Lerp(field.mEvs[0].mAzs[0].mDelays[ti],