Bug 1038061 - Allow specifying audio stream for speech recognition. r=smaug,ggp sr=smaug

content/media/webspeech/recognition/SpeechRecognition.cpp

@@ -584,19 +584,12 @@ SpeechRecognition::Observe(nsISupports* aSubject, const char* aTopic,
 void
 SpeechRecognition::ProcessTestEventRequest(nsISupports* aSubject, const nsAString& aEventName)
 {
-  if (aEventName.EqualsLiteral("EVENT_START")) {
+  if (aEventName.EqualsLiteral("EVENT_ABORT")) {
-    ErrorResult err;
-    Start(err);
-  } else if (aEventName.EqualsLiteral("EVENT_STOP")) {
-    Stop();
-  } else if (aEventName.EqualsLiteral("EVENT_ABORT")) {
     Abort();
   } else if (aEventName.EqualsLiteral("EVENT_AUDIO_ERROR")) {
     DispatchError(SpeechRecognition::EVENT_AUDIO_ERROR,
                   SpeechRecognitionErrorCode::Audio_capture, // TODO different codes?
                   NS_LITERAL_STRING("AUDIO_ERROR test event"));
-  } else if (aEventName.EqualsLiteral("EVENT_AUDIO_DATA")) {
-    StartRecording(static_cast<DOMMediaStream*>(aSubject));
   } else {
     NS_ASSERTION(mTestConfig.mFakeRecognitionService,
                  "Got request for fake recognition service event, but "
@@ -693,7 +686,7 @@ SpeechRecognition::SetServiceURI(const nsAString& aArg, ErrorResult& aRv)
 }
 
 void
-SpeechRecognition::Start(ErrorResult& aRv)
+SpeechRecognition::Start(const Optional<NonNull<DOMMediaStream>>& aStream, ErrorResult& aRv)
 {
   if (mCurrentState != STATE_IDLE) {
     aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
@@ -713,7 +706,9 @@ SpeechRecognition::Start(ErrorResult& aRv)
   MediaStreamConstraints constraints;
   constraints.mAudio.SetAsBoolean() = true;
 
-  if (!mTestConfig.mFakeFSMEvents) {
+  if (aStream.WasPassed()) {
+    StartRecording(&aStream.Value());
+  } else {
     MediaManager* manager = MediaManager::Get();
     manager->GetUserMedia(false,
                           GetOwner(),

content/media/webspeech/recognition/SpeechRecognition.h

@@ -96,7 +96,7 @@ public:
 
   void SetServiceURI(const nsAString& aArg, ErrorResult& aRv);
 
-  void Start(ErrorResult& aRv);
+  void Start(const Optional<NonNull<DOMMediaStream>>& aStream, ErrorResult& aRv);
 
   void Stop();
 

content/media/webspeech/recognition/test/head.js

@@ -90,6 +90,24 @@ function EventManager(sr) {
     }
   }
 
+  self.start = function EventManager_start() {
+    isSendingAudioData = true;
+    var audioTag = document.createElement("audio");
+    audioTag.src = self.audioSampleFile;
+
+    var stream = audioTag.mozCaptureStreamUntilEnded();
+    audioTag.addEventListener("ended", function() {
+      info("Sample stream ended, requesting queued events");
+      isSendingAudioData = false;
+      while (queuedEventRequests.length) {
+        self.requestFSMEvent(queuedEventRequests.shift());
+      }
+    });
+
+    audioTag.play();
+    sr.start(stream);
+  }
+
   self.requestFSMEvent = function EventManager_requestFSMEvent(eventName) {
     if (isSendingAudioData) {
       info("Queuing event " + eventName + " until we're done sending audio data");
@@ -97,27 +115,8 @@ function EventManager(sr) {
       return;
     }
 
-    var subject = null;
-
-    if (eventName === "EVENT_AUDIO_DATA") {
-      isSendingAudioData = true;
-      var audioTag = document.createElement("audio");
-      audioTag.src = self.audioSampleFile;
-
-      subject = audioTag.mozCaptureStreamUntilEnded();
-      audioTag.addEventListener("ended", function() {
-        info("Sample stream ended, requesting queued events");
-        isSendingAudioData = false;
-        while (queuedEventRequests.length) {
-          self.requestFSMEvent(queuedEventRequests.shift());
-        }
-      });
-
-      audioTag.play();
-    }
-
     info("requesting " + eventName);
-    Services.obs.notifyObservers(subject,
+    Services.obs.notifyObservers(null,
                                  SPEECH_RECOGNITION_TEST_REQUEST_EVENT_TOPIC,
                                  eventName);
   }
@@ -168,6 +167,8 @@ function performTest(options) {
       em.audioSampleFile = options.audioSampleFile;
     }
 
+    em.start();
+
     for (var i = 0; i < options.eventsToRequest.length; i++) {
       em.requestFSMEvent(options.eventsToRequest[i]);
     }

content/media/webspeech/recognition/test/test_abort.html

@@ -57,7 +57,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=650295
     nextEventIdx++;
 
     performTest({
-      eventsToRequest: ["EVENT_START", "EVENT_AUDIO_DATA"],
+      eventsToRequest: [],
       expectedEvents: expectedEvents,
       doneFunc: (nextEventIdx < eventsToAbortOn.length) ? doNextTest : SimpleTest.finish,
       prefs: [["media.webspeech.test.fake_fsm_events", true], ["media.webspeech.test.fake_recognition_service", true]]

content/media/webspeech/recognition/test/test_audio_capture_error.html

@@ -21,7 +21,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=650295
   SimpleTest.waitForExplicitFinish();
 
   performTest({
-    eventsToRequest: ['EVENT_START', 'EVENT_AUDIO_ERROR'],
+    eventsToRequest: ['EVENT_AUDIO_ERROR'],
     expectedEvents: {
       'error': buildErrorCallback(errorCodes.AUDIO_CAPTURE),
       'end': null

content/media/webspeech/recognition/test/test_call_start_from_end_handler.html

@@ -20,9 +20,19 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=650295
 <script type="text/javascript">
   SimpleTest.waitForExplicitFinish();
 
+  function createAudioStream() {
+    var audioTag = document.createElement("audio");
+    audioTag.src = DEFAULT_AUDIO_SAMPLE_FILE;
+
+    var stream = audioTag.mozCaptureStreamUntilEnded();
+    audioTag.play();
+
+    return stream;
+  }
+
   function endHandler(evt, sr) {
     try {
-      sr.start(); // shouldn't fail
+      sr.start(createAudioStream()); // shouldn't fail
     } catch (err) {
       ok(false, "Failed to start() from end() callback");
     }
@@ -32,7 +42,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=650295
 
   function expectExceptionHandler(evt, sr) {
     try {
-      sr.start();
+      sr.start(createAudioStream());
     } catch (err) {
       is(err.name, "InvalidStateError");
       return;
@@ -43,8 +53,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=650295
 
   performTest({
     eventsToRequest: [
-      'EVENT_START',
-      'EVENT_AUDIO_DATA',
       'EVENT_RECOGNITIONSERVICE_FINAL_RESULT'
     ],
     expectedEvents: {

content/media/webspeech/recognition/test/test_nested_eventloop.html

@@ -66,10 +66,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=650295
    */
 
   performTest({
-    eventsToRequest: [
+    eventsToRequest: [],
-      "EVENT_START",
-      "EVENT_AUDIO_DATA",
-    ],
     expectedEvents: {
       "audiostart": abortAndSpinEventLoop,
       "audioend": abortAndSpinEventLoop,

content/media/webspeech/recognition/test/test_recognition_service_error.html

@@ -22,8 +22,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=650295
 
   performTest({
     eventsToRequest: [
-      'EVENT_START',
-      'EVENT_AUDIO_DATA',
       'EVENT_RECOGNITIONSERVICE_ERROR'
     ],
     expectedEvents: {

content/media/webspeech/recognition/test/test_success_without_recognition_service.html

@@ -22,8 +22,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=650295
 
   performTest({
     eventsToRequest: [
-      'EVENT_START',
-      'EVENT_AUDIO_DATA',
       'EVENT_RECOGNITIONSERVICE_FINAL_RESULT'
     ],
     expectedEvents: {

content/media/webspeech/recognition/test/test_timeout.html

@@ -21,10 +21,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=650295
   SimpleTest.waitForExplicitFinish();
 
   performTest({
-    eventsToRequest: [
+    eventsToRequest: [],
-      "EVENT_START",
-      "EVENT_AUDIO_DATA"
-    ],
     expectedEvents: {
       "start": null,
       "audiostart": null,

dom/webidl/SpeechRecognition.webidl

@@ -29,7 +29,7 @@ interface SpeechRecognition : EventTarget {
 
     // methods to drive the speech interaction
     [Throws]
-    void start();
+    void start(optional MediaStream stream);
     void stop();
     void abort();