mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-07-09 10:35:21 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

DSP code cleanup

Browse Source
This commit is contained in:
Ryzerth
2021-07-12 05:03:51 +02:00
parent 1f1b0cd45e
commit ff030397a4
24 changed files with 442 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/src/dsp/block.h
View File

@ -24,10 +24,13 @@ namespace dsp {
virtual void init() {}
virtual ~generic_block() {
if (!_block_init) { return; }
stop();
_block_init = false;
}
virtual void start() {
assert(_block_init);
std::lock_guard<std::mutex> lck(ctrlMtx);
if (running) {
return;
@ -37,6 +40,7 @@ namespace dsp {
}
virtual void stop() {
assert(_block_init);
std::lock_guard<std::mutex> lck(ctrlMtx);
if (!running) {
return;
@ -46,6 +50,7 @@ namespace dsp {
}
void tempStart() {
assert(_block_init);
if (tempStopped) {
doStart();
tempStopped = false;
@ -53,13 +58,17 @@ namespace dsp {
}
void tempStop() {
assert(_block_init);
if (running && !tempStopped) {
doStop();
tempStopped = true;
}
}
virtual int calcOutSize(int inSize) { return inSize; }
virtual int calcOutSize(int inSize) {
assert(_block_init);
return inSize;
}
virtual int run() = 0;
@ -119,17 +128,18 @@ namespace dsp {
}
}
protected:
bool _block_init = false;
std::mutex ctrlMtx;
std::vector<untyped_steam*> inputs;
std::vector<untyped_steam*> outputs;
bool running = false;
bool tempStopped = false;
std::thread workerThread;
protected:
std::mutex ctrlMtx;
};
template <class BLOCK>
@ -138,10 +148,13 @@ namespace dsp {
virtual void init() {}
virtual ~generic_hier_block() {
if (!_block_init) { return; }
stop();
_block_init = false;
}
virtual void start() {
assert(_block_init);
std::lock_guard<std::mutex> lck(ctrlMtx);
if (running) {
return;
@ -151,6 +164,7 @@ namespace dsp {
}
virtual void stop() {
assert(_block_init);
std::lock_guard<std::mutex> lck(ctrlMtx);
if (!running) {
return;
@ -160,6 +174,7 @@ namespace dsp {
}
void tempStart() {
assert(_block_init);
if (tempStopped) {
doStart();
tempStopped = false;
@ -167,13 +182,17 @@ namespace dsp {
}
void tempStop() {
assert(_block_init);
if (running && !tempStopped) {
doStop();
tempStopped = true;
}
}
virtual int calcOutSize(int inSize) { return inSize; }
virtual int calcOutSize(int inSize) {
assert(_block_init);
return inSize;
}
friend BLOCK;
@ -203,6 +222,7 @@ namespace dsp {
bool running = false;
protected:
bool _block_init = false;
std::mutex ctrlMtx;
};