diff options
author | Chris Robinson <[email protected]> | 2019-02-21 04:57:56 -0800 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2019-02-21 04:57:56 -0800 |
commit | 169a11dffc459a37c61b1dc6e7d66a303a935c62 (patch) | |
tree | ca4f02f68580c0fa1642f603b1513eada93f0918 /OpenAL32/Include/alu.h | |
parent | 8ac2d34706d1dea7c33f2b33c156cc23dde7b197 (diff) |
Add some preliminary fields for mix-time ambisonic upsampling
Diffstat (limited to 'OpenAL32/Include/alu.h')
-rw-r--r-- | OpenAL32/Include/alu.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index 9792026c..6713c490 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -20,6 +20,7 @@ #include "logging.h" #include "math_defs.h" #include "filters/biquad.h" +#include "filters/splitter.h" #include "filters/nfc.h" #include "almalloc.h" #include "alnumeric.h" @@ -204,10 +205,11 @@ struct ALvoiceProps : public ALvoicePropsBase { DEF_NEWDEL(ALvoiceProps) }; -#define VOICE_IS_STATIC (1<<0) -#define VOICE_IS_FADING (1<<1) /* Fading sources use gain stepping for smooth transitions. */ -#define VOICE_HAS_HRTF (1<<2) -#define VOICE_HAS_NFC (1<<3) +#define VOICE_IS_STATIC (1u<<0) +#define VOICE_IS_FADING (1u<<1) /* Fading sources use gain stepping for smooth transitions. */ +#define VOICE_IS_AMBISONIC (1u<<2) /* Voice needs HF scaling for ambisonic upsampling. */ +#define VOICE_HAS_HRTF (1u<<3) +#define VOICE_HAS_NFC (1u<<4) struct ALvoice { std::atomic<ALvoiceProps*> Update{nullptr}; @@ -253,6 +255,9 @@ struct ALvoice { InterpState ResampleState; + std::array<ALfloat,MAX_AMBI_ORDER+1> AmbiScales; + BandSplitter AmbiSplitter[MAX_INPUT_CHANNELS]; + struct { int FilterType; DirectParams Params[MAX_INPUT_CHANNELS]; |