ryzerth/sdrpp
1
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2026-04-19 14:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

DSP performance upgrades + bugfix

Browse Source
This commit is contained in:
Ryzerth
2021-03-29 21:53:43 +02:00
parent b72246d769
commit 27394a091f
29 changed files with 942 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/dsp/math.h
View File

@@ -10,8 +10,6 @@ namespace dsp {
Add(stream<T>* a, stream<T>* b) { init(a, b); }
~Add() { generic_block<Add<T>>::stop(); }
void init(stream<T>* a, stream<T>* b) {
_a = a;
_b = b;
@@ -21,9 +19,9 @@ namespace dsp {
}
int run() {
a_count = _a->read();
int a_count = _a->read();
if (a_count < 0) { return -1; }
b_count = _b->read();
int b_count = _b->read();
if (b_count < 0) { return -1; }
if (a_count != b_count) {
_a->flush();
@@ -47,7 +45,6 @@ namespace dsp {
stream<T> out;
private:
int a_count, b_count;
stream<T>* _a;
stream<T>* _b;
@@ -60,8 +57,6 @@ namespace dsp {
Substract(stream<T>* a, stream<T>* b) { init(a, b); }
~Substract() { generic_block<Substract<T>>::stop(); }
void init(stream<T>* a, stream<T>* b) {
_a = a;
_b = b;
@@ -71,9 +66,9 @@ namespace dsp {
}
int run() {
a_count = _a->read();
int a_count = _a->read();
if (a_count < 0) { return -1; }
b_count = _b->read();
int b_count = _b->read();
if (b_count < 0) { return -1; }
if (a_count != b_count) {
_a->flush();
@@ -85,7 +80,7 @@ namespace dsp {
volk_32f_x2_subtract_32f((float*)out.writeBuf, (float*)_a->readBuf, (float*)_b->readBuf, a_count * 2);
}
else {
volk_32f_x2_add_32f(out.writeBuf, _a->readBuf, _b->readBuf, a_count);
volk_32f_x2_subtract_32f(out.writeBuf, _a->readBuf, _b->readBuf, a_count);
}
_a->flush();
@@ -97,7 +92,6 @@ namespace dsp {
stream<T> out;
private:
int a_count, b_count;
stream<T>* _a;
stream<T>* _b;
@@ -110,8 +104,6 @@ namespace dsp {
Multiply(stream<T>* a, stream<T>* b) { init(a, b); }
~Multiply() { generic_block<Multiply>::stop(); }
void init(stream<T>* a, stream<T>* b) {
_a = a;
_b = b;
@@ -121,9 +113,9 @@ namespace dsp {
}
int run() {
a_count = _a->read();
int a_count = _a->read();
if (a_count < 0) { return -1; }
b_count = _b->read();
int b_count = _b->read();
if (b_count < 0) { return -1; }
if (a_count != b_count) {
_a->flush();
@@ -147,7 +139,6 @@ namespace dsp {
stream<T> out;
private:
int a_count, b_count;
stream<T>* _a;
stream<T>* _b;