- add radio to build system

- added farrow test

git-svn-id: http://moon:8086/svn/software/trunk/libsrc/cpp@946 b431acfa-c32f-4a4a-93f1-934dc6c82436

radio/interpolation/Farrow.hpp

@@ -5,6 +5,8 @@
 
 #include <cpp/radio/Vector.hpp>
 #include <cpp/radio/FirComplex.hpp>
+#include <cpp/radio/processor/src/Buffer.hpp>
+#include <cpp/radio/interpolation/Interpolator.hpp>
 
 namespace Radio
 {
@@ -37,6 +39,8 @@ public:
 	, m_b(M)
 	, m_h(M)
 	, m_fifo(N)
+	, m_bufferIn(1024)
+	, m_bufferOut(1024)
 	{
 		init(M, N);
 	}
@@ -56,6 +60,8 @@ public:
 		m_h.resize(M);
 		m_fifo.resize(N);
 		m_fifo = ComplexScalar(0,0);
+//		m_bufferIn.fill(ComplexScalar(0,0));
+//		m_bufferOut.fill(ComplexScalar(0,0));
 	}
 
 	void feed(ComplexScalar const &x, uint32_t push)
@@ -64,11 +70,60 @@ public:
 		m_fifo[m_w] = x;
 	}
 	
+	ComplexScalar process(ComplexScalar const &xin, RealScalar dmu)
+	{
+		size_t adv = m_interpolator.process(dmu);
+		m_bufferIn.write(&xin, 1);
+
+		if (adv)
+		{
+			ComplexScalar xout;
+			m_bufferIn.read(&xout, 1);
+			FirComplex::feed(xout);
+		}
+
+
+		// Partial filter responses
+		for (int i=0; i < m_M; i++)
+		{
+			m_h[i] = FirComplex::processReal(column(m_coeff, i));
+		}
+
+		// Combine
+		ComplexScalar yout = horner(m_interpolator.getMu());
+		m_bufferOut.write(&yout, 1);
+
+		return yout;
+	}
+
 	ComplexScalar process(RealScalar mu, uint32_t pop)
 	{
 		uint32_t i, r;
 		int32_t j;
 
+		if (pop and m_bufferIn.len() == 0)
+		{
+			return ComplexScalar(0,0);
+		}
+
+		for (int n=0; n < m_bufferIn.len(); n++)
+		{
+			ComplexScalar x;
+			m_bufferIn.read(&x, 1);
+			FirComplex::feed(x);
+
+			// Partial filter responses
+			for (i=0; i < m_M; i++)
+			{
+				m_h[i] = FirComplex::processReal(column(m_coeff, i));
+			}
+
+			// Combine
+			ComplexScalar y = horner(mu);
+			m_bufferOut.write(&y, 1);
+		}
+
+#if 0
 		m_r = (m_r + pop) % m_N;
 
 		if (pop)
@@ -85,15 +140,7 @@ public:
 				m_state[j--] = m_fifo[r++];
 			}
 		}
-
-		// Partial filter responses
-		for (i=0; i < m_M; i++)
-		{
-			m_h[i] = FirComplex::processReal(column(m_coeff, i));
-		}
-
-		// Combine
-		return horner(mu);
+#endif
 	}	
 
 	void load(const char *pFilename)
@@ -138,6 +185,11 @@ public:
 
 	}
 	
+	Processor::Buffer<ComplexScalar>& getOutputBuffer()
+	{
+		return m_bufferOut;
+	}
+	
 private:
 	uint32_t m_M;
 	uint32_t m_N;
@@ -147,7 +199,10 @@ private:
 	CVec m_b;
 	CVec m_h;
 	CVec m_fifo;
-	
+	Processor::Buffer<ComplexScalar> m_bufferIn;
+	Processor::Buffer<ComplexScalar> m_bufferOut;
+	Interpolator m_interpolator;
+
 	ComplexScalar horner(RealScalar mu)
 	{
 		uint32_t i;
@@ -160,7 +215,7 @@ private:
 		
 		return m_b[m_M-1];
 	}
-	
+
 };
 
 } // Radio::Interpolation