mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Give the decimation method of the Interpolator class its proper name

pull/27/head
f4exb 2016-10-10 01:53:32 +02:00
rodzic 6e82cb37b8
commit 6707bab1a5
10 zmienionych plików z 13 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
plugins/channelrx/demodam/amdemod.cpp
Wyświetl plik

@ -77,7 +77,7 @@ void AMDemod::feed(const SampleVector::const_iterator& begin, const SampleVector
Complex c(it->real(), it->imag());
c *= m_nco.nextIQ();
if (m_interpolator.interpolate(&m_interpolatorDistanceRemain, c, &ci))
if (m_interpolator.decimate(&m_interpolatorDistanceRemain, c, &ci))
{
//m_sampleBuffer.push_back(Sample(ci.real() * 32767.0, ci.imag() * 32767.0));
m_sampleBuffer.push_back(Sample(ci.real(), ci.imag()));

8
plugins/channelrx/demodbfm/bfmdemod.cpp
Wyświetl plik

@ -148,7 +148,7 @@ void BFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
//Complex r(demod * 2.0 * std::cos(3.0 * m_pilotPLLSamples[3]), 0.0);
Complex r(demod * 2.0 * std::cos(3.0 * m_pilotPLLSamples[3]), 0.0);
if (m_interpolatorRDS.interpolate(&m_interpolatorRDSDistanceRemain, r, &cr))
if (m_interpolatorRDS.decimate(&m_interpolatorRDSDistanceRemain, r, &cr))
{
bool bit;
@ -185,7 +185,7 @@ void BFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
// 1.17 * 0.7 = 0.819
Complex s(demod * m_pilotPLLSamples[1], demod * m_pilotPLLSamples[2]);
if (m_interpolatorStereo.interpolate(&m_interpolatorStereoDistanceRemain, s, &cs))
if (m_interpolatorStereo.decimate(&m_interpolatorStereoDistanceRemain, s, &cs))
{
sampleStereo = cs.real() + cs.imag();
m_interpolatorStereoDistanceRemain += m_interpolatorStereoDistance;
@ -195,7 +195,7 @@ void BFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
{
Complex s(demod * 1.17 * m_pilotPLLSamples[1], 0);
if (m_interpolatorStereo.interpolate(&m_interpolatorStereoDistanceRemain, s, &cs))
if (m_interpolatorStereo.decimate(&m_interpolatorStereoDistanceRemain, s, &cs))
{
sampleStereo = cs.real();
m_interpolatorStereoDistanceRemain += m_interpolatorStereoDistance;
@ -205,7 +205,7 @@ void BFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
Complex e(demod, 0);
if (m_interpolator.interpolate(&m_interpolatorDistanceRemain, e, &ci))
if (m_interpolator.decimate(&m_interpolatorDistanceRemain, e, &ci))
{
if (m_running.m_audioStereo)
{

2
plugins/channelrx/demoddsd/dsddemod.cpp
Wyświetl plik

@ -132,7 +132,7 @@ void DSDDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
Complex c(it->real(), it->imag());
c *= m_nco.nextIQ();
if (m_interpolator.interpolate(&m_interpolatorDistanceRemain, c, &ci))
if (m_interpolator.decimate(&m_interpolatorDistanceRemain, c, &ci))
{
qint16 sample, delayedSample;

2
plugins/channelrx/demodlora/lorademod.cpp
Wyświetl plik

@ -250,7 +250,7 @@ void LoRaDemod::feed(const SampleVector::const_iterator& begin, const SampleVect
Complex c(it->real() / 32768.0f, it->imag() / 32768.0f);
c *= m_nco.nextIQ();
if(m_interpolator.interpolate(&m_sampleDistanceRemain, c, &ci))
if(m_interpolator.decimate(&m_sampleDistanceRemain, c, &ci))
{
m_chirp = (m_chirp + 1) & (SPREADFACTOR - 1);
m_angle = (m_angle + m_chirp) & (SPREADFACTOR - 1);

2
plugins/channelrx/demodnfm/nfmdemod.cpp
Wyświetl plik

@ -140,7 +140,7 @@ void NFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
c *= m_nco.nextIQ();
{
if (m_interpolator.interpolate(&m_interpolatorDistanceRemain, c, &ci))
if (m_interpolator.decimate(&m_interpolatorDistanceRemain, c, &ci))
{
qint16 sample;

2
plugins/channelrx/demodssb/ssbdemod.cpp
Wyświetl plik

@ -101,7 +101,7 @@ void SSBDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
Complex c(it->real(), it->imag());
c *= m_nco.nextIQ();
if(m_interpolator.interpolate(&m_sampleDistanceRemain, c, &ci))
if(m_interpolator.decimate(&m_sampleDistanceRemain, c, &ci))
{
if (m_dsb)
{

2
plugins/channelrx/demodwfm/wfmdemod.cpp
Wyświetl plik

@ -118,7 +118,7 @@ void WFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
Complex e(demod, 0);
if(m_interpolator.interpolate(&m_interpolatorDistanceRemain, e, &ci))
if(m_interpolator.decimate(&m_interpolatorDistanceRemain, e, &ci))
{
quint16 sample = (qint16)(ci.real() * 3000 * m_running.m_volume);
m_sampleBuffer.push_back(Sample(sample, sample));

2
plugins/channelrx/tcpsrc/tcpsrc.cpp
Wyświetl plik

@ -92,7 +92,7 @@ void TCPSrc::feed(const SampleVector::const_iterator& begin, const SampleVector:
Complex c(it->real(), it->imag());
c *= m_nco.nextIQ();
if(m_interpolator.interpolate(&m_sampleDistanceRemain, c, &ci))
if(m_interpolator.decimate(&m_sampleDistanceRemain, c, &ci))
{
m_magsq = ((ci.real()*ci.real() + ci.imag()*ci.imag())*rescale*rescale) / (1<<30);
m_sampleBuffer.push_back(Sample(ci.real() * rescale, ci.imag() * rescale));

2
plugins/channelrx/udpsrc/udpsrc.cpp
Wyświetl plik

@ -149,7 +149,7 @@ void UDPSrc::feed(const SampleVector::const_iterator& begin, const SampleVector:
Complex c(it->real(), it->imag());
c *= m_nco.nextIQ();
if(m_interpolator.interpolate(&m_sampleDistanceRemain, c, &ci))
if(m_interpolator.decimate(&m_sampleDistanceRemain, c, &ci))
{
m_magsq = ((ci.real()*ci.real() + ci.imag()*ci.imag())*rescale*rescale) / (1<<30);
Sample s(ci.real() * rescale, ci.imag() * rescale);

2
sdrbase/dsp/interpolator.h
Wyświetl plik

@ -20,7 +20,7 @@ public:
void free();
// Original code allowed for upsampling, but was never used that way
bool interpolate(Real *distance, const Complex& next, Complex* result)
bool decimate(Real *distance, const Complex& next, Complex* result)
{
advanceFilter(next);
*distance -= 1.0;