File supercollider-3.5.2-pv_binshift.patch of Package supercollider

Overview Repositories Revisions Requests Users Attributes Meta

File supercollider-3.5.2-pv_binshift.patch of Package supercollider (Revision d52e1fead274c0eb0a3795cd320936be)

Currently displaying revision d52e1fead274c0eb0a3795cd320936be , Show latest

From: danstowell+sc3@gmail.com
To: sc-dev@lists.bham.ac.uk
Cc: Julius Smith <jos@ccrma.Stanford.EDU>
Subject: [sc-dev] [PATCH] Add interpolation option to PV_BinShift,  and phase-integration option to PV_PhaseShift Signed-off-by: Dan Stowell <danstowell@users.sourceforge.net>
Date: Wed,  9 May 2012 09:32:18 +0100
Message-Id: <1336552338-3836-2-git-send-email-danstowell+sc3@gmail.com>
In-Reply-To: <1336552338-3836-1-git-send-email-danstowell+sc3@gmail.com>
References: <1336552338-3836-1-git-send-email-danstowell+sc3@gmail.com>
Sender: owner-sc-dev@lists.bham.ac.uk
Precedence: bulk
Reply-To: sc-dev@lists.bham.ac.uk

From: Julius Smith <jos@ccrma.stanford.edu>

---
 HelpSource/Classes/PV_BinShift.schelp   |    4 ++
 HelpSource/Classes/PV_PhaseShift.schelp |    5 ++-
 SCClassLibrary/Common/Audio/FFT.sc      |   11 +++++--
 server/plugins/PV_UGens.cpp             |   49 +++++++++++++++++++++++++------
 4 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/HelpSource/Classes/PV_BinShift.schelp b/HelpSource/Classes/PV_BinShift.schelp
index 8644c9b..550b778 100644
--- a/HelpSource/Classes/PV_BinShift.schelp
+++ b/HelpSource/Classes/PV_BinShift.schelp
@@ -27,6 +27,10 @@ argument::shift
 
 Add an offset to bin position.
 
+argument::interp
+
+If greater than zero, linear-interpolate between bins.
+
 
 Examples::
 
diff --git a/HelpSource/Classes/PV_PhaseShift.schelp b/HelpSource/Classes/PV_PhaseShift.schelp
index 2965f56..c95fdd4 100644
--- a/HelpSource/Classes/PV_PhaseShift.schelp
+++ b/HelpSource/Classes/PV_PhaseShift.schelp
@@ -19,8 +19,11 @@ FFT buffer.
 
 argument::shift
 
-Phase shift in degrees.
+Phase shift in radians.
 
+argument::integrate
+
+If greater than zero, integrate the phase-shift across calls (for an accumulating phase shift).
 
 Examples::
 
diff --git a/SCClassLibrary/Common/Audio/FFT.sc b/SCClassLibrary/Common/Audio/FFT.sc
index 1fbd52a..2dc1d4b 100644
--- a/SCClassLibrary/Common/Audio/FFT.sc
+++ b/SCClassLibrary/Common/Audio/FFT.sc
@@ -56,12 +56,17 @@ PV_MagSmear : PV_ChainUGen
 
 PV_BinShift : PV_ChainUGen
 {
+	*new { arg buffer, stretch = 1.0, shift = 0.0, interp = 0;
+		^this.multiNew('control', buffer, stretch, shift, interp)
+	}
+}
 
+PV_MagShift : PV_ChainUGen
+{
 	*new { arg buffer, stretch = 1.0, shift = 0.0;
 		^this.multiNew('control', buffer, stretch, shift)
 	}
 }
