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

Merge pull request #932

Browse Source
This commit is contained in:
Juho Hiltunen
2021-05-15 21:17:50 +03:00
parent 4c7c68d5fe 2d7286d571
commit 2a7080f411
7 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/readclause.c
+15 -8
View File
@@ -510,10 +510,13 @@ int ReadClause(Translator *tr, char *buf, short *charix, int *charix_top, int n_
tr->clause_lower_count = 0;
*tone_type = 0;
if (ungot_char2 != 0)
if (ungot_char2 != 0) {
c2 = ungot_char2;
else
} else if (Eof()) {
c2 = 0;
} else {
c2 = GetC();
}
while (!Eof() || (ungot_char != 0) || (ungot_char2 != 0) || (ungot_string_ix >= 0)) {
if (!iswalnum(c1)) {
@@ -542,14 +545,14 @@ int ReadClause(Translator *tr, char *buf, short *charix, int *charix_top, int n_
if ((ungot_string_ix == 0) && (ungot_char2 == 0))
c1 = ungot_string[ungot_string_ix++];
if (ungot_string_ix >= 0)
if (ungot_string_ix >= 0) {
c2 = ungot_string[ungot_string_ix++];
else {
} else if (Eof()) {
c2 = ' ';
} else {
c2 = GetC();
if (Eof())
c2 = ' ';
}
ungot_char2 = 0;
if ((option_ssml) && (phoneme_mode == 0)) {
@@ -561,7 +564,11 @@ int ReadClause(Translator *tr, char *buf, short *charix, int *charix_top, int n_
c1 = GetC();
}
xml_buf2[n_xml_buf] = 0;
c2 = GetC();
if (Eof()) {
c2 = '\0';
} else {
c2 = GetC();
}
sprintf(ungot_string, "%s%c%c", &xml_buf2[0], c1, c2);
int found = -1;
src/libespeak-ng/speech.c
+3 -1
View File
@@ -280,7 +280,9 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_InitializeOutput(espeak_ng_OUTPUT_MODE
buffer_length = min_buffer_length;
// allocate 2 bytes per sample
outbuf_size = (buffer_length * samplerate)/500;
// Always round up to the nearest sample and the nearest byte.
int millisamples = buffer_length * samplerate;
outbuf_size = (millisamples + 1000 - millisamples % 1000) / 500;
out_start = (unsigned char *)realloc(outbuf, outbuf_size);
if (out_start == NULL)
return ENOMEM;