Skip to content

Added phase wrapping in stretcher #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fleximeter merged 2 commits into from
Jul 11, 2026
Merged

Added phase wrapping in stretcher #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac5c8f7
added phase wrapping to pv stretch
Jun 23, 2026
8efdf2a
updated version for next release
Jul 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# are adapted from the prototype CMakeLists.txt provided with the SuperCollider plugin starter code.

cmake_minimum_required(VERSION 3.20)
project(flexplugins)
project(flexplugins VERSION 0.1.3)

# To make a ZIP archive
set(CPACK_GENERATOR "ZIP")
Expand Down
80 changes: 64 additions & 16 deletions src/pv/pvStretch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,10 @@ void Stretch2(
float instantaneousFreq = omegaK + phaseInc/hopSize;

// Compute the new phase
outFrame->bin[xxk].phase = outFramePrev->bin[xxk].phase + hopSize * instantaneousFreq;
outFrame->bin[xxk].phase = sc_wrap(
outFramePrev->bin[xxk].phase + static_cast<float>(hopSize * instantaneousFreq),
0.f,
static_cast<float>(twopi));
}
}

Expand Down Expand Up @@ -411,7 +414,10 @@ void Stretch2Puckette(
}

// Compute the new phase
outFrame->bin[xxk].phase = prevPhase + hopSize * instantaneousFreq;
outFrame->bin[xxk].phase = sc_wrap(
prevPhase + static_cast<float>(hopSize * instantaneousFreq),
0.f,
static_cast<float>(twopi));
}
}

Expand Down Expand Up @@ -454,7 +460,10 @@ void Stretch2LarocheDolson(
double instantaneousFreq = omegaK + phaseInc/hopSize;

// Compute the phase
outFrame->bin[xxk].phase = outFramePrev->bin[xxk].phase + hopSize * instantaneousFreq;
outFrame->bin[xxk].phase = sc_wrap(
outFramePrev->bin[xxk].phase + static_cast<float>(hopSize * instantaneousFreq),
0.f,
static_cast<float>(twopi));
}
} else {
// Update any bins that occur below the lowest peak's region of influence
Expand All @@ -468,7 +477,10 @@ void Stretch2LarocheDolson(
double instantaneousFreq = omegaK + phaseInc/hopSize;

// Compute the phase
outFrame->bin[xxk].phase = outFramePrev->bin[xxk].phase + hopSize * instantaneousFreq;
outFrame->bin[xxk].phase = sc_wrap(
outFramePrev->bin[xxk].phase + static_cast<float>(hopSize * instantaneousFreq),
0.f,
static_cast<float>(twopi));
}

// Update any bins that occur above the highest peak's region of influence
Expand All @@ -482,7 +494,10 @@ void Stretch2LarocheDolson(
double instantaneousFreq = omegaK + phaseInc/hopSize;

// Compute the phase
outFrame->bin[xxk].phase = outFramePrev->bin[xxk].phase + hopSize * instantaneousFreq;
outFrame->bin[xxk].phase = sc_wrap(
outFramePrev->bin[xxk].phase + static_cast<float>(hopSize * instantaneousFreq),
0.f,
static_cast<float>(twopi));
}

// Update all other peaks
Expand All @@ -498,16 +513,25 @@ void Stretch2LarocheDolson(
double instantaneousFreq = omegaK + phaseInc/hopSize;

// Compute the phase
outFrame->bin[peak.peak].phase = outFramePrev->bin[peak.peak].phase + hopSize * instantaneousFreq;
outFrame->bin[peak.peak].phase = sc_wrap(
outFramePrev->bin[peak.peak].phase + static_cast<float>(hopSize * instantaneousFreq),
0.f,
static_cast<float>(twopi));

// Then we update the phases of all other peaks
for (size_t xxo = peak.leftValley; xxo < peak.peak; xxo++) {
outFrame->bin[xxo].mag = frame->bin[xxo].mag;
outFrame->bin[xxo].phase = outFrame->bin[peak.peak].phase + frame->bin[xxo].phase - frame->bin[peak.peak].phase;
outFrame->bin[xxo].phase = sc_wrap(
outFrame->bin[peak.peak].phase + frame->bin[xxo].phase - frame->bin[peak.peak].phase,
0.f,
static_cast<float>(twopi));
}
for (size_t xxo = peak.peak + 1; xxo <= peak.rightValley; xxo++) {
outFrame->bin[xxo].mag = frame->bin[xxo].mag;
outFrame->bin[xxo].phase = outFrame->bin[peak.peak].phase + frame->bin[xxo].phase - frame->bin[peak.peak].phase;
outFrame->bin[xxo].phase = sc_wrap(
outFrame->bin[peak.peak].phase + frame->bin[xxo].phase - frame->bin[peak.peak].phase,
0.f,
static_cast<float>(twopi));
}
}
}
Expand Down Expand Up @@ -556,7 +580,10 @@ void Stretch3(
float instantaneousFreq = INTERP(instantaneousFreqPrev, instantaneousFreqNext, pos);

// Compute the new phase
outFrame->bin[xxk].phase = outFramePrev->bin[xxk].phase + hopSize * instantaneousFreq;
outFrame->bin[xxk].phase = sc_wrap(
outFramePrev->bin[xxk].phase + static_cast<float>(hopSize * instantaneousFreq),
0.f,
static_cast<float>(twopi));
}
}

Expand Down Expand Up @@ -619,7 +646,10 @@ void Stretch3Puckette(
}