-PV_MagShift : PV_BinShift {}
 
 PV_MagSquared : PV_ChainUGen
 {
@@ -77,8 +82,8 @@ PV_Conj : PV_MagSquared {}
 
 PV_PhaseShift : PV_ChainUGen
 {
-	*new { arg buffer, shift;
-		^this.multiNew('control', buffer, shift)
+	*new { arg buffer, shift, integrate=0;
+		^this.multiNew('control', buffer, shift, integrate)
 	}
 }
 
diff --git a/server/plugins/PV_UGens.cpp b/server/plugins/PV_UGens.cpp
index 4c268cb..16b6b06 100644
--- a/server/plugins/PV_UGens.cpp
+++ b/server/plugins/PV_UGens.cpp
@@ -21,6 +21,7 @@
 
 #include "FFT_UGens.h"
 
+#define TWOPI 6.28318530717952646f
 
 struct PV_OutOfPlace : Unit
 {
@@ -40,6 +41,11 @@ struct PV_BinShift : PV_OutOfPlace
 {
 };
 
+struct PV_PhaseShift : Unit
+{
+	float m_phase_integral;
+};
+
 struct PV_Diffuser : Unit
 {
 	int m_numbins;
@@ -81,8 +87,8 @@ struct PV_Conj : PV_Unit {};
 
 extern "C"
 {
-	void PV_PhaseShift_Ctor(PV_Unit *unit);
-	void PV_PhaseShift_next(PV_Unit *unit, int inNumSamples);
+	void PV_PhaseShift_Ctor(PV_PhaseShift *unit);
+	void PV_PhaseShift_next(PV_PhaseShift *unit, int inNumSamples);
 
 	void PV_PhaseShift90_Ctor(PV_Unit *unit);
 	void PV_PhaseShift90_next(PV_Unit *unit, int inNumSamples);
@@ -382,6 +388,7 @@ void PV_BinShift_next(PV_BinShift *unit, int inNumSamples)
 	// get shift and stretch params
 	float stretch = ZIN0(1);
 	float shift = ZIN0(2);
+	float interp = ZIN0(3);
 
 	SCComplexBuf *p = ToComplexApx(buf);
 	SCComplexBuf *q = (SCComplexBuf*)unit->m_tempbuf;
@@ -395,10 +402,25 @@ void PV_BinShift_next(PV_BinShift *unit, int inNumSamples)
 	int i;
 	q->dc = p->dc;
 	q->nyq = p->nyq;
-	for (i=0, fpos = shift; i < numbins; ++i, fpos += stretch) {
-		int32 pos = (int32)(fpos + 0.5);
-		if (pos >= 0 && pos < numbins) {
-			q->bin[pos] += p->bin[i];
+	if(interp > 0){
+		for (i=0, fpos = shift; i < numbins; ++i, fpos += stretch) {
+			int32 fpos0 = (int32)std::floor(fpos);
+			int32 fpos1 = fpos0+1;
+			float beta = fpos - std::floor(fpos);
+			float alpha = 1.0f - beta;
+			if (fpos0 >= 0 && fpos0 < numbins) {
+				q->bin[fpos0] += alpha * p->bin[i];
+			}
+			if (fpos1 >= 0 && fpos1 < numbins) {
+				q->bin[fpos1] += beta * p->bin[i];
+			}
+		}
+	} else {
+		for (i=0, fpos = shift; i < numbins; ++i, fpos += stretch) {
+			int32 pos = (int32)(fpos + 0.5);
+			if (pos >= 0 && pos < numbins) {
+				q->bin[pos] += p->bin[i];
+			}
 		}
 	}
 	memcpy(p->bin, q->bin, numbins * sizeof(SCComplex));
@@ -492,23 +514,32 @@ void PV_MagNoise_Ctor(PV_Unit *unit)
 	ZOUT0(0) = ZIN0(0);
 }
 
-void PV_PhaseShift_next(PV_Unit *unit, int inNumSamples)
+void PV_PhaseShift_next(PV_PhaseShift *unit, int inNumSamples)
 {
 	PV_GET_BUF
 
 	SCPolarBuf *p = ToPolarApx(buf);
 
 	float shift = ZIN0(1);
+	int integrate = ZIN0(2);
+
+	float ashift = shift;
+
+	if (integrate > 0) {
+		ashift += unit->m_phase_integral;
+		unit->m_phase_integral = fmod(ashift, TWOPI);
+	}
 
 	for (int i=0; i<numbins; ++i) {
-		p->bin[i].phase += shift;
+		p->bin[i].phase += ashift;
 	}
 }
 
-void PV_PhaseShift_Ctor(PV_Unit *unit)
+void PV_PhaseShift_Ctor(PV_PhaseShift *unit)
 {
 	SETCALC(PV_PhaseShift_next);
 	ZOUT0(0) = ZIN0(0);
+	unit->m_phase_integral = 0;
 }
 
 void PV_PhaseShift90_next(PV_Unit *unit, int inNumSamples)
-- 
1.7.5.4

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

Places

File supercollider-3.5.2-pv_binshift.patch of Package supercollider (Revision d52e1fead274c0eb0a3795cd320936be)

Places