Menu
▾
▴
upstage-commits
|
From: <aut...@us...> - 2012-10-12 04:01:14
|
Revision: 456
http://upstage.svn.sourceforge.net/upstage/?rev=456&view=rev
Author: aut-upstage
Date: 2012-10-12 04:01:08 +0000 (Fri, 12 Oct 2012)
Log Message:
-----------
- Daniel, Gavin
Voices cmu is working. we have changed using raw input to wav. Somehow, raw does not seem to work.
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-10-12 03:07:45 UTC (rev 455)
+++ branches/2.4.2/upstage/voices.py 2012-10-12 04:01:08 UTC (rev 456)
@@ -41,7 +41,7 @@
echo_in = ''#cat | ' #"read SPEECH ; echo $SPEECH |"
#Heath Behrens readded the -x switch used for byte switching as it breaks some voices.
-fest_lame = " | %s lame -S --quiet -m s -r -s %%s --resample 22.05 - $1 " % timeout
+fest_lame = " | %s lame -S --quiet -m s -s %%s --resample 22.05 - $1 " % timeout
rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
espeak_mbrola_lame = " | %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
@@ -62,13 +62,13 @@
def _festival(voice, hz):
s = ''.join((echo_in, timeout, "text2wave -eval '%s' " % voice,
- " -otype raw - -o - ", log,
+ " -otype wav - -o - ", log,
(fest_lame % hz), log))
return [s]
def _festival2(voice, hz, options=''):
s = ''.join((echo_in, timeout, "text2wave -eval '%s' " % voice,
- options, " -otype raw - -o - ", log,
+ options, " -otype wav - -o - ", log,
(fest_lame % hz), log))
return [s]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-10-24 03:26:21
|
Revision: 459
http://upstage.svn.sourceforge.net/upstage/?rev=459&view=rev
Author: aut-upstage
Date: 2012-10-24 03:26:15 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
- Daniel
just commented
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-10-22 23:26:41 UTC (rev 458)
+++ branches/2.4.2/upstage/voices.py 2012-10-24 03:26:15 UTC (rev 459)
@@ -14,6 +14,8 @@
files to /usr/share/mbrola/
Heath Behrens (18/09/2011) - Patch for emb voices, namely the emb voices which did not work on the main
server. Modified _espeak_mbrola function.
+
+ Daniel Han (12/10/2011) - Patch for cmu Voices which failed to create proper MP3 but only with noises. modified festival related methods
"""
import re, os
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-23 00:51:21
|
Revision: 463
http://upstage.svn.sourceforge.net/upstage/?rev=463&view=rev
Author: aut-upstage
Date: 2012-11-23 00:51:12 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Scott & Gavin
------
voices.py fix attempt 1
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-16 01:16:42 UTC (rev 462)
+++ branches/2.4.2/upstage/voices.py 2012-11-23 00:51:12 UTC (rev 463)
@@ -43,9 +43,9 @@
echo_in = ''#cat | ' #"read SPEECH ; echo $SPEECH |"
#Heath Behrens readded the -x switch used for byte switching as it breaks some voices.
-fest_lame = " | %s lame -S --quiet -m s -s %%s --resample 22.05 - $1 " % timeout
-rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
-espeak_mbrola_lame = " | %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
+fest_lame = " | %s lame -S --quiet -m s -r -s %%s --resample 22.05 --preset phone - $1 " % timeout
+rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
+espeak_mbrola_lame = " %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
# espeak doesn't seem to like piping to stdout, so it saves to tmp file instead
espeak_lame = " %s lame -S --quiet -m m -s 22.05 --preset phone $1.wav $1 " % timeout
@@ -57,7 +57,7 @@
#The other option is to simply copy all voices from the folder to the previous folder.
path_to_embrola_alt = "/usr/share/mbrola/voices"
-text2wave = '/usr/local/share/festvox/festival/bin/text2wave'
+text2wave = '/usr/bin/text2wave'
#these functions are run over the definitions in VOICE_KIT, below, to
#create the appropriate shell script for each voice.
@@ -101,9 +101,9 @@
if not espeak or not mbrola:
return None
s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
- " | ", mbrola, " -e ", mboptions, " " + path_to_embrola, mbvoice,
- " - $1.wav ", log))
- return [s, espeak_mbrola_lame, espeak_cleanup]
+ " | ", mbrola, " -e ", mboptions, " /usr/share/mbrola/", mbvoice,
+ " - $1.wav ", log))
+return [s, espeak_mbrola_lame, espeak_cleanup]
#XXX perhaps ought to be moved OUT of python code into a real config file.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-23 00:56:05
|
Revision: 464
http://upstage.svn.sourceforge.net/upstage/?rev=464&view=rev
Author: aut-upstage
Date: 2012-11-23 00:55:59 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Scott & Gavin
------
voices.py fix attempt 2
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-23 00:51:12 UTC (rev 463)
+++ branches/2.4.2/upstage/voices.py 2012-11-23 00:55:59 UTC (rev 464)
@@ -43,9 +43,9 @@
echo_in = ''#cat | ' #"read SPEECH ; echo $SPEECH |"
#Heath Behrens readded the -x switch used for byte switching as it breaks some voices.
-fest_lame = " | %s lame -S --quiet -m s -r -s %%s --resample 22.05 --preset phone - $1 " % timeout
-rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
-espeak_mbrola_lame = " %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
+fest_lame = " | %s lame -S --quiet -m s -s %%s --resample 22.05 - $1 " % timeout
+rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
+espeak_mbrola_lame = " | %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
# espeak doesn't seem to like piping to stdout, so it saves to tmp file instead
espeak_lame = " %s lame -S --quiet -m m -s 22.05 --preset phone $1.wav $1 " % timeout
@@ -57,7 +57,7 @@
#The other option is to simply copy all voices from the folder to the previous folder.
path_to_embrola_alt = "/usr/share/mbrola/voices"
-text2wave = '/usr/bin/text2wave'
+text2wave = '/usr/local/share/festvox/festival/bin/text2wave'
#these functions are run over the definitions in VOICE_KIT, below, to
#create the appropriate shell script for each voice.
@@ -101,9 +101,9 @@
if not espeak or not mbrola:
return None
s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
- " | ", mbrola, " -e ", mboptions, " /usr/share/mbrola/", mbvoice,
- " - $1.wav ", log))
-return [s, espeak_mbrola_lame, espeak_cleanup]
+ " | ", mbrola, " -e ", mboptions, " " + path_to_embrola, mbvoice,
+ " - $1.wav ", log))
+ return [s, espeak_mbrola_lame, espeak_cleanup]
#XXX perhaps ought to be moved OUT of python code into a real config file.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-23 01:00:26
|
Revision: 465
http://upstage.svn.sourceforge.net/upstage/?rev=465&view=rev
Author: aut-upstage
Date: 2012-11-23 01:00:19 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Scott & Gavin
------
voices.py fix attempt 3
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-23 00:55:59 UTC (rev 464)
+++ branches/2.4.2/upstage/voices.py 2012-11-23 01:00:19 UTC (rev 465)
@@ -43,9 +43,9 @@
echo_in = ''#cat | ' #"read SPEECH ; echo $SPEECH |"
#Heath Behrens readded the -x switch used for byte switching as it breaks some voices.
-fest_lame = " | %s lame -S --quiet -m s -s %%s --resample 22.05 - $1 " % timeout
-rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
-espeak_mbrola_lame = " | %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
+fest_lame = " | %s lame -S --quiet -m s -r -s %%s --resample 22.05 --preset phone - $1 " % timeout
+rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
+espeak_mbrola_lame = " %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
# espeak doesn't seem to like piping to stdout, so it saves to tmp file instead
espeak_lame = " %s lame -S --quiet -m m -s 22.05 --preset phone $1.wav $1 " % timeout
@@ -57,7 +57,7 @@
#The other option is to simply copy all voices from the folder to the previous folder.
path_to_embrola_alt = "/usr/share/mbrola/voices"
-text2wave = '/usr/local/share/festvox/festival/bin/text2wave'
+text2wave = '/usr/bin/text2wave'
#these functions are run over the definitions in VOICE_KIT, below, to
#create the appropriate shell script for each voice.
@@ -101,9 +101,9 @@
if not espeak or not mbrola:
return None
s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
- " | ", mbrola, " -e ", mboptions, " " + path_to_embrola, mbvoice,
- " - $1.wav ", log))
- return [s, espeak_mbrola_lame, espeak_cleanup]
+ " | ", mbrola, " -e ", mboptions, " /usr/share/mbrola/", mbvoice,
+ " - $1.wav ", log))
+return [s, espeak_mbrola_lame, espeak_cleanup]
#XXX perhaps ought to be moved OUT of python code into a real config file.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-23 01:07:21
|
Revision: 466
http://upstage.svn.sourceforge.net/upstage/?rev=466&view=rev
Author: aut-upstage
Date: 2012-11-23 01:07:15 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-23 01:00:19 UTC (rev 465)
+++ branches/2.4.2/upstage/voices.py 2012-11-23 01:07:15 UTC (rev 466)
@@ -57,7 +57,7 @@
#The other option is to simply copy all voices from the folder to the previous folder.
path_to_embrola_alt = "/usr/share/mbrola/voices"
-text2wave = '/usr/bin/text2wave'
+text2wave = '/usr/local/src/festival/bin/text2wave'
#these functions are run over the definitions in VOICE_KIT, below, to
#create the appropriate shell script for each voice.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-23 01:09:48
|
Revision: 467
http://upstage.svn.sourceforge.net/upstage/?rev=467&view=rev
Author: aut-upstage
Date: 2012-11-23 01:09:40 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Scott & Gavin
------
voices.py fix attempt 5
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-23 01:07:15 UTC (rev 466)
+++ branches/2.4.2/upstage/voices.py 2012-11-23 01:09:40 UTC (rev 467)
@@ -43,9 +43,9 @@
echo_in = ''#cat | ' #"read SPEECH ; echo $SPEECH |"
#Heath Behrens readded the -x switch used for byte switching as it breaks some voices.
-fest_lame = " | %s lame -S --quiet -m s -r -s %%s --resample 22.05 --preset phone - $1 " % timeout
-rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
-espeak_mbrola_lame = " %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
+fest_lame = " | %s lame -S --quiet -m s -s %%s --resample 22.05 - $1 " % timeout
+rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
+espeak_mbrola_lame = " | %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
# espeak doesn't seem to like piping to stdout, so it saves to tmp file instead
espeak_lame = " %s lame -S --quiet -m m -s 22.05 --preset phone $1.wav $1 " % timeout
@@ -57,20 +57,20 @@
#The other option is to simply copy all voices from the folder to the previous folder.
path_to_embrola_alt = "/usr/share/mbrola/voices"
-text2wave = '/usr/local/src/festival/bin/text2wave'
+text2wave = '/usr/local/share/festvox/festival/bin/text2wave'
#these functions are run over the definitions in VOICE_KIT, below, to
#create the appropriate shell script for each voice.
def _festival(voice, hz):
s = ''.join((echo_in, timeout, "text2wave -eval '%s' " % voice,
- " -otype wav - -o - ", log,
+ " -otype raw - -o - ", log,
(fest_lame % hz), log))
return [s]
def _festival2(voice, hz, options=''):
s = ''.join((echo_in, timeout, "text2wave -eval '%s' " % voice,
- options, " -otype wav - -o - ", log,
+ options, " -otype raw - -o - ", log,
(fest_lame % hz), log))
return [s]
@@ -101,9 +101,9 @@
if not espeak or not mbrola:
return None
s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
- " | ", mbrola, " -e ", mboptions, " /usr/share/mbrola/", mbvoice,
- " - $1.wav ", log))
-return [s, espeak_mbrola_lame, espeak_cleanup]
+ " | ", mbrola, " -e ", mboptions, " " + path_to_embrola, mbvoice,
+ " - $1.wav ", log))
+ return [s, espeak_mbrola_lame, espeak_cleanup]
#XXX perhaps ought to be moved OUT of python code into a real config file.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-23 01:12:58
|
Revision: 468
http://upstage.svn.sourceforge.net/upstage/?rev=468&view=rev
Author: aut-upstage
Date: 2012-11-23 01:12:46 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Scott & Gavin
------
voices.py fix attempt 6
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-23 01:09:40 UTC (rev 467)
+++ branches/2.4.2/upstage/voices.py 2012-11-23 01:12:46 UTC (rev 468)
@@ -43,9 +43,9 @@
echo_in = ''#cat | ' #"read SPEECH ; echo $SPEECH |"
#Heath Behrens readded the -x switch used for byte switching as it breaks some voices.
-fest_lame = " | %s lame -S --quiet -m s -s %%s --resample 22.05 - $1 " % timeout
-rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
-espeak_mbrola_lame = " | %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
+fest_lame = " | %s lame -S --quiet -m s -r -s %%s --resample 22.05 --preset phone - $1 " % timeout
+rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
+espeak_mbrola_lame = " %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
# espeak doesn't seem to like piping to stdout, so it saves to tmp file instead
espeak_lame = " %s lame -S --quiet -m m -s 22.05 --preset phone $1.wav $1 " % timeout
@@ -57,7 +57,7 @@
#The other option is to simply copy all voices from the folder to the previous folder.
path_to_embrola_alt = "/usr/share/mbrola/voices"
-text2wave = '/usr/local/share/festvox/festival/bin/text2wave'
+text2wave = '/usr/bin/text2wave'
#these functions are run over the definitions in VOICE_KIT, below, to
#create the appropriate shell script for each voice.
@@ -101,9 +101,9 @@
if not espeak or not mbrola:
return None
s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
- " | ", mbrola, " -e ", mboptions, " " + path_to_embrola, mbvoice,
- " - $1.wav ", log))
- return [s, espeak_mbrola_lame, espeak_cleanup]
+ " | ", mbrola, " -e ", mboptions, " /usr/share/mbrola/", mbvoice,
+ " - $1.wav ", log))
+return [s, espeak_mbrola_lame, espeak_cleanup]
#XXX perhaps ought to be moved OUT of python code into a real config file.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-23 01:27:37
|
Revision: 469
http://upstage.svn.sourceforge.net/upstage/?rev=469&view=rev
Author: aut-upstage
Date: 2012-11-23 01:27:25 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Scott & Gavin
------
voices.py fix attempt 7
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-23 01:12:46 UTC (rev 468)
+++ branches/2.4.2/upstage/voices.py 2012-11-23 01:27:25 UTC (rev 469)
@@ -64,13 +64,13 @@
def _festival(voice, hz):
s = ''.join((echo_in, timeout, "text2wave -eval '%s' " % voice,
- " -otype raw - -o - ", log,
+ " -otype wav - -o - ", log,
(fest_lame % hz), log))
return [s]
def _festival2(voice, hz, options=''):
s = ''.join((echo_in, timeout, "text2wave -eval '%s' " % voice,
- options, " -otype raw - -o - ", log,
+ options, " -otype wav - -o - ", log,
(fest_lame % hz), log))
return [s]
@@ -122,35 +122,35 @@
'don': (_festival, ('(voice_don_diphone)', 5)),
#compiled festival
- 'slt_cmu': (_festival2, ('(voice_cmu_us_slt_arctic_clunits)', 8)),
- 'slt_nitech': (_festival2, ('(voice_nitech_us_slt_arctic_hts)', 8)),
- 'awb_cmu': (_festival2, ('(voice_cmu_us_awb_arctic_clunits)', 8)),
- 'awb_nitech': (_festival2, ('(voice_nitech_us_awb_arctic_hts)', 8)),
- 'clb_nitech': (_festival2, ('(voice_nitech_us_clb_arctic_hts)', 8)),
- 'bdl_cmu': (_festival2, ('(voice_cmu_us_bdl_arctic_clunits)', 8)),
- 'bdl_nitech': (_festival2, ('(voice_nitech_us_bdl_arctic_hts)', 8)),
- 'jmk_cmu': (_festival2, ('(voice_cmu_us_jmk_arctic_clunits)', 8)),
- 'jmk_nitech': (_festival2, ('(voice_nitech_us_jmk_arctic_hts)', 8)),
- 'rms_nitech': (_festival2, ('(voice_nitech_us_rms_arctic_hts)', 8)),
- 'rms_faster': (_festival2, ('(voice_nitech_us_rms_arctic_hts)', 8, " -F 11025")),
+ 'slt_cmu': (_festival, ('(voice_cmu_us_slt_arctic_clunits)', 8)),
+ 'slt_nitech': (_festival, ('(voice_nitech_us_slt_arctic_hts)', 8)),
+ 'awb_cmu': (_festival, ('(voice_cmu_us_awb_arctic_clunits)', 8)),
+ 'awb_nitech': (_festival, ('(voice_nitech_us_awb_arctic_hts)', 8)),
+ 'clb_nitech': (_festival, ('(voice_nitech_us_clb_arctic_hts)', 8)),
+ 'bdl_cmu': (_festival, ('(voice_cmu_us_bdl_arctic_clunits)', 8)),
+ 'bdl_nitech': (_festival, ('(voice_nitech_us_bdl_arctic_hts)', 8)),
+ 'jmk_cmu': (_festival, ('(voice_cmu_us_jmk_arctic_clunits)', 8)),
+ 'jmk_nitech': (_festival, ('(voice_nitech_us_jmk_arctic_hts)', 8)),
+ 'rms_nitech': (_festival, ('(voice_nitech_us_rms_arctic_hts)', 8)),
+ 'rms_faster': (_festival, ('(voice_nitech_us_rms_arctic_hts)', 8, " -F 11025")),
###Shaun Narayan (02/22/10) - New voices
- 'bdl_cmu': (_festival2, ('(voice_cmu_us_bdl_arctic_clunits)', 8)),
- 'ksp_cmu': (_festival2, ('(voice_cmu_us_ksp_arctic_clunits)', 8)),
- 'rms_cmu': (_festival2, ('(voice_cmu_us_rms_arctic_clunits)', 8)),
- 'kal_cmu': (_festival2, ('(voice_cmu_us_kal_com_clunits)', 8)),
- 'kal_cmu_faster': (_festival2, ('(voice_cmu_us_kal_com_clunits)', 8, " -F 11025")),
- 'bdl_cmu_faster': (_festival2, ('(voice_cmu_us_bdl_arctic_clunits)', 8, " -F 11025")),
- 'ksp_cmu_faster': (_festival2, ('(voice_cmu_us_ksp_arctic_clunits)', 8, " -F 11025")),
- 'rms_cmu_faster': (_festival2, ('(voice_cmu_us_rms_arctic_clunits)', 8, " -F 11025")),
- 'slt_cmu_faster': (_festival2, ('(voice_cmu_us_slt_arctic_clunits)', 8, " -F 11025")),
- 'slt_nitech_faster': (_festival2, ('(voice_nitech_us_slt_arctic_hts)', 8, " -F 11025")),
- 'awb_cmu_faster': (_festival2, ('(voice_cmu_us_awb_arctic_clunits)', 8, " -F 11025")),
- 'awb_nitech_faster': (_festival2, ('(voice_nitech_us_awb_arctic_hts)', 8, " -F 11025")),
- 'clb_nitech_faster': (_festival2, ('(voice_nitech_us_clb_arctic_hts)', 8, " -F 11025")),
- 'bdl_cmu_faster': (_festival2, ('(voice_cmu_us_bdl_arctic_clunits)', 8, " -F 11025")),
- 'bdl_nitech_faster': (_festival2, ('(voice_nitech_us_bdl_arctic_hts)', 8, " -F 11025")),
- 'jmk_cmu_faster': (_festival2, ('(voice_cmu_us_jmk_arctic_clunits)', 8, " -F 11025")),
- 'jmk_nitech_faster': (_festival2, ('(voice_nitech_us_jmk_arctic_hts)', 8, " -F 11025")),
+ 'bdl_cmu': (_festival, ('(voice_cmu_us_bdl_arctic_clunits)', 8)),
+ 'ksp_cmu': (_festival, ('(voice_cmu_us_ksp_arctic_clunits)', 8)),
+ 'rms_cmu': (_festival, ('(voice_cmu_us_rms_arctic_clunits)', 8)),
+ 'kal_cmu': (_festival, ('(voice_cmu_us_kal_com_clunits)', 8)),
+ 'kal_cmu_faster': (_festival, ('(voice_cmu_us_kal_com_clunits)', 8, " -F 11025")),
+ 'bdl_cmu_faster': (_festival, ('(voice_cmu_us_bdl_arctic_clunits)', 8, " -F 11025")),
+ 'ksp_cmu_faster': (_festival, ('(voice_cmu_us_ksp_arctic_clunits)', 8, " -F 11025")),
+ 'rms_cmu_faster': (_festival, ('(voice_cmu_us_rms_arctic_clunits)', 8, " -F 11025")),
+ 'slt_cmu_faster': (_festival, ('(voice_cmu_us_slt_arctic_clunits)', 8, " -F 11025")),
+ 'slt_nitech_faster': (_festival, ('(voice_nitech_us_slt_arctic_hts)', 8, " -F 11025")),
+ 'awb_cmu_faster': (_festival, ('(voice_cmu_us_awb_arctic_clunits)', 8, " -F 11025")),
+ 'awb_nitech_faster': (_festival, ('(voice_nitech_us_awb_arctic_hts)', 8, " -F 11025")),
+ 'clb_nitech_faster': (_festival, ('(voice_nitech_us_clb_arctic_hts)', 8, " -F 11025")),
+ 'bdl_cmu_faster': (_festival, ('(voice_cmu_us_bdl_arctic_clunits)', 8, " -F 11025")),
+ 'bdl_nitech_faster': (_festival, ('(voice_nitech_us_bdl_arctic_hts)', 8, " -F 11025")),
+ 'jmk_cmu_faster': (_festival, ('(voice_cmu_us_jmk_arctic_clunits)', 8, " -F 11025")),
+ 'jmk_nitech_faster': (_festival, ('(voice_nitech_us_jmk_arctic_hts)', 8, " -F 11025")),
#rsynth:
'slow': (_rsynth, (" -x 1200 -S 3 ",)),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-23 01:33:25
|
Revision: 470
http://upstage.svn.sourceforge.net/upstage/?rev=470&view=rev
Author: aut-upstage
Date: 2012-11-23 01:33:19 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Scott & Gavin
------
voices.py fix attempt 8
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-23 01:27:25 UTC (rev 469)
+++ branches/2.4.2/upstage/voices.py 2012-11-23 01:33:19 UTC (rev 470)
@@ -43,7 +43,7 @@
echo_in = ''#cat | ' #"read SPEECH ; echo $SPEECH |"
#Heath Behrens readded the -x switch used for byte switching as it breaks some voices.
-fest_lame = " | %s lame -S --quiet -m s -r -s %%s --resample 22.05 --preset phone - $1 " % timeout
+fest_lame = " | %s lame -S --quiet -m s -s %%s --resample 22.05 - $1 " % timeout
rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
espeak_mbrola_lame = " %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
@@ -122,35 +122,35 @@
'don': (_festival, ('(voice_don_diphone)', 5)),
#compiled festival
- 'slt_cmu': (_festival, ('(voice_cmu_us_slt_arctic_clunits)', 8)),
- 'slt_nitech': (_festival, ('(voice_nitech_us_slt_arctic_hts)', 8)),
- 'awb_cmu': (_festival, ('(voice_cmu_us_awb_arctic_clunits)', 8)),
- 'awb_nitech': (_festival, ('(voice_nitech_us_awb_arctic_hts)', 8)),
- 'clb_nitech': (_festival, ('(voice_nitech_us_clb_arctic_hts)', 8)),
- 'bdl_cmu': (_festival, ('(voice_cmu_us_bdl_arctic_clunits)', 8)),
- 'bdl_nitech': (_festival, ('(voice_nitech_us_bdl_arctic_hts)', 8)),
- 'jmk_cmu': (_festival, ('(voice_cmu_us_jmk_arctic_clunits)', 8)),
- 'jmk_nitech': (_festival, ('(voice_nitech_us_jmk_arctic_hts)', 8)),
- 'rms_nitech': (_festival, ('(voice_nitech_us_rms_arctic_hts)', 8)),
- 'rms_faster': (_festival, ('(voice_nitech_us_rms_arctic_hts)', 8, " -F 11025")),
+ 'slt_cmu': (_festival2, ('(voice_cmu_us_slt_arctic_clunits)', 8)),
+ 'slt_nitech': (_festival2, ('(voice_nitech_us_slt_arctic_hts)', 8)),
+ 'awb_cmu': (_festival2, ('(voice_cmu_us_awb_arctic_clunits)', 8)),
+ 'awb_nitech': (_festival2, ('(voice_nitech_us_awb_arctic_hts)', 8)),
+ 'clb_nitech': (_festival2, ('(voice_nitech_us_clb_arctic_hts)', 8)),
+ 'bdl_cmu': (_festival2, ('(voice_cmu_us_bdl_arctic_clunits)', 8)),
+ 'bdl_nitech': (_festival2, ('(voice_nitech_us_bdl_arctic_hts)', 8)),
+ 'jmk_cmu': (_festival2, ('(voice_cmu_us_jmk_arctic_clunits)', 8)),
+ 'jmk_nitech': (_festival2, ('(voice_nitech_us_jmk_arctic_hts)', 8)),
+ 'rms_nitech': (_festival2, ('(voice_nitech_us_rms_arctic_hts)', 8)),
+ 'rms_faster': (_festival2, ('(voice_nitech_us_rms_arctic_hts)', 8, " -F 11025")),
###Shaun Narayan (02/22/10) - New voices
- 'bdl_cmu': (_festival, ('(voice_cmu_us_bdl_arctic_clunits)', 8)),
- 'ksp_cmu': (_festival, ('(voice_cmu_us_ksp_arctic_clunits)', 8)),
- 'rms_cmu': (_festival, ('(voice_cmu_us_rms_arctic_clunits)', 8)),
- 'kal_cmu': (_festival, ('(voice_cmu_us_kal_com_clunits)', 8)),
- 'kal_cmu_faster': (_festival, ('(voice_cmu_us_kal_com_clunits)', 8, " -F 11025")),
- 'bdl_cmu_faster': (_festival, ('(voice_cmu_us_bdl_arctic_clunits)', 8, " -F 11025")),
- 'ksp_cmu_faster': (_festival, ('(voice_cmu_us_ksp_arctic_clunits)', 8, " -F 11025")),
- 'rms_cmu_faster': (_festival, ('(voice_cmu_us_rms_arctic_clunits)', 8, " -F 11025")),
- 'slt_cmu_faster': (_festival, ('(voice_cmu_us_slt_arctic_clunits)', 8, " -F 11025")),
- 'slt_nitech_faster': (_festival, ('(voice_nitech_us_slt_arctic_hts)', 8, " -F 11025")),
- 'awb_cmu_faster': (_festival, ('(voice_cmu_us_awb_arctic_clunits)', 8, " -F 11025")),
- 'awb_nitech_faster': (_festival, ('(voice_nitech_us_awb_arctic_hts)', 8, " -F 11025")),
- 'clb_nitech_faster': (_festival, ('(voice_nitech_us_clb_arctic_hts)', 8, " -F 11025")),
- 'bdl_cmu_faster': (_festival, ('(voice_cmu_us_bdl_arctic_clunits)', 8, " -F 11025")),
- 'bdl_nitech_faster': (_festival, ('(voice_nitech_us_bdl_arctic_hts)', 8, " -F 11025")),
- 'jmk_cmu_faster': (_festival, ('(voice_cmu_us_jmk_arctic_clunits)', 8, " -F 11025")),
- 'jmk_nitech_faster': (_festival, ('(voice_nitech_us_jmk_arctic_hts)', 8, " -F 11025")),
+ 'bdl_cmu': (_festival2, ('(voice_cmu_us_bdl_arctic_clunits)', 8)),
+ 'ksp_cmu': (_festival2, ('(voice_cmu_us_ksp_arctic_clunits)', 8)),
+ 'rms_cmu': (_festival2, ('(voice_cmu_us_rms_arctic_clunits)', 8)),
+ 'kal_cmu': (_festival2, ('(voice_cmu_us_kal_com_clunits)', 8)),
+ 'kal_cmu_faster': (_festival2, ('(voice_cmu_us_kal_com_clunits)', 8, " -F 11025")),
+ 'bdl_cmu_faster': (_festival2, ('(voice_cmu_us_bdl_arctic_clunits)', 8, " -F 11025")),
+ 'ksp_cmu_faster': (_festival2, ('(voice_cmu_us_ksp_arctic_clunits)', 8, " -F 11025")),
+ 'rms_cmu_faster': (_festival2, ('(voice_cmu_us_rms_arctic_clunits)', 8, " -F 11025")),
+ 'slt_cmu_faster': (_festival2, ('(voice_cmu_us_slt_arctic_clunits)', 8, " -F 11025")),
+ 'slt_nitech_faster': (_festival2, ('(voice_nitech_us_slt_arctic_hts)', 8, " -F 11025")),
+ 'awb_cmu_faster': (_festival2, ('(voice_cmu_us_awb_arctic_clunits)', 8, " -F 11025")),
+ 'awb_nitech_faster': (_festival2, ('(voice_nitech_us_awb_arctic_hts)', 8, " -F 11025")),
+ 'clb_nitech_faster': (_festival2, ('(voice_nitech_us_clb_arctic_hts)', 8, " -F 11025")),
+ 'bdl_cmu_faster': (_festival2, ('(voice_cmu_us_bdl_arctic_clunits)', 8, " -F 11025")),
+ 'bdl_nitech_faster': (_festival2, ('(voice_nitech_us_bdl_arctic_hts)', 8, " -F 11025")),
+ 'jmk_cmu_faster': (_festival2, ('(voice_cmu_us_jmk_arctic_clunits)', 8, " -F 11025")),
+ 'jmk_nitech_faster': (_festival2, ('(voice_nitech_us_jmk_arctic_hts)', 8, " -F 11025")),
#rsynth:
'slow': (_rsynth, (" -x 1200 -S 3 ",)),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-23 01:37:26
|
Revision: 471
http://upstage.svn.sourceforge.net/upstage/?rev=471&view=rev
Author: aut-upstage
Date: 2012-11-23 01:37:20 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Scott & Gavin
------
voices.py fix attempt 9
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-23 01:33:19 UTC (rev 470)
+++ branches/2.4.2/upstage/voices.py 2012-11-23 01:37:20 UTC (rev 471)
@@ -64,13 +64,13 @@
def _festival(voice, hz):
s = ''.join((echo_in, timeout, "text2wave -eval '%s' " % voice,
- " -otype wav - -o - ", log,
+ " -otype mp3 - -o - ", log,
(fest_lame % hz), log))
return [s]
def _festival2(voice, hz, options=''):
s = ''.join((echo_in, timeout, "text2wave -eval '%s' " % voice,
- options, " -otype wav - -o - ", log,
+ options, " -otype mp3 - -o - ", log,
(fest_lame % hz), log))
return [s]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-23 01:41:22
|
Revision: 472
http://upstage.svn.sourceforge.net/upstage/?rev=472&view=rev
Author: aut-upstage
Date: 2012-11-23 01:41:16 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Scott & Gavin
------
voices.py fix attempt 10
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-23 01:37:20 UTC (rev 471)
+++ branches/2.4.2/upstage/voices.py 2012-11-23 01:41:16 UTC (rev 472)
@@ -64,13 +64,13 @@
def _festival(voice, hz):
s = ''.join((echo_in, timeout, "text2wave -eval '%s' " % voice,
- " -otype mp3 - -o - ", log,
+ " -otype wav - -o - ", log,
(fest_lame % hz), log))
return [s]
def _festival2(voice, hz, options=''):
s = ''.join((echo_in, timeout, "text2wave -eval '%s' " % voice,
- options, " -otype mp3 - -o - ", log,
+ options, " -otype wav - -o - ", log,
(fest_lame % hz), log))
return [s]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-23 02:13:32
|
Revision: 473
http://upstage.svn.sourceforge.net/upstage/?rev=473&view=rev
Author: aut-upstage
Date: 2012-11-23 02:13:19 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Scott & Gavin
------
voices.py fix attempt 11
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-23 01:41:16 UTC (rev 472)
+++ branches/2.4.2/upstage/voices.py 2012-11-23 02:13:19 UTC (rev 473)
@@ -43,7 +43,7 @@
echo_in = ''#cat | ' #"read SPEECH ; echo $SPEECH |"
#Heath Behrens readded the -x switch used for byte switching as it breaks some voices.
-fest_lame = " | %s lame -S --quiet -m s -s %%s --resample 22.05 - $1 " % timeout
+fest_lame = " | %s lame -S --quiet -m s -r -s %%s --resample 22.05 --preset phone - $1 " % timeout
rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
espeak_mbrola_lame = " %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
@@ -57,17 +57,19 @@
#The other option is to simply copy all voices from the folder to the previous folder.
path_to_embrola_alt = "/usr/share/mbrola/voices"
-text2wave = '/usr/bin/text2wave'
+text2wave = '/usr/local/share/festvox/festival/bin/text2wave'
#these functions are run over the definitions in VOICE_KIT, below, to
#create the appropriate shell script for each voice.
def _festival(voice, hz):
- s = ''.join((echo_in, timeout, "text2wave -eval '%s' " % voice,
- " -otype wav - -o - ", log,
+ s = ''.join((echo_in, timeout, "text2wave -eval '%s' " % voice,
+ options, " -otype wav - -o - ", log,
(fest_lame % hz), log))
- return [s]
+ return [s]
+
+
def _festival2(voice, hz, options=''):
s = ''.join((echo_in, timeout, "text2wave -eval '%s' " % voice,
options, " -otype wav - -o - ", log,
@@ -101,11 +103,12 @@
if not espeak or not mbrola:
return None
s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
- " | ", mbrola, " -e ", mboptions, " /usr/share/mbrola/", mbvoice,
- " - $1.wav ", log))
+ " | ", mbrola, " -e ", mboptions, " /usr/local/share/mbrola/", mbvoice,
+ " - $1.wav ", log))
return [s, espeak_mbrola_lame, espeak_cleanup]
+
#XXX perhaps ought to be moved OUT of python code into a real config file.
VOICE_KIT = {
#Shaun Narayan (01/23/10) - Changed sampling rate (from 16 to 8) for all festival voices as after voices bug fix they were too fast
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-23 02:17:55
|
Revision: 474
http://upstage.svn.sourceforge.net/upstage/?rev=474&view=rev
Author: aut-upstage
Date: 2012-11-23 02:17:43 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Scott & Gavin
------
voices.py fix attempt 12
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-23 02:13:19 UTC (rev 473)
+++ branches/2.4.2/upstage/voices.py 2012-11-23 02:17:43 UTC (rev 474)
@@ -103,12 +103,11 @@
if not espeak or not mbrola:
return None
s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
- " | ", mbrola, " -e ", mboptions, " /usr/local/share/mbrola/", mbvoice,
- " - $1.wav ", log))
+ " | ", mbrola, " -e ", mboptions, " /usr/share/mbrola/", mbvoice,
+ " - $1.wav ", log))
return [s, espeak_mbrola_lame, espeak_cleanup]
-
#XXX perhaps ought to be moved OUT of python code into a real config file.
VOICE_KIT = {
#Shaun Narayan (01/23/10) - Changed sampling rate (from 16 to 8) for all festival voices as after voices bug fix they were too fast
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-23 02:30:13
|
Revision: 475
http://upstage.svn.sourceforge.net/upstage/?rev=475&view=rev
Author: aut-upstage
Date: 2012-11-23 02:30:01 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Scott & Gavin
------
voices.py fix attempt 13
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-23 02:17:43 UTC (rev 474)
+++ branches/2.4.2/upstage/voices.py 2012-11-23 02:30:01 UTC (rev 475)
@@ -63,13 +63,11 @@
#create the appropriate shell script for each voice.
def _festival(voice, hz):
- s = ''.join((echo_in, timeout, "text2wave -eval '%s' " % voice,
- options, " -otype wav - -o - ", log,
+ s = ''.join((echo_in, timeout, "text2wave -eval '%s' " % voice,
+ " -otype wav - -o - ", log,
(fest_lame % hz), log))
- return [s]
-
+ return [s]
-
def _festival2(voice, hz, options=''):
s = ''.join((echo_in, timeout, "text2wave -eval '%s' " % voice,
options, " -otype wav - -o - ", log,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-23 02:35:33
|
Revision: 476
http://upstage.svn.sourceforge.net/upstage/?rev=476&view=rev
Author: aut-upstage
Date: 2012-11-23 02:35:21 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Scott & Gavin
------
voices.py fix attempt 14
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-23 02:30:01 UTC (rev 475)
+++ branches/2.4.2/upstage/voices.py 2012-11-23 02:35:21 UTC (rev 476)
@@ -43,7 +43,7 @@
echo_in = ''#cat | ' #"read SPEECH ; echo $SPEECH |"
#Heath Behrens readded the -x switch used for byte switching as it breaks some voices.
-fest_lame = " | %s lame -S --quiet -m s -r -s %%s --resample 22.05 --preset phone - $1 " % timeout
+fest_lame = " | %s lame -S --quiet -m s -r -s %%s --resample 11.05 --preset phone - $1 " % timeout
rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
espeak_mbrola_lame = " %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
@@ -64,7 +64,7 @@
def _festival(voice, hz):
s = ''.join((echo_in, timeout, "text2wave -eval '%s' " % voice,
- " -otype wav - -o - ", log,
+ " -otyp wav - -o - ", log,
(fest_lame % hz), log))
return [s]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-23 02:47:57
|
Revision: 478
http://upstage.svn.sourceforge.net/upstage/?rev=478&view=rev
Author: aut-upstage
Date: 2012-11-23 02:47:51 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Scott & Gavin
------
voices.py fix attempt 16
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-23 02:40:48 UTC (rev 477)
+++ branches/2.4.2/upstage/voices.py 2012-11-23 02:47:51 UTC (rev 478)
@@ -43,7 +43,7 @@
echo_in = ''#cat | ' #"read SPEECH ; echo $SPEECH |"
#Heath Behrens readded the -x switch used for byte switching as it breaks some voices.
-fest_lame = " | %s lame -S --quiet -m s -r -s %%s --resample 11.05 --preset phone - $1 " % timeout
+fest_lame = " | %s lame -S --quiet -m s -r -s %%s --resample 22.05 --preset phone - $1 " % timeout
rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
espeak_mbrola_lame = " %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
@@ -64,7 +64,7 @@
def _festival(voice, hz):
s = ''.join((echo_in, timeout, "text2wave -eval '%s' " % voice,
- " -otyp wav - -o - ", log,
+ " -otype wav - -o - ", log,
(fest_lame % hz), log))
return [s]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-23 03:15:47
|
Revision: 479
http://upstage.svn.sourceforge.net/upstage/?rev=479&view=rev
Author: aut-upstage
Date: 2012-11-23 03:15:36 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Scott & Gavin
------
voices.py fix attempt 17
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-23 02:47:51 UTC (rev 478)
+++ branches/2.4.2/upstage/voices.py 2012-11-23 03:15:36 UTC (rev 479)
@@ -43,9 +43,9 @@
echo_in = ''#cat | ' #"read SPEECH ; echo $SPEECH |"
#Heath Behrens readded the -x switch used for byte switching as it breaks some voices.
-fest_lame = " | %s lame -S --quiet -m s -r -s %%s --resample 22.05 --preset phone - $1 " % timeout
-rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
-espeak_mbrola_lame = " %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
+fest_lame = " | %s lame -S --quiet -m s -s %%s --resample 22.05 - $1 " % timeout
+rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
+espeak_mbrola_lame = " | %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
# espeak doesn't seem to like piping to stdout, so it saves to tmp file instead
espeak_lame = " %s lame -S --quiet -m m -s 22.05 --preset phone $1.wav $1 " % timeout
@@ -101,9 +101,9 @@
if not espeak or not mbrola:
return None
s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
- " | ", mbrola, " -e ", mboptions, " /usr/share/mbrola/", mbvoice,
- " - $1.wav ", log))
-return [s, espeak_mbrola_lame, espeak_cleanup]
+ " | ", mbrola, " -e ", mboptions, " " + path_to_embrola, mbvoice,
+ " - $1.wav ", log))
+ return [s, espeak_mbrola_lame, espeak_cleanup]
#XXX perhaps ought to be moved OUT of python code into a real config file.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-29 00:05:57
|
Revision: 480
http://upstage.svn.sourceforge.net/upstage/?rev=480&view=rev
Author: aut-upstage
Date: 2012-11-29 00:05:48 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Gavin/Scott
Changed mbrola path in voices.py
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-23 03:15:36 UTC (rev 479)
+++ branches/2.4.2/upstage/voices.py 2012-11-29 00:05:48 UTC (rev 480)
@@ -52,10 +52,10 @@
espeak_cleanup = " rm $1.wav "
#Heath Behrens - Need to declare to possible paths for mbrola voices.
-path_to_embrola = "/usr/share/mbrola/"
+path_to_embrola = "/usr/local/share/mbrola/"
#Heath Behrens - this is the path to some of the voices that install in a different location.
#The other option is to simply copy all voices from the folder to the previous folder.
-path_to_embrola_alt = "/usr/share/mbrola/voices"
+path_to_embrola_alt = "/usr/local/share/mbrola/voices"
text2wave = '/usr/local/share/festvox/festival/bin/text2wave'
@@ -78,9 +78,8 @@
exe = find_executable('rsynth-say')
if not exe:
return None
- s = ''.join((echo_in, timeout, exe, " -a -l ", options,
- " - ", log, rsynth_lame, log
- ))
+ s = ''.join((echo_in, timeout, exe, " -k27 ", options,
+ " -v ", voice, " --stdin -w $1.wav ", log))
return [s]
def _espeak(voice, options=''):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-29 00:18:19
|
Revision: 481
http://upstage.svn.sourceforge.net/upstage/?rev=481&view=rev
Author: aut-upstage
Date: 2012-11-29 00:18:13 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Scott Riddell & Gavin Chan
--------
Added version history to voices.py
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-29 00:05:48 UTC (rev 480)
+++ branches/2.4.2/upstage/voices.py 2012-11-29 00:18:13 UTC (rev 481)
@@ -8,14 +8,16 @@
Modified: Shaun Narayan (01/27/10) - Static Voices Bug Fix (Aut Upstage team 09/10)
- Modified to allow finding enhanced festival2 voices
- Added new voices (some are just re-sampled existing voices)
- Heath Behrens & Vibhu Patel (15-06-2011) - Added some new voices namely emb_de6, emb_it4,emb_ro1,emb_gr2. More to come.
+Heath Behrens & Vibhu Patel (15-06-2011) - Added some new voices namely emb_de6, emb_it4,emb_ro1,emb_gr2. More to come.
Note the voice packages need to be installed, for the emb voices to work the packages:
mbrola-* need to be installed using either debian package manager or by extracting the
files to /usr/share/mbrola/
- Heath Behrens (18/09/2011) - Patch for emb voices, namely the emb voices which did not work on the main
+Heath Behrens (18/09/2011) - Patch for emb voices, namely the emb voices which did not work on the main
server. Modified _espeak_mbrola function.
- Daniel Han (12/10/2011) - Patch for cmu Voices which failed to create proper MP3 but only with noises. modified festival related methods
+Daniel Han (12/10/2011) - Patch for cmu Voices which failed to create proper MP3 but only with noises. modified festival related methods
+Gavin Chan and Scott Riddell (23/10/2011) - Changed raw to wav, updated _festival and _festival 2 methods to correctly configure the files into the right voice format
+Gavin Chan and Scott Riddell (29/10/2011) - Changed the mbrola path to the correct location, edited Rsynth method to work correctly.
"""
import re, os
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-29 00:39:44
|
Revision: 482
http://upstage.svn.sourceforge.net/upstage/?rev=482&view=rev
Author: aut-upstage
Date: 2012-11-29 00:39:35 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Scott Riddell & Gavin Chan
--------
Mbrola voices installation Attempt 1
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-29 00:18:13 UTC (rev 481)
+++ branches/2.4.2/upstage/voices.py 2012-11-29 00:39:35 UTC (rev 482)
@@ -47,14 +47,15 @@
#Heath Behrens readded the -x switch used for byte switching as it breaks some voices.
fest_lame = " | %s lame -S --quiet -m s -s %%s --resample 22.05 - $1 " % timeout
rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
-espeak_mbrola_lame = " | %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
+espeak_mbrola_lame = " | %s lame -S --quiet -x -m m -s 16 --resample 22.05 --preset phone - $1" % timeout
+
# espeak doesn't seem to like piping to stdout, so it saves to tmp file instead
espeak_lame = " %s lame -S --quiet -m m -s 22.05 --preset phone $1.wav $1 " % timeout
espeak_cleanup = " rm $1.wav "
#Heath Behrens - Need to declare to possible paths for mbrola voices.
-path_to_embrola = "/usr/local/share/mbrola/"
+path_to_embrola = "/usr/local/share/mbrola"
#Heath Behrens - this is the path to some of the voices that install in a different location.
#The other option is to simply copy all voices from the folder to the previous folder.
path_to_embrola_alt = "/usr/local/share/mbrola/voices"
@@ -102,8 +103,8 @@
if not espeak or not mbrola:
return None
s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
- " | ", mbrola, " -e ", mboptions, " " + path_to_embrola, mbvoice,
- " - $1.wav ", log))
+ " | ", mbrola, " -e ", mboptions, " /usr/local/share/mbrola/", mbvoice,
+ " - $1.wav ", log))
return [s, espeak_mbrola_lame, espeak_cleanup]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-29 01:35:34
|
Revision: 483
http://upstage.svn.sourceforge.net/upstage/?rev=483&view=rev
Author: aut-upstage
Date: 2012-11-29 01:35:27 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Scott Riddell & Gavin Chan
--------
Mbrola voices installation Attempt 2
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-29 00:39:35 UTC (rev 482)
+++ branches/2.4.2/upstage/voices.py 2012-11-29 01:35:27 UTC (rev 483)
@@ -103,8 +103,8 @@
if not espeak or not mbrola:
return None
s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
- " | ", mbrola, " -e ", mboptions, " /usr/local/share/mbrola/", mbvoice,
- " - $1.wav ", log))
+ mbrola, " -e ", mboptions, " " + "/usr/local/share/mbrola", mbvoice,
+ " - $1.wav ", log))
return [s, espeak_mbrola_lame, espeak_cleanup]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-29 03:47:05
|
Revision: 484
http://upstage.svn.sourceforge.net/upstage/?rev=484&view=rev
Author: aut-upstage
Date: 2012-11-29 03:46:57 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Gavin
- Changed RSynth back to default method
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-29 01:35:27 UTC (rev 483)
+++ branches/2.4.2/upstage/voices.py 2012-11-29 03:46:57 UTC (rev 484)
@@ -81,8 +81,9 @@
exe = find_executable('rsynth-say')
if not exe:
return None
- s = ''.join((echo_in, timeout, exe, " -k27 ", options,
- " -v ", voice, " --stdin -w $1.wav ", log))
+ s = ''.join((echo_in, timeout, exe, " -a -l ", options,
+ " - ", log, rsynth_lame, log
+ ))
return [s]
def _espeak(voice, options=''):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-30 01:31:33
|
Revision: 486
http://upstage.svn.sourceforge.net/upstage/?rev=486&view=rev
Author: aut-upstage
Date: 2012-11-30 01:31:27 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
30-11-2012 Gavin
added slash to a path.
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-30 00:20:31 UTC (rev 485)
+++ branches/2.4.2/upstage/voices.py 2012-11-30 01:31:27 UTC (rev 486)
@@ -104,7 +104,7 @@
if not espeak or not mbrola:
return None
s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
- mbrola, " -e ", mboptions, " " + "/usr/local/share/mbrola", mbvoice,
+ mbrola, " -e ", mboptions, " " + "/usr/local/share/mbrola/", mbvoice,
" - $1.wav ", log))
return [s, espeak_mbrola_lame, espeak_cleanup]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-12-04 02:06:34
|
Revision: 487
http://upstage.svn.sourceforge.net/upstage/?rev=487&view=rev
Author: aut-upstage
Date: 2012-12-04 02:06:28 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
Gavin/Scott - Updated working voices.py with the fixed mbrola voices
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-30 01:31:27 UTC (rev 486)
+++ branches/2.4.2/upstage/voices.py 2012-12-04 02:06:28 UTC (rev 487)
@@ -47,7 +47,7 @@
#Heath Behrens readded the -x switch used for byte switching as it breaks some voices.
fest_lame = " | %s lame -S --quiet -m s -s %%s --resample 22.05 - $1 " % timeout
rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
-espeak_mbrola_lame = " | %s lame -S --quiet -x -m m -s 16 --resample 22.05 --preset phone - $1" % timeout
+espeak_mbrola_lame = " %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
# espeak doesn't seem to like piping to stdout, so it saves to tmp file instead
@@ -55,7 +55,7 @@
espeak_cleanup = " rm $1.wav "
#Heath Behrens - Need to declare to possible paths for mbrola voices.
-path_to_embrola = "/usr/local/share/mbrola"
+path_to_embrola = " /usr/local/share/mbrola/"
#Heath Behrens - this is the path to some of the voices that install in a different location.
#The other option is to simply copy all voices from the folder to the previous folder.
path_to_embrola_alt = "/usr/local/share/mbrola/voices"
@@ -104,7 +104,7 @@
if not espeak or not mbrola:
return None
s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
- mbrola, " -e ", mboptions, " " + "/usr/local/share/mbrola/", mbvoice,
+ " | ", mbrola, " -e ", mboptions, path_to_embrola, mbvoice,
" - $1.wav ", log))
return [s, espeak_mbrola_lame, espeak_cleanup]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X