// Compute the new phase
outFrame->bin[xxk].phase = prevPhase + hopSize * instantaneousFreq;
outFrame->bin[xxk].phase = sc_wrap(
prevPhase + static_cast<float>(hopSize * instantaneousFreq),
0.f,
static_cast<float>(twopi));
}
}

Expand Down Expand Up @@ -683,7 +713,10 @@ static void Stretch3LarocheDolson(
double instantaneousFreq = INTERP(instantaneousFreqPrev, instantaneousFreqNext, pos);

// Compute the new phase
outFrame->bin[xxk].phase = outFramePrev->bin[xxk].phase + hopSize * instantaneousFreq;
outFrame->bin[xxk].phase = sc_wrap(
outFramePrev->bin[xxk].phase + static_cast<float>(hopSize * instantaneousFreq),
0.f,
static_cast<float>(twopi));
}
} else {
// Update any bins that occur below the lowest peak's region of influence
Expand All @@ -706,7 +739,10 @@ static void Stretch3LarocheDolson(
double instantaneousFreq = INTERP(instantaneousFreqPrev, instantaneousFreqNext, pos);

// Compute the phase
outFrame->bin[xxk].phase = outFramePrev->bin[xxk].phase + hopSize * instantaneousFreq;
outFrame->bin[xxk].phase = sc_wrap(
outFramePrev->bin[xxk].phase + static_cast<float>(hopSize * instantaneousFreq),
0.f,
static_cast<float>(twopi));
}

// Update any bins that occur above the highest peak's region of influence
Expand All @@ -729,7 +765,10 @@ static void Stretch3LarocheDolson(
double instantaneousFreq = INTERP(instantaneousFreqPrev, instantaneousFreqNext, pos);

// Compute the phase
outFrame->bin[xxk].phase = outFramePrev->bin[xxk].phase + hopSize * instantaneousFreq;
outFrame->bin[xxk].phase = sc_wrap(
outFramePrev->bin[xxk].phase + static_cast<float>(hopSize * instantaneousFreq),
0.f,
static_cast<float>(twopi));
}

for (size_t xxn = 0; xxn < peakFinder->size(); xxn++) {
Expand All @@ -753,16 +792,25 @@ static void Stretch3LarocheDolson(
double instantaneousFreq = INTERP(instantaneousFreqPrev, instantaneousFreqNext, pos);

// Compute the phase
outFrame->bin[peak.peak].phase = outFramePrev->bin[peak.peak].phase + hopSize * instantaneousFreq;
outFrame->bin[peak.peak].phase = sc_wrap(
outFramePrev->bin[peak.peak].phase + static_cast<float>(hopSize * instantaneousFreq),
0.f,
static_cast<float>(twopi));

// Then we update all bins in the region of influence
for (size_t xxo = peak.leftValley; xxo < peak.peak; xxo++) {
outFrame->bin[xxo].mag = INTERP(framePrev1->bin[xxo].mag, frameNext->bin[xxo].mag, pos);
outFrame->bin[xxo].phase = outFrame->bin[peak.peak].phase + cframe->bin[xxo].phase - cframe->bin[peak.peak].phase;
outFrame->bin[xxo].phase = sc_wrap(
outFrame->bin[peak.peak].phase + cframe->bin[xxo].phase - cframe->bin[peak.peak].phase,
0.f,
static_cast<float>(twopi));
}
for (size_t xxo = peak.peak + 1; xxo <= peak.rightValley; xxo++) {
outFrame->bin[xxo].mag = INTERP(framePrev1->bin[xxo].mag, frameNext->bin[xxo].mag, pos);
outFrame->bin[xxo].phase = outFrame->bin[peak.peak].phase + cframe->bin[xxo].phase - cframe->bin[peak.peak].phase;
outFrame->bin[xxo].phase = sc_wrap(
outFrame->bin[peak.peak].phase + cframe->bin[xxo].phase - cframe->bin[peak.peak].phase,
0.f,
static_cast<float>(twopi));
}
}
}
Expand Down
13 changes: 0 additions & 13 deletions src/rubberband/rubberBandStretcherBuf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,6 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
extern InterfaceTable *ft;

void RubberBandStretcherBuf_Ctor(RubberBandStretcherBuf *unit) {

/* arg in, bufnum=0, offset=0.0, recLevel=1.0, preLevel=0.0, run=1.0, loop=1.0, trigger=1.0,
8 timeRatio=1.0, pitchRatio=1.0, formantRatio=0.0, transientsMode=0,
12 detectorMode=0, phaseMode=0, pitchQuality=0, windowOption=0,
16 smoothing=0, engine=0, doneAction=0;
*/

float timeRatio = IN0(8);
float pitchRatio = IN0(9);
float formantRatio = IN0(10);
Expand Down Expand Up @@ -159,12 +152,6 @@ void RubberBandStretcherBuf_Dtor(RubberBandStretcherBuf *unit) {
}

void RubberBandStretcherBuf_next(RubberBandStretcherBuf *unit, int inNumSamples) {
/* arg in, bufnum=0, offset=0.0, recLevel=1.0, preLevel=0.0, run=1.0, loop=1.0, trigger=1.0,
8 timeRatio=1.0, pitchRatio=1.0, formantRatio=0.0, transientsMode=0,
12 detectorMode=0, phaseMode=0, pitchQuality=0, windowOption=0,
16 smoothing=0, engine=0, doneAction=0;
*/

// Step 1: acquire the sound buffer
const SndBuf *writeBuf = unit->m_buf;
if (!writeBuf) {
Expand Down
Loading