VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-17 23:28:50 -05:00
Code Issues Projects Releases Wiki Activity

Renamed UpSampleChannelizer back to UpChannelizer

Browse Source
This commit is contained in:
f4exb 2019-11-15 01:38:19 +01:00
parent 5a843a573c
commit 48174ad5cf
23 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/channeltx/filesource/filesourcebaseband.cpp
View File

@ -17,7 +17,7 @@
#include <QDebug>
#include "dsp/upsamplechannelizer.h"
#include "dsp/upchannelizer.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
@ -36,7 +36,7 @@ FileSourceBaseband::FileSourceBaseband() :
m_mutex(QMutex::Recursive)
{
m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000));
m_channelizer = new UpSampleChannelizer(&m_source);
m_channelizer = new UpChannelizer(&m_source);
qDebug("FileSourceBaseband::FileSourceBaseband");
QObject::connect(

4
plugins/channeltx/filesource/filesourcebaseband.h
View File

@ -27,7 +27,7 @@
#include "filesourcesource.h"
class UpSampleChannelizer;
class UpChannelizer;
class FileSourceBaseband : public QObject
{
@ -162,7 +162,7 @@ public:
private:
SampleSourceFifo m_sampleFifo;
UpSampleChannelizer *m_channelizer;
UpChannelizer *m_channelizer;
FileSourceSource m_source;
MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication
FileSourceSettings m_settings;

4
plugins/channeltx/localsource/localsourcebaseband.cpp
View File

@ -17,7 +17,7 @@
#include <QDebug>
#include "dsp/upsamplechannelizer.h"
#include "dsp/upchannelizer.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
@ -34,7 +34,7 @@ LocalSourceBaseband::LocalSourceBaseband() :
m_mutex(QMutex::Recursive)
{
m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000));
m_channelizer = new UpSampleChannelizer(&m_source);
m_channelizer = new UpChannelizer(&m_source);
qDebug("FileSourceBaseband::FileSourceBaseband");
QObject::connect(

4
plugins/channeltx/localsource/localsourcebaseband.h
View File

@ -28,7 +28,7 @@
#include "localsourcesource.h"
#include "localsourcesettings.h"
class UpSampleChannelizer;
class UpChannelizer;
class LocalSourceBaseband : public QObject
{
@ -150,7 +150,7 @@ public:
private:
SampleSourceFifo m_sampleFifo;
UpSampleChannelizer *m_channelizer;
UpChannelizer *m_channelizer;
LocalSourceSource m_source;
MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication
LocalSourceSettings m_settings;

4
plugins/channeltx/modam/ammodbaseband.cpp
View File

@ -17,7 +17,7 @@
#include <QDebug>
#include "dsp/upsamplechannelizer.h"
#include "dsp/upchannelizer.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
@ -30,7 +30,7 @@ AMModBaseband::AMModBaseband() :
m_mutex(QMutex::Recursive)
{
m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000));
m_channelizer = new UpSampleChannelizer(&m_source);
m_channelizer = new UpChannelizer(&m_source);
qDebug("AMModBaseband::AMModBaseband");
QObject::connect(

4
plugins/channeltx/modam/ammodbaseband.h
View File

@ -27,7 +27,7 @@
#include "ammodsource.h"
class UpSampleChannelizer;
class UpChannelizer;
class AMModBaseband : public QObject
{
@ -104,7 +104,7 @@ signals:
private:
SampleSourceFifo m_sampleFifo;
UpSampleChannelizer *m_channelizer;
UpChannelizer *m_channelizer;
AMModSource m_source;
MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication
AMModSettings m_settings;

4
plugins/channeltx/modatv/atvmodbaseband.cpp
View File

@ -17,7 +17,7 @@
#include <QDebug>
#include "dsp/upsamplechannelizer.h"
#include "dsp/upchannelizer.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
@ -36,7 +36,7 @@ ATVModBaseband::ATVModBaseband() :
m_mutex(QMutex::Recursive)
{
m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000));
m_channelizer = new UpSampleChannelizer(&m_source);
m_channelizer = new UpChannelizer(&m_source);
qDebug("AMModBaseband::AMModBaseband");
QObject::connect(

4
plugins/channeltx/modatv/atvmodbaseband.h
View File

@ -27,7 +27,7 @@
#include "atvmodsource.h"
class UpSampleChannelizer;
class UpChannelizer;
class ATVModBaseband : public QObject
{
@ -233,7 +233,7 @@ signals:
private:
SampleSourceFifo m_sampleFifo;
UpSampleChannelizer *m_channelizer;
UpChannelizer *m_channelizer;
ATVModSource m_source;
MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication
ATVModSettings m_settings;

4
plugins/channeltx/modfreedv/freedvmodbaseband.cpp
View File

@ -17,7 +17,7 @@
#include <QDebug>
#include "dsp/upsamplechannelizer.h"
#include "dsp/upchannelizer.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
@ -30,7 +30,7 @@ FreeDVModBaseband::FreeDVModBaseband() :
m_mutex(QMutex::Recursive)
{
m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000));
m_channelizer = new UpSampleChannelizer(&m_source);
m_channelizer = new UpChannelizer(&m_source);
qDebug("FreeDVModBaseband::FreeDVModBaseband");
QObject::connect(

4
plugins/channeltx/modfreedv/freedvmodbaseband.h
View File

@ -27,7 +27,7 @@
#include "freedvmodsource.h"
class UpSampleChannelizer;
class UpChannelizer;
class FreeDVModBaseband : public QObject
{
@ -106,7 +106,7 @@ signals:
private:
SampleSourceFifo m_sampleFifo;
UpSampleChannelizer *m_channelizer;
UpChannelizer *m_channelizer;
FreeDVModSource m_source;
MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication
FreeDVModSettings m_settings;

4
plugins/channeltx/modnfm/nfmmodbaseband.cpp
View File

@ -17,7 +17,7 @@
#include <QDebug>
#include "dsp/upsamplechannelizer.h"
#include "dsp/upchannelizer.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
@ -30,7 +30,7 @@ NFMModBaseband::NFMModBaseband() :
m_mutex(QMutex::Recursive)
{
m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000));
m_channelizer = new UpSampleChannelizer(&m_source);
m_channelizer = new UpChannelizer(&m_source);
qDebug("NFMModBaseband::NFMModBaseband");
QObject::connect(

4
plugins/channeltx/modnfm/nfmmodbaseband.h
View File

@ -27,7 +27,7 @@
#include "nfmmodsource.h"
class UpSampleChannelizer;
class UpChannelizer;
class NFMModBaseband : public QObject
{
@ -104,7 +104,7 @@ signals:
private:
SampleSourceFifo m_sampleFifo;
UpSampleChannelizer *m_channelizer;
UpChannelizer *m_channelizer;
NFMModSource m_source;
MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication
NFMModSettings m_settings;

4
plugins/channeltx/modssb/ssbmodbaseband.cpp
View File

@ -17,7 +17,7 @@
#include <QDebug>
#include "dsp/upsamplechannelizer.h"
#include "dsp/upchannelizer.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
@ -30,7 +30,7 @@ SSBModBaseband::SSBModBaseband() :
m_mutex(QMutex::Recursive)
{
m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000));
m_channelizer = new UpSampleChannelizer(&m_source);
m_channelizer = new UpChannelizer(&m_source);
qDebug("SSBModBaseband::SSBModBaseband");
QObject::connect(

4
plugins/channeltx/modssb/ssbmodbaseband.h
View File

@ -27,7 +27,7 @@
#include "ssbmodsource.h"
class UpSampleChannelizer;
class UpChannelizer;
class BasebandSampleSink;
class SSBModBaseband : public QObject
@ -106,7 +106,7 @@ signals:
private:
SampleSourceFifo m_sampleFifo;
UpSampleChannelizer *m_channelizer;
UpChannelizer *m_channelizer;
SSBModSource m_source;
MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication
SSBModSettings m_settings;

4
plugins/channeltx/modwfm/wfmmodbaseband.cpp
View File

@ -17,7 +17,7 @@
#include <QDebug>
#include "dsp/upsamplechannelizer.h"
#include "dsp/upchannelizer.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
@ -30,7 +30,7 @@ WFMModBaseband::WFMModBaseband() :
m_mutex(QMutex::Recursive)
{
m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000));
m_channelizer = new UpSampleChannelizer(&m_source);
m_channelizer = new UpChannelizer(&m_source);
qDebug("WFMModBaseband::WFMModBaseband");
QObject::connect(

4
plugins/channeltx/modwfm/wfmmodbaseband.h
View File

@ -27,7 +27,7 @@
#include "wfmmodsource.h"
class UpSampleChannelizer;
class UpChannelizer;
class WFMModBaseband : public QObject
{
@ -102,7 +102,7 @@ signals:
private:
SampleSourceFifo m_sampleFifo;
UpSampleChannelizer *m_channelizer;
UpChannelizer *m_channelizer;
WFMModSource m_source;
MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication
WFMModSettings m_settings;

4
plugins/channeltx/remotesource/remotesourcebaseband.cpp
View File

@ -17,7 +17,7 @@
#include <QDebug>
#include "dsp/upsamplechannelizer.h"
#include "dsp/upchannelizer.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
@ -30,7 +30,7 @@ RemoteSourceBaseband::RemoteSourceBaseband() :
m_mutex(QMutex::Recursive)
{
m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000));
m_channelizer = new UpSampleChannelizer(&m_source);
m_channelizer = new UpChannelizer(&m_source);
qDebug("RemoteSourceBaseband::RemoteSourceBaseband");
QObject::connect(

4
plugins/channeltx/remotesource/remotesourcebaseband.h
View File

@ -28,7 +28,7 @@
#include "remotesourcesource.h"
#include "remotesourcesettings.h"
class UpSampleChannelizer;
class UpChannelizer;
class RemoteSourceBaseband : public QObject
{
@ -90,7 +90,7 @@ public:
private:
SampleSourceFifo m_sampleFifo;
UpSampleChannelizer *m_channelizer;
UpChannelizer *m_channelizer;
RemoteSourceSource m_source;
MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication
RemoteSourceSettings m_settings;

4
plugins/channeltx/udpsource/udpsourcebaseband.cpp
View File

@ -17,7 +17,7 @@
#include <QDebug>
#include "dsp/upsamplechannelizer.h"
#include "dsp/upchannelizer.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
@ -33,7 +33,7 @@ UDPSourceBaseband::UDPSourceBaseband() :
m_mutex(QMutex::Recursive)
{
m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000));
m_channelizer = new UpSampleChannelizer(&m_source);
m_channelizer = new UpChannelizer(&m_source);
qDebug("UDPSourceBaseband::UDPSourceBaseband");
QObject::connect(

4
plugins/channeltx/udpsource/udpsourcebaseband.h
View File

@ -27,7 +27,7 @@
#include "udpsourcesource.h"
class UpSampleChannelizer;
class UpChannelizer;
class UDPSourceBaseband : public QObject
{
@ -137,7 +137,7 @@ signals:
private:
SampleSourceFifo m_sampleFifo;
UpSampleChannelizer *m_channelizer;
UpChannelizer *m_channelizer;
UDPSourceSource m_source;
MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication
UDPSourceSettings m_settings;

4
sdrbase/CMakeLists.txt
View File

@ -63,7 +63,7 @@ set(sdrbase_SOURCES
dsp/afsquelch.cpp
dsp/agc.cpp
dsp/downchannelizer.cpp
dsp/upsamplechannelizer.cpp
dsp/upchannelizer.cpp
dsp/channelmarker.cpp
dsp/ctcssdetector.cpp
dsp/channelsamplesource.cpp
@ -178,7 +178,7 @@ set(sdrbase_HEADERS
dsp/afsquelch.h
dsp/autocorrector.h
dsp/downchannelizer.h
dsp/upsamplechannelizer.h
dsp/upchannelizer.h
dsp/channelmarker.h
dsp/channelsamplesource.h
dsp/complex.h

76
sdrbase/dsp/upsamplechannelizer.cpp → sdrbase/dsp/upchannelizer.cpp
View File

@ -24,9 +24,9 @@
#include "inthalfbandfilter.h"
#include "dspcommands.h"
#include "hbfilterchainconverter.h"
#include "upsamplechannelizer.h"
#include "upchannelizer.h"
UpSampleChannelizer::UpSampleChannelizer(ChannelSampleSource* sampleSource) :
UpChannelizer::UpChannelizer(ChannelSampleSource* sampleSource) :
m_filterChainSetMode(false),
m_sampleSource(sampleSource),
m_basebandSampleRate(0),
@ -39,12 +39,12 @@ UpSampleChannelizer::UpSampleChannelizer(ChannelSampleSource* sampleSource) :
{
}
UpSampleChannelizer::~UpSampleChannelizer()
UpChannelizer::~UpChannelizer()
{
freeFilterChain();
}
void UpSampleChannelizer::pullOne(Sample& sample)
void UpChannelizer::pullOne(Sample& sample)
{
if (m_sampleSource == nullptr)
{
@ -85,7 +85,7 @@ void UpSampleChannelizer::pullOne(Sample& sample)
}
}
void UpSampleChannelizer::pull(SampleVector::iterator begin, unsigned int nbSamples)
void UpChannelizer::pull(SampleVector::iterator begin, unsigned int nbSamples)
{
if (m_sampleSource == nullptr)
{
@ -111,20 +111,20 @@ void UpSampleChannelizer::pull(SampleVector::iterator begin, unsigned int nbSamp
}
}
void UpSampleChannelizer::prefetch(unsigned int nbSamples)
void UpChannelizer::prefetch(unsigned int nbSamples)
{
unsigned int log2Interp = m_filterStages.size();
m_sampleSource->prefetch(nbSamples/(1<<log2Interp)); // 2^n less samples will be produced by the source
}
void UpSampleChannelizer::setChannelization(int requestedSampleRate, qint64 requestedCenterFrequency)
void UpChannelizer::setChannelization(int requestedSampleRate, qint64 requestedCenterFrequency)
{
m_requestedInputSampleRate = requestedSampleRate;
m_requestedCenterFrequency = requestedCenterFrequency;
applyChannelization();
}
void UpSampleChannelizer::setBasebandSampleRate(int basebandSampleRate, bool interp)
void UpChannelizer::setBasebandSampleRate(int basebandSampleRate, bool interp)
{
m_basebandSampleRate = basebandSampleRate;
@ -135,13 +135,13 @@ void UpSampleChannelizer::setBasebandSampleRate(int basebandSampleRate, bool int
}
}
void UpSampleChannelizer::applyChannelization()
void UpChannelizer::applyChannelization()
{
m_filterChainSetMode = false;
if (m_basebandSampleRate == 0)
{
qDebug() << "UpSampleChannelizer::applyConfiguration: aborting (out=0):"
qDebug() << "UpChannelizer::applyConfiguration: aborting (out=0):"
<< " out:" << m_basebandSampleRate
<< " req:" << m_requestedInputSampleRate
<< " in:" << m_channelSampleRate
@ -157,21 +157,21 @@ void UpSampleChannelizer::applyChannelization()
m_channelSampleRate = m_basebandSampleRate / (1 << m_filterStages.size());
qDebug() << "UpSampleChannelizer::applyConfiguration: done: "
qDebug() << "UpChannelizer::applyConfiguration: done: "
<< " out:" << m_basebandSampleRate
<< " req:" << m_requestedInputSampleRate
<< " in:" << m_channelSampleRate
<< " fc:" << m_channelFrequencyOffset;
}
void UpSampleChannelizer::setInterpolation(unsigned int log2Interp, unsigned int filterChainHash)
void UpChannelizer::setInterpolation(unsigned int log2Interp, unsigned int filterChainHash)
{
m_log2Interp = log2Interp;
m_filterChainHash = filterChainHash;
applyInterpolation();
}
void UpSampleChannelizer::applyInterpolation()
void UpChannelizer::applyInterpolation()
{
m_filterChainSetMode = true;
std::vector<unsigned int> stageIndexes;
@ -184,7 +184,7 @@ void UpSampleChannelizer::applyInterpolation()
m_channelSampleRate = m_basebandSampleRate / (1 << m_filterStages.size());
m_requestedInputSampleRate = m_channelSampleRate;
qDebug() << "UpSampleChannelizer::applyInterpolation:"
qDebug() << "UpChannelizer::applyInterpolation:"
<< " m_log2Interp:" << m_log2Interp
<< " m_filterChainHash:" << m_filterChainHash
<< " out:" << m_basebandSampleRate
@ -193,51 +193,51 @@ void UpSampleChannelizer::applyInterpolation()
}
#ifdef USE_SSE4_1
UpSampleChannelizer::FilterStage::FilterStage(Mode mode) :
m_filter(new IntHalfbandFilterEO1<UPSAMPLECHANNELIZER_HB_FILTER_ORDER>),
UpChannelizer::FilterStage::FilterStage(Mode mode) :
m_filter(new IntHalfbandFilterEO1<UPCHANNELIZER_HB_FILTER_ORDER>),
m_workFunction(0)
{
switch(mode) {
case ModeCenter:
m_workFunction = &IntHalfbandFilterEO1<UPSAMPLECHANNELIZER_HB_FILTER_ORDER>::workInterpolateCenter;
m_workFunction = &IntHalfbandFilterEO1<UPCHANNELIZER_HB_FILTER_ORDER>::workInterpolateCenter;
break;
case ModeLowerHalf:
m_workFunction = &IntHalfbandFilterEO1<UPSAMPLECHANNELIZER_HB_FILTER_ORDER>::workInterpolateLowerHalf;
m_workFunction = &IntHalfbandFilterEO1<UPCHANNELIZER_HB_FILTER_ORDER>::workInterpolateLowerHalf;
break;
case ModeUpperHalf:
m_workFunction = &IntHalfbandFilterEO1<UPSAMPLECHANNELIZER_HB_FILTER_ORDER>::workInterpolateUpperHalf;
m_workFunction = &IntHalfbandFilterEO1<UPCHANNELIZER_HB_FILTER_ORDER>::workInterpolateUpperHalf;
break;
}
}
#else
UpSampleChannelizer::FilterStage::FilterStage(Mode mode) :
m_filter(new IntHalfbandFilterDB<qint32, UPSAMPLECHANNELIZER_HB_FILTER_ORDER>),
UpChannelizer::FilterStage::FilterStage(Mode mode) :
m_filter(new IntHalfbandFilterDB<qint32, UPCHANNELIZER_HB_FILTER_ORDER>),
m_workFunction(0)
{
switch(mode) {
case ModeCenter:
m_workFunction = &IntHalfbandFilterDB<qint32, UPSAMPLECHANNELIZER_HB_FILTER_ORDER>::workInterpolateCenter;
m_workFunction = &IntHalfbandFilterDB<qint32, UPCHANNELIZER_HB_FILTER_ORDER>::workInterpolateCenter;
break;
case ModeLowerHalf:
m_workFunction = &IntHalfbandFilterDB<qint32, UPSAMPLECHANNELIZER_HB_FILTER_ORDER>::workInterpolateLowerHalf;
m_workFunction = &IntHalfbandFilterDB<qint32, UPCHANNELIZER_HB_FILTER_ORDER>::workInterpolateLowerHalf;
break;
case ModeUpperHalf:
m_workFunction = &IntHalfbandFilterDB<qint32, UPSAMPLECHANNELIZER_HB_FILTER_ORDER>::workInterpolateUpperHalf;
m_workFunction = &IntHalfbandFilterDB<qint32, UPCHANNELIZER_HB_FILTER_ORDER>::workInterpolateUpperHalf;
break;
}
}
#endif
UpSampleChannelizer::FilterStage::~FilterStage()
UpChannelizer::FilterStage::~FilterStage()
{
delete m_filter;
}
bool UpSampleChannelizer::signalContainsChannel(Real sigStart, Real sigEnd, Real chanStart, Real chanEnd) const
bool UpChannelizer::signalContainsChannel(Real sigStart, Real sigEnd, Real chanStart, Real chanEnd) const
{
//qDebug(" testing signal [%f, %f], channel [%f, %f]", sigStart, sigEnd, chanStart, chanEnd);
if(sigEnd <= sigStart)
@ -247,13 +247,13 @@ bool UpSampleChannelizer::signalContainsChannel(Real sigStart, Real sigEnd, Real
return (sigStart <= chanStart) && (sigEnd >= chanEnd);
}
Real UpSampleChannelizer::createFilterChain(Real sigStart, Real sigEnd, Real chanStart, Real chanEnd)
Real UpChannelizer::createFilterChain(Real sigStart, Real sigEnd, Real chanStart, Real chanEnd)
{
Real sigBw = sigEnd - sigStart;
Real rot = sigBw / 4;
Sample s;
qDebug() << "UpSampleChannelizer::createFilterChain: start:"
qDebug() << "UpChannelizer::createFilterChain: start:"
<< " sig: [" << sigStart << ":" << sigEnd << "]"
<< " BW: " << sigBw
<< " chan: [" << chanStart << ":" << chanEnd << "]"
@ -262,7 +262,7 @@ Real UpSampleChannelizer::createFilterChain(Real sigStart, Real sigEnd, Real cha
// check if it fits into the left half
if(signalContainsChannel(sigStart, sigStart + sigBw / 2.0, chanStart, chanEnd))
{
qDebug() << "UpSampleChannelizer::createFilterChain: take left half (rotate by +1/4 and decimate by 2):"
qDebug() << "UpChannelizer::createFilterChain: take left half (rotate by +1/4 and decimate by 2):"
<< " [" << m_filterStages.size() << "]"
<< " sig: [" << sigStart << ":" << sigStart + sigBw / 2.0 << "]";
m_filterStages.push_back(new FilterStage(FilterStage::ModeLowerHalf));
@ -273,7 +273,7 @@ Real UpSampleChannelizer::createFilterChain(Real sigStart, Real sigEnd, Real cha
// check if it fits into the right half
if(signalContainsChannel(sigEnd - sigBw / 2.0f, sigEnd, chanStart, chanEnd))
{
qDebug() << "UpSampleChannelizer::createFilterChain: take right half (rotate by -1/4 and decimate by 2):"
qDebug() << "UpChannelizer::createFilterChain: take right half (rotate by -1/4 and decimate by 2):"
<< " [" << m_filterStages.size() << "]"
<< " sig: [" << sigEnd - sigBw / 2.0f << ":" << sigEnd << "]";
m_filterStages.push_back(new FilterStage(FilterStage::ModeUpperHalf));
@ -285,7 +285,7 @@ Real UpSampleChannelizer::createFilterChain(Real sigStart, Real sigEnd, Real cha
// Was: if(signalContainsChannel(sigStart + rot + safetyMargin, sigStart + rot + sigBw / 2.0f - safetyMargin, chanStart, chanEnd)) {
if(signalContainsChannel(sigStart + rot, sigEnd - rot, chanStart, chanEnd))
{
qDebug() << "UpSampleChannelizer::createFilterChain: take center half (decimate by 2):"
qDebug() << "UpChannelizer::createFilterChain: take center half (decimate by 2):"
<< " [" << m_filterStages.size() << "]"
<< " sig: [" << sigStart + rot << ":" << sigEnd - rot << "]";
m_filterStages.push_back(new FilterStage(FilterStage::ModeCenter));
@ -296,7 +296,7 @@ Real UpSampleChannelizer::createFilterChain(Real sigStart, Real sigEnd, Real cha
Real ofs = ((chanEnd - chanStart) / 2.0 + chanStart) - ((sigEnd - sigStart) / 2.0 + sigStart);
qDebug() << "UpSampleChannelizer::createFilterChain: complete:"
qDebug() << "UpChannelizer::createFilterChain: complete:"
<< " #stages: " << m_filterStages.size()
<< " BW: " << sigBw
<< " ofs: " << ofs;
@ -304,7 +304,7 @@ Real UpSampleChannelizer::createFilterChain(Real sigStart, Real sigEnd, Real cha
return ofs;
}
double UpSampleChannelizer::setFilterChain(const std::vector<unsigned int>& stageIndexes)
double UpChannelizer::setFilterChain(const std::vector<unsigned int>& stageIndexes)
{
// filters are described from lower to upper level but the chain is constructed the other way round
std::vector<unsigned int>::const_reverse_iterator rit = stageIndexes.rbegin();
@ -321,33 +321,33 @@ double UpSampleChannelizer::setFilterChain(const std::vector<unsigned int>& stag
m_filterStages.push_back(new FilterStage(FilterStage::ModeLowerHalf));
m_stageSamples.push_back(s);
ofs -= ofs_stage;
qDebug("UpSampleChannelizer::setFilterChain: lower half: ofs: %f", ofs);
qDebug("UpChannelizer::setFilterChain: lower half: ofs: %f", ofs);
}
else if (*rit == 1)
{
m_filterStages.push_back(new FilterStage(FilterStage::ModeCenter));
m_stageSamples.push_back(s);
qDebug("UpSampleChannelizer::setFilterChain: center: ofs: %f", ofs);
qDebug("UpChannelizer::setFilterChain: center: ofs: %f", ofs);
}
else if (*rit == 2)
{
m_filterStages.push_back(new FilterStage(FilterStage::ModeUpperHalf));
m_stageSamples.push_back(s);
ofs += ofs_stage;
qDebug("UpSampleChannelizer::setFilterChain: upper half: ofs: %f", ofs);
qDebug("UpChannelizer::setFilterChain: upper half: ofs: %f", ofs);
}
ofs_stage /= 2;
}
qDebug() << "UpSampleChannelizer::setFilterChain: complete:"
qDebug() << "UpChannelizer::setFilterChain: complete:"
<< " #stages: " << m_filterStages.size()
<< " ofs: " << ofs;
return ofs;
}
void UpSampleChannelizer::freeFilterChain()
void UpChannelizer::freeFilterChain()
{
for(FilterStages::iterator it = m_filterStages.begin(); it != m_filterStages.end(); ++it)
delete *it;

22
sdrbase/dsp/upsamplechannelizer.h → sdrbase/dsp/upchannelizer.h
View File

@ -16,8 +16,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#ifndef SDRBASE_DSP_UPSAMPLECHANNELIZER_H_
#define SDRBASE_DSP_UPSAMPLECHANNELIZER_H_
#ifndef SDRBASE_DSP_UPCHANNELIZER_H_
#define SDRBASE_DSP_UPCHANNELIZER_H_
#include <QObject>
#include <algorithm>
@ -33,12 +33,12 @@
#include "dsp/inthalfbandfilterdb.h"
#endif
#define UPSAMPLECHANNELIZER_HB_FILTER_ORDER 96
#define UPCHANNELIZER_HB_FILTER_ORDER 96
class SDRBASE_API UpSampleChannelizer : public ChannelSampleSource {
class SDRBASE_API UpChannelizer : public ChannelSampleSource {
public:
UpSampleChannelizer(ChannelSampleSource* sampleSource);
virtual ~UpSampleChannelizer();
UpChannelizer(ChannelSampleSource* sampleSource);
virtual ~UpChannelizer();
virtual void pull(SampleVector::iterator begin, unsigned int nbSamples);
virtual void pullOne(Sample& sample);
@ -59,11 +59,11 @@ protected:
};
#ifdef USE_SSE4_1
typedef bool (IntHalfbandFilterEO1<UPSAMPLECHANNELIZER_HB_FILTER_ORDER>::*WorkFunction)(Sample* sIn, Sample *sOut);
IntHalfbandFilterEO1<UPSAMPLECHANNELIZER_HB_FILTER_ORDER>* m_filter;
typedef bool (IntHalfbandFilterEO1<UPCHANNELIZER_HB_FILTER_ORDER>::*WorkFunction)(Sample* sIn, Sample *sOut);
IntHalfbandFilterEO1<UPCHANNELIZER_HB_FILTER_ORDER>* m_filter;
#else
typedef bool (IntHalfbandFilterDB<qint32, UPSAMPLECHANNELIZER_HB_FILTER_ORDER>::*WorkFunction)(Sample* sIn, Sample *sOut);
IntHalfbandFilterDB<qint32, UPSAMPLECHANNELIZER_HB_FILTER_ORDER>* m_filter;
typedef bool (IntHalfbandFilterDB<qint32, UPCHANNELIZER_HB_FILTER_ORDER>::*WorkFunction)(Sample* sIn, Sample *sOut);
IntHalfbandFilterDB<qint32, UPCHANNELIZER_HB_FILTER_ORDER>* m_filter;
#endif
WorkFunction m_workFunction;
@ -101,4 +101,4 @@ protected:
#endif // SDRBASE_DSP_UPSAMPLECHANNELIZER_H_
#endif // SDRBASE_DSP_UPCHANNELIZER_H_