Some experimentation yields promising results...

Zach Fox committed 8 years ago

Commit 26e388b1 parent 79f30eb5 files · +769 −736Browse files

Showing the changes to interface/src/scripting (2 of 5 files). Show all

Unified · Split

2 files

interface/src/scripting/TTSScriptingInterface.cpp +12 −5
interface/src/scripting/TTSScriptingInterface.h +9 −2

interface/src/scripting/TTSScriptingInterface.cpp+12−5

         int16_t temp = (glm::sin(glm::radians((float)a))) * 32768;
         samples[a] = temp;
     }
-    emit ttsSampleCreated(_lastSoundByteArray);
+    emit ttsSampleCreated(_lastSoundByteArray, AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL * 50, 96);
     if (alsoInject) {
         AudioInjectorOptions options;
     }
 }
-void TTSScriptingInterface::speakText(const QString& textToSpeak, const bool& alsoInject) {
+void TTSScriptingInterface::speakText(const QString& textToSpeak,
+                                      const int& newChunkSize,
+                                      const int& timerInterval,
+                                      const int& sampleRate,
+                                      const int& bitsPerSample,
+                                      const bool& alsoInject) {
     WAVEFORMATEX fmt;
     fmt.wFormatTag = WAVE_FORMAT_PCM;
-    fmt.nSamplesPerSec = 24000;
+    fmt.nSamplesPerSec = sampleRate;
-    fmt.wBitsPerSample = 16;
+    fmt.wBitsPerSample = bitsPerSample;
     fmt.nChannels = 1;
     fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8;
     fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign;
     _lastSoundByteArray.resize(0);
     _lastSoundByteArray.append(buf1, dwSize);
-    emit ttsSampleCreated(_lastSoundByteArray);
+    emit ttsSampleCreated(_lastSoundByteArray, newChunkSize, timerInterval);
     if (alsoInject) {
         AudioInjectorOptions options;
     if (_lastSoundAudioInjector) {
         _lastSoundAudioInjector->stop();
     }
+    emit clearTTSBuffer();
 }

interface/src/scripting/TTSScriptingInterface.h+9−2

 #include <sapi.h>      // SAPI
 #include <sphelper.h>  // SAPI Helper
 #include <AudioInjector.h>
+#include <AudioConstants.h>
 class TTSScriptingInterface : public QObject, public Dependency {
     Q_OBJECT
     ~TTSScriptingInterface();
     Q_INVOKABLE void testTone(const bool& alsoInject = false);
-    Q_INVOKABLE void speakText(const QString& textToSpeak, const bool& alsoInject = false);
+    Q_INVOKABLE void speakText(const QString& textToSpeak,
+                               const int& newChunkSize = (AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL * 50),
+                               const int& timerInterval = 96,
+                               const int& sampleRate = 24000,
+                               const int& bitsPerSample = 16,
+                               const bool& alsoInject = false);
     Q_INVOKABLE void stopLastSpeech();
 signals:
-    void ttsSampleCreated(QByteArray outputArray);
+    void ttsSampleCreated(QByteArray outputArray, const int& newChunkSize, const int& timerInterval);
+    void clearTTSBuffer();
 private:
     class CComAutoInit {