AuroraMiddleware/AuroraOpenALSoft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
af8bbefcab
AuroraOpenALSoft/Alc/panning.c

1308 lines
52 KiB
C
Raw Normal View History

Separate speaker/panning initialization into another source file
2010-08-03 07:21:36 +00:00
/**
* OpenAL cross platform audio library
* Copyright (C) 1999-2010 by authors.
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
Update COPYING to the latest https://www.gnu.org/licenses/old-licenses/lgpl-2.0.txt to fix the FSF' address Fix the FSF' address in the source
2014-08-18 12:11:03 +00:00
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Separate speaker/panning initialization into another source file
2010-08-03 07:21:36 +00:00
* Or go to http://www.gnu.org/copyleft/lgpl.html
*/
#include "config.h"
#include <math.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <assert.h>
#include "alMain.h"
Mix to multichannel for effects This mixes to a 4-channel first-order ambisonics buffer. With ACN ordering and N3D scaling, this makes it easy to remain compatible with effects that only care about mono input since channel 0 is an unattenuated mono signal.
2016-01-28 08:02:46 +00:00
#include "alAuxEffectSlot.h"
Separate speaker/panning initialization into another source file
2010-08-03 07:21:36 +00:00
#include "alu.h"
Move the config function declarations to their own header And rename alcConfig.c to alconfig.c for consistency.
2018-01-11 15:56:54 +00:00
#include "alconfig.h"
Add the ability to use custom output channel coefficients I'm not sure exactly how I want to do this yet, but this is a good starting point.
2014-11-11 01:53:42 +00:00
#include "bool.h"
Add a dual-band ambisonic decoder This uses a virtual B-Format buffer for mixing, and then uses a dual-band decoder for improved positional quality. This currently only works with first- order output since first-order input (from the AL_EXT_BFROMAT extension) would not sound correct when fed through a second- or third-order decoder. This also does not currently implement near-field compensation since near-field rendering effects are not implemented.
2016-03-15 12:08:05 +00:00
#include "ambdec.h"
#include "bformatdec.h"
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
#include "uhjfilter.h"
#include "bs2b.h"
Separate speaker/panning initialization into another source file
2010-08-03 07:21:36 +00:00
Remove CalcXYZCoeffs and inline CalcAngleCoeffs
2017-02-24 00:44:59 +00:00
extern inline void CalcAngleCoeffs(ALfloat azimuth, ALfloat elevation, ALfloat spread, ALfloat coeffs[MAX_AMBI_COEFFS]);
Avoid using macros to access anonymous structures
2018-01-11 11:45:23 +00:00
extern inline void ComputeAmbientGains(const DryMixParams *dry, ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS]);
extern inline void ComputeDryPanGains(const DryMixParams *dry, const ALfloat coeffs[MAX_AMBI_COEFFS], ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS]);
extern inline void ComputeFirstOrderGains(const BFMixParams *foa, const ALfloat mtx[4], ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS]);
Separate calculating ambisonic coefficients from the panning gains
2016-01-25 14:11:51 +00:00
Use ALsizei for sizes and offsets with the mixer Unsigned 32-bit offsets actually have some potential overhead on 64-bit targets for pointer/array accesses due to rules on integer wrapping. No idea how much impact it has in practice, but it's nice to be correct about it.
2017-01-16 15:45:07 +00:00
static const ALsizei FuMa2ACN[MAX_AMBI_COEFFS] = {
Use ACN ordering for ambisonics coefficients arrays Note that it still uses FuMa scalings internally. Coefficients loaded from config files specify if they're FuMa (in both ordering and scaling) or N3D, and will get reordered or rescaled as needed.
2015-08-28 17:58:30 +00:00
0, /* W */
3, /* X */
1, /* Y */
2, /* Z */
6, /* R */
7, /* S */
5, /* T */
8, /* U */
4, /* V */
12, /* K */
13, /* L */
11, /* M */
14, /* N */
10, /* O */
15, /* P */
9, /* Q */
};
Use ALsizei for sizes and offsets with the mixer Unsigned 32-bit offsets actually have some potential overhead on 64-bit targets for pointer/array accesses due to rules on integer wrapping. No idea how much impact it has in practice, but it's nice to be correct about it.
2017-01-16 15:45:07 +00:00
static const ALsizei ACN2ACN[MAX_AMBI_COEFFS] = {
Add an option to specify the ambisonic output configuration
2016-07-31 14:46:38 +00:00
0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15
};
Use ACN ordering for ambisonics coefficients arrays Note that it still uses FuMa scalings internally. Coefficients loaded from config files specify if they're FuMa (in both ordering and scaling) or N3D, and will get reordered or rescaled as needed.
2015-08-28 17:58:30 +00:00
Replace the custom layout options with an ambdec loader The ambisonic layout options were never very good for clarity or flexibility. Hopefully using ambdec files will prove to be better.
2016-03-15 15:00:03 +00:00
/* NOTE: These are scale factors as applied to Ambisonics content. Decoder
* coefficients should be divided by these values to get proper N3D scalings.
Use N3D scaling instead of FuMa
2015-09-23 22:03:53 +00:00
*/
Replace the custom layout options with an ambdec loader The ambisonic layout options were never very good for clarity or flexibility. Hopefully using ambdec files will prove to be better.
2016-03-15 15:00:03 +00:00
static const ALfloat UnitScale[MAX_AMBI_COEFFS] = {
1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f,
1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f
};
static const ALfloat SN3D2N3DScale[MAX_AMBI_COEFFS] = {
1.000000000f, /* ACN 0 (W), sqrt(1) */
1.732050808f, /* ACN 1 (Y), sqrt(3) */
1.732050808f, /* ACN 2 (Z), sqrt(3) */
1.732050808f, /* ACN 3 (X), sqrt(3) */
2.236067978f, /* ACN 4 (V), sqrt(5) */
2.236067978f, /* ACN 5 (T), sqrt(5) */
2.236067978f, /* ACN 6 (R), sqrt(5) */
2.236067978f, /* ACN 7 (S), sqrt(5) */
2.236067978f, /* ACN 8 (U), sqrt(5) */
2.645751311f, /* ACN 9 (Q), sqrt(7) */
2.645751311f, /* ACN 10 (O), sqrt(7) */
2.645751311f, /* ACN 11 (M), sqrt(7) */
2.645751311f, /* ACN 12 (K), sqrt(7) */
2.645751311f, /* ACN 13 (L), sqrt(7) */
2.645751311f, /* ACN 14 (N), sqrt(7) */
2.645751311f, /* ACN 15 (P), sqrt(7) */
};
Use N3D scaling instead of FuMa
2015-09-23 22:03:53 +00:00
static const ALfloat FuMa2N3DScale[MAX_AMBI_COEFFS] = {
Use more accurate floating point literals
2015-11-06 18:27:28 +00:00
1.414213562f, /* ACN 0 (W), sqrt(2) */
1.732050808f, /* ACN 1 (Y), sqrt(3) */
1.732050808f, /* ACN 2 (Z), sqrt(3) */
1.732050808f, /* ACN 3 (X), sqrt(3) */
1.936491673f, /* ACN 4 (V), sqrt(15)/2 */
1.936491673f, /* ACN 5 (T), sqrt(15)/2 */
2.236067978f, /* ACN 6 (R), sqrt(5) */
1.936491673f, /* ACN 7 (S), sqrt(15)/2 */
1.936491673f, /* ACN 8 (U), sqrt(15)/2 */
2.091650066f, /* ACN 9 (Q), sqrt(35/8) */
1.972026594f, /* ACN 10 (O), sqrt(35)/3 */
2.231093404f, /* ACN 11 (M), sqrt(224/45) */
2.645751311f, /* ACN 12 (K), sqrt(7) */
2.231093404f, /* ACN 13 (L), sqrt(224/45) */
1.972026594f, /* ACN 14 (N), sqrt(35)/3 */
2.091650066f, /* ACN 15 (P), sqrt(35/8) */
Use ACN ordering for ambisonics coefficients arrays Note that it still uses FuMa scalings internally. Coefficients loaded from config files specify if they're FuMa (in both ordering and scaling) or N3D, and will get reordered or rescaled as needed.
2015-08-28 17:58:30 +00:00
};
Improve radius behavior with scaling of ambisonic coefficients
2016-04-25 04:42:59 +00:00
void CalcDirectionCoeffs(const ALfloat dir[3], ALfloat spread, ALfloat coeffs[MAX_AMBI_COEFFS])
Use an ambisonics-based panning method For mono sources, third-order ambisonics is utilized to generate panning gains. The general idea is that a panned mono sound can be encoded into b-format ambisonics as: w[i] = sample[i] * 0.7071; x[i] = sample[i] * dir[0]; y[i] = sample[i] * dir[1]; ... and subsequently rendered using: output[chan][i] = w[i] * w_coeffs[chan] + x[i] * x_coeffs[chan] + y[i] * y_coeffs[chan] + ...; By reordering the math, channel gains can be generated by doing: gain[chan] = 0.7071 * w_coeffs[chan] + dir[0] * x_coeffs[chan] + dir[1] * y_coeffs[chan] + ...; which then get applied as normal: output[chan][i] = sample[i] * gain[chan]; One of the reasons to use ambisonics for panning is that it provides arguably better reproduction for sounds emanating from between two speakers. As well, this makes it easier to pan in all 3 dimensions, with for instance a "3D7.1" or 8-channel cube speaker configuration by simply providing the necessary coefficients (this will need some work since some methods still use angle-based panpot, particularly multi-channel sources). Unfortunately, the math to reliably generate the coefficients for a given speaker configuration is too costly to do at run-time. They have to be pre- generated based on a pre-specified speaker arangement, which means the config options for tweaking speaker angles are no longer supportable. Eventually I hope to provide config options for custom coefficients, which can either be generated and written in manually, or via alsoft-config from user-specified speaker positions. The current default set of coefficients were generated using the MATLAB scripts (compatible with GNU Octave) from the excellent Ambisonic Decoder Toolbox, at https://bitbucket.org/ambidecodertoolbox/adt/
2014-09-30 14:33:13 +00:00
{
/* Convert from OpenAL coords to Ambisonics. */
Store default speaker configurations in a struct
2014-10-03 03:25:30 +00:00
ALfloat x = -dir[2];
ALfloat y = -dir[0];
ALfloat z = dir[1];
Use ACN ordering for ambisonics coefficients arrays Note that it still uses FuMa scalings internally. Coefficients loaded from config files specify if they're FuMa (in both ordering and scaling) or N3D, and will get reordered or rescaled as needed.
2015-08-28 17:58:30 +00:00
/* Zeroth-order */
Use N3D scaling instead of FuMa
2015-09-23 22:03:53 +00:00
coeffs[0] = 1.0f; /* ACN 0 = 1 */
Use ACN ordering for ambisonics coefficients arrays Note that it still uses FuMa scalings internally. Coefficients loaded from config files specify if they're FuMa (in both ordering and scaling) or N3D, and will get reordered or rescaled as needed.
2015-08-28 17:58:30 +00:00
/* First-order */
Use more accurate floating point literals
2015-11-06 18:27:28 +00:00
coeffs[1] = 1.732050808f * y; /* ACN 1 = sqrt(3) * Y */
coeffs[2] = 1.732050808f * z; /* ACN 2 = sqrt(3) * Z */
coeffs[3] = 1.732050808f * x; /* ACN 3 = sqrt(3) * X */
Use ACN ordering for ambisonics coefficients arrays Note that it still uses FuMa scalings internally. Coefficients loaded from config files specify if they're FuMa (in both ordering and scaling) or N3D, and will get reordered or rescaled as needed.
2015-08-28 17:58:30 +00:00
/* Second-order */
Use more accurate floating point literals
2015-11-06 18:27:28 +00:00
coeffs[4] = 3.872983346f * x * y; /* ACN 4 = sqrt(15) * X * Y */
coeffs[5] = 3.872983346f * y * z; /* ACN 5 = sqrt(15) * Y * Z */
coeffs[6] = 1.118033989f * (3.0f*z*z - 1.0f); /* ACN 6 = sqrt(5)/2 * (3*Z*Z - 1) */
coeffs[7] = 3.872983346f * x * z; /* ACN 7 = sqrt(15) * X * Z */
coeffs[8] = 1.936491673f * (x*x - y*y); /* ACN 8 = sqrt(15)/2 * (X*X - Y*Y) */
Use ACN ordering for ambisonics coefficients arrays Note that it still uses FuMa scalings internally. Coefficients loaded from config files specify if they're FuMa (in both ordering and scaling) or N3D, and will get reordered or rescaled as needed.
2015-08-28 17:58:30 +00:00
/* Third-order */
Use more accurate floating point literals
2015-11-06 18:27:28 +00:00
coeffs[9] = 2.091650066f * y * (3.0f*x*x - y*y); /* ACN 9 = sqrt(35/8) * Y * (3*X*X - Y*Y) */
coeffs[10] = 10.246950766f * z * x * y; /* ACN 10 = sqrt(105) * Z * X * Y */
coeffs[11] = 1.620185175f * y * (5.0f*z*z - 1.0f); /* ACN 11 = sqrt(21/8) * Y * (5*Z*Z - 1) */
coeffs[12] = 1.322875656f * z * (5.0f*z*z - 3.0f); /* ACN 12 = sqrt(7)/2 * Z * (5*Z*Z - 3) */
coeffs[13] = 1.620185175f * x * (5.0f*z*z - 1.0f); /* ACN 13 = sqrt(21/8) * X * (5*Z*Z - 1) */
coeffs[14] = 5.123475383f * z * (x*x - y*y); /* ACN 14 = sqrt(105)/2 * Z * (X*X - Y*Y) */
coeffs[15] = 2.091650066f * x * (x*x - 3.0f*y*y); /* ACN 15 = sqrt(35/8) * X * (X*X - 3*Y*Y) */
Improve radius behavior with scaling of ambisonic coefficients
2016-04-25 04:42:59 +00:00
if(spread > 0.0f)
{
/* Implement the spread by using a spherical source that subtends the
* angle spread. See:
* http://www.ppsloan.org/publications/StupidSH36.pdf - Appendix A3
*
Update comment about the source radius calculations
2016-07-11 05:00:27 +00:00
* When adjusted for N3D normalization instead of SN3D, these
* calculations are:
*
* ZH0 = -sqrt(pi) * (-1+ca);
* ZH1 = 0.5*sqrt(pi) * sa*sa;
* ZH2 = -0.5*sqrt(pi) * ca*(-1+ca)*(ca+1);
* ZH3 = -0.125*sqrt(pi) * (-1+ca)*(ca+1)*(5*ca*ca - 1);
* ZH4 = -0.125*sqrt(pi) * ca*(-1+ca)*(ca+1)*(7*ca*ca - 3);
* ZH5 = -0.0625*sqrt(pi) * (-1+ca)*(ca+1)*(21*ca*ca*ca*ca - 14*ca*ca + 1);
Improve radius behavior with scaling of ambisonic coefficients
2016-04-25 04:42:59 +00:00
*
Update comment about the source radius calculations
2016-07-11 05:00:27 +00:00
* The gain of the source is compensated for size, so that the
Scale the source volume by +3dB for a full spread This effectively turns a full spread source into an ambient response, preventing such sources from being unexpectedly quiet.
2017-07-19 05:15:32 +00:00
* loundness doesn't depend on the spread. Thus:
Improve radius behavior with scaling of ambisonic coefficients
2016-04-25 04:42:59 +00:00
*
Update comment about the source radius calculations
2016-07-11 05:00:27 +00:00
* ZH0 = 1.0f;
* ZH1 = 0.5f * (ca+1.0f);
* ZH2 = 0.5f * (ca+1.0f)*ca;
* ZH3 = 0.125f * (ca+1.0f)*(5.0f*ca*ca - 1.0f);
* ZH4 = 0.125f * (ca+1.0f)*(7.0f*ca*ca - 3.0f)*ca;
* ZH5 = 0.0625f * (ca+1.0f)*(21.0f*ca*ca*ca*ca - 14.0f*ca*ca + 1.0f);
Improve radius behavior with scaling of ambisonic coefficients
2016-04-25 04:42:59 +00:00
*/
ALfloat ca = cosf(spread * 0.5f);
Scale the source volume by +3dB for a full spread This effectively turns a full spread source into an ambient response, preventing such sources from being unexpectedly quiet.
2017-07-19 05:15:32 +00:00
/* Increase the source volume by up to +3dB for a full spread. */
ALfloat scale = sqrtf(1.0f + spread/F_TAU);
Improve radius behavior with scaling of ambisonic coefficients
2016-04-25 04:42:59 +00:00
Scale the source volume by +3dB for a full spread This effectively turns a full spread source into an ambient response, preventing such sources from being unexpectedly quiet.
2017-07-19 05:15:32 +00:00
ALfloat ZH0_norm = scale;
ALfloat ZH1_norm = 0.5f * (ca+1.f) * scale;
ALfloat ZH2_norm = 0.5f * (ca+1.f)*ca * scale;
ALfloat ZH3_norm = 0.125f * (ca+1.f)*(5.f*ca*ca-1.f) * scale;
Improve radius behavior with scaling of ambisonic coefficients
2016-04-25 04:42:59 +00:00
/* Zeroth-order */
coeffs[0] *= ZH0_norm;
/* First-order */
coeffs[1] *= ZH1_norm;
coeffs[2] *= ZH1_norm;
coeffs[3] *= ZH1_norm;
/* Second-order */
coeffs[4] *= ZH2_norm;
coeffs[5] *= ZH2_norm;
coeffs[6] *= ZH2_norm;
coeffs[7] *= ZH2_norm;
coeffs[8] *= ZH2_norm;
/* Third-order */
coeffs[9] *= ZH3_norm;
coeffs[10] *= ZH3_norm;
coeffs[11] *= ZH3_norm;
coeffs[12] *= ZH3_norm;
coeffs[13] *= ZH3_norm;
coeffs[14] *= ZH3_norm;
coeffs[15] *= ZH3_norm;
}
Separate calculating ambisonic coefficients from the panning gains
2016-01-25 14:11:51 +00:00
}
Alter how panpot/pair-wise panning works This change allows pair-wise panning to mostly go through the normal ambisonic panning methods, with one special-case. First, a term is added to the stereo decoder matrix's X coefficient so that a centered sound is reduced by -3dB on each output channel. Panning in front creates a similar gain response to the typical L = sqrt(1-pan) R = sqrt(pan) for pan = [0,1]. Panning behind the listener can reduce (up to) an additional -10dB, creating a audible difference between front and back sounds as if simulating head obstruction. Secondly, as a special-case, the source positions are warped when calculating the ambisonic coefficients so that full left panning is reached at -30 degrees and full right at +30 degrees. This is to retain the expected 60-degree stereo width. This warping does not apply to B-Format buffer input, although it otherwise has the same gain responses.
2017-02-23 08:23:16 +00:00
void CalcAnglePairwiseCoeffs(ALfloat azimuth, ALfloat elevation, ALfloat spread, ALfloat coeffs[MAX_AMBI_COEFFS])
{
ALfloat sign = (azimuth < 0.0f) ? -1.0f : 1.0f;
if(!(fabsf(azimuth) > F_PI_2))
azimuth = minf(fabsf(azimuth) * F_PI_2 / (F_PI/6.0f), F_PI_2) * sign;
CalcAngleCoeffs(azimuth, elevation, spread, coeffs);
}
Separate calculating ambisonic coefficients from the panning gains
2016-01-25 14:11:51 +00:00
Use ALsizei in more places
2017-01-18 15:13:23 +00:00
void ComputeAmbientGainsMC(const ChannelConfig *chancoeffs, ALsizei numchans, ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS])
Separate calculating ambisonic coefficients from the panning gains
2016-01-25 14:11:51 +00:00
{
Use ALsizei in more places
2017-01-18 15:13:23 +00:00
ALsizei i;
Separate calculating ambisonic coefficients from the panning gains
2016-01-25 14:11:51 +00:00
for(i = 0;i < numchans;i++)
Use a flat sqrt(2) scale for non-directional ambient gains
2017-01-21 19:54:22 +00:00
gains[i] = chancoeffs[i][0] * 1.414213562f * ingain;
Separate calculating ambisonic coefficients from the panning gains
2016-01-25 14:11:51 +00:00
for(;i < MAX_OUTPUT_CHANNELS;i++)
gains[i] = 0.0f;
}
Use ALsizei in more places
2017-01-18 15:13:23 +00:00
void ComputeAmbientGainsBF(const BFChannelConfig *chanmap, ALsizei numchans, ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS])
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
{
ALfloat gain = 0.0f;
Use ALsizei in more places
2017-01-18 15:13:23 +00:00
ALsizei i;
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
for(i = 0;i < numchans;i++)
{
if(chanmap[i].Index == 0)
gain += chanmap[i].Scale;
}
gains[0] = gain * 1.414213562f * ingain;
for(i = 1;i < MAX_OUTPUT_CHANNELS;i++)
gains[i] = 0.0f;
}
Use ALsizei in more places
2017-01-18 15:13:23 +00:00
void ComputePanningGainsMC(const ChannelConfig *chancoeffs, ALsizei numchans, ALsizei numcoeffs, const ALfloat coeffs[MAX_AMBI_COEFFS], ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS])
Separate calculating ambisonic coefficients from the panning gains
2016-01-25 14:11:51 +00:00
{
Use ALsizei in more places
2017-01-18 15:13:23 +00:00
ALsizei i, j;
Use an ambisonics-based panning method For mono sources, third-order ambisonics is utilized to generate panning gains. The general idea is that a panned mono sound can be encoded into b-format ambisonics as: w[i] = sample[i] * 0.7071; x[i] = sample[i] * dir[0]; y[i] = sample[i] * dir[1]; ... and subsequently rendered using: output[chan][i] = w[i] * w_coeffs[chan] + x[i] * x_coeffs[chan] + y[i] * y_coeffs[chan] + ...; By reordering the math, channel gains can be generated by doing: gain[chan] = 0.7071 * w_coeffs[chan] + dir[0] * x_coeffs[chan] + dir[1] * y_coeffs[chan] + ...; which then get applied as normal: output[chan][i] = sample[i] * gain[chan]; One of the reasons to use ambisonics for panning is that it provides arguably better reproduction for sounds emanating from between two speakers. As well, this makes it easier to pan in all 3 dimensions, with for instance a "3D7.1" or 8-channel cube speaker configuration by simply providing the necessary coefficients (this will need some work since some methods still use angle-based panpot, particularly multi-channel sources). Unfortunately, the math to reliably generate the coefficients for a given speaker configuration is too costly to do at run-time. They have to be pre- generated based on a pre-specified speaker arangement, which means the config options for tweaking speaker angles are no longer supportable. Eventually I hope to provide config options for custom coefficients, which can either be generated and written in manually, or via alsoft-config from user-specified speaker positions. The current default set of coefficients were generated using the MATLAB scripts (compatible with GNU Octave) from the excellent Ambisonic Decoder Toolbox, at https://bitbucket.org/ambidecodertoolbox/adt/
2014-09-30 14:33:13 +00:00
Separate calculating ambisonic coefficients from the panning gains
2016-01-25 14:11:51 +00:00
for(i = 0;i < numchans;i++)
Use an ambisonics-based panning method For mono sources, third-order ambisonics is utilized to generate panning gains. The general idea is that a panned mono sound can be encoded into b-format ambisonics as: w[i] = sample[i] * 0.7071; x[i] = sample[i] * dir[0]; y[i] = sample[i] * dir[1]; ... and subsequently rendered using: output[chan][i] = w[i] * w_coeffs[chan] + x[i] * x_coeffs[chan] + y[i] * y_coeffs[chan] + ...; By reordering the math, channel gains can be generated by doing: gain[chan] = 0.7071 * w_coeffs[chan] + dir[0] * x_coeffs[chan] + dir[1] * y_coeffs[chan] + ...; which then get applied as normal: output[chan][i] = sample[i] * gain[chan]; One of the reasons to use ambisonics for panning is that it provides arguably better reproduction for sounds emanating from between two speakers. As well, this makes it easier to pan in all 3 dimensions, with for instance a "3D7.1" or 8-channel cube speaker configuration by simply providing the necessary coefficients (this will need some work since some methods still use angle-based panpot, particularly multi-channel sources). Unfortunately, the math to reliably generate the coefficients for a given speaker configuration is too costly to do at run-time. They have to be pre- generated based on a pre-specified speaker arangement, which means the config options for tweaking speaker angles are no longer supportable. Eventually I hope to provide config options for custom coefficients, which can either be generated and written in manually, or via alsoft-config from user-specified speaker positions. The current default set of coefficients were generated using the MATLAB scripts (compatible with GNU Octave) from the excellent Ambisonic Decoder Toolbox, at https://bitbucket.org/ambidecodertoolbox/adt/
2014-09-30 14:33:13 +00:00
{
Minor reformating
2015-08-22 14:23:43 +00:00
float gain = 0.0f;
Avoid mixing all coefficients together when only some are used
2016-04-16 00:31:04 +00:00
for(j = 0;j < numcoeffs;j++)
Separate calculating ambisonic coefficients from the panning gains
2016-01-25 14:11:51 +00:00
gain += chancoeffs[i][j]*coeffs[j];
Alter how panpot/pair-wise panning works This change allows pair-wise panning to mostly go through the normal ambisonic panning methods, with one special-case. First, a term is added to the stereo decoder matrix's X coefficient so that a centered sound is reduced by -3dB on each output channel. Panning in front creates a similar gain response to the typical L = sqrt(1-pan) R = sqrt(pan) for pan = [0,1]. Panning behind the listener can reduce (up to) an additional -10dB, creating a audible difference between front and back sounds as if simulating head obstruction. Secondly, as a special-case, the source positions are warped when calculating the ambisonic coefficients so that full left panning is reached at -30 degrees and full right at +30 degrees. This is to retain the expected 60-degree stereo width. This warping does not apply to B-Format buffer input, although it otherwise has the same gain responses.
2017-02-23 08:23:16 +00:00
gains[i] = clampf(gain, 0.0f, 1.0f) * ingain;
Slightly increase the ambient gain volume
2014-11-15 12:11:22 +00:00
}
Loop over the gain values only once
2015-09-24 19:36:02 +00:00
for(;i < MAX_OUTPUT_CHANNELS;i++)
gains[i] = 0.0f;
Use a method to set omni-directional channel gains
2014-11-04 11:33:35 +00:00
}
Use ALsizei in more places
2017-01-18 15:13:23 +00:00
void ComputePanningGainsBF(const BFChannelConfig *chanmap, ALsizei numchans, const ALfloat coeffs[MAX_AMBI_COEFFS], ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS])
Avoid unnecessary loops for setting up effect slot b-format buffer mixing
2016-04-15 04:50:36 +00:00
{
Use ALsizei in more places
2017-01-18 15:13:23 +00:00
ALsizei i;
Avoid unnecessary loops for setting up effect slot b-format buffer mixing
2016-04-15 04:50:36 +00:00
for(i = 0;i < numchans;i++)
gains[i] = chanmap[i].Scale * coeffs[chanmap[i].Index] * ingain;
for(;i < MAX_OUTPUT_CHANNELS;i++)
gains[i] = 0.0f;
}
Use ALsizei in more places
2017-01-18 15:13:23 +00:00
void ComputeFirstOrderGainsMC(const ChannelConfig *chancoeffs, ALsizei numchans, const ALfloat mtx[4], ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS])
Add preliminary AL_EXT_BFORMAT support Currently missing the AL_ORIENTATION source property. Gain stepping also does not work.
2014-11-01 00:18:45 +00:00
{
Use ALsizei in more places
2017-01-18 15:13:23 +00:00
ALsizei i, j;
Add preliminary AL_EXT_BFORMAT support Currently missing the AL_ORIENTATION source property. Gain stepping also does not work.
2014-11-01 00:18:45 +00:00
Separate calculating ambisonic coefficients from the panning gains
2016-01-25 14:11:51 +00:00
for(i = 0;i < numchans;i++)
Add preliminary AL_EXT_BFORMAT support Currently missing the AL_ORIENTATION source property. Gain stepping also does not work.
2014-11-01 00:18:45 +00:00
{
Loop over the gain values only once
2015-09-24 19:36:02 +00:00
float gain = 0.0f;
Use ACN ordering for ambisonics coefficients arrays Note that it still uses FuMa scalings internally. Coefficients loaded from config files specify if they're FuMa (in both ordering and scaling) or N3D, and will get reordered or rescaled as needed.
2015-08-28 17:58:30 +00:00
for(j = 0;j < 4;j++)
Separate calculating ambisonic coefficients from the panning gains
2016-01-25 14:11:51 +00:00
gain += chancoeffs[i][j] * mtx[j];
Alter how panpot/pair-wise panning works This change allows pair-wise panning to mostly go through the normal ambisonic panning methods, with one special-case. First, a term is added to the stereo decoder matrix's X coefficient so that a centered sound is reduced by -3dB on each output channel. Panning in front creates a similar gain response to the typical L = sqrt(1-pan) R = sqrt(pan) for pan = [0,1]. Panning behind the listener can reduce (up to) an additional -10dB, creating a audible difference between front and back sounds as if simulating head obstruction. Secondly, as a special-case, the source positions are warped when calculating the ambisonic coefficients so that full left panning is reached at -30 degrees and full right at +30 degrees. This is to retain the expected 60-degree stereo width. This warping does not apply to B-Format buffer input, although it otherwise has the same gain responses.
2017-02-23 08:23:16 +00:00
gains[i] = clampf(gain, 0.0f, 1.0f) * ingain;
Add preliminary AL_EXT_BFORMAT support Currently missing the AL_ORIENTATION source property. Gain stepping also does not work.
2014-11-01 00:18:45 +00:00
}
Loop over the gain values only once
2015-09-24 19:36:02 +00:00
for(;i < MAX_OUTPUT_CHANNELS;i++)
gains[i] = 0.0f;
Add preliminary AL_EXT_BFORMAT support Currently missing the AL_ORIENTATION source property. Gain stepping also does not work.
2014-11-01 00:18:45 +00:00
}
Use ALsizei in more places
2017-01-18 15:13:23 +00:00
void ComputeFirstOrderGainsBF(const BFChannelConfig *chanmap, ALsizei numchans, const ALfloat mtx[4], ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS])
Avoid unnecessary loops for setting up effect slot b-format buffer mixing
2016-04-15 04:50:36 +00:00
{
Use ALsizei in more places
2017-01-18 15:13:23 +00:00
ALsizei i;
Avoid unnecessary loops for setting up effect slot b-format buffer mixing
2016-04-15 04:50:36 +00:00
for(i = 0;i < numchans;i++)
gains[i] = chanmap[i].Scale * mtx[chanmap[i].Index] * ingain;
for(;i < MAX_OUTPUT_CHANNELS;i++)
gains[i] = 0.0f;
}
Use ComputeAngleGains for multi-channel sources and remove the unused lookup table stuff
2012-04-29 12:04:46 +00:00
Remove use of DECL_CONST No idea if it was really gaining us anything, but removing it fixes a crash I was getting with libs built with Clang.
2016-09-06 16:09:25 +00:00
static inline const char *GetLabelFromChannel(enum Channel channel)
Add a method to convert channel enums to a label string
2014-11-15 08:19:56 +00:00
{
switch(channel)
{
case FrontLeft: return "front-left";
case FrontRight: return "front-right";
case FrontCenter: return "front-center";
case LFE: return "lfe";
case BackLeft: return "back-left";
case BackRight: return "back-right";
case BackCenter: return "back-center";
case SideLeft: return "side-left";
case SideRight: return "side-right";
Use a different method for HRTF mixing This new method mixes sources normally into a 14-channel buffer with the channels placed all around the listener. HRTF is then applied to the channels given their positions and written to a 2-channel buffer, which gets written out to the device. This method has the benefit that HRTF processing becomes more scalable. The costly HRTF filters are applied to the 14-channel buffer after the mix is done, turning it into a post-process with a fixed overhead. Mixing sources is done with normal non-HRTF methods, so increasing the number of playing sources only incurs normal mixing costs. Another benefit is that it improves B-Format playback since the soundfield gets mixed into speakers covering all three dimensions, which then get filtered based on their locations. The main downside to this is that the spatial resolution of the HRTF dataset does not play a big role anymore. However, the hope is that with ambisonics- based panning, the perceptual position of panned sounds will still be good. It is also an option to increase the number of virtual channels for systems that can handle it, or maybe even decrease it for weaker systems.
2014-11-22 12:20:17 +00:00
Use an 8-channel cube for HRTF's virtual format. There were phase issues caused by applying HRTF directly to the B-Format channels, since the HRIR delays were all averaged which removed the inter-aural time-delay, which in turn removed significant spatial information.
2016-02-20 08:53:01 +00:00
case UpperFrontLeft: return "upper-front-left";
case UpperFrontRight: return "upper-front-right";
case UpperBackLeft: return "upper-back-left";
case UpperBackRight: return "upper-back-right";
case LowerFrontLeft: return "lower-front-left";
case LowerFrontRight: return "lower-front-right";
case LowerBackLeft: return "lower-back-left";
case LowerBackRight: return "lower-back-right";
Rename the BFormat channels to Aux
2016-03-16 13:49:35 +00:00
case Aux0: return "aux-0";
case Aux1: return "aux-1";
case Aux2: return "aux-2";
case Aux3: return "aux-3";
Allow second-order HQ decoding Could really do with some optimizations to the mixing gain calculations. For ambisonic targets, the coefficients will only have 1 non-0 entry for each output, so the double loop in unnecessarily wasteful. Similarly, most uses won't need a full height encoding either, so a horizontal-only or mixed-order target could reduce the number of channels.
2016-03-23 17:39:14 +00:00
case Aux4: return "aux-4";
case Aux5: return "aux-5";
case Aux6: return "aux-6";
case Aux7: return "aux-7";
case Aux8: return "aux-8";
Increase max output channels to 16 This also enables fully periphonic 3rd order HQ decoding.
2016-04-20 01:58:19 +00:00
case Aux9: return "aux-9";
case Aux10: return "aux-10";
case Aux11: return "aux-11";
case Aux12: return "aux-12";
case Aux13: return "aux-13";
case Aux14: return "aux-14";
case Aux15: return "aux-15";
Support B-Format output with the wave file writer
2014-11-26 06:20:00 +00:00
Add a method to convert channel enums to a label string
2014-11-15 08:19:56 +00:00
case InvalidChannel: break;
}
return "(unknown)";
}
Remove the channel name from ChannelConfig
2014-11-05 11:46:00 +00:00
typedef struct ChannelMap {
enum Channel ChanName;
ChannelConfig Config;
} ChannelMap;
Print an error if the input channel isn't in the device Rather than the other way around, if a device channel isn't in the channel map.
2017-07-31 07:13:14 +00:00
static void SetChannelMap(const enum Channel devchans[MAX_OUTPUT_CHANNELS],
ChannelConfig *ambicoeffs, const ChannelMap *chanmap,
ALsizei count, ALsizei *outcount)
Don't bother with LFE in the channel setup, set the values explicitly
2014-11-13 03:26:53 +00:00
{
Print an error if the input channel isn't in the device Rather than the other way around, if a device channel isn't in the channel map.
2017-07-31 07:13:14 +00:00
ALsizei maxchans = 0;
ALsizei i, j;
Don't bother with LFE in the channel setup, set the values explicitly
2014-11-13 03:26:53 +00:00
Print an error if the input channel isn't in the device Rather than the other way around, if a device channel isn't in the channel map.
2017-07-31 07:13:14 +00:00
for(i = 0;i < count;i++)
Don't bother with LFE in the channel setup, set the values explicitly
2014-11-13 03:26:53 +00:00
{
Print an error if the input channel isn't in the device Rather than the other way around, if a device channel isn't in the channel map.
2017-07-31 07:13:14 +00:00
ALint idx = GetChannelIndex(devchans, chanmap[i].ChanName);
if(idx < 0)
Don't bother with LFE in the channel setup, set the values explicitly
2014-11-13 03:26:53 +00:00
{
Print an error if the input channel isn't in the device Rather than the other way around, if a device channel isn't in the channel map.
2017-07-31 07:13:14 +00:00
ERR("Failed to find %s channel in device\n",
GetLabelFromChannel(chanmap[i].ChanName));
Don't bother with LFE in the channel setup, set the values explicitly
2014-11-13 03:26:53 +00:00
continue;
}
Print an error if the input channel isn't in the device Rather than the other way around, if a device channel isn't in the channel map.
2017-07-31 07:13:14 +00:00
maxchans = maxi(maxchans, idx+1);
for(j = 0;j < MAX_AMBI_COEFFS;j++)
ambicoeffs[idx][j] = chanmap[i].Config[j];
Don't bother with LFE in the channel setup, set the values explicitly
2014-11-13 03:26:53 +00:00
}
Print an error if the input channel isn't in the device Rather than the other way around, if a device channel isn't in the channel map.
2017-07-31 07:13:14 +00:00
*outcount = mini(maxchans, MAX_OUTPUT_CHANNELS);
Don't bother with LFE in the channel setup, set the values explicitly
2014-11-13 03:26:53 +00:00
}
Replace more ALuint with ALsizei
2017-01-30 00:42:02 +00:00
static bool MakeSpeakerMap(ALCdevice *device, const AmbDecConf *conf, ALsizei speakermap[MAX_OUTPUT_CHANNELS])
Add a dual-band ambisonic decoder This uses a virtual B-Format buffer for mixing, and then uses a dual-band decoder for improved positional quality. This currently only works with first- order output since first-order input (from the AL_EXT_BFROMAT extension) would not sound correct when fed through a second- or third-order decoder. This also does not currently implement near-field compensation since near-field rendering effects are not implemented.
2016-03-15 12:08:05 +00:00
{
More ALsizei, with the B-Format decoder
2017-01-16 17:37:55 +00:00
ALsizei i;
Add a dual-band ambisonic decoder This uses a virtual B-Format buffer for mixing, and then uses a dual-band decoder for improved positional quality. This currently only works with first- order output since first-order input (from the AL_EXT_BFROMAT extension) would not sound correct when fed through a second- or third-order decoder. This also does not currently implement near-field compensation since near-field rendering effects are not implemented.
2016-03-15 12:08:05 +00:00
for(i = 0;i < conf->NumSpeakers;i++)
{
int c = -1;
/* NOTE: AmbDec does not define any standard speaker names, however
* for this to work we have to by able to find the output channel
* the speaker definition corresponds to. Therefore, OpenAL Soft
* requires these channel labels to be recognized:
*
* LF = Front left
* RF = Front right
* LS = Side left
* RS = Side right
* LB = Back left
* RB = Back right
* CE = Front center
* CB = Back center
*
* Additionally, surround51 will acknowledge back speakers for side
* channels, and surround51rear will acknowledge side speakers for
* back channels, to avoid issues with an ambdec expecting 5.1 to
* use the side channels when the device is configured for back,
* and vice-versa.
*/
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
if(alstr_cmp_cstr(conf->Speakers[i].Name, "LF") == 0)
Avoid using macros to access anonymous structures
2018-01-11 11:45:23 +00:00
c = GetChannelIdxByName(&device->RealOut, FrontLeft);
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
else if(alstr_cmp_cstr(conf->Speakers[i].Name, "RF") == 0)
Avoid using macros to access anonymous structures
2018-01-11 11:45:23 +00:00
c = GetChannelIdxByName(&device->RealOut, FrontRight);
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
else if(alstr_cmp_cstr(conf->Speakers[i].Name, "CE") == 0)
Avoid using macros to access anonymous structures
2018-01-11 11:45:23 +00:00
c = GetChannelIdxByName(&device->RealOut, FrontCenter);
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
else if(alstr_cmp_cstr(conf->Speakers[i].Name, "LS") == 0)
Add a dual-band ambisonic decoder This uses a virtual B-Format buffer for mixing, and then uses a dual-band decoder for improved positional quality. This currently only works with first- order output since first-order input (from the AL_EXT_BFROMAT extension) would not sound correct when fed through a second- or third-order decoder. This also does not currently implement near-field compensation since near-field rendering effects are not implemented.
2016-03-15 12:08:05 +00:00
{
if(device->FmtChans == DevFmtX51Rear)
Avoid using macros to access anonymous structures
2018-01-11 11:45:23 +00:00
c = GetChannelIdxByName(&device->RealOut, BackLeft);
Add a dual-band ambisonic decoder This uses a virtual B-Format buffer for mixing, and then uses a dual-band decoder for improved positional quality. This currently only works with first- order output since first-order input (from the AL_EXT_BFROMAT extension) would not sound correct when fed through a second- or third-order decoder. This also does not currently implement near-field compensation since near-field rendering effects are not implemented.
2016-03-15 12:08:05 +00:00
else
Avoid using macros to access anonymous structures
2018-01-11 11:45:23 +00:00
c = GetChannelIdxByName(&device->RealOut, SideLeft);
Add a dual-band ambisonic decoder This uses a virtual B-Format buffer for mixing, and then uses a dual-band decoder for improved positional quality. This currently only works with first- order output since first-order input (from the AL_EXT_BFROMAT extension) would not sound correct when fed through a second- or third-order decoder. This also does not currently implement near-field compensation since near-field rendering effects are not implemented.
2016-03-15 12:08:05 +00:00
}
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
else if(alstr_cmp_cstr(conf->Speakers[i].Name, "RS") == 0)
Add a dual-band ambisonic decoder This uses a virtual B-Format buffer for mixing, and then uses a dual-band decoder for improved positional quality. This currently only works with first- order output since first-order input (from the AL_EXT_BFROMAT extension) would not sound correct when fed through a second- or third-order decoder. This also does not currently implement near-field compensation since near-field rendering effects are not implemented.
2016-03-15 12:08:05 +00:00
{
if(device->FmtChans == DevFmtX51Rear)
Avoid using macros to access anonymous structures
2018-01-11 11:45:23 +00:00
c = GetChannelIdxByName(&device->RealOut, BackRight);
Add a dual-band ambisonic decoder This uses a virtual B-Format buffer for mixing, and then uses a dual-band decoder for improved positional quality. This currently only works with first- order output since first-order input (from the AL_EXT_BFROMAT extension) would not sound correct when fed through a second- or third-order decoder. This also does not currently implement near-field compensation since near-field rendering effects are not implemented.
2016-03-15 12:08:05 +00:00
else
Avoid using macros to access anonymous structures
2018-01-11 11:45:23 +00:00
c = GetChannelIdxByName(&device->RealOut, SideRight);
Add a dual-band ambisonic decoder This uses a virtual B-Format buffer for mixing, and then uses a dual-band decoder for improved positional quality. This currently only works with first- order output since first-order input (from the AL_EXT_BFROMAT extension) would not sound correct when fed through a second- or third-order decoder. This also does not currently implement near-field compensation since near-field rendering effects are not implemented.
2016-03-15 12:08:05 +00:00
}
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
else if(alstr_cmp_cstr(conf->Speakers[i].Name, "LB") == 0)
Add a dual-band ambisonic decoder This uses a virtual B-Format buffer for mixing, and then uses a dual-band decoder for improved positional quality. This currently only works with first- order output since first-order input (from the AL_EXT_BFROMAT extension) would not sound correct when fed through a second- or third-order decoder. This also does not currently implement near-field compensation since near-field rendering effects are not implemented.
2016-03-15 12:08:05 +00:00
{
if(device->FmtChans == DevFmtX51)
Avoid using macros to access anonymous structures
2018-01-11 11:45:23 +00:00
c = GetChannelIdxByName(&device->RealOut, SideLeft);
Add a dual-band ambisonic decoder This uses a virtual B-Format buffer for mixing, and then uses a dual-band decoder for improved positional quality. This currently only works with first- order output since first-order input (from the AL_EXT_BFROMAT extension) would not sound correct when fed through a second- or third-order decoder. This also does not currently implement near-field compensation since near-field rendering effects are not implemented.
2016-03-15 12:08:05 +00:00
else
Avoid using macros to access anonymous structures
2018-01-11 11:45:23 +00:00
c = GetChannelIdxByName(&device->RealOut, BackLeft);
Add a dual-band ambisonic decoder This uses a virtual B-Format buffer for mixing, and then uses a dual-band decoder for improved positional quality. This currently only works with first- order output since first-order input (from the AL_EXT_BFROMAT extension) would not sound correct when fed through a second- or third-order decoder. This also does not currently implement near-field compensation since near-field rendering effects are not implemented.
2016-03-15 12:08:05 +00:00
}
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
else if(alstr_cmp_cstr(conf->Speakers[i].Name, "RB") == 0)
Add a dual-band ambisonic decoder This uses a virtual B-Format buffer for mixing, and then uses a dual-band decoder for improved positional quality. This currently only works with first- order output since first-order input (from the AL_EXT_BFROMAT extension) would not sound correct when fed through a second- or third-order decoder. This also does not currently implement near-field compensation since near-field rendering effects are not implemented.
2016-03-15 12:08:05 +00:00
{
if(device->FmtChans == DevFmtX51)
Avoid using macros to access anonymous structures
2018-01-11 11:45:23 +00:00
c = GetChannelIdxByName(&device->RealOut, SideRight);
Add a dual-band ambisonic decoder This uses a virtual B-Format buffer for mixing, and then uses a dual-band decoder for improved positional quality. This currently only works with first- order output since first-order input (from the AL_EXT_BFROMAT extension) would not sound correct when fed through a second- or third-order decoder. This also does not currently implement near-field compensation since near-field rendering effects are not implemented.
2016-03-15 12:08:05 +00:00
else
Avoid using macros to access anonymous structures
2018-01-11 11:45:23 +00:00
c = GetChannelIdxByName(&device->RealOut, BackRight);
Add a dual-band ambisonic decoder This uses a virtual B-Format buffer for mixing, and then uses a dual-band decoder for improved positional quality. This currently only works with first- order output since first-order input (from the AL_EXT_BFROMAT extension) would not sound correct when fed through a second- or third-order decoder. This also does not currently implement near-field compensation since near-field rendering effects are not implemented.
2016-03-15 12:08:05 +00:00
}
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
else if(alstr_cmp_cstr(conf->Speakers[i].Name, "CB") == 0)
Avoid using macros to access anonymous structures
2018-01-11 11:45:23 +00:00
c = GetChannelIdxByName(&device->RealOut, BackCenter);
Add a dual-band ambisonic decoder This uses a virtual B-Format buffer for mixing, and then uses a dual-band decoder for improved positional quality. This currently only works with first- order output since first-order input (from the AL_EXT_BFROMAT extension) would not sound correct when fed through a second- or third-order decoder. This also does not currently implement near-field compensation since near-field rendering effects are not implemented.
2016-03-15 12:08:05 +00:00
else
{
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
const char *name = alstr_get_cstr(conf->Speakers[i].Name);
Recognize AUX0...AUX15 for decoder speaker labels
2016-05-13 06:41:23 +00:00
unsigned int n;
char ch;
if(sscanf(name, "AUX%u%c", &n, &ch) == 1 && n < 16)
Avoid using macros to access anonymous structures
2018-01-11 11:45:23 +00:00
c = GetChannelIdxByName(&device->RealOut, Aux0+n);
Recognize AUX0...AUX15 for decoder speaker labels
2016-05-13 06:41:23 +00:00
else
{
ERR("AmbDec speaker label \"%s\" not recognized\n", name);
return false;
}
Add a dual-band ambisonic decoder This uses a virtual B-Format buffer for mixing, and then uses a dual-band decoder for improved positional quality. This currently only works with first- order output since first-order input (from the AL_EXT_BFROMAT extension) would not sound correct when fed through a second- or third-order decoder. This also does not currently implement near-field compensation since near-field rendering effects are not implemented.
2016-03-15 12:08:05 +00:00
}
if(c == -1)
{
ERR("Failed to lookup AmbDec speaker label %s\n",
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
alstr_get_cstr(conf->Speakers[i].Name));
Add a dual-band ambisonic decoder This uses a virtual B-Format buffer for mixing, and then uses a dual-band decoder for improved positional quality. This currently only works with first- order output since first-order input (from the AL_EXT_BFROMAT extension) would not sound correct when fed through a second- or third-order decoder. This also does not currently implement near-field compensation since near-field rendering effects are not implemented.
2016-03-15 12:08:05 +00:00
return false;
}
speakermap[i] = c;
}
return true;
}
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
static const ChannelMap MonoCfg[1] = {
Update the default basic B-Format decoders This also converts them to ACN/N3D format.
2017-01-21 19:05:05 +00:00
{ FrontCenter, { 1.0f } },
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
}, StereoCfg[2] = {
Alter how panpot/pair-wise panning works This change allows pair-wise panning to mostly go through the normal ambisonic panning methods, with one special-case. First, a term is added to the stereo decoder matrix's X coefficient so that a centered sound is reduced by -3dB on each output channel. Panning in front creates a similar gain response to the typical L = sqrt(1-pan) R = sqrt(pan) for pan = [0,1]. Panning behind the listener can reduce (up to) an additional -10dB, creating a audible difference between front and back sounds as if simulating head obstruction. Secondly, as a special-case, the source positions are warped when calculating the ambisonic coefficients so that full left panning is reached at -30 degrees and full right at +30 degrees. This is to retain the expected 60-degree stereo width. This warping does not apply to B-Format buffer input, although it otherwise has the same gain responses.
2017-02-23 08:23:16 +00:00
{ FrontLeft, { 5.00000000e-1f, 2.88675135e-1f, 0.0f, 1.19573156e-1f } },
{ FrontRight, { 5.00000000e-1f, -2.88675135e-1f, 0.0f, 1.19573156e-1f } },
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
}, QuadCfg[4] = {
Update the default basic B-Format decoders This also converts them to ACN/N3D format.
2017-01-21 19:05:05 +00:00
{ BackLeft, { 3.53553391e-1f, 2.04124145e-1f, 0.0f, -2.04124145e-1f } },
{ FrontLeft, { 3.53553391e-1f, 2.04124145e-1f, 0.0f, 2.04124145e-1f } },
{ FrontRight, { 3.53553391e-1f, -2.04124145e-1f, 0.0f, 2.04124145e-1f } },
{ BackRight, { 3.53553391e-1f, -2.04124145e-1f, 0.0f, -2.04124145e-1f } },
Print an error if the input channel isn't in the device Rather than the other way around, if a device channel isn't in the channel map.
2017-07-31 07:13:14 +00:00
}, X51SideCfg[4] = {
Update default 5.1 and 6.1 coefficients to exclude front-center Not all speaker kits have a front-center speaker capable of outputing full- range content. It's best to err on the side of caution and not include front- center for normal positional sound by default, leaving it instead for the dedicated dialog effect.
2017-07-31 06:39:06 +00:00
{ SideLeft, { 3.33000782e-1f, 1.89084803e-1f, 0.0f, -2.00042375e-1f, -2.12307769e-2f, 0.0f, 0.0f, 0.0f, -1.14579885e-2f } },
{ FrontLeft, { 1.88542860e-1f, 1.27709292e-1f, 0.0f, 1.66295695e-1f, 7.30571517e-2f, 0.0f, 0.0f, 0.0f, 2.10901184e-2f } },
{ FrontRight, { 1.88542860e-1f, -1.27709292e-1f, 0.0f, 1.66295695e-1f, -7.30571517e-2f, 0.0f, 0.0f, 0.0f, 2.10901184e-2f } },
{ SideRight, { 3.33000782e-1f, -1.89084803e-1f, 0.0f, -2.00042375e-1f, 2.12307769e-2f, 0.0f, 0.0f, 0.0f, -1.14579885e-2f } },
Print an error if the input channel isn't in the device Rather than the other way around, if a device channel isn't in the channel map.
2017-07-31 07:13:14 +00:00
}, X51RearCfg[4] = {
Update default 5.1 and 6.1 coefficients to exclude front-center Not all speaker kits have a front-center speaker capable of outputing full- range content. It's best to err on the side of caution and not include front- center for normal positional sound by default, leaving it instead for the dedicated dialog effect.
2017-07-31 06:39:06 +00:00
{ BackLeft, { 3.33000782e-1f, 1.89084803e-1f, 0.0f, -2.00042375e-1f, -2.12307769e-2f, 0.0f, 0.0f, 0.0f, -1.14579885e-2f } },
{ FrontLeft, { 1.88542860e-1f, 1.27709292e-1f, 0.0f, 1.66295695e-1f, 7.30571517e-2f, 0.0f, 0.0f, 0.0f, 2.10901184e-2f } },
{ FrontRight, { 1.88542860e-1f, -1.27709292e-1f, 0.0f, 1.66295695e-1f, -7.30571517e-2f, 0.0f, 0.0f, 0.0f, 2.10901184e-2f } },
{ BackRight, { 3.33000782e-1f, -1.89084803e-1f, 0.0f, -2.00042375e-1f, 2.12307769e-2f, 0.0f, 0.0f, 0.0f, -1.14579885e-2f } },
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
}, X61Cfg[6] = {
Update default 5.1 and 6.1 coefficients to exclude front-center Not all speaker kits have a front-center speaker capable of outputing full- range content. It's best to err on the side of caution and not include front- center for normal positional sound by default, leaving it instead for the dedicated dialog effect.
2017-07-31 06:39:06 +00:00
{ SideLeft, { 2.04460341e-1f, 2.17177926e-1f, 0.0f, -4.39996780e-2f, -2.60790269e-2f, 0.0f, 0.0f, 0.0f, -6.87239792e-2f } },
{ FrontLeft, { 1.58923161e-1f, 9.21772680e-2f, 0.0f, 1.59658796e-1f, 6.66278083e-2f, 0.0f, 0.0f, 0.0f, 3.84686854e-2f } },
{ FrontRight, { 1.58923161e-1f, -9.21772680e-2f, 0.0f, 1.59658796e-1f, -6.66278083e-2f, 0.0f, 0.0f, 0.0f, 3.84686854e-2f } },
{ SideRight, { 2.04460341e-1f, -2.17177926e-1f, 0.0f, -4.39996780e-2f, 2.60790269e-2f, 0.0f, 0.0f, 0.0f, -6.87239792e-2f } },
Update the default basic B-Format decoders This also converts them to ACN/N3D format.
2017-01-21 19:05:05 +00:00
{ BackCenter, { 2.50001688e-1f, 0.00000000e+0f, 0.0f, -2.50000094e-1f, 0.00000000e+0f, 0.0f, 0.0f, 0.0f, 6.05133395e-2f } },
}, X71Cfg[6] = {
{ BackLeft, { 2.04124145e-1f, 1.08880247e-1f, 0.0f, -1.88586120e-1f, -1.29099444e-1f, 0.0f, 0.0f, 0.0f, 7.45355993e-2f, 3.73460789e-2f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.00000000e+0f } },
{ SideLeft, { 2.04124145e-1f, 2.17760495e-1f, 0.0f, 0.00000000e+0f, 0.00000000e+0f, 0.0f, 0.0f, 0.0f, -1.49071198e-1f, -3.73460789e-2f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.00000000e+0f } },
{ FrontLeft, { 2.04124145e-1f, 1.08880247e-1f, 0.0f, 1.88586120e-1f, 1.29099444e-1f, 0.0f, 0.0f, 0.0f, 7.45355993e-2f, 3.73460789e-2f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.00000000e+0f } },
{ FrontRight, { 2.04124145e-1f, -1.08880247e-1f, 0.0f, 1.88586120e-1f, -1.29099444e-1f, 0.0f, 0.0f, 0.0f, 7.45355993e-2f, -3.73460789e-2f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.00000000e+0f } },
{ SideRight, { 2.04124145e-1f, -2.17760495e-1f, 0.0f, 0.00000000e+0f, 0.00000000e+0f, 0.0f, 0.0f, 0.0f, -1.49071198e-1f, 3.73460789e-2f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.00000000e+0f } },
{ BackRight, { 2.04124145e-1f, -1.08880247e-1f, 0.0f, -1.88586120e-1f, 1.29099444e-1f, 0.0f, 0.0f, 0.0f, 7.45355993e-2f, -3.73460789e-2f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.00000000e+0f } },
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
};
Implement NFC filters for Ambisonic rendering NFC filters currently only work when rendering to ambisonic buffers, which includes HQ rendering and ambisonic output. There are two new config options: 'decoder/nfc' (default on) enables or disables use of NFC filters globally, and 'decoder/nfc-ref-delay' (default 0) specifies the reference delay parameter for NFC-HOA rendering with ambisonic output (a value of 0 disables NFC). Currently, NFC filters rely on having an appropriate value set for AL_METERS_PER_UNIT to get the correct scaling. HQ rendering uses the averaged speaker distances as a control/reference, and currently doesn't correct for individual speaker distances (if the speakers are all equidistant, this is fine, otherwise per-speaker correction should be done as well).
2017-03-10 12:35:32 +00:00
static void InitNearFieldCtrl(ALCdevice *device, ALfloat ctrl_dist, ALsizei order, bool periphonic)
{
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
const char *devname = alstr_get_cstr(device->DeviceName);
Implement NFC filters for Ambisonic rendering NFC filters currently only work when rendering to ambisonic buffers, which includes HQ rendering and ambisonic output. There are two new config options: 'decoder/nfc' (default on) enables or disables use of NFC filters globally, and 'decoder/nfc-ref-delay' (default 0) specifies the reference delay parameter for NFC-HOA rendering with ambisonic output (a value of 0 disables NFC). Currently, NFC filters rely on having an appropriate value set for AL_METERS_PER_UNIT to get the correct scaling. HQ rendering uses the averaged speaker distances as a control/reference, and currently doesn't correct for individual speaker distances (if the speakers are all equidistant, this is fine, otherwise per-speaker correction should be done as well).
2017-03-10 12:35:32 +00:00
ALsizei i;
if(GetConfigValueBool(devname, "decoder", "nfc", 1) && ctrl_dist > 0.0f)
{
/* NFC is only used when AvgSpeakerDist is greater than 0, and
* METERS_PER_UNIT is also greater than 0. In addition, NFC can only be
* used when rendering to an ambisonic buffer.
*/
device->AvgSpeakerDist = ctrl_dist;
device->Dry.NumChannelsPerOrder[0] = 1;
if(periphonic)
for(i = 1;i < order+1;i++)
device->Dry.NumChannelsPerOrder[i] = (i+1)*(i+1) - i*i;
else
for(i = 1;i < order+1;i++)
device->Dry.NumChannelsPerOrder[i] = (i*2+1) - ((i-1)*2+1);
for(;i < MAX_AMBI_ORDER+1;i++)
device->Dry.NumChannelsPerOrder[i] = 0;
}
}
static void InitDistanceComp(ALCdevice *device, const AmbDecConf *conf, const ALsizei speakermap[MAX_OUTPUT_CHANNELS])
{
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
const char *devname = alstr_get_cstr(device->DeviceName);
Implement NFC filters for Ambisonic rendering NFC filters currently only work when rendering to ambisonic buffers, which includes HQ rendering and ambisonic output. There are two new config options: 'decoder/nfc' (default on) enables or disables use of NFC filters globally, and 'decoder/nfc-ref-delay' (default 0) specifies the reference delay parameter for NFC-HOA rendering with ambisonic output (a value of 0 disables NFC). Currently, NFC filters rely on having an appropriate value set for AL_METERS_PER_UNIT to get the correct scaling. HQ rendering uses the averaged speaker distances as a control/reference, and currently doesn't correct for individual speaker distances (if the speakers are all equidistant, this is fine, otherwise per-speaker correction should be done as well).
2017-03-10 12:35:32 +00:00
ALfloat maxdist = 0.0f;
Fix up some types for MSVC
2018-01-11 18:55:35 +00:00
size_t total = 0;
Implement NFC filters for Ambisonic rendering NFC filters currently only work when rendering to ambisonic buffers, which includes HQ rendering and ambisonic output. There are two new config options: 'decoder/nfc' (default on) enables or disables use of NFC filters globally, and 'decoder/nfc-ref-delay' (default 0) specifies the reference delay parameter for NFC-HOA rendering with ambisonic output (a value of 0 disables NFC). Currently, NFC filters rely on having an appropriate value set for AL_METERS_PER_UNIT to get the correct scaling. HQ rendering uses the averaged speaker distances as a control/reference, and currently doesn't correct for individual speaker distances (if the speakers are all equidistant, this is fine, otherwise per-speaker correction should be done as well).
2017-03-10 12:35:32 +00:00
ALsizei i;
for(i = 0;i < conf->NumSpeakers;i++)
maxdist = maxf(maxdist, conf->Speakers[i].Distance);
if(GetConfigValueBool(devname, "decoder", "distance-comp", 1) && maxdist > 0.0f)
{
ALfloat srate = (ALfloat)device->Frequency;
for(i = 0;i < conf->NumSpeakers;i++)
{
ALsizei chan = speakermap[i];
ALfloat delay;
/* Distance compensation only delays in steps of the sample rate.
* This is a bit less accurate since the delay time falls to the
* nearest sample time, but it's far simpler as it doesn't have to
* deal with phase offsets. This means at 48khz, for instance, the
* distance delay will be in steps of about 7 millimeters.
*/
delay = floorf((maxdist-conf->Speakers[i].Distance) / SPEEDOFSOUNDMETRESPERSEC *
srate + 0.5f);
if(delay >= (ALfloat)MAX_DELAY_LENGTH)
ERR("Delay for speaker \"%s\" exceeds buffer length (%f >= %u)\n",
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
alstr_get_cstr(conf->Speakers[i].Name), delay, MAX_DELAY_LENGTH);
Implement NFC filters for Ambisonic rendering NFC filters currently only work when rendering to ambisonic buffers, which includes HQ rendering and ambisonic output. There are two new config options: 'decoder/nfc' (default on) enables or disables use of NFC filters globally, and 'decoder/nfc-ref-delay' (default 0) specifies the reference delay parameter for NFC-HOA rendering with ambisonic output (a value of 0 disables NFC). Currently, NFC filters rely on having an appropriate value set for AL_METERS_PER_UNIT to get the correct scaling. HQ rendering uses the averaged speaker distances as a control/reference, and currently doesn't correct for individual speaker distances (if the speakers are all equidistant, this is fine, otherwise per-speaker correction should be done as well).
2017-03-10 12:35:32 +00:00
device->ChannelDelay[chan].Length = (ALsizei)clampf(
delay, 0.0f, (ALfloat)(MAX_DELAY_LENGTH-1)
);
device->ChannelDelay[chan].Gain = conf->Speakers[i].Distance / maxdist;
TRACE("Channel %u \"%s\" distance compensation: %d samples, %f gain\n", chan,
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
alstr_get_cstr(conf->Speakers[i].Name), device->ChannelDelay[chan].Length,
Implement NFC filters for Ambisonic rendering NFC filters currently only work when rendering to ambisonic buffers, which includes HQ rendering and ambisonic output. There are two new config options: 'decoder/nfc' (default on) enables or disables use of NFC filters globally, and 'decoder/nfc-ref-delay' (default 0) specifies the reference delay parameter for NFC-HOA rendering with ambisonic output (a value of 0 disables NFC). Currently, NFC filters rely on having an appropriate value set for AL_METERS_PER_UNIT to get the correct scaling. HQ rendering uses the averaged speaker distances as a control/reference, and currently doesn't correct for individual speaker distances (if the speakers are all equidistant, this is fine, otherwise per-speaker correction should be done as well).
2017-03-10 12:35:32 +00:00
device->ChannelDelay[chan].Gain
);
/* Round up to the next 4th sample, so each channel buffer starts
* 16-byte aligned.
*/
total += RoundUp(device->ChannelDelay[chan].Length, 4);
}
}
if(total > 0)
{
device->ChannelDelay[0].Buffer = al_calloc(16, total * sizeof(ALfloat));
for(i = 1;i < MAX_OUTPUT_CHANNELS;i++)
{
size_t len = RoundUp(device->ChannelDelay[i-1].Length, 4);
device->ChannelDelay[i].Buffer = device->ChannelDelay[i-1].Buffer + len;
}
}
}
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
static void InitPanning(ALCdevice *device)
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
{
const ChannelMap *chanmap = NULL;
Use ALsizei for sizes and offsets with the mixer Unsigned 32-bit offsets actually have some potential overhead on 64-bit targets for pointer/array accesses due to rules on integer wrapping. No idea how much impact it has in practice, but it's nice to be correct about it.
2017-01-16 15:45:07 +00:00
ALsizei coeffcount = 0;
ALsizei count = 0;
ALsizei i, j;
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
Combine some fields into a struct
2014-09-11 00:53:01 +00:00
switch(device->FmtChans)
Separate speaker/panning initialization into another source file
2010-08-03 07:21:36 +00:00
{
Separate device format into 'channel config' and 'sample type' components
2010-12-05 03:50:00 +00:00
case DevFmtMono:
Set gains using the device channel index
2014-11-05 10:54:11 +00:00
count = COUNTOF(MonoCfg);
Remove the channel name from ChannelConfig
2014-11-05 11:46:00 +00:00
chanmap = MonoCfg;
Avoid mixing all coefficients together when only some are used
2016-04-16 00:31:04 +00:00
coeffcount = 1;
Separate speaker/panning initialization into another source file
2010-08-03 07:21:36 +00:00
break;
Separate device format into 'channel config' and 'sample type' components
2010-12-05 03:50:00 +00:00
case DevFmtStereo:
Set gains using the device channel index
2014-11-05 10:54:11 +00:00
count = COUNTOF(StereoCfg);
Remove the channel name from ChannelConfig
2014-11-05 11:46:00 +00:00
chanmap = StereoCfg;
Avoid mixing all coefficients together when only some are used
2016-04-16 00:31:04 +00:00
coeffcount = 4;
Separate speaker/panning initialization into another source file
2010-08-03 07:21:36 +00:00
break;
Separate device format into 'channel config' and 'sample type' components
2010-12-05 03:50:00 +00:00
case DevFmtQuad:
Set gains using the device channel index
2014-11-05 10:54:11 +00:00
count = COUNTOF(QuadCfg);
Remove the channel name from ChannelConfig
2014-11-05 11:46:00 +00:00
chanmap = QuadCfg;
Fix coefficient counts for the built-in B-Format decoders
2017-01-21 20:28:54 +00:00
coeffcount = 4;
Separate speaker/panning initialization into another source file
2010-08-03 07:21:36 +00:00
break;
Separate device format into 'channel config' and 'sample type' components
2010-12-05 03:50:00 +00:00
case DevFmtX51:
Set gains using the device channel index
2014-11-05 10:54:11 +00:00
count = COUNTOF(X51SideCfg);
Remove the channel name from ChannelConfig
2014-11-05 11:46:00 +00:00
chanmap = X51SideCfg;
Avoid mixing all coefficients together when only some are used
2016-04-16 00:31:04 +00:00
coeffcount = 9;
Add a 5.1 device format that uses side channels instead of back
2011-05-29 02:35:32 +00:00
break;
Fix 5.1 surround sound Apparently, 5.1 surround sound is supposed to use the "side" channels, not the back channels, and we've been wrong this whole time. That means the "5.1 Side" is actually the correct 5.1 setup, and using the back channels is anomalous. Additionally, this means the 5.1 buffer format should also use the the side channels instead of the back channels. A final note: the 5.1 mixing coefficients are changed so both use the original 5.1 surround sound set (with the surround channels at +/-110 degrees). So the only difference now between 5.1 "side" and 5.1 "back" is the channel labels.
2014-11-07 08:54:16 +00:00
case DevFmtX51Rear:
count = COUNTOF(X51RearCfg);
chanmap = X51RearCfg;
Avoid mixing all coefficients together when only some are used
2016-04-16 00:31:04 +00:00
coeffcount = 9;
Fix 5.1 surround sound Apparently, 5.1 surround sound is supposed to use the "side" channels, not the back channels, and we've been wrong this whole time. That means the "5.1 Side" is actually the correct 5.1 setup, and using the back channels is anomalous. Additionally, this means the 5.1 buffer format should also use the the side channels instead of the back channels. A final note: the 5.1 mixing coefficients are changed so both use the original 5.1 surround sound set (with the surround channels at +/-110 degrees). So the only difference now between 5.1 "side" and 5.1 "back" is the channel labels.
2014-11-07 08:54:16 +00:00
break;
Separate device format into 'channel config' and 'sample type' components
2010-12-05 03:50:00 +00:00
case DevFmtX61:
Set gains using the device channel index
2014-11-05 10:54:11 +00:00
count = COUNTOF(X61Cfg);
Remove the channel name from ChannelConfig
2014-11-05 11:46:00 +00:00
chanmap = X61Cfg;
Fix coefficient counts for the built-in B-Format decoders
2017-01-21 20:28:54 +00:00
coeffcount = 9;
Separate speaker/panning initialization into another source file
2010-08-03 07:21:36 +00:00
break;
Separate device format into 'channel config' and 'sample type' components
2010-12-05 03:50:00 +00:00
case DevFmtX71:
Set gains using the device channel index
2014-11-05 10:54:11 +00:00
count = COUNTOF(X71Cfg);
Remove the channel name from ChannelConfig
2014-11-05 11:46:00 +00:00
chanmap = X71Cfg;
Avoid mixing all coefficients together when only some are used
2016-04-16 00:31:04 +00:00
coeffcount = 16;
Separate speaker/panning initialization into another source file
2010-08-03 07:21:36 +00:00
break;
Support B-Format output with the wave file writer
2014-11-26 06:20:00 +00:00
Store the ambisonic order separate from the channel enum
2017-04-13 01:26:07 +00:00
case DevFmtAmbi3D:
Support B-Format output with the wave file writer
2014-11-26 06:20:00 +00:00
break;
Separate speaker/panning initialization into another source file
2010-08-03 07:21:36 +00:00
}
Don't bother with LFE in the channel setup, set the values explicitly
2014-11-13 03:26:53 +00:00
Store the ambisonic order separate from the channel enum
2017-04-13 01:26:07 +00:00
if(device->FmtChans == DevFmtAmbi3D)
Add a config to output first-, second-, or third-order ambisonics Currently incomplete, as second- and third-order output will not correctly handle B-Format input buffers. A standalone up-sampler will be needed, similar to the high-quality decoder. Also, output is ACN ordering with SN3D normalization. A config option will eventually be provided to change this if desired.
2016-07-30 04:55:43 +00:00
{
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
const char *devname = alstr_get_cstr(device->DeviceName);
Use separate enums for the ambisonic channel order and normalization
2017-02-28 00:11:45 +00:00
const ALsizei *acnmap = (device->AmbiLayout == AmbiLayout_FuMa) ? FuMa2ACN : ACN2ACN;
const ALfloat *n3dscale = (device->AmbiScale == AmbiNorm_FuMa) ? FuMa2N3DScale :
(device->AmbiScale == AmbiNorm_SN3D) ? SN3D2N3DScale :
/*(device->AmbiScale == AmbiNorm_N3D) ?*/ UnitScale;
Implement NFC filters for Ambisonic rendering NFC filters currently only work when rendering to ambisonic buffers, which includes HQ rendering and ambisonic output. There are two new config options: 'decoder/nfc' (default on) enables or disables use of NFC filters globally, and 'decoder/nfc-ref-delay' (default 0) specifies the reference delay parameter for NFC-HOA rendering with ambisonic output (a value of 0 disables NFC). Currently, NFC filters rely on having an appropriate value set for AL_METERS_PER_UNIT to get the correct scaling. HQ rendering uses the averaged speaker distances as a control/reference, and currently doesn't correct for individual speaker distances (if the speakers are all equidistant, this is fine, otherwise per-speaker correction should be done as well).
2017-03-10 12:35:32 +00:00
ALfloat nfc_delay = 0.0f;
Add a config to output first-, second-, or third-order ambisonics Currently incomplete, as second- and third-order output will not correctly handle B-Format input buffers. A standalone up-sampler will be needed, similar to the high-quality decoder. Also, output is ACN ordering with SN3D normalization. A config option will eventually be provided to change this if desired.
2016-07-30 04:55:43 +00:00
Store the ambisonic order separate from the channel enum
2017-04-13 01:26:07 +00:00
count = (device->AmbiOrder == 3) ? 16 :
(device->AmbiOrder == 2) ? 9 :
(device->AmbiOrder == 1) ? 4 : 1;
Add a config to output first-, second-, or third-order ambisonics Currently incomplete, as second- and third-order output will not correctly handle B-Format input buffers. A standalone up-sampler will be needed, similar to the high-quality decoder. Also, output is ACN ordering with SN3D normalization. A config option will eventually be provided to change this if desired.
2016-07-30 04:55:43 +00:00
for(i = 0;i < count;i++)
{
Use ALsizei for sizes and offsets with the mixer Unsigned 32-bit offsets actually have some potential overhead on 64-bit targets for pointer/array accesses due to rules on integer wrapping. No idea how much impact it has in practice, but it's nice to be correct about it.
2017-01-16 15:45:07 +00:00
ALsizei acn = acnmap[i];
Use the ACN and N3D map and scale lookup tables in SetChannelMap
2016-08-02 16:16:12 +00:00
device->Dry.Ambi.Map[i].Scale = 1.0f/n3dscale[acn];
Add an option to specify the ambisonic output configuration
2016-07-31 14:46:38 +00:00
device->Dry.Ambi.Map[i].Index = acn;
Add a config to output first-, second-, or third-order ambisonics Currently incomplete, as second- and third-order output will not correctly handle B-Format input buffers. A standalone up-sampler will be needed, similar to the high-quality decoder. Also, output is ACN ordering with SN3D normalization. A config option will eventually be provided to change this if desired.
2016-07-30 04:55:43 +00:00
}
device->Dry.CoeffCount = 0;
device->Dry.NumChannels = count;
Store the ambisonic order separate from the channel enum
2017-04-13 01:26:07 +00:00
if(device->AmbiOrder < 2)
Add a config to output first-, second-, or third-order ambisonics Currently incomplete, as second- and third-order output will not correctly handle B-Format input buffers. A standalone up-sampler will be needed, similar to the high-quality decoder. Also, output is ACN ordering with SN3D normalization. A config option will eventually be provided to change this if desired.
2016-07-30 04:55:43 +00:00
{
Add an option to specify the ambisonic output configuration
2016-07-31 14:46:38 +00:00
device->FOAOut.Ambi = device->Dry.Ambi;
device->FOAOut.CoeffCount = device->Dry.CoeffCount;
Avoid duplicating device buffer layout logic
2017-02-21 00:57:25 +00:00
device->FOAOut.NumChannels = 0;
Add a config to output first-, second-, or third-order ambisonics Currently incomplete, as second- and third-order output will not correctly handle B-Format input buffers. A standalone up-sampler will be needed, similar to the high-quality decoder. Also, output is ACN ordering with SN3D normalization. A config option will eventually be provided to change this if desired.
2016-07-30 04:55:43 +00:00
}
Add an option to specify the ambisonic output configuration
2016-07-31 14:46:38 +00:00
else
{
/* FOA output is always ACN+N3D for higher-order ambisonic output.
* The upsampler expects this and will convert it for output.
*/
memset(&device->FOAOut.Ambi, 0, sizeof(device->FOAOut.Ambi));
for(i = 0;i < 4;i++)
{
device->FOAOut.Ambi.Map[i].Scale = 1.0f;
device->FOAOut.Ambi.Map[i].Index = i;
}
device->FOAOut.CoeffCount = 0;
Avoid duplicating device buffer layout logic
2017-02-21 00:57:25 +00:00
device->FOAOut.NumChannels = 4;
Add a stand-alone upsampler for higher-order ambisonic oputput
2016-07-30 16:29:21 +00:00
Add an option to specify the ambisonic output configuration
2016-07-31 14:46:38 +00:00
ambiup_reset(device->AmbiUp, device);
}
Implement NFC filters for Ambisonic rendering NFC filters currently only work when rendering to ambisonic buffers, which includes HQ rendering and ambisonic output. There are two new config options: 'decoder/nfc' (default on) enables or disables use of NFC filters globally, and 'decoder/nfc-ref-delay' (default 0) specifies the reference delay parameter for NFC-HOA rendering with ambisonic output (a value of 0 disables NFC). Currently, NFC filters rely on having an appropriate value set for AL_METERS_PER_UNIT to get the correct scaling. HQ rendering uses the averaged speaker distances as a control/reference, and currently doesn't correct for individual speaker distances (if the speakers are all equidistant, this is fine, otherwise per-speaker correction should be done as well).
2017-03-10 12:35:32 +00:00
Don't enable NFC for a 0 reference delay
2017-05-15 01:50:22 +00:00
if(ConfigValueFloat(devname, "decoder", "nfc-ref-delay", &nfc_delay) && nfc_delay > 0.0f)
Implement NFC filters for Ambisonic rendering NFC filters currently only work when rendering to ambisonic buffers, which includes HQ rendering and ambisonic output. There are two new config options: 'decoder/nfc' (default on) enables or disables use of NFC filters globally, and 'decoder/nfc-ref-delay' (default 0) specifies the reference delay parameter for NFC-HOA rendering with ambisonic output (a value of 0 disables NFC). Currently, NFC filters rely on having an appropriate value set for AL_METERS_PER_UNIT to get the correct scaling. HQ rendering uses the averaged speaker distances as a control/reference, and currently doesn't correct for individual speaker distances (if the speakers are all equidistant, this is fine, otherwise per-speaker correction should be done as well).
2017-03-10 12:35:32 +00:00
{
nfc_delay = clampf(nfc_delay, 0.001f, 1000.0f);
InitNearFieldCtrl(device, nfc_delay * SPEEDOFSOUNDMETRESPERSEC,
Store the ambisonic order separate from the channel enum
2017-04-13 01:26:07 +00:00
device->AmbiOrder, true);
Implement NFC filters for Ambisonic rendering NFC filters currently only work when rendering to ambisonic buffers, which includes HQ rendering and ambisonic output. There are two new config options: 'decoder/nfc' (default on) enables or disables use of NFC filters globally, and 'decoder/nfc-ref-delay' (default 0) specifies the reference delay parameter for NFC-HOA rendering with ambisonic output (a value of 0 disables NFC). Currently, NFC filters rely on having an appropriate value set for AL_METERS_PER_UNIT to get the correct scaling. HQ rendering uses the averaged speaker distances as a control/reference, and currently doesn't correct for individual speaker distances (if the speakers are all equidistant, this is fine, otherwise per-speaker correction should be done as well).
2017-03-10 12:35:32 +00:00
}
Add a config to output first-, second-, or third-order ambisonics Currently incomplete, as second- and third-order output will not correctly handle B-Format input buffers. A standalone up-sampler will be needed, similar to the high-quality decoder. Also, output is ACN ordering with SN3D normalization. A config option will eventually be provided to change this if desired.
2016-07-30 04:55:43 +00:00
}
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
else
Include any first-order scaling in the FOAOut coefficients
2016-03-26 06:25:13 +00:00
{
Improve the ambisonic upscaling methods This now takes advantage of the differences seen in generated decoder matrices for first-order compared to second- and third-order, such that with the appropriate frequency-dependent scaling applied to first-order content, the result is identical with a higher-order decoder matrix compared to a first- order matrix for the same layout.
2017-01-25 03:03:51 +00:00
ALfloat w_scale, xyz_scale;
Avoid storing channel names for the dry buffer
2016-04-17 00:21:31 +00:00
SetChannelMap(device->RealOut.ChannelName, device->Dry.Ambi.Coeffs,
Update the default basic B-Format decoders This also converts them to ACN/N3D format.
2017-01-21 19:05:05 +00:00
chanmap, count, &device->Dry.NumChannels);
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
device->Dry.CoeffCount = coeffcount;
Improve the ambisonic upscaling methods This now takes advantage of the differences seen in generated decoder matrices for first-order compared to second- and third-order, such that with the appropriate frequency-dependent scaling applied to first-order content, the result is identical with a higher-order decoder matrix compared to a first- order matrix for the same layout.
2017-01-25 03:03:51 +00:00
w_scale = (device->Dry.CoeffCount > 9) ? W_SCALE2D_THIRD :
(device->Dry.CoeffCount > 4) ? W_SCALE2D_SECOND : 1.0f;
xyz_scale = (device->Dry.CoeffCount > 9) ? XYZ_SCALE2D_THIRD :
(device->Dry.CoeffCount > 4) ? XYZ_SCALE2D_SECOND : 1.0f;
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
memset(&device->FOAOut.Ambi, 0, sizeof(device->FOAOut.Ambi));
Improve the ambisonic upscaling methods This now takes advantage of the differences seen in generated decoder matrices for first-order compared to second- and third-order, such that with the appropriate frequency-dependent scaling applied to first-order content, the result is identical with a higher-order decoder matrix compared to a first- order matrix for the same layout.
2017-01-25 03:03:51 +00:00
for(i = 0;i < device->Dry.NumChannels;i++)
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
{
Improve the ambisonic upscaling methods This now takes advantage of the differences seen in generated decoder matrices for first-order compared to second- and third-order, such that with the appropriate frequency-dependent scaling applied to first-order content, the result is identical with a higher-order decoder matrix compared to a first- order matrix for the same layout.
2017-01-25 03:03:51 +00:00
device->FOAOut.Ambi.Coeffs[i][0] = device->Dry.Ambi.Coeffs[i][0] * w_scale;
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
for(j = 1;j < 4;j++)
Improve the ambisonic upscaling methods This now takes advantage of the differences seen in generated decoder matrices for first-order compared to second- and third-order, such that with the appropriate frequency-dependent scaling applied to first-order content, the result is identical with a higher-order decoder matrix compared to a first- order matrix for the same layout.
2017-01-25 03:03:51 +00:00
device->FOAOut.Ambi.Coeffs[i][j] = device->Dry.Ambi.Coeffs[i][j] * xyz_scale;
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
}
device->FOAOut.CoeffCount = 4;
Avoid duplicating device buffer layout logic
2017-02-21 00:57:25 +00:00
device->FOAOut.NumChannels = 0;
Include any first-order scaling in the FOAOut coefficients
2016-03-26 06:25:13 +00:00
}
Avoid duplicating device buffer layout logic
2017-02-21 00:57:25 +00:00
device->RealOut.NumChannels = 0;
Separate speaker/panning initialization into another source file
2010-08-03 07:21:36 +00:00
}
Mix to multichannel for effects This mixes to a 4-channel first-order ambisonics buffer. With ACN ordering and N3D scaling, this makes it easy to remain compatible with effects that only care about mono input since channel 0 is an unattenuated mono signal.
2016-01-28 08:02:46 +00:00
Replace more ALuint with ALsizei
2017-01-30 00:42:02 +00:00
static void InitCustomPanning(ALCdevice *device, const AmbDecConf *conf, const ALsizei speakermap[MAX_OUTPUT_CHANNELS])
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
{
ChannelMap chanmap[MAX_OUTPUT_CHANNELS];
const ALfloat *coeff_scale = UnitScale;
Improve the ambisonic upscaling methods This now takes advantage of the differences seen in generated decoder matrices for first-order compared to second- and third-order, such that with the appropriate frequency-dependent scaling applied to first-order content, the result is identical with a higher-order decoder matrix compared to a first- order matrix for the same layout.
2017-01-25 03:03:51 +00:00
ALfloat w_scale = 1.0f;
ALfloat xyz_scale = 1.0f;
Use ALsizei for sizes and offsets with the mixer Unsigned 32-bit offsets actually have some potential overhead on 64-bit targets for pointer/array accesses due to rules on integer wrapping. No idea how much impact it has in practice, but it's nice to be correct about it.
2017-01-16 15:45:07 +00:00
ALsizei i, j;
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
if(conf->FreqBands != 1)
ERR("Basic renderer uses the high-frequency matrix as single-band (xover_freq = %.0fhz)\n",
conf->XOverFreq);
Improve the ambisonic upscaling methods This now takes advantage of the differences seen in generated decoder matrices for first-order compared to second- and third-order, such that with the appropriate frequency-dependent scaling applied to first-order content, the result is identical with a higher-order decoder matrix compared to a first- order matrix for the same layout.
2017-01-25 03:03:51 +00:00
if((conf->ChanMask&AMBI_PERIPHONIC_MASK))
{
if(conf->ChanMask > 0x1ff)
{
w_scale = W_SCALE3D_THIRD;
xyz_scale = XYZ_SCALE3D_THIRD;
}
else if(conf->ChanMask > 0xf)
{
w_scale = W_SCALE3D_SECOND;
xyz_scale = XYZ_SCALE3D_SECOND;
}
}
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
else
Improve the ambisonic upscaling methods This now takes advantage of the differences seen in generated decoder matrices for first-order compared to second- and third-order, such that with the appropriate frequency-dependent scaling applied to first-order content, the result is identical with a higher-order decoder matrix compared to a first- order matrix for the same layout.
2017-01-25 03:03:51 +00:00
{
if(conf->ChanMask > 0x1ff)
{
w_scale = W_SCALE2D_THIRD;
xyz_scale = XYZ_SCALE2D_THIRD;
}
else if(conf->ChanMask > 0xf)
{
w_scale = W_SCALE2D_SECOND;
xyz_scale = XYZ_SCALE2D_SECOND;
}
}
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
if(conf->CoeffScale == ADS_SN3D)
coeff_scale = SN3D2N3DScale;
else if(conf->CoeffScale == ADS_FuMa)
coeff_scale = FuMa2N3DScale;
More ALsizei, with the B-Format decoder
2017-01-16 17:37:55 +00:00
for(i = 0;i < conf->NumSpeakers;i++)
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
{
Use ALsizei for sizes and offsets with the mixer Unsigned 32-bit offsets actually have some potential overhead on 64-bit targets for pointer/array accesses due to rules on integer wrapping. No idea how much impact it has in practice, but it's nice to be correct about it.
2017-01-16 15:45:07 +00:00
ALsizei chan = speakermap[i];
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
ALfloat gain;
Use ALsizei for sizes and offsets with the mixer Unsigned 32-bit offsets actually have some potential overhead on 64-bit targets for pointer/array accesses due to rules on integer wrapping. No idea how much impact it has in practice, but it's nice to be correct about it.
2017-01-16 15:45:07 +00:00
ALsizei k = 0;
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
for(j = 0;j < MAX_AMBI_COEFFS;j++)
chanmap[i].Config[j] = 0.0f;
chanmap[i].ChanName = device->RealOut.ChannelName[chan];
for(j = 0;j < MAX_AMBI_COEFFS;j++)
{
if(j == 0) gain = conf->HFOrderGain[0];
else if(j == 1) gain = conf->HFOrderGain[1];
else if(j == 4) gain = conf->HFOrderGain[2];
else if(j == 9) gain = conf->HFOrderGain[3];
if((conf->ChanMask&(1<<j)))
chanmap[i].Config[j] = conf->HFMatrix[i][k++] / coeff_scale[j] * gain;
}
}
Avoid storing channel names for the dry buffer
2016-04-17 00:21:31 +00:00
SetChannelMap(device->RealOut.ChannelName, device->Dry.Ambi.Coeffs, chanmap,
Update the default basic B-Format decoders This also converts them to ACN/N3D format.
2017-01-21 19:05:05 +00:00
conf->NumSpeakers, &device->Dry.NumChannels);
Avoid mixing all coefficients together when only some are used
2016-04-16 00:31:04 +00:00
device->Dry.CoeffCount = (conf->ChanMask > 0x1ff) ? 16 :
(conf->ChanMask > 0xf) ? 9 : 4;
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
memset(&device->FOAOut.Ambi, 0, sizeof(device->FOAOut.Ambi));
Improve the ambisonic upscaling methods This now takes advantage of the differences seen in generated decoder matrices for first-order compared to second- and third-order, such that with the appropriate frequency-dependent scaling applied to first-order content, the result is identical with a higher-order decoder matrix compared to a first- order matrix for the same layout.
2017-01-25 03:03:51 +00:00
for(i = 0;i < device->Dry.NumChannels;i++)
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
{
Improve the ambisonic upscaling methods This now takes advantage of the differences seen in generated decoder matrices for first-order compared to second- and third-order, such that with the appropriate frequency-dependent scaling applied to first-order content, the result is identical with a higher-order decoder matrix compared to a first- order matrix for the same layout.
2017-01-25 03:03:51 +00:00
device->FOAOut.Ambi.Coeffs[i][0] = device->Dry.Ambi.Coeffs[i][0] * w_scale;
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
for(j = 1;j < 4;j++)
Improve the ambisonic upscaling methods This now takes advantage of the differences seen in generated decoder matrices for first-order compared to second- and third-order, such that with the appropriate frequency-dependent scaling applied to first-order content, the result is identical with a higher-order decoder matrix compared to a first- order matrix for the same layout.
2017-01-25 03:03:51 +00:00
device->FOAOut.Ambi.Coeffs[i][j] = device->Dry.Ambi.Coeffs[i][j] * xyz_scale;
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
}
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
device->FOAOut.CoeffCount = 4;
Avoid duplicating device buffer layout logic
2017-02-21 00:57:25 +00:00
device->FOAOut.NumChannels = 0;
device->RealOut.NumChannels = 0;
Allow distance compensation for non-HQ rendering as well It still requires a custom configuration to specify appropriate speaker distances.
2017-02-20 17:08:57 +00:00
InitDistanceComp(device, conf, speakermap);
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
}
Replace more ALuint with ALsizei
2017-01-30 00:42:02 +00:00
static void InitHQPanning(ALCdevice *device, const AmbDecConf *conf, const ALsizei speakermap[MAX_OUTPUT_CHANNELS])
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
{
Implement NFC filters for Ambisonic rendering NFC filters currently only work when rendering to ambisonic buffers, which includes HQ rendering and ambisonic output. There are two new config options: 'decoder/nfc' (default on) enables or disables use of NFC filters globally, and 'decoder/nfc-ref-delay' (default 0) specifies the reference delay parameter for NFC-HOA rendering with ambisonic output (a value of 0 disables NFC). Currently, NFC filters rely on having an appropriate value set for AL_METERS_PER_UNIT to get the correct scaling. HQ rendering uses the averaged speaker distances as a control/reference, and currently doesn't correct for individual speaker distances (if the speakers are all equidistant, this is fine, otherwise per-speaker correction should be done as well).
2017-03-10 12:35:32 +00:00
ALfloat avg_dist;
ALsizei count;
ALsizei i;
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
Use a macro to specify the ambisonic periphonic channel mask
2016-06-01 12:30:06 +00:00
if((conf->ChanMask&AMBI_PERIPHONIC_MASK))
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
{
Increase max output channels to 16 This also enables fully periphonic 3rd order HQ decoding.
2016-04-20 01:58:19 +00:00
count = (conf->ChanMask > 0x1ff) ? 16 :
(conf->ChanMask > 0xf) ? 9 : 4;
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
for(i = 0;i < count;i++)
{
device->Dry.Ambi.Map[i].Scale = 1.0f;
device->Dry.Ambi.Map[i].Index = i;
}
}
else
{
Constify and use the correct size for an array
2016-07-17 22:38:39 +00:00
static const int map[MAX_AMBI2D_COEFFS] = { 0, 1, 3, 4, 8, 9, 15 };
Combine two if checks into one
2016-04-19 20:58:33 +00:00
Increase max output channels to 16 This also enables fully periphonic 3rd order HQ decoding.
2016-04-20 01:58:19 +00:00
count = (conf->ChanMask > 0x1ff) ? 7 :
(conf->ChanMask > 0xf) ? 5 : 3;
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
for(i = 0;i < count;i++)
{
device->Dry.Ambi.Map[i].Scale = 1.0f;
device->Dry.Ambi.Map[i].Index = map[i];
}
}
device->Dry.CoeffCount = 0;
device->Dry.NumChannels = count;
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
TRACE("Enabling %s-band %s-order%s ambisonic decoder\n",
(conf->FreqBands == 1) ? "single" : "dual",
(conf->ChanMask > 0xf) ? (conf->ChanMask > 0x1ff) ? "third" : "second" : "first",
Use a macro to specify the ambisonic periphonic channel mask
2016-06-01 12:30:06 +00:00
(conf->ChanMask&AMBI_PERIPHONIC_MASK) ? " periphonic" : ""
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
);
Apply distance compensation when writing to the output
2017-02-20 06:47:59 +00:00
bformatdec_reset(device->AmbiDecoder, conf, count, device->Frequency, speakermap);
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
Remove an unneeded function
2017-03-01 03:44:34 +00:00
if(!(conf->ChanMask > 0xf))
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
{
Avoid using memcpy to copy a single struct
2016-07-06 20:33:40 +00:00
device->FOAOut.Ambi = device->Dry.Ambi;
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
device->FOAOut.CoeffCount = device->Dry.CoeffCount;
Avoid duplicating device buffer layout logic
2017-02-21 00:57:25 +00:00
device->FOAOut.NumChannels = 0;
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
}
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
else
{
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
memset(&device->FOAOut.Ambi, 0, sizeof(device->FOAOut.Ambi));
Don't use periphonic FOA when the HOA decoder is not periphonic
2017-02-20 01:45:27 +00:00
if((conf->ChanMask&AMBI_PERIPHONIC_MASK))
Avoid duplicating device buffer layout logic
2017-02-21 00:57:25 +00:00
{
count = 4;
for(i = 0;i < count;i++)
Don't use periphonic FOA when the HOA decoder is not periphonic
2017-02-20 01:45:27 +00:00
{
device->FOAOut.Ambi.Map[i].Scale = 1.0f;
device->FOAOut.Ambi.Map[i].Index = i;
}
Avoid duplicating device buffer layout logic
2017-02-21 00:57:25 +00:00
}
Don't use periphonic FOA when the HOA decoder is not periphonic
2017-02-20 01:45:27 +00:00
else
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
{
Don't use periphonic FOA when the HOA decoder is not periphonic
2017-02-20 01:45:27 +00:00
static const int map[3] = { 0, 1, 3 };
Avoid duplicating device buffer layout logic
2017-02-21 00:57:25 +00:00
count = 3;
for(i = 0;i < count;i++)
Don't use periphonic FOA when the HOA decoder is not periphonic
2017-02-20 01:45:27 +00:00
{
device->FOAOut.Ambi.Map[i].Scale = 1.0f;
device->FOAOut.Ambi.Map[i].Index = map[i];
}
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
}
device->FOAOut.CoeffCount = 0;
Avoid duplicating device buffer layout logic
2017-02-21 00:57:25 +00:00
device->FOAOut.NumChannels = count;
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
}
Apply distance compensation when writing to the output
2017-02-20 06:47:59 +00:00
Store the ambisonic order separate from the channel enum
2017-04-13 01:26:07 +00:00
device->RealOut.NumChannels = ChannelsFromDevFmt(device->FmtChans, device->AmbiOrder);
Avoid duplicating device buffer layout logic
2017-02-21 00:57:25 +00:00
Implement NFC filters for Ambisonic rendering NFC filters currently only work when rendering to ambisonic buffers, which includes HQ rendering and ambisonic output. There are two new config options: 'decoder/nfc' (default on) enables or disables use of NFC filters globally, and 'decoder/nfc-ref-delay' (default 0) specifies the reference delay parameter for NFC-HOA rendering with ambisonic output (a value of 0 disables NFC). Currently, NFC filters rely on having an appropriate value set for AL_METERS_PER_UNIT to get the correct scaling. HQ rendering uses the averaged speaker distances as a control/reference, and currently doesn't correct for individual speaker distances (if the speakers are all equidistant, this is fine, otherwise per-speaker correction should be done as well).
2017-03-10 12:35:32 +00:00
avg_dist = 0.0f;
for(i = 0;i < conf->NumSpeakers;i++)
avg_dist += conf->Speakers[i].Distance;
avg_dist /= (ALfloat)conf->NumSpeakers;
InitNearFieldCtrl(device, avg_dist,
(conf->ChanMask > 0x1ff) ? 3 : (conf->ChanMask > 0xf) ? 2 : 1,
!!(conf->ChanMask&AMBI_PERIPHONIC_MASK)
);
Allow distance compensation for non-HQ rendering as well It still requires a custom configuration to specify appropriate speaker distances.
2017-02-20 17:08:57 +00:00
InitDistanceComp(device, conf, speakermap);
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
}
Check for the upsampler to determine if HRTF uses HOA
2017-04-19 00:39:10 +00:00
static void InitHrtfPanning(ALCdevice *device)
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
{
Move the B-Format HRTF virtual speaker stuff to InitHrtfPanning This keeps the decoder matrices and coefficient mapping together for if it changes in the future.
2017-01-19 03:16:24 +00:00
/* NOTE: azimuth goes clockwise. */
static const ALfloat AmbiPoints[][2] = {
{ DEG2RAD( 90.0f), DEG2RAD( 0.0f) },
{ DEG2RAD( 35.0f), DEG2RAD( -45.0f) },
{ DEG2RAD( 35.0f), DEG2RAD( 45.0f) },
{ DEG2RAD( 35.0f), DEG2RAD( 135.0f) },
{ DEG2RAD( 35.0f), DEG2RAD(-135.0f) },
{ DEG2RAD( 0.0f), DEG2RAD( 0.0f) },
{ DEG2RAD( 0.0f), DEG2RAD( 90.0f) },
{ DEG2RAD( 0.0f), DEG2RAD( 180.0f) },
{ DEG2RAD( 0.0f), DEG2RAD( -90.0f) },
{ DEG2RAD(-35.0f), DEG2RAD( -45.0f) },
{ DEG2RAD(-35.0f), DEG2RAD( 45.0f) },
{ DEG2RAD(-35.0f), DEG2RAD( 135.0f) },
{ DEG2RAD(-35.0f), DEG2RAD(-135.0f) },
{ DEG2RAD(-90.0f), DEG2RAD( 0.0f) },
};
static const ALfloat AmbiMatrixFOA[][2][MAX_AMBI_COEFFS] = {
{ { 1.88982237e-001f, 0.00000000e+000f, 1.90399923e-001f, 0.00000000e+000f }, { 7.14285714e-002f, 0.00000000e+000f, 1.24646009e-001f, 0.00000000e+000f } },
{ { 1.88982237e-001f, 1.09057783e-001f, 1.09208910e-001f, 1.09057783e-001f }, { 7.14285714e-002f, 7.13950780e-002f, 7.14940135e-002f, 7.13950780e-002f } },
{ { 1.88982237e-001f, -1.09057783e-001f, 1.09208910e-001f, 1.09057783e-001f }, { 7.14285714e-002f, -7.13950780e-002f, 7.14940135e-002f, 7.13950780e-002f } },
{ { 1.88982237e-001f, -1.09057783e-001f, 1.09208910e-001f, -1.09057783e-001f }, { 7.14285714e-002f, -7.13950780e-002f, 7.14940135e-002f, -7.13950780e-002f } },
{ { 1.88982237e-001f, 1.09057783e-001f, 1.09208910e-001f, -1.09057783e-001f }, { 7.14285714e-002f, 7.13950780e-002f, 7.14940135e-002f, -7.13950780e-002f } },
{ { 1.88982237e-001f, 0.00000000e+000f, 0.00000000e+000f, 1.88281281e-001f }, { 7.14285714e-002f, 0.00000000e+000f, 0.00000000e+000f, 1.23259031e-001f } },
{ { 1.88982237e-001f, -1.88281281e-001f, 0.00000000e+000f, 0.00000000e+000f }, { 7.14285714e-002f, -1.23259031e-001f, 0.00000000e+000f, 0.00000000e+000f } },
{ { 1.88982237e-001f, 0.00000000e+000f, 0.00000000e+000f, -1.88281281e-001f }, { 7.14285714e-002f, 0.00000000e+000f, 0.00000000e+000f, -1.23259031e-001f } },
{ { 1.88982237e-001f, 1.88281281e-001f, 0.00000000e+000f, 0.00000000e+000f }, { 7.14285714e-002f, 1.23259031e-001f, 0.00000000e+000f, 0.00000000e+000f } },
{ { 1.88982237e-001f, 1.09057783e-001f, -1.09208910e-001f, 1.09057783e-001f }, { 7.14285714e-002f, 7.13950780e-002f, -7.14940135e-002f, 7.13950780e-002f } },
{ { 1.88982237e-001f, -1.09057783e-001f, -1.09208910e-001f, 1.09057783e-001f }, { 7.14285714e-002f, -7.13950780e-002f, -7.14940135e-002f, 7.13950780e-002f } },
{ { 1.88982237e-001f, -1.09057783e-001f, -1.09208910e-001f, -1.09057783e-001f }, { 7.14285714e-002f, -7.13950780e-002f, -7.14940135e-002f, -7.13950780e-002f } },
{ { 1.88982237e-001f, 1.09057783e-001f, -1.09208910e-001f, -1.09057783e-001f }, { 7.14285714e-002f, 7.13950780e-002f, -7.14940135e-002f, -7.13950780e-002f } },
{ { 1.88982237e-001f, 0.00000000e+000f, -1.90399923e-001f, 0.00000000e+000f }, { 7.14285714e-002f, 0.00000000e+000f, -1.24646009e-001f, 0.00000000e+000f } }
}, AmbiMatrixHOA[][2][MAX_AMBI_COEFFS] = {
{ { 1.43315266e-001f, 0.00000000e+000f, 1.90399923e-001f, 0.00000000e+000f, 0.00000000e+000f, 0.00000000e+000f, 1.18020996e-001f, 0.00000000e+000f, 0.00000000e+000f }, { 7.26741039e-002f, 0.00000000e+000f, 1.24646009e-001f, 0.00000000e+000f, 0.00000000e+000f, 0.00000000e+000f, 1.49618920e-001f, 0.00000000e+000f, 0.00000000e+000f } },
{ { 1.40852210e-001f, 1.09057783e-001f, 1.09208910e-001f, 1.09057783e-001f, 7.58818830e-002f, 7.66295578e-002f, -3.28314629e-004f, 7.66295578e-002f, 0.00000000e+000f }, { 7.14251066e-002f, 7.13950780e-002f, 7.14940135e-002f, 7.13950780e-002f, 9.61978444e-002f, 9.71456952e-002f, -4.16214759e-004f, 9.71456952e-002f, 0.00000000e+000f } },
{ { 1.40852210e-001f, -1.09057783e-001f, 1.09208910e-001f, 1.09057783e-001f, -7.58818830e-002f, -7.66295578e-002f, -3.28314629e-004f, 7.66295578e-002f, 0.00000000e+000f }, { 7.14251066e-002f, -7.13950780e-002f, 7.14940135e-002f, 7.13950780e-002f, -9.61978444e-002f, -9.71456952e-002f, -4.16214759e-004f, 9.71456952e-002f, 0.00000000e+000f } },
{ { 1.40852210e-001f, -1.09057783e-001f, 1.09208910e-001f, -1.09057783e-001f, 7.58818830e-002f, -7.66295578e-002f, -3.28314629e-004f, -7.66295578e-002f, 0.00000000e+000f }, { 7.14251066e-002f, -7.13950780e-002f, 7.14940135e-002f, -7.13950780e-002f, 9.61978444e-002f, -9.71456952e-002f, -4.16214759e-004f, -9.71456952e-002f, 0.00000000e+000f } },
{ { 1.40852210e-001f, 1.09057783e-001f, 1.09208910e-001f, -1.09057783e-001f, -7.58818830e-002f, 7.66295578e-002f, -3.28314629e-004f, -7.66295578e-002f, 0.00000000e+000f }, { 7.14251066e-002f, 7.13950780e-002f, 7.14940135e-002f, -7.13950780e-002f, -9.61978444e-002f, 9.71456952e-002f, -4.16214759e-004f, -9.71456952e-002f, 0.00000000e+000f } },
{ { 1.39644596e-001f, 0.00000000e+000f, 0.00000000e+000f, 1.88281281e-001f, 0.00000000e+000f, 0.00000000e+000f, -5.83538687e-002f, 0.00000000e+000f, 1.01835015e-001f }, { 7.08127349e-002f, 0.00000000e+000f, 0.00000000e+000f, 1.23259031e-001f, 0.00000000e+000f, 0.00000000e+000f, -7.39770307e-002f, 0.00000000e+000f, 1.29099445e-001f } },
{ { 1.39644596e-001f, -1.88281281e-001f, 0.00000000e+000f, 0.00000000e+000f, 0.00000000e+000f, 0.00000000e+000f, -5.83538687e-002f, 0.00000000e+000f, -1.01835015e-001f }, { 7.08127349e-002f, -1.23259031e-001f, 0.00000000e+000f, 0.00000000e+000f, 0.00000000e+000f, 0.00000000e+000f, -7.39770307e-002f, 0.00000000e+000f, -1.29099445e-001f } },
{ { 1.39644596e-001f, 0.00000000e+000f, 0.00000000e+000f, -1.88281281e-001f, 0.00000000e+000f, 0.00000000e+000f, -5.83538687e-002f, 0.00000000e+000f, 1.01835015e-001f }, { 7.08127349e-002f, 0.00000000e+000f, 0.00000000e+000f, -1.23259031e-001f, 0.00000000e+000f, 0.00000000e+000f, -7.39770307e-002f, 0.00000000e+000f, 1.29099445e-001f } },
{ { 1.39644596e-001f, 1.88281281e-001f, 0.00000000e+000f, 0.00000000e+000f, 0.00000000e+000f, 0.00000000e+000f, -5.83538687e-002f, 0.00000000e+000f, -1.01835015e-001f }, { 7.08127349e-002f, 1.23259031e-001f, 0.00000000e+000f, 0.00000000e+000f, 0.00000000e+000f, 0.00000000e+000f, -7.39770307e-002f, 0.00000000e+000f, -1.29099445e-001f } },
{ { 1.40852210e-001f, 1.09057783e-001f, -1.09208910e-001f, 1.09057783e-001f, 7.58818830e-002f, -7.66295578e-002f, -3.28314629e-004f, -7.66295578e-002f, 0.00000000e+000f }, { 7.14251066e-002f, 7.13950780e-002f, -7.14940135e-002f, 7.13950780e-002f, 9.61978444e-002f, -9.71456952e-002f, -4.16214759e-004f, -9.71456952e-002f, 0.00000000e+000f } },
{ { 1.40852210e-001f, -1.09057783e-001f, -1.09208910e-001f, 1.09057783e-001f, -7.58818830e-002f, 7.66295578e-002f, -3.28314629e-004f, -7.66295578e-002f, 0.00000000e+000f }, { 7.14251066e-002f, -7.13950780e-002f, -7.14940135e-002f, 7.13950780e-002f, -9.61978444e-002f, 9.71456952e-002f, -4.16214759e-004f, -9.71456952e-002f, 0.00000000e+000f } },
{ { 1.40852210e-001f, -1.09057783e-001f, -1.09208910e-001f, -1.09057783e-001f, 7.58818830e-002f, 7.66295578e-002f, -3.28314629e-004f, 7.66295578e-002f, 0.00000000e+000f }, { 7.14251066e-002f, -7.13950780e-002f, -7.14940135e-002f, -7.13950780e-002f, 9.61978444e-002f, 9.71456952e-002f, -4.16214759e-004f, 9.71456952e-002f, 0.00000000e+000f } },
{ { 1.40852210e-001f, 1.09057783e-001f, -1.09208910e-001f, -1.09057783e-001f, -7.58818830e-002f, -7.66295578e-002f, -3.28314629e-004f, 7.66295578e-002f, 0.00000000e+000f }, { 7.14251066e-002f, 7.13950780e-002f, -7.14940135e-002f, -7.13950780e-002f, -9.61978444e-002f, -9.71456952e-002f, -4.16214759e-004f, 9.71456952e-002f, 0.00000000e+000f } },
{ { 1.43315266e-001f, 0.00000000e+000f, -1.90399923e-001f, 0.00000000e+000f, 0.00000000e+000f, 0.00000000e+000f, 1.18020996e-001f, 0.00000000e+000f, 0.00000000e+000f }, { 7.26741039e-002f, 0.00000000e+000f, -1.24646009e-001f, 0.00000000e+000f, 0.00000000e+000f, 0.00000000e+000f, 1.49618920e-001f, 0.00000000e+000f, 0.00000000e+000f } },
};
Check for the upsampler to determine if HRTF uses HOA
2017-04-19 00:39:10 +00:00
const ALfloat (*AmbiMatrix)[2][MAX_AMBI_COEFFS] = device->AmbiUp ? AmbiMatrixHOA :
AmbiMatrixFOA;
ALsizei count = device->AmbiUp ? 9 : 4;
Implement NFC filters for Ambisonic rendering NFC filters currently only work when rendering to ambisonic buffers, which includes HQ rendering and ambisonic output. There are two new config options: 'decoder/nfc' (default on) enables or disables use of NFC filters globally, and 'decoder/nfc-ref-delay' (default 0) specifies the reference delay parameter for NFC-HOA rendering with ambisonic output (a value of 0 disables NFC). Currently, NFC filters rely on having an appropriate value set for AL_METERS_PER_UNIT to get the correct scaling. HQ rendering uses the averaged speaker distances as a control/reference, and currently doesn't correct for individual speaker distances (if the speakers are all equidistant, this is fine, otherwise per-speaker correction should be done as well).
2017-03-10 12:35:32 +00:00
ALsizei i;
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
Move the B-Format HRTF virtual speaker stuff to InitHrtfPanning This keeps the decoder matrices and coefficient mapping together for if it changes in the future.
2017-01-19 03:16:24 +00:00
static_assert(COUNTOF(AmbiPoints) <= HRTF_AMBI_MAX_CHANNELS, "HRTF_AMBI_MAX_CHANNELS is too small");
Use second-order ambisonics for basic HRTF rendering This should improve positional quality for relatively low cost. Full HRTF rendering still only uses first-order since the only use of the dry buffer there is for first-order content (B-Format buffers, effects).
2017-01-15 21:57:22 +00:00
Use a different way to get the size of structs with flexible array members
2017-04-18 21:11:15 +00:00
device->Hrtf = al_calloc(16, FAM_SIZE(DirectHrtfState, Chan, count));
Allocate as many channels for DirectHrtfState as needed
2017-03-11 14:20:04 +00:00
Decode directly from B-Format to HRTF instead of a cube Last time this attempted to average the HRIRs according to their contribution to a given B-Format channel as if they were loudspeakers, as well as averaging the HRIR delays. The latter part resulted in the loss of the ITD (inter-aural time delay), a key component of HRTF. This time, the HRIRs are averaged similar to above, except instead of averaging the delays, they're applied to the resulting coefficients (for example, a delay of 8 would apply the HRIR starting at the 8th sample of the target HRIR). This does roughly double the IR length, as the largest delay is about 35 samples while the filter is normally 32 samples. However, this is still smaller the original data set IR (which was 256 samples), it also only needs to be applied to 4 channels for first-order ambisonics, rather than the 8-channel cube. So it's doing twice as much work per sample, but only working on half the number of samples. Additionally, since the resulting HRIRs no longer rely on an extra delay line, a more efficient HRTF mixing function can be made that doesn't use one. Such a function can also avoid the per-sample stepping parameters the original uses.
2016-08-12 06:20:35 +00:00
for(i = 0;i < count;i++)
{
device->Dry.Ambi.Map[i].Scale = 1.0f;
Move the B-Format HRTF virtual speaker stuff to InitHrtfPanning This keeps the decoder matrices and coefficient mapping together for if it changes in the future.
2017-01-19 03:16:24 +00:00
device->Dry.Ambi.Map[i].Index = i;
Decode directly from B-Format to HRTF instead of a cube Last time this attempted to average the HRIRs according to their contribution to a given B-Format channel as if they were loudspeakers, as well as averaging the HRIR delays. The latter part resulted in the loss of the ITD (inter-aural time delay), a key component of HRTF. This time, the HRIRs are averaged similar to above, except instead of averaging the delays, they're applied to the resulting coefficients (for example, a delay of 8 would apply the HRIR starting at the 8th sample of the target HRIR). This does roughly double the IR length, as the largest delay is about 35 samples while the filter is normally 32 samples. However, this is still smaller the original data set IR (which was 256 samples), it also only needs to be applied to 4 channels for first-order ambisonics, rather than the 8-channel cube. So it's doing twice as much work per sample, but only working on half the number of samples. Additionally, since the resulting HRIRs no longer rely on an extra delay line, a more efficient HRTF mixing function can be made that doesn't use one. Such a function can also avoid the per-sample stepping parameters the original uses.
2016-08-12 06:20:35 +00:00
}
device->Dry.CoeffCount = 0;
device->Dry.NumChannels = count;
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
Check for the upsampler to determine if HRTF uses HOA
2017-04-19 00:39:10 +00:00
if(device->AmbiUp)
Use second-order ambisonics for basic HRTF rendering This should improve positional quality for relatively low cost. Full HRTF rendering still only uses first-order since the only use of the dry buffer there is for first-order content (B-Format buffers, effects).
2017-01-15 21:57:22 +00:00
{
memset(&device->FOAOut.Ambi, 0, sizeof(device->FOAOut.Ambi));
for(i = 0;i < 4;i++)
{
device->FOAOut.Ambi.Map[i].Scale = 1.0f;
device->FOAOut.Ambi.Map[i].Index = i;
}
device->FOAOut.CoeffCount = 0;
Avoid duplicating device buffer layout logic
2017-02-21 00:57:25 +00:00
device->FOAOut.NumChannels = 4;
Use second-order ambisonics for basic HRTF rendering This should improve positional quality for relatively low cost. Full HRTF rendering still only uses first-order since the only use of the dry buffer there is for first-order content (B-Format buffers, effects).
2017-01-15 21:57:22 +00:00
ambiup_reset(device->AmbiUp, device);
}
Check for the upsampler to determine if HRTF uses HOA
2017-04-19 00:39:10 +00:00
else
{
device->FOAOut.Ambi = device->Dry.Ambi;
device->FOAOut.CoeffCount = device->Dry.CoeffCount;
device->FOAOut.NumChannels = 0;
}
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
Store the ambisonic order separate from the channel enum
2017-04-13 01:26:07 +00:00
device->RealOut.NumChannels = ChannelsFromDevFmt(device->FmtChans, device->AmbiOrder);
Avoid duplicating device buffer layout logic
2017-02-21 00:57:25 +00:00
Don't bother returning the IR length for B-Format decoding
2017-07-31 08:20:42 +00:00
BuildBFormatHrtf(device->HrtfHandle,
device->Hrtf, device->Dry.NumChannels, AmbiPoints, AmbiMatrix, COUNTOF(AmbiPoints)
Combine related members into a struct
2016-08-24 07:25:28 +00:00
);
Enable NFC filters for HRTF Only applies to the Ambisonic mix (basic HRTF rendering, or B-Format buffers).
2017-10-23 20:30:01 +00:00
InitNearFieldCtrl(device, device->HrtfHandle->distance, device->AmbiUp ? 2 : 1, true);
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
}
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
static void InitUhjPanning(ALCdevice *device)
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
{
Use ALsizei for sizes and offsets with the mixer Unsigned 32-bit offsets actually have some potential overhead on 64-bit targets for pointer/array accesses due to rules on integer wrapping. No idea how much impact it has in practice, but it's nice to be correct about it.
2017-01-16 15:45:07 +00:00
ALsizei count = 3;
ALsizei i;
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
for(i = 0;i < count;i++)
{
Use ALsizei for sizes and offsets with the mixer Unsigned 32-bit offsets actually have some potential overhead on 64-bit targets for pointer/array accesses due to rules on integer wrapping. No idea how much impact it has in practice, but it's nice to be correct about it.
2017-01-16 15:45:07 +00:00
ALsizei acn = FuMa2ACN[i];
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
device->Dry.Ambi.Map[i].Scale = 1.0f/FuMa2N3DScale[acn];
device->Dry.Ambi.Map[i].Index = acn;
}
device->Dry.CoeffCount = 0;
device->Dry.NumChannels = count;
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
Avoid using memcpy to copy a single struct
2016-07-06 20:33:40 +00:00
device->FOAOut.Ambi = device->Dry.Ambi;
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
device->FOAOut.CoeffCount = device->Dry.CoeffCount;
Avoid duplicating device buffer layout logic
2017-02-21 00:57:25 +00:00
device->FOAOut.NumChannels = 0;
Store the ambisonic order separate from the channel enum
2017-04-13 01:26:07 +00:00
device->RealOut.NumChannels = ChannelsFromDevFmt(device->FmtChans, device->AmbiOrder);
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
}
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
void aluInitRenderer(ALCdevice *device, ALint hrtf_id, enum HrtfRequestMode hrtf_appreq, enum HrtfRequestMode hrtf_userreq)
{
Reference count HRTFs and unload them when unused
2017-04-06 20:00:29 +00:00
/* Hold the HRTF the device last used, in case it's used again. */
struct Hrtf *old_hrtf = device->HrtfHandle;
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
const char *mode;
bool headphones;
int bs2blevel;
size_t i;
Dynamically allocate the device's HRTF state
2017-03-10 18:47:43 +00:00
al_free(device->Hrtf);
device->Hrtf = NULL;
device->HrtfHandle = NULL;
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
alstr_clear(&device->HrtfName);
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
device->Render_Mode = NormalRender;
More directly map coefficients for ambisonic mixing buffers Instead of looping over all the coefficients for each channel with multiplies, when we know only one will have a non-0 factor for ambisonic mixing buffers, just index the one with a non-0 factor.
2016-04-16 05:05:47 +00:00
memset(&device->Dry.Ambi, 0, sizeof(device->Dry.Ambi));
Avoid mixing all coefficients together when only some are used
2016-04-16 00:31:04 +00:00
device->Dry.CoeffCount = 0;
device->Dry.NumChannels = 0;
Implement NFC filters for Ambisonic rendering NFC filters currently only work when rendering to ambisonic buffers, which includes HQ rendering and ambisonic output. There are two new config options: 'decoder/nfc' (default on) enables or disables use of NFC filters globally, and 'decoder/nfc-ref-delay' (default 0) specifies the reference delay parameter for NFC-HOA rendering with ambisonic output (a value of 0 disables NFC). Currently, NFC filters rely on having an appropriate value set for AL_METERS_PER_UNIT to get the correct scaling. HQ rendering uses the averaged speaker distances as a control/reference, and currently doesn't correct for individual speaker distances (if the speakers are all equidistant, this is fine, otherwise per-speaker correction should be done as well).
2017-03-10 12:35:32 +00:00
for(i = 0;i < MAX_AMBI_ORDER+1;i++)
device->Dry.NumChannelsPerOrder[i] = 0;
Avoid mixing all coefficients together when only some are used
2016-04-16 00:31:04 +00:00
Implement NFC filters for Ambisonic rendering NFC filters currently only work when rendering to ambisonic buffers, which includes HQ rendering and ambisonic output. There are two new config options: 'decoder/nfc' (default on) enables or disables use of NFC filters globally, and 'decoder/nfc-ref-delay' (default 0) specifies the reference delay parameter for NFC-HOA rendering with ambisonic output (a value of 0 disables NFC). Currently, NFC filters rely on having an appropriate value set for AL_METERS_PER_UNIT to get the correct scaling. HQ rendering uses the averaged speaker distances as a control/reference, and currently doesn't correct for individual speaker distances (if the speakers are all equidistant, this is fine, otherwise per-speaker correction should be done as well).
2017-03-10 12:35:32 +00:00
device->AvgSpeakerDist = 0.0f;
Apply distance compensation when writing to the output
2017-02-20 06:47:59 +00:00
memset(device->ChannelDelay, 0, sizeof(device->ChannelDelay));
for(i = 0;i < MAX_OUTPUT_CHANNELS;i++)
{
device->ChannelDelay[i].Gain = 1.0f;
device->ChannelDelay[i].Length = 0;
}
Add a front-stablizer config option for surround sound modes This improves a stereo (front-left + front-right) sound "image" by generating a front-center channel signal. Done correctly, it helps reduce the comb effects and phase errors associated with using only two speakers to simulate center sounds. Note that it shouldn't be used if the front-center channel is already included in the positional audio mix (the dialog effect is okay). In general, it may actually be better to exclude the front-center channel from the positional audio mix and use this to generate front-center output.
2017-08-01 06:49:48 +00:00
al_free(device->Stablizer);
device->Stablizer = NULL;
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
if(device->FmtChans != DevFmtStereo)
{
Replace more ALuint with ALsizei
2017-01-30 00:42:02 +00:00
ALsizei speakermap[MAX_OUTPUT_CHANNELS];
Reorganize a bit of aluInitRenderer code
2016-04-16 21:00:22 +00:00
const char *devname, *layout = NULL;
AmbDecConf conf, *pconf = NULL;
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
Reference count HRTFs and unload them when unused
2017-04-06 20:00:29 +00:00
if(old_hrtf)
Hrtf_DecRef(old_hrtf);
old_hrtf = NULL;
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
if(hrtf_appreq == Hrtf_Enable)
Dynamically allocate the device's HRTF state
2017-03-10 18:47:43 +00:00
device->HrtfStatus = ALC_HRTF_UNSUPPORTED_FORMAT_SOFT;
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
ambdec_init(&conf);
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
devname = alstr_get_cstr(device->DeviceName);
Reorganize a bit of aluInitRenderer code
2016-04-16 21:00:22 +00:00
switch(device->FmtChans)
{
case DevFmtQuad: layout = "quad"; break;
Remove the separate surround51rear decoder option Both 5.1 Side and Rear configurations use 'surround51' to look up the appropriate decoder file. The decoder loader already handles mapping between rear and side channels, so there's no need for separate options.
2017-02-20 06:59:55 +00:00
case DevFmtX51: /* fall-through */
case DevFmtX51Rear: layout = "surround51"; break;
Reorganize a bit of aluInitRenderer code
2016-04-16 21:00:22 +00:00
case DevFmtX61: layout = "surround61"; break;
case DevFmtX71: layout = "surround71"; break;
Add a config to output first-, second-, or third-order ambisonics Currently incomplete, as second- and third-order output will not correctly handle B-Format input buffers. A standalone up-sampler will be needed, similar to the high-quality decoder. Also, output is ACN ordering with SN3D normalization. A config option will eventually be provided to change this if desired.
2016-07-30 04:55:43 +00:00
/* Mono, Stereo, and Ambisonics output don't use custom decoders. */
Reorganize a bit of aluInitRenderer code
2016-04-16 21:00:22 +00:00
case DevFmtMono:
case DevFmtStereo:
Store the ambisonic order separate from the channel enum
2017-04-13 01:26:07 +00:00
case DevFmtAmbi3D:
Reorganize a bit of aluInitRenderer code
2016-04-16 21:00:22 +00:00
break;
}
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
if(layout)
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
{
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
const char *fname;
if(ConfigValueStr(devname, "decoder", layout, &fname))
{
if(!ambdec_load(&conf, fname))
ERR("Failed to load layout file %s\n", fname);
else
{
if(conf.ChanMask > 0xffff)
ERR("Unsupported channel mask 0x%04x (max 0xffff)\n", conf.ChanMask);
else
{
if(MakeSpeakerMap(device, &conf, speakermap))
pconf = &conf;
}
}
}
}
if(pconf && GetConfigValueBool(devname, "decoder", "hq-mode", 0))
{
Add a stand-alone upsampler for higher-order ambisonic oputput
2016-07-30 16:29:21 +00:00
ambiup_free(device->AmbiUp);
device->AmbiUp = NULL;
Increase max output channels to 16 This also enables fully periphonic 3rd order HQ decoding.
2016-04-20 01:58:19 +00:00
if(!device->AmbiDecoder)
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
device->AmbiDecoder = bformatdec_alloc();
}
else
{
bformatdec_free(device->AmbiDecoder);
device->AmbiDecoder = NULL;
Correctly enable the ambisonic upsampler for HOA output
2017-04-21 20:26:29 +00:00
if(device->FmtChans == DevFmtAmbi3D && device->AmbiOrder > 1)
Add a stand-alone upsampler for higher-order ambisonic oputput
2016-07-30 16:29:21 +00:00
{
if(!device->AmbiUp)
device->AmbiUp = ambiup_alloc();
}
else
{
ambiup_free(device->AmbiUp);
device->AmbiUp = NULL;
}
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
}
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
if(!pconf)
InitPanning(device);
else if(device->AmbiDecoder)
InitHQPanning(device, pconf, speakermap);
else
InitCustomPanning(device, pconf, speakermap);
Add a front-stablizer config option for surround sound modes This improves a stereo (front-left + front-right) sound "image" by generating a front-center channel signal. Done correctly, it helps reduce the comb effects and phase errors associated with using only two speakers to simulate center sounds. Note that it shouldn't be used if the front-center channel is already included in the positional audio mix (the dialog effect is okay). In general, it may actually be better to exclude the front-center channel from the positional audio mix and use this to generate front-center output.
2017-08-01 06:49:48 +00:00
/* Enable the stablizer only for formats that have front-left, front-
* right, and front-center outputs.
*/
switch(device->FmtChans)
{
case DevFmtX51:
case DevFmtX51Rear:
case DevFmtX61:
case DevFmtX71:
if(GetConfigValueBool(devname, NULL, "front-stablizer", 0))
{
/* Initialize band-splitting filters for the front-left and
* front-right channels, with a crossover at 5khz (could be
* higher).
*/
ALfloat scale = (ALfloat)(5000.0 / device->Frequency);
FrontStablizer *stablizer = al_calloc(16, sizeof(*stablizer));
bandsplit_init(&stablizer->LFilter, scale);
stablizer->RFilter = stablizer->LFilter;
/* Initialize all-pass filters for all other channels. */
splitterap_init(&stablizer->APFilter[0], scale);
for(i = 1;i < (size_t)device->RealOut.NumChannels;i++)
stablizer->APFilter[i] = stablizer->APFilter[0];
device->Stablizer = stablizer;
}
break;
case DevFmtMono:
case DevFmtStereo:
case DevFmtQuad:
case DevFmtAmbi3D:
break;
}
TRACE("Front stablizer %s\n", device->Stablizer ? "enabled" : "disabled");
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
ambdec_deinit(&conf);
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
return;
}
bformatdec_free(device->AmbiDecoder);
device->AmbiDecoder = NULL;
headphones = device->IsHeadphones;
if(device->Type != Loopback)
{
const char *mode;
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
if(ConfigValueStr(alstr_get_cstr(device->DeviceName), NULL, "stereo-mode", &mode))
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
{
if(strcasecmp(mode, "headphones") == 0)
headphones = true;
else if(strcasecmp(mode, "speakers") == 0)
headphones = false;
else if(strcasecmp(mode, "auto") != 0)
ERR("Unexpected stereo-mode: %s\n", mode);
}
}
if(hrtf_userreq == Hrtf_Default)
{
Reorganize a bit of aluInitRenderer code
2016-04-16 21:00:22 +00:00
bool usehrtf = (headphones && hrtf_appreq != Hrtf_Disable) ||
(hrtf_appreq == Hrtf_Enable);
if(!usehrtf) goto no_hrtf;
Dynamically allocate the device's HRTF state
2017-03-10 18:47:43 +00:00
device->HrtfStatus = ALC_HRTF_ENABLED_SOFT;
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
if(headphones && hrtf_appreq != Hrtf_Disable)
Dynamically allocate the device's HRTF state
2017-03-10 18:47:43 +00:00
device->HrtfStatus = ALC_HRTF_HEADPHONES_DETECTED_SOFT;
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
}
else
{
Reorganize a bit of aluInitRenderer code
2016-04-16 21:00:22 +00:00
if(hrtf_userreq != Hrtf_Enable)
{
if(hrtf_appreq == Hrtf_Enable)
Dynamically allocate the device's HRTF state
2017-03-10 18:47:43 +00:00
device->HrtfStatus = ALC_HRTF_DENIED_SOFT;
Reorganize a bit of aluInitRenderer code
2016-04-16 21:00:22 +00:00
goto no_hrtf;
}
Dynamically allocate the device's HRTF state
2017-03-10 18:47:43 +00:00
device->HrtfStatus = ALC_HRTF_REQUIRED_SOFT;
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
}
Dynamically allocate the device's HRTF state
2017-03-10 18:47:43 +00:00
if(VECTOR_SIZE(device->HrtfList) == 0)
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
{
Dynamically allocate the device's HRTF state
2017-03-10 18:47:43 +00:00
VECTOR_DEINIT(device->HrtfList);
device->HrtfList = EnumerateHrtf(device->DeviceName);
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
}
Dynamically allocate the device's HRTF state
2017-03-10 18:47:43 +00:00
if(hrtf_id >= 0 && (size_t)hrtf_id < VECTOR_SIZE(device->HrtfList))
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
{
Store the loaded hrtf entry container in the enumerated hrtf entry
2017-04-05 18:29:58 +00:00
const EnumeratedHrtf *entry = &VECTOR_ELEM(device->HrtfList, hrtf_id);
Reference count HRTFs and unload them when unused
2017-04-06 20:00:29 +00:00
struct Hrtf *hrtf = GetLoadedHrtf(entry->hrtf);
Load HRTF files as needed Currently only applies to external files, rather than embedded datasets. Also, HRTFs aren't unloaded after being loaded, until library shutdown.
2017-04-05 19:27:30 +00:00
if(hrtf && hrtf->sampleRate == device->Frequency)
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
{
Store the loaded hrtf entry container in the enumerated hrtf entry
2017-04-05 18:29:58 +00:00
device->HrtfHandle = hrtf;
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
alstr_copy(&device->HrtfName, entry->name);
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
}
Reference count HRTFs and unload them when unused
2017-04-06 20:00:29 +00:00
else if(hrtf)
Hrtf_DecRef(hrtf);
}
Dynamically allocate the device's HRTF state
2017-03-10 18:47:43 +00:00
for(i = 0;!device->HrtfHandle && i < VECTOR_SIZE(device->HrtfList);i++)
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
{
Store the loaded hrtf entry container in the enumerated hrtf entry
2017-04-05 18:29:58 +00:00
const EnumeratedHrtf *entry = &VECTOR_ELEM(device->HrtfList, i);
Reference count HRTFs and unload them when unused
2017-04-06 20:00:29 +00:00
struct Hrtf *hrtf = GetLoadedHrtf(entry->hrtf);
Load HRTF files as needed Currently only applies to external files, rather than embedded datasets. Also, HRTFs aren't unloaded after being loaded, until library shutdown.
2017-04-05 19:27:30 +00:00
if(hrtf && hrtf->sampleRate == device->Frequency)
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
{
Store the loaded hrtf entry container in the enumerated hrtf entry
2017-04-05 18:29:58 +00:00
device->HrtfHandle = hrtf;
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
alstr_copy(&device->HrtfName, entry->name);
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
}
Reference count HRTFs and unload them when unused
2017-04-06 20:00:29 +00:00
else if(hrtf)
Hrtf_DecRef(hrtf);
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
}
Dynamically allocate the device's HRTF state
2017-03-10 18:47:43 +00:00
if(device->HrtfHandle)
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
{
Reference count HRTFs and unload them when unused
2017-04-06 20:00:29 +00:00
if(old_hrtf)
Hrtf_DecRef(old_hrtf);
old_hrtf = NULL;
Reorganize a bit of aluInitRenderer code
2016-04-16 21:00:22 +00:00
device->Render_Mode = HrtfRender;
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
if(ConfigValueStr(alstr_get_cstr(device->DeviceName), NULL, "hrtf-mode", &mode))
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
{
if(strcasecmp(mode, "full") == 0)
device->Render_Mode = HrtfRender;
else if(strcasecmp(mode, "basic") == 0)
device->Render_Mode = NormalRender;
else
ERR("Unexpected hrtf-mode: %s\n", mode);
}
Use second-order ambisonics for basic HRTF rendering This should improve positional quality for relatively low cost. Full HRTF rendering still only uses first-order since the only use of the dry buffer there is for first-order content (B-Format buffers, effects).
2017-01-15 21:57:22 +00:00
if(device->Render_Mode == HrtfRender)
{
/* Don't bother with HOA when using full HRTF rendering. Nothing
* needs it, and it eases the CPU/memory load.
*/
ambiup_free(device->AmbiUp);
device->AmbiUp = NULL;
}
else
{
if(!device->AmbiUp)
device->AmbiUp = ambiup_alloc();
}
Be clearer about whether full or basic HRTF rendering is used
2016-11-01 21:07:14 +00:00
TRACE("%s HRTF rendering enabled, using \"%s\"\n",
((device->Render_Mode == HrtfRender) ? "Full" : "Basic"),
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
alstr_get_cstr(device->HrtfName)
Be clearer about whether full or basic HRTF rendering is used
2016-11-01 21:07:14 +00:00
);
Check for the upsampler to determine if HRTF uses HOA
2017-04-19 00:39:10 +00:00
InitHrtfPanning(device);
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
return;
}
Dynamically allocate the device's HRTF state
2017-03-10 18:47:43 +00:00
device->HrtfStatus = ALC_HRTF_UNSUPPORTED_FORMAT_SOFT;
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
no_hrtf:
Reference count HRTFs and unload them when unused
2017-04-06 20:00:29 +00:00
if(old_hrtf)
Hrtf_DecRef(old_hrtf);
old_hrtf = NULL;
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
TRACE("HRTF disabled\n");
Rename stereo-panning option to stereo-encoding Also rename the 'paired' value to 'panpot', and make it the default.
2017-02-23 03:18:01 +00:00
device->Render_Mode = StereoPair;
Use second-order ambisonics for basic HRTF rendering This should improve positional quality for relatively low cost. Full HRTF rendering still only uses first-order since the only use of the dry buffer there is for first-order content (B-Format buffers, effects).
2017-01-15 21:57:22 +00:00
ambiup_free(device->AmbiUp);
device->AmbiUp = NULL;
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
bs2blevel = ((headphones && hrtf_appreq != Hrtf_Disable) ||
(hrtf_appreq == Hrtf_Enable)) ? 5 : 0;
if(device->Type != Loopback)
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
ConfigValueInt(alstr_get_cstr(device->DeviceName), NULL, "cf_level", &bs2blevel);
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
if(bs2blevel > 0 && bs2blevel <= 6)
{
device->Bs2b = al_calloc(16, sizeof(*device->Bs2b));
bs2b_set_params(device->Bs2b, bs2blevel, device->Frequency);
TRACE("BS2B enabled\n");
InitPanning(device);
return;
}
TRACE("BS2B disabled\n");
Rename al_string_* functions to alstr_*
2017-04-04 13:58:53 +00:00
if(ConfigValueStr(alstr_get_cstr(device->DeviceName), NULL, "stereo-encoding", &mode))
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
{
Rename stereo-panning option to stereo-encoding Also rename the 'paired' value to 'panpot', and make it the default.
2017-02-23 03:18:01 +00:00
if(strcasecmp(mode, "uhj") == 0)
device->Render_Mode = NormalRender;
else if(strcasecmp(mode, "panpot") != 0)
ERR("Unexpected stereo-encoding: %s\n", mode);
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
}
if(device->Render_Mode == NormalRender)
{
device->Uhj_Encoder = al_calloc(16, sizeof(Uhj2Encoder));
TRACE("UHJ enabled\n");
InitUhjPanning(device);
return;
}
TRACE("UHJ disabled\n");
InitPanning(device);
}
Mix to multichannel for effects This mixes to a 4-channel first-order ambisonics buffer. With ACN ordering and N3D scaling, this makes it easy to remain compatible with effects that only care about mono input since channel 0 is an unattenuated mono signal.
2016-01-28 08:02:46 +00:00
void aluInitEffectPanning(ALeffectslot *slot)
{
Use ALsizei for sizes and offsets with the mixer Unsigned 32-bit offsets actually have some potential overhead on 64-bit targets for pointer/array accesses due to rules on integer wrapping. No idea how much impact it has in practice, but it's nice to be correct about it.
2017-01-16 15:45:07 +00:00
ALsizei i;
Mix to multichannel for effects This mixes to a 4-channel first-order ambisonics buffer. With ACN ordering and N3D scaling, this makes it easy to remain compatible with effects that only care about mono input since channel 0 is an unattenuated mono signal.
2016-01-28 08:02:46 +00:00
Avoid unnecessary loops for setting up effect slot b-format buffer mixing
2016-04-15 04:50:36 +00:00
memset(slot->ChanMap, 0, sizeof(slot->ChanMap));
Mix to multichannel for effects This mixes to a 4-channel first-order ambisonics buffer. With ACN ordering and N3D scaling, this makes it easy to remain compatible with effects that only care about mono input since channel 0 is an unattenuated mono signal.
2016-01-28 08:02:46 +00:00
slot->NumChannels = 0;
Avoid unnecessary loops for setting up effect slot b-format buffer mixing
2016-04-15 04:50:36 +00:00
for(i = 0;i < MAX_EFFECT_CHANNELS;i++)
{
slot->ChanMap[i].Scale = 1.0f;
slot->ChanMap[i].Index = i;
}
slot->NumChannels = i;
Mix to multichannel for effects This mixes to a 4-channel first-order ambisonics buffer. With ACN ordering and N3D scaling, this makes it easy to remain compatible with effects that only care about mono input since channel 0 is an unattenuated mono signal.
2016-01-28 08:02:46 +00:00
}
Reference in New Issue Copy Permalink