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

[1.39.28]

Browse Source 
Added experimental Klatt synthesizer.
Klatt phonemes use a new format of phoneme data.
espeakedit, new dialog fields and layout for Klatt phonemes.
Added Klatt versions of English phonemes.

Fixed some compilation warnings on Windows.
Fixed bug in Lettergroups > L10

Increased amplitude of harmonics below F1 peak, to increase bass.
Allow 5 (up from 4) pairs of values in "tone" command in voice files.
Default to slightly wider pk_shape1.

If words are separated by hyphens, don't add word-gap, and don't pass new-word flag onto phoneme processing.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@203 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2008-11-22 22:25:29 +00:00
parent a7501374b2
commit 1150d1d8da
52 changed files with 2687 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/voices.cpp
+24 -15
View File
@@ -49,8 +49,8 @@ MNEM_TAB genders [] = {
{"female", 2},
{NULL, 0 }};
//int tone_points[10] = {250,140, 1200,110, -1,0, -1,0, -1,0};
int tone_points[10] = {600,170, 1200,135, 2000,110, 3000,110, -1,0};
int tone_points[12] = {600,170, 1200,135, 2000,110, 3000,110, -1,0};
//int tone_points[12] = {250,200, 400,170, 600,170, 1200,135, 2000,110, -1,0};
// limit the rate of change for each formant number
//static int formant_rate_22050[9] = {50, 104, 165, 230, 220, 220, 220, 220, 220}; // values for 22kHz sample rate
@@ -101,11 +101,13 @@ espeak_VOICE voice_selected;
#define V_NUMBERS 25
#define V_OPTION 26
#define V_MBROLA 27
#define V_MBROLA 27
#define V_KLATT 28
// these need a phoneme table to have been specified
#define V_REPLACE 28
#define V_CONSONANTS 29
#define V_REPLACE 29
#define V_CONSONANTS 30
typedef struct {
@@ -144,6 +146,7 @@ static keywtab_t keyword_tab[] = {
{"option", V_OPTION},
{"mbrola", V_MBROLA},
{"consonants", V_CONSONANTS},
{"klatt", V_KLATT},
// these just set a value in langopts.param[]
{"l_dieresis", 0x100+LOPT_DIERESES},
@@ -195,7 +198,7 @@ void SetToneAdjust(voice_t *voice, int *tone_pts)
int height2;
double rate;
for(pt=0; pt<10; pt+=2)
for(pt=0; pt<12; pt+=2)
{
if(tone_pts[pt] == -1)
{
@@ -225,15 +228,16 @@ void SetToneAdjust(voice_t *voice, int *tone_pts)
void ReadTonePoints(char *string, int *tone_pts)
{//=============================================
// tone_pts[] is int[10]
// tone_pts[] is int[12]
int ix;
for(ix=0; ix<10; ix++)
for(ix=0; ix<12; ix++)
tone_pts[ix] = -1;
sscanf(string,"%d %d %d %d %d %d %d %d",
sscanf(string,"%d %d %d %d %d %d %d %d %d %d",
&tone_pts[0],&tone_pts[1],&tone_pts[2],&tone_pts[3],
&tone_pts[4],&tone_pts[5],&tone_pts[6],&tone_pts[7]);
&tone_pts[4],&tone_pts[5],&tone_pts[6],&tone_pts[7],
&tone_pts[8],&tone_pts[9]);
}
@@ -369,10 +373,11 @@ void VoiceReset(int tone_only)
voice->echo_amp = 0;
voice->flutter = 64;
voice->n_harmonic_peaks = 5;
voice->peak_shape = 1;
voice->peak_shape = 0;
voice->voicing = 64;
voice->consonant_amp = 100;
voice->consonant_ampv = 100;
memset(voice->klatt,0,sizeof(voice->klatt));
#ifdef PLATFORM_RISCOS
voice->roughness = 1;
@@ -864,6 +869,11 @@ voice_t *LoadVoice(const char *vname, int control)
}
break;
case V_KLATT:
Read8Numbers(p,voice->klatt);
voice->klatt[KLATT_Kopen] -= 40;
break;
default:
if((key & 0xff00) == 0x100)
{
@@ -1493,13 +1503,12 @@ void GetVoices(const char *path)
}
#else
#ifdef PLATFORM_WINDOWS
WIN32_FIND_DATA FindFileData;
WIN32_FIND_DATAA FindFileData;
HANDLE hFind = INVALID_HANDLE_VALUE;
DWORD dwError;
#undef UNICODE // we need FindFirstFileA() which takes an 8-bit c-string
sprintf(fname,"%s\\*",path);
hFind = FindFirstFile(fname, &FindFileData);
hFind = FindFirstFileA(fname, &FindFileData);
if(hFind == INVALID_HANDLE_VALUE)
return;
@@ -1529,7 +1538,7 @@ void GetVoices(const char *path)
voices_list[n_voices_list++] = voice_data;
}
}
} while(FindNextFile(hFind, &FindFileData) != 0);
} while(FindNextFileA(hFind, &FindFileData) != 0);
FindClose(hFind);
#else