mirror of
https://github.com/rhasspy/espeak-ng.git
synced 2026-11-21 19:37:52 +00:00
[1.26.06] Fixed check for dot in abbreviations, for multibyte characters.
Defined a Revision number macro in speak_lib.h for interface changes. Changes to formant rate smoothing so that it's proportional to frequency. Add phoneme translations for mbrola "it3" "it4" Italian voices. Added rule in *_rules files for "word starts with capital letter". git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@49 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
+36
-6
@@ -660,12 +660,29 @@ static void SmoothSpect(void)
|
||||
|
||||
for(pk=0; pk<6; pk++)
|
||||
{
|
||||
int f1, f2;
|
||||
|
||||
if((frame->frflags & FRFLAG_BREAK_LF) && (pk < 3))
|
||||
continue;
|
||||
|
||||
allowed = (formant_rate[pk] * len)/256;
|
||||
f1 = frame1->ffreq[pk];
|
||||
f2 = frame->ffreq[pk];
|
||||
|
||||
// backwards
|
||||
if((diff = f2 - f1) > 0)
|
||||
{
|
||||
allowed = f1*2 + f2;
|
||||
}
|
||||
else
|
||||
{
|
||||
allowed = f1 + f2*2;
|
||||
}
|
||||
|
||||
// the allowed change is specified as percentage (%*10) of the frequency
|
||||
// take "frequency" as 1/3 from the lower freq
|
||||
allowed = (allowed * formant_rate[pk])/3000;
|
||||
allowed = (allowed * len)/256;
|
||||
|
||||
diff = frame->ffreq[pk] - frame1->ffreq[pk];
|
||||
if(diff > allowed)
|
||||
{
|
||||
if(modified == 0)
|
||||
@@ -726,17 +743,30 @@ static void SmoothSpect(void)
|
||||
frame = frame2 = (frame_t *)q[3];
|
||||
modified = 0;
|
||||
|
||||
if(frame->frflags & FRFLAG_BREAK)
|
||||
if(frame1->frflags & FRFLAG_BREAK)
|
||||
break;
|
||||
|
||||
if(frame->frflags & FRFLAG_FORMANT_RATE)
|
||||
if(frame1->frflags & FRFLAG_FORMANT_RATE)
|
||||
len = (len *6)/5; // allow slightly greater rate of change for this frame
|
||||
|
||||
for(pk=0; pk<6; pk++)
|
||||
{
|
||||
allowed = (formant_rate[pk] * len)/256;
|
||||
int f1, f2;
|
||||
f1 = frame1->ffreq[pk];
|
||||
f2 = frame->ffreq[pk];
|
||||
|
||||
// forwards
|
||||
if((diff = f2 - f1) > 0)
|
||||
{
|
||||
allowed = f1*2 + f2;
|
||||
}
|
||||
else
|
||||
{
|
||||
allowed = f1 + f2*2;
|
||||
}
|
||||
allowed = (allowed * formant_rate[pk])/3000;
|
||||
allowed = (allowed * len)/256;
|
||||
|
||||
diff = frame->ffreq[pk] - frame1->ffreq[pk];
|
||||
if(diff > allowed)
|
||||
{
|
||||
if(modified == 0)
|
||||
|
||||
Reference in New Issue
Block a user