commit - 8e32e5c20dcbd0b890e26e65a6a33a2b45bed8db
commit + a295faf460487ebf6b3f3a649fd88d2834d36334
blob - f3da1596fe2bc8d459d1ba90d5c46bcbd68f649c
blob + 5940246d8826032a820f333ef2547b21494ccca9
--- src/createtransitions.c
+++ src/createtransitions.c
}
}
+void interpolate_pitch(unsigned char width, unsigned char pos, unsigned char mem49, unsigned char phase3) {
+ // unlike the other values, the pitches[] interpolates from
+ // the middle of the current phoneme to the middle of the
+ // next phoneme
+
+ // half the width of the current and next phoneme
+ unsigned char cur_width = phonemeLengthOutput[pos] / 2;
+ unsigned char next_width = phonemeLengthOutput[pos+1] / 2;
+ // sum the values
+ width = cur_width + next_width;
+ unsigned char pitch = pitches[next_width + mem49] - pitches[mem49- cur_width];
+ interpolate(width, 168, phase3, pitch);
+}
+
unsigned char CreateTransitions()
{
unsigned char phase1;
unsigned char transition = phase1 + phase2; // total transition?
if (((transition - 2) & 128) == 0) {
- unsigned table = 168;
+
+ interpolate_pitch(transition, pos, mem49, phase3);
+ unsigned table = 169;
while (table < 175) {
// tables:
// 168 pitches[]
// 173 amplitude2
// 174 amplitude3
- // number of frames to interpolate over
- unsigned char width = transition;
-
- unsigned char mem53;
- if (table == 168) { // pitch
- // unlike the other values, the pitches[] interpolates from
- // the middle of the current phoneme to the middle of the
- // next phoneme
-
- // half the width of the current and next phoneme
- unsigned char cur_width = phonemeLengthOutput[pos] / 2;
- unsigned char next_width = phonemeLengthOutput[pos+1] / 2;
- // sum the values
- width = cur_width + next_width;
- mem53 = pitches[next_width + mem49] - pitches[mem49- cur_width];
- } else {
- mem53 = Read(table, speedcounter) - Read(table, phase3);
- }
- interpolate(width, table, phase3, mem53);
+ unsigned char value = Read(table, speedcounter) - Read(table, phase3);
+ interpolate(transition, table, phase3, value);
table++;
}
}