comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-26 21:58:37 -05:00
Code Issues Projects Releases Wiki Activity

SoapySDRThread readStream buffering tweak

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-09-26 20:39:33 -04:00
parent 404632f373
commit 89ecf8eb9c
1 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/sdr/SoapySDRThread.cpp
View File

@ -67,9 +67,24 @@ std::vector<SDRDeviceInfo *> *SDRThread::enumerate_devices() {
} }
std::cout << std::endl; std::cout << std::endl;
std::vector<SoapySDR::Kwargs> results = SoapySDR::Device::enumerate(); std::vector<SoapySDR::Kwargs> results = SoapySDR::Device::enumerate();
std::map<std::string, int> deviceIndexes;
// Remote driver test..
/* * /
SDRDeviceInfo *remoteDev = new SDRDeviceInfo();
remoteDev->setDriver("remote");
remoteDev->setName("SoapySDR Remote Test");
SoapySDR::Kwargs remoteArgs;
remoteArgs["driver"] = "remote";
remoteArgs["remote"] = "127.0.0.1";
// remoteArgs["remote"] = "192.168.1.107";
remoteArgs["remote:driver"] = "rtlsdr";
remoteArgs["remote:format"] = "CS8";
remoteArgs["buffers"] = "6";
remoteArgs["buflen"] = "16384";
remoteDev->setDeviceArgs(remoteArgs);
SDRThread::devs.push_back(remoteDev);
// */
for (size_t i = 0; i < results.size(); i++) { for (size_t i = 0; i < results.size(); i++) {
std::cout << "Found device " << i << std::endl; std::cout << "Found device " << i << std::endl;
@ -84,8 +99,6 @@ std::vector<SDRDeviceInfo *> *SDRThread::enumerate_devices() {
} }
dev->setDeviceArgs(results[i]); dev->setDeviceArgs(results[i]);
dev->setIndex(deviceIndexes[dev->getDriver()]);
deviceIndexes[dev->getDriver()]++;
std::cout << "Make device " << i << std::endl; std::cout << "Make device " << i << std::endl;
try { try {
@ -294,26 +307,38 @@ void SDRThread::run() {
} }
} }
SDRThreadIQData *dataOut = buffers.getBuffer();
if (dataOut->data.size() != numElems * 2) {
dataOut->data.resize(numElems * 2);
}
int n_read = 0;
while (n_read != numElems) {
int n_stream_read = device->readStream(stream, buffs, numElems-n_read, flags, timeNs);
if (n_stream_read > 0) {
memcpy(&dataOut->data[n_read * 2], buffs[0], n_stream_read * sizeof(float) * 2);
n_read += n_stream_read;
} else {
dataOut->data.resize(n_read);
break;
}
}
int n_read = device->readStream(stream, buffs, numElems, flags, timeNs); // std::cout << n_read << std::endl;
// std::cout << n_read << ", " << timeNs << std::endl;
if (n_read > 0) { if (n_read > 0) {
SDRThreadIQData *dataOut = buffers.getBuffer();
dataOut->setRefCount(1); dataOut->setRefCount(1);
dataOut->frequency = frequency; dataOut->frequency = frequency;
dataOut->sampleRate = sampleRate.load(); dataOut->sampleRate = sampleRate.load();
dataOut->data.resize(n_read * 2);
memcpy(&dataOut->data[0],buffs[0],n_read * sizeof(float) * 2);
if (iqDataOutQueue != NULL) { if (iqDataOutQueue != NULL) {
iqDataOutQueue->push(dataOut); iqDataOutQueue->push(dataOut);
} else { } else {
dataOut->setRefCount(0); dataOut->setRefCount(0);
} }
} else {
dataOut->setRefCount(0);
} }
} }
device->deactivateStream(stream); device->deactivateStream(stream);