mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-01 13:54:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[1.43.57]

Browse Source 
Indicate language changes in IPA phoneme output.

Phoneme definitions FMT(), second parameter is amplitude percentage.

Phoneme definitions CALL(),  If phoneme type is not defined, copy the static attributes from the called phoneme.

Unpronouncable word check: stop when an apostrophe is reached.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@250 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2010-07-18 22:43:04 +00:00
parent 3bf61040b9
commit ebf0535e6d
85 changed files with 2294 additions and 1945 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wavegen.cpp
+12 -3
View File
@@ -693,6 +693,7 @@ void WavegenInit(int rate, int wavemult_fact)
max_hval = 0;
wdata.amplitude = 32;
wdata.amplitude_fmt = 100;
for(ix=0; ix<N_EMBEDDED_VALUES; ix++)
embedded_value[ix] = embedded_default[ix];
@@ -1147,7 +1148,8 @@ int Wavegen()
maxh2 = PeaksToHarmspect(peaks, wdata.pitch<<4, hspect[0], 0);
// adjust amplitude to compensate for fewer harmonics at higher pitch
amplitude2 = (wdata.amplitude * wdata.pitch)/(100 << 11);
// amplitude2 = (wdata.amplitude * wdata.pitch)/(100 << 11);
amplitude2 = (wdata.amplitude * (wdata.pitch >> 8) * wdata.amplitude_fmt)/(10000 << 3);
// switch sign of harmonics above about 900Hz, to reduce max peak amplitude
h_switch_sign = 890 / (wdata.pitch >> 12);
@@ -1200,7 +1202,8 @@ int Wavegen()
}
// adjust amplitude to compensate for fewer harmonics at higher pitch
amplitude2 = (wdata.amplitude * wdata.pitch)/(100 << 11);
// amplitude2 = (wdata.amplitude * wdata.pitch)/(100 << 11);
amplitude2 = (wdata.amplitude * (wdata.pitch >> 8) * wdata.amplitude_fmt)/(10000 << 3);
if(glottal_flag > 0)
{
@@ -1535,7 +1538,7 @@ void SetEmbedded(int control, int value)
general_amplitude = GetAmplitude();
break;
case EMBED_F: // emphasiis
case EMBED_F: // emphasis
general_amplitude = GetAmplitude();
break;
@@ -1837,6 +1840,7 @@ int WavegenFill(int fill_zeros)
echo_complete -= length;
}
wdata.n_mix_wavefile = 0;
wdata.amplitude_fmt = 100;
KlattReset(1);
result = PlaySilence(length,resume);
break;
@@ -1907,6 +1911,11 @@ int WavegenFill(int fill_zeros)
case WCMD_MBROLA_DATA:
result = MbrolaFill(length, resume);
break;
case WCMD_FMT_AMPLITUDE:
if((wdata.amplitude_fmt = q[1]) == 0)
wdata.amplitude_fmt = 100; // percentage, but value=0 means 100%
break;
}
if(result==0)