summaryrefslogtreecommitdiffstats
path: root/src/MemlessPoly.cpp
diff options
context:
space:
mode:
authorandreas128 <Andreas>2017-06-17 16:10:43 +0100
committerandreas128 <Andreas>2017-06-17 16:10:43 +0100
commitedf28ac88d46d0cbbccd99ad5973f2939271b51f (patch)
tree3bb98a3ab647244cd3b27638e6752a8b224d0e7f /src/MemlessPoly.cpp
parente37567081d00778aea70ab42ad294679dff328be (diff)
downloaddabmod-edf28ac88d46d0cbbccd99ad5973f2939271b51f.tar.gz
dabmod-edf28ac88d46d0cbbccd99ad5973f2939271b51f.tar.bz2
dabmod-edf28ac88d46d0cbbccd99ad5973f2939271b51f.zip
Change to complex poly
Diffstat (limited to 'src/MemlessPoly.cpp')
-rw-r--r--src/MemlessPoly.cpp53
1 files changed, 29 insertions, 24 deletions
diff --git a/src/MemlessPoly.cpp b/src/MemlessPoly.cpp
index 7e074eb..5fbf724 100644
--- a/src/MemlessPoly.cpp
+++ b/src/MemlessPoly.cpp
@@ -45,10 +45,10 @@ using namespace std;
// By default the signal is unchanged
-static const std::array<float, 8> default_coefficients({
+static const std::array<complexf, 8> default_coefficients({{
1, 0.0, 0.0, 0.0,
0.0, 0.0, 0.0, 0.0
- });
+ }});
MemlessPoly::MemlessPoly(const std::string& coefs_file) :
@@ -69,7 +69,7 @@ MemlessPoly::MemlessPoly(const std::string& coefs_file) :
void MemlessPoly::load_coefficients(const std::string &coefFile)
{
- std::vector<float> coefs;
+ std::vector<complexf> coefs;
if (coefFile == "default") {
std::copy(default_coefficients.begin(), default_coefficients.end(),
std::back_inserter(coefs));
@@ -98,7 +98,10 @@ void MemlessPoly::load_coefficients(const std::string &coefFile)
int n;
for (n = 0; n < n_coefs; n++) {
- coef_fstream >> coefs[n];
+ float a, b;
+ coef_fstream >> a;
+ coef_fstream >> b;
+ coefs[n] = complexf(a, b)
PDEBUG("MemlessPoly: coef: %f\n", coefs[n] );
if (coef_fstream.eof()) {
fprintf(stderr, "MemlessPoly: file %s should contains %d coefs, but EOF reached "\
@@ -118,27 +121,29 @@ void MemlessPoly::load_coefficients(const std::string &coefFile)
int MemlessPoly::internal_process(Buffer* const dataIn, Buffer* dataOut)
{
- const float* in = reinterpret_cast<const float*>(dataIn->getData());
- float* out = reinterpret_cast<float*>(dataOut->getData());
- size_t sizeIn = dataIn->getLength() / sizeof(float);
-
- {
- std::lock_guard<std::mutex> lock(m_coefs_mutex);
- for (size_t i = 0; i < sizeIn; i += 1) {
- float mag = std::abs(in[i]);
- //out[i] = in[i];
- out[i] = in[i] * (
- m_coefs[0] +
- m_coefs[1] * mag +
- m_coefs[2] * mag*mag +
- m_coefs[3] * mag*mag*mag +
- m_coefs[4] * mag*mag*mag*mag +
- m_coefs[5] * mag*mag*mag*mag*mag +
- m_coefs[6] * mag*mag*mag*mag*mag*mag +
- m_coefs[7] * mag*mag*mag*mag*mag*mag*mag
- );
- }
+ dataOut->setLength(dataIn->getLength());
+
+ const complexf* in = reinterpret_cast<const complexf*>(dataIn->getData());
+ complexf* out = reinterpret_cast<complexf*>(dataOut->getData());
+ size_t sizeOut = dataOut->getLength() / sizeof(complexf);
+
+ {
+ std::lock_guard<std::mutex> lock(m_coefs_mutex);
+ for (size_t i = 0; i < sizeOut; i += 1) {
+ float mag = std::abs(in[i]);
+ //out[i] = in[i];
+ out[i] = in[i] * (
+ m_coefs[0] +
+ m_coefs[1] * mag +
+ m_coefs[2] * mag*mag +
+ m_coefs[3] * mag*mag*mag +
+ m_coefs[4] * mag*mag*mag*mag +
+ m_coefs[5] * mag*mag*mag*mag*mag +
+ m_coefs[6] * mag*mag*mag*mag*mag*mag +
+ m_coefs[7] * mag*mag*mag*mag*mag*mag*mag
+ );
}
+ }
return dataOut->getLength();
}