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

[1.38.03]

Browse Source 
Fix crash with SSML <say-as>.
Sada audio output now OK on big-endian processors.
Don't reduce the pause before doubles stop consonants (eg.Finnish "kk") as much at high speeds.
Language changes: pl (reduce length of stressed syllables, [i] closer, [f] stronger befiore [s]).


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@188 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2008-09-01 16:13:19 +00:00
parent 37ded768c9
commit b7a6f479ef
30 changed files with 673 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/synthesize.cpp
+19 -13
View File
@@ -185,20 +185,26 @@ static void DoPitch(unsigned char *env, int pitch1, int pitch2)
int PauseLength(int pause)
{//=======================
int PauseLength(int pause, int control)
{//====================================
int len;
len = (pause * speed_factor1)/256;
if(control == 0)
len = (pause * speed_factor1)/256;
else
len = (pause * speed_factor2)/256;
if(len < 5) len = 5; // mS, limit the amount to which pauses can be shortened
return(len);
}
static void DoPause(int length)
{//============================
static void DoPause(int length, int control)
{//=========================================
// control = 1, less shortening at fast speeds
int len;
len = PauseLength(length);
len = PauseLength(length, control);
len = (len * samplerate) / 1000; // convert from mS to number of samples
@@ -617,7 +623,7 @@ static short vcolouring[N_VCOLOUR][5] = {
}
if(flags & 0x40)
DoPause(12); // add a short pause after the consonant
DoPause(12,0); // add a short pause after the consonant
if(flags & 16)
return(len);
@@ -1045,7 +1051,7 @@ static void DoEmbedded(int &embix, int sourceix)
{
if(soundicon_tab[value].length != 0)
{
DoPause(10); // ensure a break in the speech
DoPause(10,0); // ensure a break in the speech
wcmdq[wcmdq_tail][0] = WCMD_WAVE;
wcmdq[wcmdq_tail][1] = soundicon_tab[value].length;
wcmdq[wcmdq_tail][2] = (long)soundicon_tab[value].data + 44; // skip WAV header
@@ -1064,7 +1070,7 @@ static void DoEmbedded(int &embix, int sourceix)
break;
default:
DoPause(10); // ensure a break in the speech
DoPause(10,0); // ensure a break in the speech
wcmdq[wcmdq_tail][0] = WCMD_EMBEDDED;
wcmdq[wcmdq_tail][1] = command;
wcmdq[wcmdq_tail][2] = value;
@@ -1168,7 +1174,7 @@ int Generate(PHONEME_LIST *phoneme_list, int *n_ph, int resume)
EndAmplitude();
if(p->prepause > 0)
DoPause(p->prepause);
DoPause(p->prepause,1);
if(option_phoneme_events && (p->type != phVOWEL))
{
@@ -1179,7 +1185,7 @@ int Generate(PHONEME_LIST *phoneme_list, int *n_ph, int resume)
switch(p->type)
{
case phPAUSE:
DoPause(p->length);
DoPause(p->length,0);
break;
case phSTOP:
@@ -1229,7 +1235,7 @@ int Generate(PHONEME_LIST *phoneme_list, int *n_ph, int resume)
DoSpect(p->ph,phoneme_tab[phonSCHWA],next->ph,1,p,0);
if(p->synthflags & SFLAG_LENGTHEN)
{
DoPause(20);
DoPause(20,0);
DoSpect(p->ph,phoneme_tab[phonSCHWA],next->ph,1,p,0);
}
}
@@ -1237,7 +1243,7 @@ int Generate(PHONEME_LIST *phoneme_list, int *n_ph, int resume)
{
if(p->synthflags & SFLAG_LENGTHEN)
{
DoPause(50);
DoPause(50,0);
}
}