VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-28 13:12:24 -04:00
Code Issues Projects Releases Wiki Activity

Tx: new handling of multiple channel sources (1)

Browse Source
This commit is contained in:
f4exb 2018-01-02 03:40:55 +01:00
parent 1056a39983
commit df1e09fdb7
2 changed files with 53 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdrbase/dsp/basebandsamplesource.cpp
View File

@ -73,10 +73,12 @@ void BasebandSampleSource::setDeviceSampleSourceFifo(SampleSourceFifo *deviceSam
if (m_deviceSampleFifo != deviceSampleFifo) if (m_deviceSampleFifo != deviceSampleFifo)
{ {
if (m_deviceSampleFifo) { if (m_deviceSampleFifo) {
qDebug("BasebandSampleSource::setDeviceSampleSourceFifo: disconnect device FIFO %p", m_deviceSampleFifo);
disconnect(m_deviceSampleFifo, SIGNAL(dataWrite(int)), this, SLOT(handleWriteToDeviceFifo(int))); disconnect(m_deviceSampleFifo, SIGNAL(dataWrite(int)), this, SLOT(handleWriteToDeviceFifo(int)));
} }
if (deviceSampleFifo) { if (deviceSampleFifo) {
qDebug("BasebandSampleSource::setDeviceSampleSourceFifo: connect device FIFO %p", deviceSampleFifo);
connect(deviceSampleFifo, SIGNAL(dataWrite(int)), this, SLOT(handleWriteToDeviceFifo(int))); connect(deviceSampleFifo, SIGNAL(dataWrite(int)), this, SLOT(handleWriteToDeviceFifo(int)));
} }

171
sdrbase/dsp/dspdevicesinkengine.cpp
View File

@ -176,126 +176,44 @@ void DSPDeviceSinkEngine::work(int nbWriteSamples)
{ {
// qDebug("DSPDeviceSinkEngine::work: multiple channel sources handling: %u", m_multipleSourcesDivisionFactor); // qDebug("DSPDeviceSinkEngine::work: multiple channel sources handling: %u", m_multipleSourcesDivisionFactor);
// SampleVector::iterator writeBegin;
// sampleFifo->getWriteIterator(writeBegin);
// SampleVector::iterator writeAt = writeBegin;
// Sample s;
// int sourceOccurence = 0;
//
// // Read a chunk of data from the sources
//
// for (ThreadedBasebandSampleSources::iterator it = m_threadedBasebandSampleSources.begin(); it != m_threadedBasebandSampleSources.end(); ++it)
// {
// ((*it)->getSampleSourceFifo()).readAdvance(m_threadedBasebandSampleSourcesIteratorMap[*it], nbWriteSamples);
// m_threadedBasebandSampleSourcesIteratorMap[*it] -= nbWriteSamples;
// }
//
// for (BasebandSampleSources::iterator it = m_basebandSampleSources.begin(); it != m_basebandSampleSources.end(); ++it)
// {
// ((*it)->getSampleSourceFifo()).readAdvance(m_basebandSampleSourcesIteratorMap[*it], nbWriteSamples);
// m_basebandSampleSourcesIteratorMap[*it] -= nbWriteSamples;
// }
//
// // Process sample by sample
//
// for (int is = 0; is < nbWriteSamples; is++)
// {
// // pull data from threaded sources and merge them in the device sample FIFO
// for (ThreadedBasebandSampleSources::iterator it = m_threadedBasebandSampleSources.begin(); it != m_threadedBasebandSampleSources.end(); ++it)
// {
// s = *m_threadedBasebandSampleSourcesIteratorMap[*it];
// s /= (m_threadedBasebandSampleSources.size() + m_basebandSampleSources.size());
//
// if (sourceOccurence == 0) {
// (*writeAt) = s;
// } else {
// (*writeAt) += s;
// }
//
// sourceOccurence++;
// m_threadedBasebandSampleSourcesIteratorMap[*it]++;
// }
//
// // pull data from direct sources and merge them in the device sample FIFO
// for (BasebandSampleSources::iterator it = m_basebandSampleSources.begin(); it != m_basebandSampleSources.end(); ++it)
// {
// s = *m_basebandSampleSourcesIteratorMap[*it];
// s /= (m_threadedBasebandSampleSources.size() + m_basebandSampleSources.size());
//
// if (sourceOccurence == 0) {
// (*writeAt) = s;
// } else {
// (*writeAt) += s;
// }
//
// sourceOccurence++;
// m_basebandSampleSourcesIteratorMap[*it]++;
// }
//
// sampleFifo->bumpIndex(writeAt);
// sourceOccurence = 0;
// }
SampleVector::iterator writeBegin; SampleVector::iterator writeBegin;
SampleSourceFifo* sampleFifo = m_deviceSampleSink->getSampleFifo(); SampleSourceFifo* sampleFifo = m_deviceSampleSink->getSampleFifo();
sampleFifo->getWriteIterator(writeBegin); sampleFifo->getWriteIterator(writeBegin);
SampleVector::iterator writeAt = writeBegin; SampleVector::iterator writeAt = writeBegin;
Sample s; std::vector<SampleVector::iterator> sampleSourceIterators;
int sourceOccurence = 0;
for (ThreadedBasebandSampleSources::iterator it = m_threadedBasebandSampleSources.begin(); it != m_threadedBasebandSampleSources.end(); ++it) for (ThreadedBasebandSampleSources::iterator it = m_threadedBasebandSampleSources.begin(); it != m_threadedBasebandSampleSources.end(); ++it)
{ {
(*it)->setDeviceSampleSourceFifo(0); sampleSourceIterators.push_back(SampleVector::iterator());
(*it)->pullAudio(nbWriteSamples); (*it)->getSampleSourceFifo().readAdvance(sampleSourceIterators.back(), nbWriteSamples);
sampleSourceIterators.back() -= nbWriteSamples;
} }
for (BasebandSampleSources::iterator it = m_basebandSampleSources.begin(); it != m_basebandSampleSources.end(); ++it) for (BasebandSampleSources::iterator it = m_basebandSampleSources.begin(); it != m_basebandSampleSources.end(); ++it)
{ {
(*it)->setDeviceSampleSourceFifo(0); sampleSourceIterators.push_back(SampleVector::iterator());
(*it)->pullAudio(nbWriteSamples); (*it)->getSampleSourceFifo().readAdvance(sampleSourceIterators.back(), nbWriteSamples);
sampleSourceIterators.back() -= nbWriteSamples;
} }
for (int is = 0; is < nbWriteSamples; is++) for (int is = 0; is < nbWriteSamples; is++)
{ {
// pull data from threaded sources and merge them in the device sample FIFO // pull data from sources FIFOs and merge them in the device sample FIFO
for (ThreadedBasebandSampleSources::iterator it = m_threadedBasebandSampleSources.begin(); it != m_threadedBasebandSampleSources.end(); ++it) for (std::vector<SampleVector::iterator>::iterator it = sampleSourceIterators.begin(); it != sampleSourceIterators.end(); ++it)
{ {
(*it)->pull(s); Sample s = (**it);
s /= m_multipleSourcesDivisionFactor; s /= m_multipleSourcesDivisionFactor;
++(*it);
if (sourceOccurence == 0) { if (it == sampleSourceIterators.begin()) {
(*writeAt) = s; (*writeAt) = s;
} else { } else {
(*writeAt) += s; (*writeAt) += s;
} }
}
sourceOccurence++;
}
// pull data from direct sources and merge them in the device sample FIFO
for (BasebandSampleSources::iterator it = m_basebandSampleSources.begin(); it != m_basebandSampleSources.end(); ++it)
{
(*it)->pull(s);
s /= m_multipleSourcesDivisionFactor;
if (sourceOccurence == 0) {
(*writeAt) = s;
} else {
(*writeAt) += s;
}
sourceOccurence++;
}
sampleFifo->bumpIndex(writeAt); sampleFifo->bumpIndex(writeAt);
sourceOccurence = 0;
} }
// feed the mix to the main spectrum sink
// if (m_spectrumSink)
// {
// m_spectrumSink->feed(writeBegin, writeBegin + nbWriteSamples, false);
// }
} }
} }
@ -446,29 +364,15 @@ DSPDeviceSinkEngine::State DSPDeviceSinkEngine::gotoRunning()
return gotoError("DSPDeviceSinkEngine::gotoRunning: Could not start sample source"); return gotoError("DSPDeviceSinkEngine::gotoRunning: Could not start sample source");
} }
uint32_t nbSources = m_basebandSampleSources.size() + m_threadedBasebandSampleSources.size();
if (nbSources == 0) {
m_multipleSourcesDivisionFactor = 1;
} else if (nbSources < 3) {
m_multipleSourcesDivisionFactor = nbSources;
} else {
m_multipleSourcesDivisionFactor = 1<<nbSources;
}
for(BasebandSampleSources::const_iterator it = m_basebandSampleSources.begin(); it != m_basebandSampleSources.end(); it++) for(BasebandSampleSources::const_iterator it = m_basebandSampleSources.begin(); it != m_basebandSampleSources.end(); it++)
{ {
qDebug() << "DSPDeviceSinkEngine::gotoRunning: starting " << (*it)->objectName().toStdString().c_str(); qDebug() << "DSPDeviceSinkEngine::gotoRunning: starting " << (*it)->objectName().toStdString().c_str();
// not used with sample by sample processing
// (*it)->getSampleSourceFifo().resize(2*m_deviceSampleSink->getSampleFifo()->size()); // Equalize channel source FIFO size with device sink FIFO size
(*it)->start(); (*it)->start();
} }
for (ThreadedBasebandSampleSources::const_iterator it = m_threadedBasebandSampleSources.begin(); it != m_threadedBasebandSampleSources.end(); ++it) for (ThreadedBasebandSampleSources::const_iterator it = m_threadedBasebandSampleSources.begin(); it != m_threadedBasebandSampleSources.end(); ++it)
{ {
qDebug() << "DSPDeviceSinkEngine::gotoRunning: starting ThreadedSampleSource(" << (*it)->getSampleSourceObjectName().toStdString().c_str() << ")"; qDebug() << "DSPDeviceSinkEngine::gotoRunning: starting ThreadedSampleSource(" << (*it)->getSampleSourceObjectName().toStdString().c_str() << ")";
// not used with sample by sample processing
// (*it)->getSampleSourceFifo().resize(2*m_deviceSampleSink->getSampleFifo()->size()); // Equalize channel source FIFO size with device sink FIFO size
(*it)->start(); (*it)->start();
} }
@ -497,17 +401,11 @@ void DSPDeviceSinkEngine::handleSetSink(DeviceSampleSink* sink)
{ {
gotoIdle(); gotoIdle();
// if(m_sampleSource != 0)
// {
// disconnect(m_sampleSource->getSampleFifo(), SIGNAL(dataReady()), this, SLOT(handleData()));
// }
m_deviceSampleSink = sink; m_deviceSampleSink = sink;
if(m_deviceSampleSink != 0) if(m_deviceSampleSink != 0)
{ {
qDebug("DSPDeviceSinkEngine::handleSetSink: set %s", qPrintable(sink->getDeviceDescription())); qDebug("DSPDeviceSinkEngine::handleSetSink: set %s", qPrintable(sink->getDeviceDescription()));
connect(m_deviceSampleSink->getSampleFifo(), SIGNAL(dataWrite(int)), this, SLOT(handleData(int)), Qt::QueuedConnection);
} }
else else
{ {
@ -582,6 +480,10 @@ void DSPDeviceSinkEngine::handleSynchronousMessages()
BasebandSampleSource* source = ((DSPAddBasebandSampleSource*) message)->getSampleSource(); BasebandSampleSource* source = ((DSPAddBasebandSampleSource*) message)->getSampleSource();
m_basebandSampleSources.push_back(source); m_basebandSampleSources.push_back(source);
checkNumberOfBasebandSources(); checkNumberOfBasebandSources();
if (m_state == StRunning) {
source->start();
}
} }
else if (DSPRemoveBasebandSampleSource::match(*message)) else if (DSPRemoveBasebandSampleSource::match(*message))
{ {
@ -599,6 +501,10 @@ void DSPDeviceSinkEngine::handleSynchronousMessages()
ThreadedBasebandSampleSource *threadedSource = ((DSPAddThreadedBasebandSampleSource*) message)->getThreadedSampleSource(); ThreadedBasebandSampleSource *threadedSource = ((DSPAddThreadedBasebandSampleSource*) message)->getThreadedSampleSource();
m_threadedBasebandSampleSources.push_back(threadedSource); m_threadedBasebandSampleSources.push_back(threadedSource);
checkNumberOfBasebandSources(); checkNumberOfBasebandSources();
if (m_state == StRunning) {
threadedSource->start();
}
} }
else if (DSPRemoveThreadedBasebandSampleSource::match(*message)) else if (DSPRemoveThreadedBasebandSampleSource::match(*message))
{ {
@ -679,23 +585,48 @@ void DSPDeviceSinkEngine::checkNumberOfBasebandSources()
// single channel source handling // single channel source handling
if ((m_threadedBasebandSampleSources.size() + m_basebandSampleSources.size()) == 1) if ((m_threadedBasebandSampleSources.size() + m_basebandSampleSources.size()) == 1)
{ {
qDebug("DSPDeviceSinkEngine::checkNumberOfBasebandSources: single channel mode");
disconnect(sampleFifo, SIGNAL(dataWrite(int)), this, SLOT(handleData(int)));
if (m_threadedBasebandSampleSources.size() == 1) { if (m_threadedBasebandSampleSources.size() == 1) {
m_threadedBasebandSampleSources.back()->setDeviceSampleSourceFifo(sampleFifo); m_threadedBasebandSampleSources.back()->setDeviceSampleSourceFifo(sampleFifo);
} else if (m_basebandSampleSources.size() == 1) { } else if (m_basebandSampleSources.size() == 1) {
m_threadedBasebandSampleSources.back()->setDeviceSampleSourceFifo(sampleFifo); m_threadedBasebandSampleSources.back()->setDeviceSampleSourceFifo(sampleFifo);
} }
m_multipleSourcesDivisionFactor = 1; // for consistency but it is not used in this case
} }
// null or multiple channel sources handling // null or multiple channel sources handling
else else
{ {
int nbSources = 0;
for (ThreadedBasebandSampleSources::iterator it = m_threadedBasebandSampleSources.begin(); it != m_threadedBasebandSampleSources.end(); ++it) for (ThreadedBasebandSampleSources::iterator it = m_threadedBasebandSampleSources.begin(); it != m_threadedBasebandSampleSources.end(); ++it)
{ {
(*it)->setDeviceSampleSourceFifo(0); (*it)->setDeviceSampleSourceFifo(0);
nbSources++;
} }
for (BasebandSampleSources::iterator it = m_basebandSampleSources.begin(); it != m_basebandSampleSources.end(); ++it) for (BasebandSampleSources::iterator it = m_basebandSampleSources.begin(); it != m_basebandSampleSources.end(); ++it)
{ {
(*it)->setDeviceSampleSourceFifo(0); (*it)->setDeviceSampleSourceFifo(0);
nbSources++;
} }
if (nbSources == 0) {
m_multipleSourcesDivisionFactor = 1;
} else if (nbSources < 3) {
m_multipleSourcesDivisionFactor = nbSources;
} else {
m_multipleSourcesDivisionFactor = 1<<nbSources;
}
if (nbSources == 0) {
disconnect(sampleFifo, SIGNAL(dataWrite(int)), this, SLOT(handleData(int)));
} else if (nbSources > 1) {
connect(sampleFifo, SIGNAL(dataWrite(int)), this, SLOT(handleData(int)), Qt::QueuedConnection);
}
qDebug("DSPDeviceSinkEngine::checkNumberOfBasebandSources: handle %d channel(s)", nbSources);
} }
} }