Zwischenstand

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

radio/interpolation/Farrow.hpp

@@ -8,6 +8,8 @@
 #include <cpp/radio/processor/src/Buffer.hpp>
 #include <cpp/radio/interpolation/Interpolator.hpp>
 
+#include <iostream>
+
 namespace Radio
 {
 namespace Interpolation
@@ -39,8 +41,8 @@ public:
 	, m_b(M)
 	, m_h(M)
 	, m_fifo(N)
-	, m_bufferIn(1024)
-	, m_bufferOut(1024)
+	, m_bufferIn(8*1024)
+	, m_bufferOut(8*1024)
 	{
 		init(M, N);
 	}
@@ -64,36 +66,43 @@ public:
 //		m_bufferOut.fill(ComplexScalar(0,0));
 	}
 
-	void feed(ComplexScalar const &x, uint32_t push)
+	size_t feed(ComplexScalar const *x, uint32_t size=1)
 	{
-		m_w = (m_w + push) % m_N;
-		m_fifo[m_w] = x;
+		return m_bufferIn.write(x, size);
 	}
 	
-	ComplexScalar process_new(ComplexScalar const &xin, RealScalar dmu)
+	bool process_new(RealScalar dmu)
 	{
-		size_t adv = m_interpolator.process(dmu);
-		m_bufferIn.write(&xin, 1);
-
-		if (adv)
+		while(true)
 		{
-			ComplexScalar xout;
-			m_bufferIn.read(&xout, 1);
-			FirComplex::feed(xout);
+			radio_float_t mu = m_interpolator.getMu();
+			size_t adv = m_interpolator.getAdv();
+			if (m_bufferIn.len() < adv)
+			{
+				std::cout << "----- SKIP -----" << std::endl;
+				break;
+			}
+			if (adv)
+			{
+				ComplexScalar xout;
+				m_bufferIn.consume(adv);
+				m_bufferIn.read(&xout, 1, false);
+				FirComplex::feed(xout);
+
+				// Partial filter responses
+				for (int i=0; i < m_M; i++)
+				{
+					m_h[i] = FirComplex::processReal(column(m_coeff, i));
+				}
+			}
+			m_interpolator.process(dmu);
+
+			// Combine
+			ComplexScalar yout = horner(mu);
+			m_bufferOut.write(&yout, 1);
+
 		}
-
-
-		// 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;
+		return true;
 	}
 
 	ComplexScalar process(RealScalar mu, uint32_t pop)