diff --git a/3rdparty/OpenAL/include/alext.h b/3rdparty/OpenAL/include/alext.h index 4b9a155379..cd7f2750d1 100644 --- a/3rdparty/OpenAL/include/alext.h +++ b/3rdparty/OpenAL/include/alext.h @@ -97,6 +97,31 @@ extern "C" { #ifndef AL_EXT_MCFORMATS #define AL_EXT_MCFORMATS 1 +/* Provides support for surround sound buffer formats with 8, 16, and 32-bit + * samples. + * + * QUAD8: Unsigned 8-bit, Quadraphonic (Front Left, Front Right, Rear Left, + * Rear Right). + * QUAD16: Signed 16-bit, Quadraphonic. + * QUAD32: 32-bit float, Quadraphonic. + * REAR8: Unsigned 8-bit, Rear Stereo (Rear Left, Rear Right). + * REAR16: Signed 16-bit, Rear Stereo. + * REAR32: 32-bit float, Rear Stereo. + * 51CHN8: Unsigned 8-bit, 5.1 Surround (Front Left, Front Right, Front Center, + * LFE, Side Left, Side Right). Note that some audio systems may label + * 5.1's Side channels as Rear or Surround; they are equivalent for the + * purposes of this extension. + * 51CHN16: Signed 16-bit, 5.1 Surround. + * 51CHN32: 32-bit float, 5.1 Surround. + * 61CHN8: Unsigned 8-bit, 6.1 Surround (Front Left, Front Right, Front Center, + * LFE, Rear Center, Side Left, Side Right). + * 61CHN16: Signed 16-bit, 6.1 Surround. + * 61CHN32: 32-bit float, 6.1 Surround. + * 71CHN8: Unsigned 8-bit, 7.1 Surround (Front Left, Front Right, Front Center, + * LFE, Rear Left, Rear Right, Side Left, Side Right). + * 71CHN16: Signed 16-bit, 7.1 Surround. + * 71CHN32: 32-bit float, 7.1 Surround. + */ #define AL_FORMAT_QUAD8 0x1204 #define AL_FORMAT_QUAD16 0x1205 #define AL_FORMAT_QUAD32 0x1206 @@ -395,6 +420,16 @@ ALC_API void ALC_APIENTRY alcDeviceResumeSOFT(ALCdevice *device); #ifndef AL_EXT_BFORMAT #define AL_EXT_BFORMAT 1 +/* Provides support for B-Format ambisonic buffers (first-order, FuMa scaling + * and layout). + * + * BFORMAT2D_8: Unsigned 8-bit, 3-channel non-periphonic (WXY). + * BFORMAT2D_16: Signed 16-bit, 3-channel non-periphonic (WXY). + * BFORMAT2D_FLOAT32: 32-bit float, 3-channel non-periphonic (WXY). + * BFORMAT3D_8: Unsigned 8-bit, 4-channel periphonic (WXYZ). + * BFORMAT3D_16: Signed 16-bit, 4-channel periphonic (WXYZ). + * BFORMAT3D_FLOAT32: 32-bit float, 4-channel periphonic (WXYZ). + */ #define AL_FORMAT_BFORMAT2D_8 0x20021 #define AL_FORMAT_BFORMAT2D_16 0x20022 #define AL_FORMAT_BFORMAT2D_FLOAT32 0x20023 @@ -459,6 +494,21 @@ AL_API const ALchar* AL_APIENTRY alGetStringiSOFT(ALenum pname, ALsizei index); #define ALC_OUTPUT_LIMITER_SOFT 0x199A #endif +#ifndef ALC_SOFT_device_clock +#define ALC_SOFT_device_clock 1 +typedef int64_t ALCint64SOFT; +typedef uint64_t ALCuint64SOFT; +#define ALC_DEVICE_CLOCK_SOFT 0x1600 +#define ALC_DEVICE_LATENCY_SOFT 0x1601 +#define ALC_DEVICE_CLOCK_LATENCY_SOFT 0x1602 +#define AL_SAMPLE_OFFSET_CLOCK_SOFT 0x1202 +#define AL_SEC_OFFSET_CLOCK_SOFT 0x1203 +typedef void (ALC_APIENTRY*LPALCGETINTEGER64VSOFT)(ALCdevice *device, ALCenum pname, ALsizei size, ALCint64SOFT *values); +#ifdef AL_ALEXT_PROTOTYPES +ALC_API void ALC_APIENTRY alcGetInteger64vSOFT(ALCdevice *device, ALCenum pname, ALsizei size, ALCint64SOFT *values); +#endif +#endif + #ifdef __cplusplus } #endif diff --git a/3rdparty/OpenAL/libs/Win64/OpenAL32.def b/3rdparty/OpenAL/libs/Win64/OpenAL32.def index 810b8233c2..32820731c0 100644 --- a/3rdparty/OpenAL/libs/Win64/OpenAL32.def +++ b/3rdparty/OpenAL/libs/Win64/OpenAL32.def @@ -1,72 +1,35 @@ EXPORTS - alAuxiliaryEffectSlotf - alAuxiliaryEffectSlotfv - alAuxiliaryEffectSloti - alAuxiliaryEffectSlotiv alBuffer3f alBuffer3i alBufferData - alBufferSamplesSOFT - alBufferSubDataSOFT - alBufferSubSamplesSOFT alBufferf alBufferfv alBufferi alBufferiv - alDeferUpdatesSOFT - alDeleteAuxiliaryEffectSlots alDeleteBuffers - alDeleteEffects - alDeleteFilters alDeleteSources alDisable alDistanceModel alDopplerFactor alDopplerVelocity - alEffectf - alEffectfv - alEffecti - alEffectiv alEnable - alFilterf - alFilterfv - alFilteri - alFilteriv - alGenAuxiliaryEffectSlots alGenBuffers - alGenEffects - alGenFilters alGenSources - alGetAuxiliaryEffectSlotf - alGetAuxiliaryEffectSlotfv - alGetAuxiliaryEffectSloti - alGetAuxiliaryEffectSlotiv alGetBoolean alGetBooleanv alGetBuffer3f alGetBuffer3i - alGetBufferSamplesSOFT alGetBufferf alGetBufferfv alGetBufferi alGetBufferiv alGetDouble alGetDoublev - alGetEffectf - alGetEffectfv - alGetEffecti - alGetEffectiv alGetEnumValue alGetError - alGetFilterf - alGetFilterfv - alGetFilteri - alGetFilteriv alGetFloat alGetFloatv alGetInteger - alGetInteger64SOFT - alGetInteger64vSOFT alGetIntegerv alGetListener3f alGetListener3i @@ -75,27 +38,16 @@ EXPORTS alGetListeneri alGetListeneriv alGetProcAddress - alGetSource3dSOFT alGetSource3f alGetSource3i - alGetSource3i64SOFT - alGetSourcedSOFT - alGetSourcedvSOFT alGetSourcef alGetSourcefv alGetSourcei - alGetSourcei64SOFT - alGetSourcei64vSOFT alGetSourceiv alGetString - alGetStringiSOFT - alIsAuxiliaryEffectSlot alIsBuffer - alIsBufferFormatSupportedSOFT - alIsEffect alIsEnabled alIsExtensionPresent - alIsFilter alIsSource alListener3f alListener3i @@ -103,11 +55,8 @@ EXPORTS alListenerfv alListeneri alListeneriv - alProcessUpdatesSOFT - alSource3dSOFT alSource3f alSource3i - alSource3i64SOFT alSourcePause alSourcePausev alSourcePlay @@ -118,13 +67,9 @@ EXPORTS alSourceStop alSourceStopv alSourceUnqueueBuffers - alSourcedSOFT - alSourcedvSOFT alSourcef alSourcefv alSourcei - alSourcei64SOFT - alSourcei64vSOFT alSourceiv alSpeedOfSound alcCaptureCloseDevice @@ -135,26 +80,17 @@ EXPORTS alcCloseDevice alcCreateContext alcDestroyContext - alcDevicePauseSOFT - alcDeviceResumeSOFT alcGetContextsDevice alcGetCurrentContext alcGetEnumValue alcGetError - alcGetInteger64vSOFT alcGetIntegerv alcGetProcAddress alcGetString - alcGetStringiSOFT alcGetThreadContext - alcIsAmbisonicFormatSupportedSOFT alcIsExtensionPresent - alcIsRenderFormatSupportedSOFT - alcLoopbackOpenDeviceSOFT alcMakeContextCurrent alcOpenDevice alcProcessContext - alcRenderSamplesSOFT - alcResetDeviceSOFT alcSetThreadContext alcSuspendContext diff --git a/3rdparty/OpenAL/libs/Win64/OpenAL32.lib b/3rdparty/OpenAL/libs/Win64/OpenAL32.lib index 7b21931172..a4b910b650 100644 Binary files a/3rdparty/OpenAL/libs/Win64/OpenAL32.lib and b/3rdparty/OpenAL/libs/Win64/OpenAL32.lib differ diff --git a/bin/OpenAL32.dll b/bin/OpenAL32.dll index 75d46cf9b5..f903a0c635 100644 Binary files a/bin/OpenAL32.dll and b/bin/OpenAL32.dll differ