comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-06-03 06:24:49 -04:00
Code Issues Projects Releases Wiki Activity

convert inline buffers to dynamic growth per instance

Browse Source
This commit is contained in:
Charles J. Cliffe
2014-12-24 03:03:34 -05:00
parent 576a77e095
commit b487cf9901
4 changed files with 72 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sdr/SDRPostThread.cpp
+18 -13
View File
@@ -53,6 +53,7 @@ void SDRPostThread::threadMain() {
std::deque<DemodulatorThreadIQData *> buffers;
std::deque<DemodulatorThreadIQData *>::iterator buffers_i;
std::vector<signed char> dataOut;
while (!terminated) {
SDRThreadIQData *data_in;
@@ -61,29 +62,34 @@ void SDRPostThread::threadMain() {
// std::lock_guard < std::mutex > lock(data_in->m_mutex);
if (data_in && data_in->data.size()) {
SDRThreadIQData *dataOut = new SDRThreadIQData;
if (data_in->data.size() > dataOut.capacity()) {
dataOut.reserve(data_in->data.size());
}
dataOut->frequency = data_in->frequency;
dataOut->bandwidth = data_in->bandwidth;
dataOut->data.assign(data_in->data.begin(), data_in->data.end());
dataOut.assign(data_in->data.begin(), data_in->data.end());
for (int i = 0, iMax = dataOut->data.size() / 2; i < iMax; i++) {
x.real = (float) dataOut->data[i * 2] / 127.0;
x.imag = (float) dataOut->data[i * 2 + 1] / 127.0;
for (int i = 0, iMax = dataOut.size() / 2; i < iMax; i++) {
x.real = (float) dataOut[i * 2] / 127.0;
x.imag = (float) dataOut[i * 2 + 1] / 127.0;
iirfilt_crcf_execute(dcFilter, x, &y);
dataOut->data[i * 2] = (signed char) floor(y.real * 127.0);
dataOut->data[i * 2 + 1] = (signed char) floor(y.imag * 127.0);
dataOut[i * 2] = (signed char) floor(y.real * 127.0);
dataOut[i * 2 + 1] = (signed char) floor(y.imag * 127.0);
}
if (iqDataOutQueue != NULL) {
iqDataOutQueue.load()->push(dataOut);
SDRThreadIQData *visDataOut = new SDRThreadIQData;
visDataOut->frequency = data_in->frequency;
visDataOut->bandwidth = data_in->bandwidth;
visDataOut->data.assign(dataOut.begin(), dataOut.end());
iqDataOutQueue.load()->push(visDataOut);
}
if (iqVisualQueue != NULL && iqVisualQueue.load()->empty()) {
SDRThreadIQData *visualDataOut = new SDRThreadIQData;
visualDataOut->data.assign(dataOut->data.begin(), dataOut->data.begin() + (FFT_SIZE * 2));
visualDataOut->data.assign(dataOut.begin(), dataOut.begin() + (FFT_SIZE * 2));
iqVisualQueue.load()->push(visualDataOut);
}
@@ -142,7 +148,7 @@ void SDRPostThread::threadMain() {
demodDataOut->frequency = data_in->frequency;
demodDataOut->bandwidth = data_in->bandwidth;
demodDataOut->setRefCount(activeDemods);
demodDataOut->data.assign(dataOut->data.begin(), dataOut->data.begin() + dataOut->data.size());
demodDataOut->data.assign(dataOut.begin(), dataOut.begin() + dataOut.size());
std::vector<DemodulatorInstance *>::iterator i;
for (i = demodulators.begin(); i != demodulators.end(); i++) {
@@ -175,7 +181,6 @@ void SDRPostThread::threadMain() {
}
}
}
delete dataOut;
}
data_in->decRefCount();
}
src/sdr/SDRThread.cpp
+4
View File
@@ -181,6 +181,10 @@ void SDRThread::threadMain() {
dataOut->frequency = frequency;
dataOut->bandwidth = bandwidth;
if (dataOut->data.capacity() < n_read) {
dataOut->data.reserve(n_read);
}
if (dataOut->data.size() != n_read) {
dataOut->data.resize(n_read);
}