voice: More voice generation fixes:

* espeak vs espeak-ng  (prefer the latter!)
 * voicepool was busted for most non-english strings

Change-Id: Iae6df0f5426155b7b1f444160814ff9ef4581f21
This commit is contained in:
Solomon Peachy 2020-07-10 20:40:36 -04:00
parent 938d820355
commit 185d2bbb6a
2 changed files with 6 additions and 1 deletions

4
tools/configure vendored
View file

@ -1283,6 +1283,10 @@ voiceconfig () {
advopts="$advopts --voice=$CHOICE"
echo "Mimic voice set to $TTS_MIMIC_VOICE"
TTS_OPTS="$TTS_OPTS -voice $TTS_MIMIC_VOICE"
elif [ "$TTS_ENGINE" = "espeak" ] ; then
if [ -n "`findtool espeak-ng`" ] ; then
TTS_ENGINE="espeak-ng"
fi
fi
# Read custom tts options from command line

View file

@ -26,6 +26,7 @@ use Digest::MD5 qw(md5_hex);
use DirHandle;
use open ':encoding(utf8)';
use open ':std';
use utf8;
sub printusage {
print <<USAGE
@ -383,7 +384,7 @@ sub generateclips {
# If we have a pool of snippets, see if the string exists there first
if (defined($ENV{'POOL'})) {
$pool_file = sprintf("%s/%s-%s.mp3", $ENV{'POOL'},
md5_hex("$voice $tts_engine $tts_engine_opts $encoder_opts"),
md5_hex(Encode::encode_utf8("$voice $tts_engine $tts_engine_opts $encoder_opts")),
$language);
if (-f $pool_file) {
printf("Re-using %s (%s) from pool\n", $id, $voice) if $verbose;