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.42.21]

Browse Source 
New format for phoneme source files.
Update phoneme data for Klatt synthesizer.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@235 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2009-12-20 07:48:33 +00:00
parent dd1623232f
commit 20f52f0301
231 changed files with 10132 additions and 8946 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/setlengths.cpp
+10 -4
View File
@@ -298,6 +298,7 @@ void CalcLengths(Translator *tr)
int emphasized;
int tone_mod;
unsigned char *pitch_env=NULL;
PHONEME_DATA phdata_tone;
for(ix=1; ix<n_phoneme_list; ix++)
{
@@ -408,7 +409,7 @@ void CalcLengths(Translator *tr)
case phLIQUID:
case phNASAL:
p->amp = tr->stress_amps[1]; // unless changed later
p->amp = tr->stress_amps[0]; // unless changed later
p->length = 256; // TEMPORARY
min_drop = 0;
@@ -474,6 +475,10 @@ void CalcLengths(Translator *tr)
if(stress > 7) stress = 7;
if(stress <= 1)
{
stress = stress ^ 1; // swap diminished and unstressed (until we swap stress_amps,stress_lengths in tr_languages)
}
if(pre_sonorant)
p->amp = tr->stress_amps[stress]-1;
else
@@ -562,7 +567,7 @@ void CalcLengths(Translator *tr)
{
length_mod += 20;
}
if((len = tr->stress_lengths[stress]) == 0)
len = tr->stress_lengths[6];
@@ -580,7 +585,7 @@ void CalcLengths(Translator *tr)
if(end_of_clause == 2)
{
// this is the last syllable in the clause, lengthen it - more for short vowels
len = p->ph->std_length;
len = (p->ph->std_length * 2);
if(tr->langopts.stress_flags & 0x40000)
len=200; // don't lengthen short vowels more than long vowels at end-of-clause
length_mod = length_mod * (256 + (280 - len)/3)/256;
@@ -608,7 +613,8 @@ if(p->type != phVOWEL)
if(p->tone_ph != 0)
{
pitch_env = LookupEnvelope(phoneme_tab[p->tone_ph]->spect);
InterpretPhoneme2(p->tone_ph, &phdata_tone);
pitch_env = LookupEnvelope(phdata_tone.pitch_env);
}
else
{