diff --git a/plugins/channelrx/demodam/amdemod.cpp b/plugins/channelrx/demodam/amdemod.cpp index c0212b40b..2f4020b80 100644 --- a/plugins/channelrx/demodam/amdemod.cpp +++ b/plugins/channelrx/demodam/amdemod.cpp @@ -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())); diff --git a/plugins/channelrx/demodbfm/bfmdemod.cpp b/plugins/channelrx/demodbfm/bfmdemod.cpp index d7ea77421..d0f794ec6 100644 --- a/plugins/channelrx/demodbfm/bfmdemod.cpp +++ b/plugins/channelrx/demodbfm/bfmdemod.cpp @@ -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) { diff --git a/plugins/channelrx/demoddsd/dsddemod.cpp b/plugins/channelrx/demoddsd/dsddemod.cpp index e72f0d289..5164c78fb 100644 --- a/plugins/channelrx/demoddsd/dsddemod.cpp +++ b/plugins/channelrx/demoddsd/dsddemod.cpp @@ -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; diff --git a/plugins/channelrx/demodlora/lorademod.cpp b/plugins/channelrx/demodlora/lorademod.cpp index 43d88cc63..937f080eb 100644 --- a/plugins/channelrx/demodlora/lorademod.cpp +++ b/plugins/channelrx/demodlora/lorademod.cpp @@ -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); diff --git a/plugins/channelrx/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp index 3b8c51f5d..4e778194c 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.cpp +++ b/plugins/channelrx/demodnfm/nfmdemod.cpp @@ -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; diff --git a/plugins/channelrx/demodssb/ssbdemod.cpp b/plugins/channelrx/demodssb/ssbdemod.cpp index 5b89e437e..ba8490a7c 100644 --- a/plugins/channelrx/demodssb/ssbdemod.cpp +++ b/plugins/channelrx/demodssb/ssbdemod.cpp @@ -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) { diff --git a/plugins/channelrx/demodwfm/wfmdemod.cpp b/plugins/channelrx/demodwfm/wfmdemod.cpp index 841707c6b..eeb3c61f8 100644 --- a/plugins/channelrx/demodwfm/wfmdemod.cpp +++ b/plugins/channelrx/demodwfm/wfmdemod.cpp @@ -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)); diff --git a/plugins/channelrx/tcpsrc/tcpsrc.cpp b/plugins/channelrx/tcpsrc/tcpsrc.cpp index 1ed8a73d1..3db06de1f 100644 --- a/plugins/channelrx/tcpsrc/tcpsrc.cpp +++ b/plugins/channelrx/tcpsrc/tcpsrc.cpp @@ -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)); diff --git a/plugins/channelrx/udpsrc/udpsrc.cpp b/plugins/channelrx/udpsrc/udpsrc.cpp index 28cc681e4..07b806dde 100644 --- a/plugins/channelrx/udpsrc/udpsrc.cpp +++ b/plugins/channelrx/udpsrc/udpsrc.cpp @@ -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); diff --git a/sdrbase/dsp/interpolator.h b/sdrbase/dsp/interpolator.h index 6ec98977f..cdd7055ef 100644 --- a/sdrbase/dsp/interpolator.h +++ b/sdrbase/dsp/interpolator.h @@ -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;