david/librubberband
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Chris Cannam
2022-09-29 16:26:46 +01:00
parent de56cd114a f26771d077
commit 50b231ee23
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dotnet/rubberband-library.vcxproj
View File

@@ -158,6 +158,7 @@
<ClCompile Include="..\src\common\StretchCalculator.cpp" /> <ClCompile Include="..\src\common\StretchCalculator.cpp" />
<ClCompile Include="..\src\common\mathmisc.cpp" /> <ClCompile Include="..\src\common\mathmisc.cpp" />
<ClCompile Include="..\src\common\sysutils.cpp" /> <ClCompile Include="..\src\common\sysutils.cpp" />
<ClCompile Include="..\src\common\mathmisc.cpp" />
<ClCompile Include="..\src\common\Thread.cpp" /> <ClCompile Include="..\src\common\Thread.cpp" />
<ClCompile Include="..\src\finer\R3Stretcher.cpp" /> <ClCompile Include="..\src\finer\R3Stretcher.cpp" />
</ItemGroup> </ItemGroup>

4
src/finer/Guide.h
View File

@@ -241,7 +241,7 @@ public:
guidance.phaseLockBands[0].f1 = 1600.0; guidance.phaseLockBands[0].f1 = 1600.0;
guidance.phaseLockBands[1].p = 2; guidance.phaseLockBands[1].p = 2;
guidance.phaseLockBands[1].beta = betaFor(4800.0, ratio); guidance.phaseLockBands[1].beta = betaFor(5000.0, ratio);
guidance.phaseLockBands[1].f0 = 1600.0; guidance.phaseLockBands[1].f0 = 1600.0;
guidance.phaseLockBands[1].f1 = 7000.0; guidance.phaseLockBands[1].f1 = 7000.0;
@@ -403,7 +403,7 @@ public:
guidance.phaseLockBands[1].f1 = mid; guidance.phaseLockBands[1].f1 = mid;
guidance.phaseLockBands[2].p = 3; guidance.phaseLockBands[2].p = 3;
guidance.phaseLockBands[2].beta = betaFor(4800.0, ratio); guidance.phaseLockBands[2].beta = betaFor(5000.0, ratio);
guidance.phaseLockBands[2].f0 = mid; guidance.phaseLockBands[2].f0 = mid;
guidance.phaseLockBands[2].f1 = higher; guidance.phaseLockBands[2].f1 = higher;

6
src/finer/PhaseAdvance.h
View File

@@ -135,7 +135,8 @@ public:
for (int i = lowest; i <= highest; ++i) { for (int i = lowest; i <= highest; ++i) {
m_currentPeaks[c][i] = i; m_currentPeaks[c][i] = i;
} }
for (const auto &band : guidance[c]->phaseLockBands) { for (int i = 0; i < guidance[c]->phaseLockBandCount; ++i) {
const auto &band = guidance[c]->phaseLockBands[i];
int startBin = binForFrequency int startBin = binForFrequency
(band.f0, m_parameters.fftSize, m_parameters.sampleRate); (band.f0, m_parameters.fftSize, m_parameters.sampleRate);
int endBin = binForFrequency int endBin = binForFrequency
@@ -189,7 +190,8 @@ public:
for (int i = lowest; i <= highest; ++i) { for (int i = lowest; i <= highest; ++i) {
process_t f = frequencyForBin process_t f = frequencyForBin
(i, m_parameters.fftSize, m_parameters.sampleRate); (i, m_parameters.fftSize, m_parameters.sampleRate);
while (f > g->phaseLockBands[phaseLockBand].f1) { while (f > g->phaseLockBands[phaseLockBand].f1 &&
phaseLockBand + 1 < g->phaseLockBandCount) {
++phaseLockBand; ++phaseLockBand;
} }
process_t ph = 0.0; process_t ph = 0.0;