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

Fixed file source and cleaned up buffering code

Browse Source
This commit is contained in:
Ryzerth
2021-06-29 02:43:04 +02:00
parent 70cf463881
commit aaa15315ce
8 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/src/dsp/buffer.h
View File

@@ -224,14 +224,6 @@ namespace dsp {
SampleFrameBuffer(stream<T>* in) { init(in); }
~SampleFrameBuffer() {
generic_block<SampleFrameBuffer<T>>::stop();
out.stopWriter();
stopWorker = true;
cnd.notify_all();
if (readWorkerThread.joinable()) { readWorkerThread.join(); }
}
void init(stream<T>* in) {
_in = in;
@@ -241,8 +233,6 @@ namespace dsp {
generic_block<SampleFrameBuffer<T>>::registerInput(in);
generic_block<SampleFrameBuffer<T>>::registerOutput(&out);
readWorkerThread = std::thread(&SampleFrameBuffer::worker, this);
}
void setInput(stream<T>* in) {
@@ -275,9 +265,9 @@ namespace dsp {
writeCur++;
writeCur = ((writeCur) % TEST_BUFFER_SIZE);
if (((writeCur - readCur + TEST_BUFFER_SIZE) % TEST_BUFFER_SIZE) >= (TEST_BUFFER_SIZE-2)) {
spdlog::warn("Overflow");
}
// if (((writeCur - readCur + TEST_BUFFER_SIZE) % TEST_BUFFER_SIZE) >= (TEST_BUFFER_SIZE-2)) {
// spdlog::warn("Overflow");
// }
}
cnd.notify_all();
_in->flush();
@@ -311,6 +301,25 @@ namespace dsp {
bool bypass = false;
private:
void doStart() {
generic_block<SampleFrameBuffer<T>>::workerThread = std::thread(&generic_block<SampleFrameBuffer<T>>::workerLoop, this);
readWorkerThread = std::thread(&SampleFrameBuffer<T>::worker, this);
}
void doStop() {
_in->stopReader();
out.stopWriter();
stopWorker = true;
cnd.notify_all();
if (generic_block<SampleFrameBuffer<T>>::workerThread.joinable()) { generic_block<SampleFrameBuffer<T>>::workerThread.join(); }
if (readWorkerThread.joinable()) { readWorkerThread.join(); }
_in->clearReadStop();
out.clearWriteStop();
stopWorker = false;
}
stream<T>* _in;
std::thread readWorkerThread;