Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(740)

Side by Side Diff: Source/modules/speech/SpeechRecognitionController.h

Issue 448163003: Support for providing media stream audio track to speech recognition (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove attach/detach - using overloaded start Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * * Redistributions of source code must retain the above copyright 7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright 9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef SpeechRecognitionController_h 26 #ifndef SpeechRecognitionController_h
27 #define SpeechRecognitionController_h 27 #define SpeechRecognitionController_h
28 28
29 #include "core/page/Page.h" 29 #include "core/page/Page.h"
30 #include "modules/mediastream/MediaStreamTrack.h"
30 #include "modules/speech/SpeechRecognitionClient.h" 31 #include "modules/speech/SpeechRecognitionClient.h"
31 #include "wtf/PassOwnPtr.h" 32 #include "wtf/PassOwnPtr.h"
32 33
33 namespace blink { 34 namespace blink {
34 35
35 class SpeechRecognitionController FINAL : public NoBaseWillBeGarbageCollectedFin alized<SpeechRecognitionController>, public WillBeHeapSupplement<Page> { 36 class SpeechRecognitionController FINAL : public NoBaseWillBeGarbageCollectedFin alized<SpeechRecognitionController>, public WillBeHeapSupplement<Page> {
36 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(SpeechRecognitionController); 37 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(SpeechRecognitionController);
37 public: 38 public:
38 virtual ~SpeechRecognitionController(); 39 virtual ~SpeechRecognitionController();
39 40
40 void start(SpeechRecognition* recognition, const SpeechGrammarList* grammars , const String& lang, bool continuous, bool interimResults, unsigned long maxAlt ernatives) 41 void start(SpeechRecognition* recognition, const SpeechGrammarList* grammars , const String& lang, bool continuous, bool interimResults, unsigned long maxAlt ernatives, MediaStreamTrack* audioTrack)
Mike West 2014/09/17 10:20:27 Hrm. The various '::start()' methods are getting a
burnik 2014/09/17 11:17:20 Could you take a look at the previous patchset? I'
Mike West 2014/09/17 11:30:46 I like this approach more than the separate attach
41 { 42 {
42 m_client->start(recognition, grammars, lang, continuous, interimResults, maxAlternatives); 43 m_client->start(recognition, grammars, lang, continuous, interimResults, maxAlternatives, audioTrack);
43 } 44 }
44 45
45 void stop(SpeechRecognition* recognition) { m_client->stop(recognition); } 46 void stop(SpeechRecognition* recognition) { m_client->stop(recognition); }
46 void abort(SpeechRecognition* recognition) { m_client->abort(recognition); } 47 void abort(SpeechRecognition* recognition) { m_client->abort(recognition); }
47 48
48 static PassOwnPtrWillBeRawPtr<SpeechRecognitionController> create(PassOwnPtr <SpeechRecognitionClient>); 49 static PassOwnPtrWillBeRawPtr<SpeechRecognitionController> create(PassOwnPtr <SpeechRecognitionClient>);
49 static const char* supplementName(); 50 static const char* supplementName();
50 static SpeechRecognitionController* from(Page* page) { return static_cast<Sp eechRecognitionController*>(WillBeHeapSupplement<Page>::from(page, supplementNam e())); } 51 static SpeechRecognitionController* from(Page* page) { return static_cast<Sp eechRecognitionController*>(WillBeHeapSupplement<Page>::from(page, supplementNam e())); }
51 52
52 virtual void trace(Visitor* visitor) OVERRIDE { WillBeHeapSupplement<Page>:: trace(visitor); } 53 virtual void trace(Visitor* visitor) OVERRIDE { WillBeHeapSupplement<Page>:: trace(visitor); }
53 54
54 private: 55 private:
55 explicit SpeechRecognitionController(PassOwnPtr<SpeechRecognitionClient>); 56 explicit SpeechRecognitionController(PassOwnPtr<SpeechRecognitionClient>);
56 57
57 OwnPtr<SpeechRecognitionClient> m_client; 58 OwnPtr<SpeechRecognitionClient> m_client;
58 }; 59 };
59 60
60 } // namespace blink 61 } // namespace blink
61 62
62 #endif // SpeechRecognitionController_h 63 #endif // SpeechRecognitionController_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698