kfr

commit d36482b2f6389d11d5fa031d316d7b25c20e8b25
parent 9e6adbcdd27af4c2fd290fedbaf0313c7515c0ed
Author: d.levin256@gmail.com <d.levin256@gmail.com>
Date:   Wed, 27 Jul 2016 20:53:43 +0300

Weighting functions

Diffstat:
M
include/kfr/dsp/weighting.hpp
 | 
51
+++++++++++++++++++++++++++++++++------------------

1 file changed, 33 insertions(+), 18 deletions(-)
diff --git a/include/kfr/dsp/weighting.hpp b/include/kfr/dsp/weighting.hpp
@@ -22,13 +22,12 @@
  */
 #pragma once
 
+#include "../base/operators.hpp"
 #include "../base/sqrt.hpp"
-#include "../base/vec.hpp"
-#include "units.hpp"
 
 namespace kfr
 {
-namespace internal
+namespace intrinsics
 {
 
 template <typename T>
@@ -86,28 +85,44 @@ KFR_SINTRIN T cweighting(T f)
 {
     return weight_c_unnorm(f) * weight_c_gain<subtype<T>>;
 }
+}
+KFR_I_FN(aweighting)
+KFR_I_FN(bweighting)
+KFR_I_FN(cweighting)
 
-template <typename T>
-KFR_SINTRIN T aweightingdB(T f)
+template <typename T1, KFR_ENABLE_IF(is_numeric<T1>::value)>
+KFR_INTRIN T1 aweighting(const T1& x)
 {
-    return amp_to_dB(aweighting(f));
+    return intrinsics::aweighting(x);
 }
-template <typename T>
-KFR_SINTRIN T bweightingdB(T f)
+
+template <typename E1, KFR_ENABLE_IF(is_input_expression<E1>::value)>
+KFR_INTRIN expr_func<fn::aweighting, E1> aweighting(E1&& x)
 {
-    return amp_to_dB(bweighting(f));
+    return { {}, std::forward<E1>(x) };
 }
-template <typename T>
-KFR_SINTRIN T cweightingdB(T f)
+
+template <typename T1, KFR_ENABLE_IF(is_numeric<T1>::value)>
+KFR_INTRIN T1 bweighting(const T1& x)
 {
-    return amp_to_dB(cweighting(f));
+    return intrinsics::bweighting(x);
 }
 
-KFR_I_FN(aweighting)
-KFR_I_FN(bweighting)
-KFR_I_FN(cweighting)
-KFR_I_FN(aweightingdB)
-KFR_I_FN(bweightingdB)
-KFR_I_FN(cweightingdB)
+template <typename E1, KFR_ENABLE_IF(is_input_expression<E1>::value)>
+KFR_INTRIN expr_func<fn::bweighting, E1> bweighting(E1&& x)
+{
+    return { {}, std::forward<E1>(x) };
+}
+
+template <typename T1, KFR_ENABLE_IF(is_numeric<T1>::value)>
+KFR_INTRIN T1 cweighting(const T1& x)
+{
+    return intrinsics::cweighting(x);
+}
+
+template <typename E1, KFR_ENABLE_IF(is_input_expression<E1>::value)>
+KFR_INTRIN expr_func<fn::cweighting, E1> cweighting(E1&& x)
+{
+    return { {}, std::forward<E1>(x) };
 }
 }