Update OpenAL-soft to 1.23.1-bc7cb17.

2026-08-16 08:11:25 +02:00 · 2024-03-20 11:06:03 +08:00
parent 4a512be715
commit 73a6fc9196
294 changed files with 44342 additions and 40077 deletions
@@ -1,93 +1,117 @@

 #include "config.h"

-#include "AL/al.h"
-#include "alc/inprogext.h"
+#include <algorithm>
+#include <array>
+#include <cmath>

-#include "alc/effects/base.h"
+#include "AL/al.h"
+
+#include "alc/inprogext.h"
+#include "alnumeric.h"
+#include "alspan.h"
+#include "core/effects/base.h"
 #include "effects.h"


 namespace {

-void Convolution_setParami(EffectProps* /*props*/, ALenum param, int /*val*/)
+constexpr EffectProps genDefaultProps() noexcept
 {
-    switch(param)
-    {
-    default:
-        throw effect_exception{AL_INVALID_ENUM, "Invalid null effect integer property 0x%04x",
-            param};
-    }
-}
-void Convolution_setParamiv(EffectProps *props, ALenum param, const int *vals)
-{
-    switch(param)
-    {
-    default:
-        Convolution_setParami(props, param, vals[0]);
-    }
-}
-void Convolution_setParamf(EffectProps* /*props*/, ALenum param, float /*val*/)
-{
-    switch(param)
-    {
-    default:
-        throw effect_exception{AL_INVALID_ENUM, "Invalid null effect float property 0x%04x",
-            param};
-    }
-}
-void Convolution_setParamfv(EffectProps *props, ALenum param, const float *vals)
-{
-    switch(param)
-    {
-    default:
-        Convolution_setParamf(props, param, vals[0]);
-    }
-}
-
-void Convolution_getParami(const EffectProps* /*props*/, ALenum param, int* /*val*/)
-{
-    switch(param)
-    {
-    default:
-        throw effect_exception{AL_INVALID_ENUM, "Invalid null effect integer property 0x%04x",
-            param};
-    }
-}
-void Convolution_getParamiv(const EffectProps *props, ALenum param, int *vals)
-{
-    switch(param)
-    {
-    default:
-        Convolution_getParami(props, param, vals);
-    }
-}
-void Convolution_getParamf(const EffectProps* /*props*/, ALenum param, float* /*val*/)
-{
-    switch(param)
-    {
-    default:
-        throw effect_exception{AL_INVALID_ENUM, "Invalid null effect float property 0x%04x",
-            param};
-    }
-}
-void Convolution_getParamfv(const EffectProps *props, ALenum param, float *vals)
-{
-    switch(param)
-    {
-    default:
-        Convolution_getParamf(props, param, vals);
-    }
-}
-
-EffectProps genDefaultProps() noexcept
-{
-    EffectProps props{};
+    ConvolutionProps props{};
+    props.OrientAt = {0.0f,  0.0f, -1.0f};
+    props.OrientUp = {0.0f,  1.0f,  0.0f};
    return props;
 }

 } // namespace

-DEFINE_ALEFFECT_VTABLE(Convolution);
-
 const EffectProps ConvolutionEffectProps{genDefaultProps()};
+
+void EffectHandler::SetParami(ConvolutionProps& /*props*/, ALenum param, int /*val*/)
+{
+    switch(param)
+    {
+    default:
+        throw effect_exception{AL_INVALID_ENUM, "Invalid convolution effect integer property 0x%04x",
+            param};
+    }
+}
+void EffectHandler::SetParamiv(ConvolutionProps &props, ALenum param, const int *vals)
+{
+    switch(param)
+    {
+    default:
+        SetParami(props, param, *vals);
+    }
+}
+void EffectHandler::SetParamf(ConvolutionProps& /*props*/, ALenum param, float /*val*/)
+{
+    switch(param)
+    {
+    default:
+        throw effect_exception{AL_INVALID_ENUM, "Invalid convolution effect float property 0x%04x",
+            param};
+    }
+}
+void EffectHandler::SetParamfv(ConvolutionProps &props, ALenum param, const float *values)
+{
+    static constexpr auto finite_checker = [](float val) -> bool { return std::isfinite(val); };
+    al::span<const float> vals;
+    switch(param)
+    {
+    case AL_CONVOLUTION_ORIENTATION_SOFT:
+        vals = {values, 6_uz};
+        if(!std::all_of(vals.cbegin(), vals.cend(), finite_checker))
+            throw effect_exception{AL_INVALID_VALUE, "Property 0x%04x value out of range", param};
+
+        std::copy_n(vals.cbegin(), props.OrientAt.size(), props.OrientAt.begin());
+        std::copy_n(vals.cbegin()+3, props.OrientUp.size(), props.OrientUp.begin());
+        break;
+
+    default:
+        SetParamf(props, param, *values);
+    }
+}
+
+void EffectHandler::GetParami(const ConvolutionProps& /*props*/, ALenum param, int* /*val*/)
+{
+    switch(param)
+    {
+    default:
+        throw effect_exception{AL_INVALID_ENUM, "Invalid convolution effect integer property 0x%04x",
+            param};
+    }
+}
+void EffectHandler::GetParamiv(const ConvolutionProps &props, ALenum param, int *vals)
+{
+    switch(param)
+    {
+    default:
+        GetParami(props, param, vals);
+    }
+}
+void EffectHandler::GetParamf(const ConvolutionProps& /*props*/, ALenum param, float* /*val*/)
+{
+    switch(param)
+    {
+    default:
+        throw effect_exception{AL_INVALID_ENUM, "Invalid convolution effect float property 0x%04x",
+            param};
+    }
+}
+void EffectHandler::GetParamfv(const ConvolutionProps &props, ALenum param, float *values)
+{
+    al::span<float> vals;
+    switch(param)
+    {
+    case AL_CONVOLUTION_ORIENTATION_SOFT:
+        vals = {values, 6_uz};
+        std::copy(props.OrientAt.cbegin(), props.OrientAt.cend(), vals.begin());
+        std::copy(props.OrientUp.cbegin(), props.OrientUp.cend(), vals.begin()+3);
+        break;
+
+    default:
+        GetParamf(props, param, values);
+    }
+}