more optimized build, plus some debug info in demo.html

kripken · Jan 13, 2012 · 904faf2 · 904faf2
1 parent 6625dc5
commit 904faf2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/demo.html b/demo.html
@@ -10,7 +10,7 @@
 <body>
   <h1>speak.js</h1>
   <h2>Text-To-Speech on the Web</h2>
-  <form onsubmit="speak(text.value, { amplitude: amplitude.value, wordgap: workdgap.value, pitch: pitch.value, speed: speed.value }); return false">
+  <form onsubmit="speak(text.value, { amplitude: amplitude.value, wordgap: workdgap.value, pitch: pitch.value, speed: speed.value, debug: true }); return false">
     Text: <input type="text" name="text" size=50 value="Never gonna give, you, up.">
     Amplitude: <input type="text" name="amplitude" size=5 value="100">
     Pitch: <input type="text" name="pitch" size=5 value="50">

diff --git a/speakClient.js b/speakClient.js
@@ -69,10 +69,15 @@ function speak(text, args) {
     }
   }
 
+  var startTime = Date.now();
+
   var wav = generateSpeech(text, args);
   var data = parseWav(wav); // validate the data and parse it
 
   // TODO: try playAudioDataAPI(data), and fallback if failed
   playHTMLAudioElement(wav);
+
+  var endTime = Date.now();
+  if (args && args.debug) console.log('speak.js: took ' + (endTime - startTime) + ' ms.');
 }
 
diff --git a/speakGenerator.js b/speakGenerator.js
diff --git a/src/emscripten.sh b/src/emscripten.sh
@@ -10,16 +10,16 @@ make clean
 rm libespeak.*
 rm speak speak.bc speak.o
 CXXFLAGS="-DNEED_WCHAR_FUNCTIONS" $EMSCRIPTEN/emmake make -j 4
+mv speak speak.bc
 
-echo "dis"
-~/Dev/llvm/cbuild/bin/llvm-dis -show-annotations speak -o=speak.ll
-
+#echo "dis"
+#~/Dev/llvm/cbuild/bin/llvm-dis -show-annotations speak -o=speak.ll
 #echo "autodebug"
 #mv speak.ll speak.orig.ll
 #python ~/Dev/emscripten/tools/autodebugger.py speak.orig.ll speak.ll
 
 echo "emscripten"
-$EMSCRIPTEN/emcc -O2 --js-transform "python bundle.py" speak.ll -o speak.raw.js
+$EMSCRIPTEN/emcc -O3 -s CORRECT_SIGNS=1 --js-transform "python bundle.py" speak.bc -o speak.raw.js
 cat shell_pre.js > ../speakGenerator.js
 cat speak.raw.js >> ../speakGenerator.js
 cat shell_post.js >> ../speakGenerator.js