mirror of
https://github.com/rhasspy/espeak-ng.git
synced 2026-11-17 18:40:50 +00:00
[1.48.03]
Fix bug, use of the command-line "espeakedit --compile" produced phoneme data in which vowels started at full amplitude instead of gradual increase. Fix bug: SSML <break time=""> with values greater than 23 seconds were ignored due to arithmetic overflow. Phoneme definition files: Added new function: ChangeNextPhoneme(). Language changes include: da, en, fa, gu, hu, it, nl, pt, ta Started new language: eu (Basque). *_rules files: Allow $p_alt1, $p_alt2, etc in pre-conditions. The rule matches if the characters before the current point in the word occur as an entry in the *_list file with the corresponding $alt attibute. Added condition $list. This is similar to $p_alt etc, but examines all words in the *_list file which don't have the $only attribute. git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@374 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
+14
-4
@@ -1,5 +1,5 @@
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2005 to 2013 by Jonathan Duddington *
|
||||
* Copyright (C) 2005 to 2014 by Jonathan Duddington *
|
||||
* email: jonsd@users.sourceforge.net *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
@@ -188,7 +188,7 @@ static void DoPitch(unsigned char *env, int pitch1, int pitch2)
|
||||
|
||||
int PauseLength(int pause, int control)
|
||||
{//====================================
|
||||
int len;
|
||||
unsigned int len;
|
||||
|
||||
if(control == 0)
|
||||
{
|
||||
@@ -210,8 +210,10 @@ int PauseLength(int pause, int control)
|
||||
|
||||
static void DoPause(int length, int control)
|
||||
{//=========================================
|
||||
// length in nominal mS
|
||||
// control = 1, less shortening at fast speeds
|
||||
int len;
|
||||
unsigned int len;
|
||||
int srate2;
|
||||
|
||||
if(length == 0)
|
||||
len = 0;
|
||||
@@ -219,7 +221,15 @@ static void DoPause(int length, int control)
|
||||
{
|
||||
len = PauseLength(length, control);
|
||||
|
||||
len = (len * samplerate) / 1000; // convert from mS to number of samples
|
||||
if(len < 90000)
|
||||
{
|
||||
len = (len * samplerate) / 1000; // convert from mS to number of samples
|
||||
}
|
||||
else
|
||||
{
|
||||
srate2 = samplerate / 25; // avoid overflow
|
||||
len = (len * srate2) / 40;
|
||||
}
|
||||
}
|
||||
|
||||
EndPitch(1);
|
||||
|
||||
Reference in New Issue
Block a user