X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Finterpolation.h;h=a4a332c8a2781c541dc4485dc05ceb4e5e8facb0;hb=ee97942165fbbd82eb7453f2e74f6f06a1974a44;hp=deb0204794e8cd2d68f68a559b3631f28d41e99d;hpb=dd84d5312e2b09538aa98a1b21e84a458a2c145c;p=ardour.git

diff --git a/libs/ardour/ardour/interpolation.h b/libs/ardour/ardour/interpolation.h
index deb0204794..a4a332c8a2 100644
--- a/libs/ardour/ardour/interpolation.h
+++ b/libs/ardour/ardour/interpolation.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 1999-2010 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <math.h>
 #include <samplerate.h>
 
@@ -9,101 +28,43 @@
 namespace ARDOUR {
 
 class Interpolation {
- protected:
-         double   _speed, _target_speed;
-             
- public:
-         Interpolation () { _speed = 1.0; }
-     
-         void set_speed (double new_speed)          { _speed = new_speed; }
-         void set_target_speed (double new_speed)   { _target_speed = new_speed; }
-
-         double target_speed()          const { return _target_speed; }
-         double speed()                 const { return _speed; }
-         
-         void add_channel_to (int input_buffer_size, int output_buffer_size) {}
-         void remove_channel_from () {}
-  
-         nframes_t interpolate (int channel, nframes_t nframes, Sample* input, Sample* output) {}
-         void reset () {}
+protected:
+	double _speed;
+	double _target_speed;
+
+	// the idea is that when the speed is not 1.0, we have to
+	// interpolate between samples and then we have to store where we thought we were.
+	// rather than being at sample N or N+1, we were at N+0.8792922
+	std::vector<double> phase;
+
+public:
+	Interpolation ()  { _speed = 1.0; _target_speed = 1.0; }
+	~Interpolation () { phase.clear(); }
+
+	void set_speed (double new_speed)          { _speed = new_speed; _target_speed = new_speed; }
+	void set_target_speed (double new_speed)   { _target_speed = new_speed; }
+
+	double target_speed()          const { return _target_speed; }
+	double speed()                 const { return _speed; }
+
+	void add_channel_to (int /*input_buffer_size*/, int /*output_buffer_size*/) { phase.push_back (0.0); }
+	void remove_channel_from () { phase.pop_back (); }
+
+	void reset () {
+		for (size_t i = 0; i < phase.size(); i++) {
+			phase[i] = 0.0;
+		}
+	}
 };
 
-// 40.24 fixpoint math
-#define FIXPOINT_ONE 0x1000000
-
-class FixedPointLinearInterpolation : public Interpolation {
-    protected:
-    /// speed in fixed point math
-    uint64_t      phi;
-    
-    /// target speed in fixed point math
-    uint64_t      target_phi;
-    
-    std::vector<uint64_t> last_phase;
-
-	// Fixed point is just an integer with an implied scaling factor. 
-	// In 40.24 the scaling factor is 2^24 = 16777216,  
-	// so a value of 10*2^24 (in integer space) is equivalent to 10.0. 
-	//
-	// The advantage is that addition and modulus [like x = (x + y) % 2^40]  
-	// have no rounding errors and no drift, and just require a single integer add.
-	// (swh)
-	
-	static const int64_t fractional_part_mask  = 0xFFFFFF;
-	static const Sample  binary_scaling_factor = 16777216.0f;
-    
-    public:
-    	FixedPointLinearInterpolation () : phi (FIXPOINT_ONE), target_phi (FIXPOINT_ONE) {}
-    
-        void set_speed (double new_speed) {
-            target_phi = (uint64_t) (FIXPOINT_ONE * fabs(new_speed));
-            phi = target_phi;
-        }
-        
-        void add_channel_to (int input_buffer_size, int output_buffer_size);
-        void remove_channel_from ();
-         
-        nframes_t interpolate (int channel, nframes_t nframes, Sample* input, Sample* output);
-        void reset ();
+class LinearInterpolation : public Interpolation {
+public:
+	framecnt_t interpolate (int channel, framecnt_t nframes, Sample* input, Sample* output);
 };
 
- class LinearInterpolation : public Interpolation {
- protected:
-    // the idea is that when the speed is not 1.0, we have to 
-    // interpolate between samples and then we have to store where we thought we were. 
-    // rather than being at sample N or N+1, we were at N+0.8792922
-    std::vector<double> phase;
-    
- public:
-         void add_channel_to (int input_buffer_size, int output_buffer_size);
-         void remove_channel_from ();
-     
-         nframes_t interpolate (int channel, nframes_t nframes, Sample* input, Sample* output);
-         void reset ();
- };
-
-class LibSamplerateInterpolation : public Interpolation {
- protected:
-    std::vector<SRC_STATE*>  state;
-    std::vector<SRC_DATA*>   data;
-    
-    int        error;
-    
-    void reset_state ();
-    
- public:
-        LibSamplerateInterpolation ();
-        ~LibSamplerateInterpolation ();
-    
-        void   set_speed (double new_speed);
-        void   set_target_speed (double new_speed)   {}
-        double speed ()                        const { return _speed;      }
-        
-        void add_channel_to (int input_buffer_size, int output_buffer_size);
-        void remove_channel_from (); 
- 
-        nframes_t interpolate (int channel, nframes_t nframes, Sample* input, Sample* output);
-        void reset() { reset_state (); }
+class CubicInterpolation : public Interpolation {
+public:
+	framecnt_t interpolate (int channel, framecnt_t nframes, Sample* input, Sample* output);
 };
 
 } // namespace ARDOUR