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

Revert "maintainability: pass seq_len_adjust to LookupSpect() instead of using globals"

Browse Source 
This reverts commit d08b8e43ca.

This commit causes gcc-4.8 to output a different SHA1 hash on the
language-phonemes test for `af` (the first language tested). It
does not break on clang or on gcc-7 so may be a compiler bug,
however the Travis CI build server is using it on Ubuntu Trusty
(14.04 LTS) and so may other older OSes.
This commit is contained in:
Reece H. Dunn
2018-03-25 13:34:52 +01:00
parent 566e904b33
commit 9344dab0c3
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/synthdata.c
+7 -6
View File
@@ -61,6 +61,7 @@ int phoneme_tab_number = 0;
int wavefile_ix; // a wavefile to play along with the synthesis
int wavefile_amp;
int seq_len_adjust;
int vowel_transition[4];
static espeak_ng_STATUS ReadPhFile(void **ptr, const char *fname, int *size, espeak_ng_ERROR_CONTEXT *context)
@@ -197,7 +198,7 @@ int LookupPhonemeString(const char *string)
return PhonemeCode(mnem);
}
frameref_t *LookupSpect(PHONEME_TAB *this_ph, int which, FMT_PARAMS *fmt_params, int *n_frames, PHONEME_LIST *plist, int *seq_len_adjust)
frameref_t *LookupSpect(PHONEME_TAB *this_ph, int which, FMT_PARAMS *fmt_params, int *n_frames, PHONEME_LIST *plist)
{
int ix;
int nf;
@@ -219,7 +220,7 @@ frameref_t *LookupSpect(PHONEME_TAB *this_ph, int which, FMT_PARAMS *fmt_params,
if (nf >= N_SEQ_FRAMES)
nf = N_SEQ_FRAMES - 1;
*seq_len_adjust = fmt_params->fmt2_lenadj + fmt_params->fmt_length;
seq_len_adjust = fmt_params->fmt2_lenadj + fmt_params->fmt_length;
seq_break = 0;
for (ix = 0; ix < nf; ix++) {
@@ -246,7 +247,7 @@ frameref_t *LookupSpect(PHONEME_TAB *this_ph, int which, FMT_PARAMS *fmt_params,
// do we need to modify a frame for blending with a consonant?
if ((this_ph->type == phVOWEL) && (fmt_params->fmt2_addr == 0) && (fmt_params->use_vowelin))
*seq_len_adjust += FormantTransition2(frames, &nf, fmt_params->transition0, fmt_params->transition1, NULL, which);
seq_len_adjust += FormantTransition2(frames, &nf, fmt_params->transition0, fmt_params->transition1, NULL, which);
length1 = 0;
nf1 = nf - 1;
@@ -282,7 +283,7 @@ frameref_t *LookupSpect(PHONEME_TAB *this_ph, int which, FMT_PARAMS *fmt_params,
// adjust the length of the main part to match the standard length specified for the vowel
// less the front part of the vowel and any added suffix
length_std = fmt_params->std_length + (int) *seq_len_adjust - 45;
length_std = fmt_params->std_length + seq_len_adjust - 45;
if (length_std < 10)
length_std = 10;
if (plist->synthflags & SFLAG_LENGTHEN)
@@ -306,11 +307,11 @@ frameref_t *LookupSpect(PHONEME_TAB *this_ph, int which, FMT_PARAMS *fmt_params,
} else {
// not a vowel
if (fmt_params->std_length > 0)
*seq_len_adjust += (fmt_params->std_length - length1);
seq_len_adjust += (fmt_params->std_length - length1);
}
if (seq_len_adjust != 0) {
length_factor = ((length1 + (int) *seq_len_adjust) * 256)/length1;
length_factor = ((length1 + seq_len_adjust) * 256)/length1;
for (ix = 0; ix < nf1; ix++)
frames[ix].length = (frames[ix].length * length_factor)/256;
}
src/libespeak-ng/synthdata.h
+1 -2
View File
@@ -48,8 +48,7 @@ frameref_t *LookupSpect(PHONEME_TAB *this_ph,
int which,
FMT_PARAMS *fmt_params,
int *n_frames,
PHONEME_LIST *plist,
int *seq_len_adjust);
PHONEME_LIST *plist);
int NumInstnWords(unsigned short *prog);
int PhonemeCode(unsigned int mnem);
src/libespeak-ng/synthesize.c
+2 -2
View File
@@ -223,7 +223,7 @@ static void DoPause(int length, int control)
}
}
int seq_len_adjust; // temporary fix to advance the start point for playing the wav sample
extern int seq_len_adjust; // temporary fix to advance the start point for playing the wav sample
static int DoSample2(int index, int which, int std_length, int control, int length_mod, int amp)
{
@@ -889,7 +889,7 @@ int DoSpect2(PHONEME_TAB *this_ph, int which, FMT_PARAMS *fmt_params, PHONEME_L
}
modn_flags = 0;
frames = LookupSpect(this_ph, which, fmt_params, &n_frames, plist, &seq_len_adjust);
frames = LookupSpect(this_ph, which, fmt_params, &n_frames, plist);
if (frames == NULL)
return 0; // not found