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

1071 lines
38 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"
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
Improve radius behavior with scaling of ambisonic coefficients
2016-04-25 04:42:59 +00:00
extern inline void CalcXYZCoeffs(ALfloat x, ALfloat y, ALfloat z, ALfloat spread, ALfloat coeffs[MAX_AMBI_COEFFS]);
Separate calculating ambisonic coefficients from the panning gains
2016-01-25 14:11:51 +00:00
Don't explicitly store first-order coefficients It seems a simple scaling on the coefficients will allow first-order content to work with second- and third-order coefficients, although obviously not with any improved locality. That may be something to look into for the future, but this is good enough for now.
2015-08-18 14:44:17 +00:00
#define ZERO_ORDER_SCALE 0.0f
#define FIRST_ORDER_SCALE 1.0f
#define SECOND_ORDER_SCALE (1.0f / 1.22474f)
#define THIRD_ORDER_SCALE (1.0f / 1.30657f)
Minor reformating
2015-08-22 14:23:43 +00:00
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
static const ALuint FuMa2ACN[MAX_AMBI_COEFFS] = {
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 */
};
Add an option to specify the ambisonic output configuration
2016-07-31 14:46:38 +00:00
static const ALuint ACN2ACN[MAX_AMBI_COEFFS] = {
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
* loundness doesn't depend on the spread. That is, the factors are
* scaled so that ZH0 remains 1 regardless of 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);
ALfloat ZH0_norm = 1.0f;
ALfloat ZH1_norm = 0.5f * (ca+1.f);
ALfloat ZH2_norm = 0.5f * (ca+1.f)*ca;
ALfloat ZH3_norm = 0.125f * (ca+1.f)*(5.f*ca*ca-1.f);
/* 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
}
Improve radius behavior with scaling of ambisonic coefficients
2016-04-25 04:42:59 +00:00
void CalcAngleCoeffs(ALfloat azimuth, ALfloat elevation, ALfloat spread, ALfloat coeffs[MAX_AMBI_COEFFS])
Separate calculating ambisonic coefficients from the panning gains
2016-01-25 14:11:51 +00:00
{
ALfloat dir[3] = {
Update some comments
2016-04-16 01:14:19 +00:00
sinf(azimuth) * cosf(elevation),
Separate calculating ambisonic coefficients from the panning gains
2016-01-25 14:11:51 +00:00
sinf(elevation),
Update some comments
2016-04-16 01:14:19 +00:00
-cosf(azimuth) * cosf(elevation)
Separate calculating ambisonic coefficients from the panning gains
2016-01-25 14:11:51 +00:00
};
Improve radius behavior with scaling of ambisonic coefficients
2016-04-25 04:42:59 +00:00
CalcDirectionCoeffs(dir, spread, coeffs);
Separate calculating ambisonic coefficients from the panning gains
2016-01-25 14:11:51 +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
void ComputeAmbientGainsMC(const ChannelConfig *chancoeffs, ALuint numchans, ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS])
Separate calculating ambisonic coefficients from the panning gains
2016-01-25 14:11:51 +00:00
{
ALuint i;
for(i = 0;i < numchans;i++)
{
// The W coefficients are based on a mathematical average of the
// output. The square root of the base average provides for a more
// perceptual average volume, better suited to non-directional gains.
gains[i] = sqrtf(chancoeffs[i][0]) * ingain;
}
for(;i < MAX_OUTPUT_CHANNELS;i++)
gains[i] = 0.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
void ComputeAmbientGainsBF(const BFChannelConfig *chanmap, ALuint numchans, ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS])
{
ALfloat gain = 0.0f;
ALuint i;
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;
}
void ComputePanningGainsMC(const ChannelConfig *chancoeffs, ALuint numchans, ALuint 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
{
ALuint 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];
Minor reformating
2015-08-22 14:23:43 +00:00
gains[i] = gain * 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
}
Avoid unnecessary loops for setting up effect slot b-format buffer mixing
2016-04-15 04:50:36 +00:00
void ComputePanningGainsBF(const BFChannelConfig *chanmap, ALuint numchans, const ALfloat coeffs[MAX_AMBI_COEFFS], ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS])
{
ALuint i;
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;
}
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
void ComputeFirstOrderGainsMC(const ChannelConfig *chancoeffs, ALuint 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
{
Support B-Format source rotation with AL_ORIENTATION
2014-11-01 05:43:13 +00:00
ALuint 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];
Loop over the gain values only once
2015-09-24 19:36:02 +00:00
gains[i] = gain * 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
}
Avoid unnecessary loops for setting up effect slot b-format buffer mixing
2016-04-15 04:50:36 +00:00
void ComputeFirstOrderGainsBF(const BFChannelConfig *chanmap, ALuint numchans, const ALfloat mtx[4], ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS])
{
ALuint i;
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
Mark a function as const
2014-11-16 07:20:38 +00:00
DECL_CONST 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;
Avoid passing the device to SetChannelMap
2016-01-27 12:44:21 +00:00
static void SetChannelMap(const enum Channel *devchans, ChannelConfig *ambicoeffs,
const ChannelMap *chanmap, size_t count, ALuint *outcount,
ALboolean isfuma)
Don't bother with LFE in the channel setup, set the values explicitly
2014-11-13 03:26:53 +00:00
{
Use ALuint instead of size_t for a loop iterator
2015-11-06 10:21:24 +00:00
size_t j, k;
ALuint i;
Don't bother with LFE in the channel setup, set the values explicitly
2014-11-13 03:26:53 +00:00
Avoid passing the device to SetChannelMap
2016-01-27 12:44:21 +00:00
for(i = 0;i < MAX_OUTPUT_CHANNELS && devchans[i] != InvalidChannel;i++)
Don't bother with LFE in the channel setup, set the values explicitly
2014-11-13 03:26:53 +00:00
{
Avoid passing the device to SetChannelMap
2016-01-27 12:44:21 +00:00
if(devchans[i] == LFE)
Don't bother with LFE in the channel setup, set the values explicitly
2014-11-13 03:26:53 +00:00
{
for(j = 0;j < MAX_AMBI_COEFFS;j++)
Avoid passing the device to SetChannelMap
2016-01-27 12:44:21 +00:00
ambicoeffs[i][j] = 0.0f;
Don't bother with LFE in the channel setup, set the values explicitly
2014-11-13 03:26:53 +00:00
continue;
}
for(j = 0;j < count;j++)
{
Avoid passing the device to SetChannelMap
2016-01-27 12:44:21 +00:00
if(devchans[i] != chanmap[j].ChanName)
continue;
if(isfuma)
Don't bother with LFE in the channel setup, set the values explicitly
2014-11-13 03:26:53 +00:00
{
Avoid passing the device to SetChannelMap
2016-01-27 12:44:21 +00:00
/* Reformat FuMa -> ACN/N3D */
for(k = 0;k < MAX_AMBI_COEFFS;++k)
Use N3D scaling instead of FuMa
2015-09-23 22:03:53 +00:00
{
Avoid passing the device to SetChannelMap
2016-01-27 12:44:21 +00:00
ALuint acn = FuMa2ACN[k];
ambicoeffs[i][acn] = chanmap[j].Config[k] / FuMa2N3DScale[acn];
Use N3D scaling instead of FuMa
2015-09-23 22:03:53 +00:00
}
Don't bother with LFE in the channel setup, set the values explicitly
2014-11-13 03:26:53 +00:00
}
Avoid passing the device to SetChannelMap
2016-01-27 12:44:21 +00:00
else
{
for(k = 0;k < MAX_AMBI_COEFFS;++k)
ambicoeffs[i][k] = chanmap[j].Config[k];
}
break;
Don't bother with LFE in the channel setup, set the values explicitly
2014-11-13 03:26:53 +00:00
}
if(j == count)
Avoid passing the device to SetChannelMap
2016-01-27 12:44:21 +00:00
ERR("Failed to match %s channel (%u) in channel map\n", GetLabelFromChannel(devchans[i]), i);
Don't bother with LFE in the channel setup, set the values explicitly
2014-11-13 03:26:53 +00:00
}
Avoid passing the device to SetChannelMap
2016-01-27 12:44:21 +00:00
*outcount = i;
Don't bother with LFE in the channel setup, set the values explicitly
2014-11-13 03:26:53 +00:00
}
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
static bool MakeSpeakerMap(ALCdevice *device, const AmbDecConf *conf, ALuint speakermap[MAX_OUTPUT_CHANNELS])
{
ALuint i;
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.
*/
if(al_string_cmp_cstr(conf->Speakers[i].Name, "LF") == 0)
c = GetChannelIdxByName(device->RealOut, FrontLeft);
else if(al_string_cmp_cstr(conf->Speakers[i].Name, "RF") == 0)
c = GetChannelIdxByName(device->RealOut, FrontRight);
else if(al_string_cmp_cstr(conf->Speakers[i].Name, "CE") == 0)
c = GetChannelIdxByName(device->RealOut, FrontCenter);
else if(al_string_cmp_cstr(conf->Speakers[i].Name, "LS") == 0)
{
if(device->FmtChans == DevFmtX51Rear)
c = GetChannelIdxByName(device->RealOut, BackLeft);
else
c = GetChannelIdxByName(device->RealOut, SideLeft);
}
else if(al_string_cmp_cstr(conf->Speakers[i].Name, "RS") == 0)
{
if(device->FmtChans == DevFmtX51Rear)
c = GetChannelIdxByName(device->RealOut, BackRight);
else
c = GetChannelIdxByName(device->RealOut, SideRight);
}
else if(al_string_cmp_cstr(conf->Speakers[i].Name, "LB") == 0)
{
if(device->FmtChans == DevFmtX51)
c = GetChannelIdxByName(device->RealOut, SideLeft);
else
c = GetChannelIdxByName(device->RealOut, BackLeft);
}
else if(al_string_cmp_cstr(conf->Speakers[i].Name, "RB") == 0)
{
if(device->FmtChans == DevFmtX51)
c = GetChannelIdxByName(device->RealOut, SideRight);
else
c = GetChannelIdxByName(device->RealOut, BackRight);
}
else if(al_string_cmp_cstr(conf->Speakers[i].Name, "CB") == 0)
c = GetChannelIdxByName(device->RealOut, BackCenter);
else
{
Recognize AUX0...AUX15 for decoder speaker labels
2016-05-13 06:41:23 +00:00
const char *name = al_string_get_cstr(conf->Speakers[i].Name);
unsigned int n;
char ch;
if(sscanf(name, "AUX%u%c", &n, &ch) == 1 && n < 16)
c = GetChannelIdxByName(device->RealOut, Aux0+n);
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",
al_string_get_cstr(conf->Speakers[i].Name));
return false;
}
speakermap[i] = c;
}
return true;
}
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
/* NOTE: These decoder coefficients are using FuMa channel ordering and
* normalization, since that's what was produced by the Ambisonic Decoder
* Toolbox. SetChannelMap will convert them to N3D.
*/
static const ChannelMap MonoCfg[1] = {
{ FrontCenter, { 1.414213562f } },
}, StereoCfg[2] = {
{ FrontLeft, { 0.707106781f, 0.0f, 0.5f, 0.0f } },
{ FrontRight, { 0.707106781f, 0.0f, -0.5f, 0.0f } },
}, QuadCfg[4] = {
Update the default quad decoder matrix
2016-07-19 02:42:11 +00:00
{ FrontLeft, { 0.353553f, 0.306186f, 0.306186f, 0.0f, 0.0f, 0.0f, 0.0f, 0.000000f, 0.125000f } },
{ FrontRight, { 0.353553f, 0.306186f, -0.306186f, 0.0f, 0.0f, 0.0f, 0.0f, 0.000000f, -0.125000f } },
{ BackLeft, { 0.353553f, -0.306186f, 0.306186f, 0.0f, 0.0f, 0.0f, 0.0f, 0.000000f, -0.125000f } },
{ BackRight, { 0.353553f, -0.306186f, -0.306186f, 0.0f, 0.0f, 0.0f, 0.0f, 0.000000f, 0.125000f } },
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
}, X51SideCfg[5] = {
{ FrontLeft, { 0.208954f, 0.199518f, 0.223424f, 0.0f, 0.0f, 0.0f, 0.0f, -0.012543f, 0.144260f } },
{ FrontRight, { 0.208950f, 0.199514f, -0.223425f, 0.0f, 0.0f, 0.0f, 0.0f, -0.012544f, -0.144258f } },
{ FrontCenter, { 0.109403f, 0.168250f, -0.000002f, 0.0f, 0.0f, 0.0f, 0.0f, 0.100431f, -0.000001f } },
{ SideLeft, { 0.470934f, -0.346484f, 0.327504f, 0.0f, 0.0f, 0.0f, 0.0f, -0.022188f, -0.041113f } },
{ SideRight, { 0.470936f, -0.346480f, -0.327507f, 0.0f, 0.0f, 0.0f, 0.0f, -0.022186f, 0.041114f } },
}, X51RearCfg[5] = {
{ FrontLeft, { 0.208954f, 0.199518f, 0.223424f, 0.0f, 0.0f, 0.0f, 0.0f, -0.012543f, 0.144260f } },
{ FrontRight, { 0.208950f, 0.199514f, -0.223425f, 0.0f, 0.0f, 0.0f, 0.0f, -0.012544f, -0.144258f } },
{ FrontCenter, { 0.109403f, 0.168250f, -0.000002f, 0.0f, 0.0f, 0.0f, 0.0f, 0.100431f, -0.000001f } },
{ BackLeft, { 0.470934f, -0.346484f, 0.327504f, 0.0f, 0.0f, 0.0f, 0.0f, -0.022188f, -0.041113f } },
{ BackRight, { 0.470936f, -0.346480f, -0.327507f, 0.0f, 0.0f, 0.0f, 0.0f, -0.022186f, 0.041114f } },
}, X61Cfg[6] = {
{ FrontLeft, { 0.167065f, 0.200583f, 0.172695f, 0.0f, 0.0f, 0.0f, 0.0f, 0.029855f, 0.186407f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.039241f, 0.068910f } },
{ FrontRight, { 0.167065f, 0.200583f, -0.172695f, 0.0f, 0.0f, 0.0f, 0.0f, 0.029855f, -0.186407f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.039241f, -0.068910f } },
{ FrontCenter, { 0.109403f, 0.179490f, 0.000000f, 0.0f, 0.0f, 0.0f, 0.0f, 0.142031f, 0.000000f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.072024f, 0.000000f } },
{ BackCenter, { 0.353556f, -0.461940f, 0.000000f, 0.0f, 0.0f, 0.0f, 0.0f, 0.165723f, 0.000000f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.000000f, 0.000000f } },
{ SideLeft, { 0.289151f, -0.081301f, 0.401292f, 0.0f, 0.0f, 0.0f, 0.0f, -0.188208f, -0.071420f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.010099f, -0.032897f } },
{ SideRight, { 0.289151f, -0.081301f, -0.401292f, 0.0f, 0.0f, 0.0f, 0.0f, -0.188208f, 0.071420f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.010099f, 0.032897f } },
}, X71Cfg[7] = {
{ FrontLeft, { 0.167065f, 0.200583f, 0.172695f, 0.0f, 0.0f, 0.0f, 0.0f, 0.029855f, 0.186407f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.039241f, 0.068910f } },
{ FrontRight, { 0.167065f, 0.200583f, -0.172695f, 0.0f, 0.0f, 0.0f, 0.0f, 0.029855f, -0.186407f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.039241f, -0.068910f } },
{ FrontCenter, { 0.109403f, 0.179490f, 0.000000f, 0.0f, 0.0f, 0.0f, 0.0f, 0.142031f, 0.000000f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.072024f, 0.000000f } },
{ BackLeft, { 0.224752f, -0.295009f, 0.170325f, 0.0f, 0.0f, 0.0f, 0.0f, 0.105349f, -0.182473f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.000000f, 0.065799f } },
{ BackRight, { 0.224752f, -0.295009f, -0.170325f, 0.0f, 0.0f, 0.0f, 0.0f, 0.105349f, 0.182473f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.000000f, -0.065799f } },
{ SideLeft, { 0.224739f, 0.000000f, 0.340644f, 0.0f, 0.0f, 0.0f, 0.0f, -0.210697f, 0.000000f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.000000f, -0.065795f } },
{ SideRight, { 0.224739f, 0.000000f, -0.340644f, 0.0f, 0.0f, 0.0f, 0.0f, -0.210697f, 0.000000f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.000000f, 0.065795f } },
};
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;
Avoid mixing all coefficients together when only some are used
2016-04-16 00:31:04 +00:00
ALuint coeffcount = 0;
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
ALfloat ambiscale;
size_t count = 0;
ALuint i, j;
Include any first-order scaling in the FOAOut coefficients
2016-03-26 06:25:13 +00:00
ambiscale = 1.0f;
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;
Don't explicitly store first-order coefficients It seems a simple scaling on the coefficients will allow first-order content to work with second- and third-order coefficients, although obviously not with any improved locality. That may be something to look into for the future, but this is good enough for now.
2015-08-18 14:44:17 +00:00
ambiscale = ZERO_ORDER_SCALE;
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;
Don't explicitly store first-order coefficients It seems a simple scaling on the coefficients will allow first-order content to work with second- and third-order coefficients, although obviously not with any improved locality. That may be something to look into for the future, but this is good enough for now.
2015-08-18 14:44:17 +00:00
ambiscale = FIRST_ORDER_SCALE;
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;
Don't explicitly store first-order coefficients It seems a simple scaling on the coefficients will allow first-order content to work with second- and third-order coefficients, although obviously not with any improved locality. That may be something to look into for the future, but this is good enough for now.
2015-08-18 14:44:17 +00:00
ambiscale = SECOND_ORDER_SCALE;
Avoid mixing all coefficients together when only some are used
2016-04-16 00:31:04 +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 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;
Use second-order coefficients for 5.1 Since the panning only drives 5 speakers, it shouldn't use more than 5 ambisonic channels (9 total in second order, minus 4 for unused height).
2016-03-13 10:32:32 +00:00
ambiscale = SECOND_ORDER_SCALE;
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;
Use second-order coefficients for 5.1 Since the panning only drives 5 speakers, it shouldn't use more than 5 ambisonic channels (9 total in second order, minus 4 for unused height).
2016-03-13 10:32:32 +00:00
ambiscale = SECOND_ORDER_SCALE;
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;
Don't explicitly store first-order coefficients It seems a simple scaling on the coefficients will allow first-order content to work with second- and third-order coefficients, although obviously not with any improved locality. That may be something to look into for the future, but this is good enough for now.
2015-08-18 14:44:17 +00:00
ambiscale = THIRD_ORDER_SCALE;
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;
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;
Don't explicitly store first-order coefficients It seems a simple scaling on the coefficients will allow first-order content to work with second- and third-order coefficients, although obviously not with any improved locality. That may be something to look into for the future, but this is good enough for now.
2015-08-18 14:44:17 +00:00
ambiscale = THIRD_ORDER_SCALE;
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
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
case DevFmtAmbi1:
case DevFmtAmbi2:
case DevFmtAmbi3:
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
Remove DevFmtBFormat3D, which is covered by DevFmtAmbi1
2016-07-31 15:13:41 +00:00
if(device->FmtChans >= DevFmtAmbi1 && device->FmtChans <= DevFmtAmbi3)
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
const ALuint *acnmap = (device->AmbiFmt == AmbiFormat_FuMa) ? FuMa2ACN : ACN2ACN;
const ALfloat *n3dcale = (device->AmbiFmt == AmbiFormat_FuMa) ? FuMa2N3DScale :
(device->AmbiFmt == AmbiFormat_ACN_SN3D) ? SN3D2N3DScale :
/*(device->AmbiFmt == AmbiFormat_ACN_N3D) ?*/ UnitScale;
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
count = (device->FmtChans == DevFmtAmbi3) ? 16 :
Add an option to specify the ambisonic output configuration
2016-07-31 14:46:38 +00:00
(device->FmtChans == DevFmtAmbi2) ? 9 :
(device->FmtChans == DevFmtAmbi1) ? 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++)
{
Add an option to specify the ambisonic output configuration
2016-07-31 14:46:38 +00:00
ALuint acn = acnmap[i];
device->Dry.Ambi.Map[i].Scale = 1.0f/n3dcale[acn];
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;
Add an option to specify the ambisonic output configuration
2016-07-31 14:46:38 +00:00
if(device->FmtChans == DevFmtAmbi1)
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;
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;
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);
}
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
{
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, count, &device->Dry.NumChannels, AL_TRUE);
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;
memset(&device->FOAOut.Ambi, 0, sizeof(device->FOAOut.Ambi));
for(i = 0;i < device->Dry.NumChannels;i++)
{
device->FOAOut.Ambi.Coeffs[i][0] = device->Dry.Ambi.Coeffs[i][0];
for(j = 1;j < 4;j++)
device->FOAOut.Ambi.Coeffs[i][j] = device->Dry.Ambi.Coeffs[i][j] * ambiscale;
}
device->FOAOut.CoeffCount = 4;
Include any first-order scaling in the FOAOut coefficients
2016-03-26 06:25:13 +00:00
}
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
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
static void InitCustomPanning(ALCdevice *device, const AmbDecConf *conf, const ALuint speakermap[MAX_OUTPUT_CHANNELS])
{
ChannelMap chanmap[MAX_OUTPUT_CHANNELS];
const ALfloat *coeff_scale = UnitScale;
ALfloat ambiscale = 1.0f;
ALuint i, j;
if(conf->FreqBands != 1)
ERR("Basic renderer uses the high-frequency matrix as single-band (xover_freq = %.0fhz)\n",
conf->XOverFreq);
if(conf->ChanMask > 0x1ff)
ambiscale = THIRD_ORDER_SCALE;
else if(conf->ChanMask > 0xf)
ambiscale = SECOND_ORDER_SCALE;
else if(conf->ChanMask > 0x1)
ambiscale = FIRST_ORDER_SCALE;
else
ambiscale = 0.0f;
if(conf->CoeffScale == ADS_SN3D)
coeff_scale = SN3D2N3DScale;
else if(conf->CoeffScale == ADS_FuMa)
coeff_scale = FuMa2N3DScale;
for(i = 0;i < conf->NumSpeakers;i++)
{
ALuint chan = speakermap[i];
ALfloat gain;
ALuint k = 0;
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,
Avoid mixing all coefficients together when only some are used
2016-04-16 00:31:04 +00:00
conf->NumSpeakers, &device->Dry.NumChannels, AL_FALSE);
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));
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +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
device->FOAOut.Ambi.Coeffs[i][0] = device->Dry.Ambi.Coeffs[i][0];
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
for(j = 1;j < 4;j++)
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.Ambi.Coeffs[i][j] = device->Dry.Ambi.Coeffs[i][j] * ambiscale;
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;
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
}
static void InitHQPanning(ALCdevice *device, const AmbDecConf *conf, const ALuint speakermap[MAX_OUTPUT_CHANNELS])
{
const char *devname;
int decflags = 0;
size_t count;
ALuint i;
devname = al_string_get_cstr(device->DeviceName);
if(GetConfigValueBool(devname, "decoder", "distance-comp", 1))
decflags |= BFDF_DistanceComp;
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
);
bformatdec_reset(device->AmbiDecoder, conf, count, device->Frequency,
speakermap, decflags);
if(bformatdec_getOrder(device->AmbiDecoder) < 2)
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;
}
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));
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;
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
}
}
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
static void InitHrtfPanning(ALCdevice *device)
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
{
Avoid storing channel names for the dry buffer
2016-04-17 00:21:31 +00:00
static const enum Channel CubeChannels[MAX_OUTPUT_CHANNELS] = {
UpperFrontLeft, UpperFrontRight, UpperBackLeft, UpperBackRight,
LowerFrontLeft, LowerFrontRight, LowerBackLeft, LowerBackRight,
Increase max output channels to 16 This also enables fully periphonic 3rd order HQ decoding.
2016-04-20 01:58:19 +00:00
InvalidChannel, InvalidChannel, InvalidChannel, InvalidChannel,
InvalidChannel, InvalidChannel, InvalidChannel, InvalidChannel
Avoid storing channel names for the dry buffer
2016-04-17 00:21:31 +00:00
};
Avoid mixing all coefficients together when only some are used
2016-04-16 00:31:04 +00:00
static const ChannelMap Cube8Cfg[8] = {
{ UpperFrontLeft, { 0.176776695f, 0.072168784f, 0.072168784f, 0.072168784f } },
{ UpperFrontRight, { 0.176776695f, 0.072168784f, -0.072168784f, 0.072168784f } },
{ UpperBackLeft, { 0.176776695f, -0.072168784f, 0.072168784f, 0.072168784f } },
{ UpperBackRight, { 0.176776695f, -0.072168784f, -0.072168784f, 0.072168784f } },
{ LowerFrontLeft, { 0.176776695f, 0.072168784f, 0.072168784f, -0.072168784f } },
{ LowerFrontRight, { 0.176776695f, 0.072168784f, -0.072168784f, -0.072168784f } },
{ LowerBackLeft, { 0.176776695f, -0.072168784f, 0.072168784f, -0.072168784f } },
{ LowerBackRight, { 0.176776695f, -0.072168784f, -0.072168784f, -0.072168784f } },
};
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
static const struct {
enum Channel Channel;
ALfloat Angle;
ALfloat Elevation;
} CubeInfo[8] = {
{ UpperFrontLeft, DEG2RAD( -45.0f), DEG2RAD( 45.0f) },
{ UpperFrontRight, DEG2RAD( 45.0f), DEG2RAD( 45.0f) },
{ UpperBackLeft, DEG2RAD(-135.0f), DEG2RAD( 45.0f) },
{ UpperBackRight, DEG2RAD( 135.0f), DEG2RAD( 45.0f) },
{ LowerFrontLeft, DEG2RAD( -45.0f), DEG2RAD(-45.0f) },
{ LowerFrontRight, DEG2RAD( 45.0f), DEG2RAD(-45.0f) },
{ LowerBackLeft, DEG2RAD(-135.0f), DEG2RAD(-45.0f) },
{ LowerBackRight, DEG2RAD( 135.0f), DEG2RAD(-45.0f) },
};
const ChannelMap *chanmap = Cube8Cfg;
size_t count = COUNTOF(Cube8Cfg);
ALuint i;
Avoid storing channel names for the dry buffer
2016-04-17 00:21:31 +00:00
SetChannelMap(CubeChannels, device->Dry.Ambi.Coeffs, chanmap, count,
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
&device->Dry.NumChannels, AL_TRUE);
Avoid mixing all coefficients together when only some are used
2016-04-16 00:31:04 +00:00
device->Dry.CoeffCount = 4;
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;
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
for(i = 0;i < device->Dry.NumChannels;i++)
{
Avoid storing channel names for the dry buffer
2016-04-17 00:21:31 +00:00
int chan = GetChannelIndex(CubeChannels, CubeInfo[i].Channel);
Improve radius behavior with scaling of ambisonic coefficients
2016-04-25 04:42:59 +00:00
GetLerpedHrtfCoeffs(device->Hrtf, CubeInfo[i].Elevation, CubeInfo[i].Angle, 1.0f, 0.0f,
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
device->Hrtf_Params[chan].Coeffs, device->Hrtf_Params[chan].Delay);
}
}
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
{
Remove unneeded ChannelMaps for BFormat formats
2016-04-18 05:11:15 +00:00
size_t count = 3;
Split aluInitPanning into separate functions for HRTF or UHJ
2016-04-14 17:44:57 +00:00
ALuint 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 < count;i++)
{
ALuint acn = FuMa2ACN[i];
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;
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)
{
const char *mode;
bool headphones;
int bs2blevel;
size_t i;
device->Hrtf = NULL;
al_string_clear(&device->Hrtf_Name);
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;
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
if(device->FmtChans != DevFmtStereo)
{
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
ALuint 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
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
if(hrtf_appreq == Hrtf_Enable)
device->Hrtf_Status = ALC_HRTF_UNSUPPORTED_FORMAT_SOFT;
Prepare the custom decoder in aluInitRenderer
2016-04-14 23:42:32 +00:00
ambdec_init(&conf);
devname = al_string_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;
case DevFmtX51: layout = "surround51"; break;
case DevFmtX51Rear: layout = "surround51rear"; break;
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:
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
case DevFmtAmbi1:
case DevFmtAmbi2:
case DevFmtAmbi3:
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;
Add a stand-alone upsampler for higher-order ambisonic oputput
2016-07-30 16:29:21 +00:00
if(device->FmtChans > DevFmtAmbi1 && device->FmtChans <= DevFmtAmbi3)
{
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);
ambdec_deinit(&conf);
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
return;
}
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;
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
bformatdec_free(device->AmbiDecoder);
device->AmbiDecoder = NULL;
headphones = device->IsHeadphones;
if(device->Type != Loopback)
{
const char *mode;
if(ConfigValueStr(al_string_get_cstr(device->DeviceName), NULL, "stereo-mode", &mode))
{
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;
device->Hrtf_Status = 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)
Reorganize a bit of aluInitRenderer code
2016-04-16 21:00:22 +00:00
device->Hrtf_Status = 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)
device->Hrtf_Status = ALC_HRTF_DENIED_SOFT;
goto no_hrtf;
}
device->Hrtf_Status = ALC_HRTF_REQUIRED_SOFT;
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
}
if(VECTOR_SIZE(device->Hrtf_List) == 0)
{
VECTOR_DEINIT(device->Hrtf_List);
device->Hrtf_List = EnumerateHrtf(device->DeviceName);
}
if(hrtf_id >= 0 && (size_t)hrtf_id < VECTOR_SIZE(device->Hrtf_List))
{
const HrtfEntry *entry = &VECTOR_ELEM(device->Hrtf_List, hrtf_id);
Avoid function calls to get the HRTF sample rate and IR size
2016-07-07 17:26:42 +00:00
if(entry->hrtf->sampleRate == device->Frequency)
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
{
device->Hrtf = entry->hrtf;
al_string_copy(&device->Hrtf_Name, entry->name);
}
}
for(i = 0;!device->Hrtf && i < VECTOR_SIZE(device->Hrtf_List);i++)
{
const HrtfEntry *entry = &VECTOR_ELEM(device->Hrtf_List, i);
Avoid function calls to get the HRTF sample rate and IR size
2016-07-07 17:26:42 +00:00
if(entry->hrtf->sampleRate == device->Frequency)
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
{
device->Hrtf = entry->hrtf;
al_string_copy(&device->Hrtf_Name, entry->name);
}
}
if(device->Hrtf)
{
Reorganize a bit of aluInitRenderer code
2016-04-16 21:00:22 +00:00
device->Render_Mode = HrtfRender;
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
if(ConfigValueStr(al_string_get_cstr(device->DeviceName), NULL, "hrtf-mode", &mode))
{
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);
}
TRACE("HRTF enabled, \"%s\"\n", al_string_get_cstr(device->Hrtf_Name));
InitHrtfPanning(device);
return;
}
Reorganize a bit of aluInitRenderer code
2016-04-16 21:00:22 +00:00
device->Hrtf_Status = ALC_HRTF_UNSUPPORTED_FORMAT_SOFT;
Move the InitRenderer method to panning.c
2016-04-14 22:25:12 +00:00
no_hrtf:
TRACE("HRTF disabled\n");
bs2blevel = ((headphones && hrtf_appreq != Hrtf_Disable) ||
(hrtf_appreq == Hrtf_Enable)) ? 5 : 0;
if(device->Type != Loopback)
ConfigValueInt(al_string_get_cstr(device->DeviceName), NULL, "cf_level", &bs2blevel);
if(bs2blevel > 0 && bs2blevel <= 6)
{
device->Bs2b = al_calloc(16, sizeof(*device->Bs2b));
bs2b_set_params(device->Bs2b, bs2blevel, device->Frequency);
device->Render_Mode = StereoPair;
TRACE("BS2B enabled\n");
InitPanning(device);
return;
}
TRACE("BS2B disabled\n");
device->Render_Mode = NormalRender;
if(ConfigValueStr(al_string_get_cstr(device->DeviceName), NULL, "stereo-panning", &mode))
{
if(strcasecmp(mode, "paired") == 0)
device->Render_Mode = StereoPair;
else if(strcasecmp(mode, "uhj") != 0)
ERR("Unexpected stereo-panning: %s\n", mode);
}
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)
{
Avoid unnecessary loops for setting up effect slot b-format buffer mixing
2016-04-15 04:50:36 +00:00
ALuint 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