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

Side by Side Diff: content/browser/speech/speech_recognition_engine.h

Issue 10233010: Introducing new data types and IPC messages for scripted JS speech recognition APIs (Speech CL2.0) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added CONTENT_EXPORT to SpeechRecognitionEngine::Config Created 8 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_ENGINE_H_ 5 #ifndef CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_ENGINE_H_
6 #define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_ENGINE_H_ 6 #define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_ENGINE_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector>
11 10
12 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "content/common/content_export.h"
13 #include "content/public/common/speech_recognition_grammar.h"
13 14
14 namespace content { 15 namespace content {
15 struct SpeechRecognitionResult; 16 struct SpeechRecognitionResult;
16 struct SpeechRecognitionError; 17 struct SpeechRecognitionError;
17 } 18 }
18 19
19 namespace speech { 20 namespace speech {
20 21
21 class AudioChunk; 22 class AudioChunk;
22 23
23 // This interface models the basic contract that a speech recognition engine, 24 // This interface models the basic contract that a speech recognition engine,
24 // either working locally or relying on a remote web-service, must obey. 25 // either working locally or relying on a remote web-service, must obey.
25 // The expected call sequence for exported methods is: 26 // The expected call sequence for exported methods is:
26 // StartRecognition Mandatory at beginning of SR. 27 // StartRecognition Mandatory at beginning of SR.
27 // TakeAudioChunk For every audio chunk pushed. 28 // TakeAudioChunk For every audio chunk pushed.
28 // AudioChunksEnded Finalize the audio stream (omitted in case of errors). 29 // AudioChunksEnded Finalize the audio stream (omitted in case of errors).
29 // EndRecognition Mandatory at end of SR (even on errors). 30 // EndRecognition Mandatory at end of SR (even on errors).
30 // No delegate callback is allowed before Initialize() or after Cleanup(). 31 // No delegate callbacks are allowed before StartRecognition or after
32 // EndRecognition. If a recognition was started, the caller can free the
33 // SpeechRecognitionEngine only after calling EndRecognition.
31 class SpeechRecognitionEngine { 34 class SpeechRecognitionEngine {
32 public: 35 public:
33 // Interface for receiving callbacks from this object. 36 // Interface for receiving callbacks from this object.
34 class Delegate { 37 class Delegate {
35 public: 38 public:
36 // Called whenever a result is retrieved. It might be issued several times, 39 // Called whenever a result is retrieved. It might be issued several times,
37 // (e.g., in the case of continuous speech recognition engine 40 // (e.g., in the case of continuous speech recognition engine
38 // implementations). 41 // implementations).
39 virtual void OnSpeechRecognitionEngineResult( 42 virtual void OnSpeechRecognitionEngineResult(
40 const content::SpeechRecognitionResult& result) = 0; 43 const content::SpeechRecognitionResult& result) = 0;
41 virtual void OnSpeechRecognitionEngineError( 44 virtual void OnSpeechRecognitionEngineError(
42 const content::SpeechRecognitionError& error) = 0; 45 const content::SpeechRecognitionError& error) = 0;
43 46
44 protected: 47 protected:
45 virtual ~Delegate() {} 48 virtual ~Delegate() {}
46 }; 49 };
47 50
51 // Remote engine configuration.
52 struct CONTENT_EXPORT Config {
53 Config();
54 ~Config();
55
56 std::string language;
57 content::SpeechRecognitionGrammarArray grammars;
58 bool filter_profanities;
59 std::string hardware_info;
60 std::string origin_url;
61 int audio_sample_rate;
62 int audio_num_bits_per_sample;
63 };
64
48 virtual ~SpeechRecognitionEngine() {} 65 virtual ~SpeechRecognitionEngine() {}
49 66
67 // Set/change the recognition engine configuration. It is not allowed to call
68 // this function while a recognition is ongoing.
69 virtual void SetConfig(const Config& config) = 0;
70
50 // Called when the speech recognition begins, before any TakeAudioChunk call. 71 // Called when the speech recognition begins, before any TakeAudioChunk call.
51 virtual void StartRecognition() = 0; 72 virtual void StartRecognition() = 0;
52 73
53 // End any recognition activity and don't make any further callback. 74 // End any recognition activity and don't make any further callback.
54 // Must be always called to close the corresponding StartRecognition call, 75 // Must be always called to close the corresponding StartRecognition call,
55 // even in case of errors. 76 // even in case of errors.
56 // No further TakeAudioChunk/AudioChunksEnded calls are allowed after this. 77 // No further TakeAudioChunk/AudioChunksEnded calls are allowed after this.
57 virtual void EndRecognition() = 0; 78 virtual void EndRecognition() = 0;
58 79
59 // Push a chunk of uncompressed audio data, where the chunk length agrees with 80 // Push a chunk of uncompressed audio data, where the chunk length agrees with
(...skipping 14 matching lines...) Expand all
74 // set_delegate detached from constructor for lazy dependency injection. 95 // set_delegate detached from constructor for lazy dependency injection.
75 void set_delegate(Delegate* delegate) { delegate_ = delegate; } 96 void set_delegate(Delegate* delegate) { delegate_ = delegate; }
76 97
77 protected: 98 protected:
78 Delegate* delegate() const { return delegate_; } 99 Delegate* delegate() const { return delegate_; }
79 100
80 private: 101 private:
81 Delegate* delegate_; 102 Delegate* delegate_;
82 }; 103 };
83 104
84 // This typedef is to workaround the issue with certain versions of 105 // These typedefs are to workaround the issue with certain versions of
85 // Visual Studio where it gets confused between multiple Delegate 106 // Visual Studio where it gets confused between multiple Delegate
86 // classes and gives a C2500 error. (I saw this error on the try bots - 107 // classes and gives a C2500 error.
87 // the workaround was not needed for my machine).
88 typedef SpeechRecognitionEngine::Delegate SpeechRecognitionEngineDelegate; 108 typedef SpeechRecognitionEngine::Delegate SpeechRecognitionEngineDelegate;
109 typedef SpeechRecognitionEngine::Config SpeechRecognitionEngineConfig;
89 110
90 } // namespace speech 111 } // namespace speech
91 112
92 #endif // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_ENGINE_H_ 113 #endif // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_ENGINE_H_
OLDNEW
« no previous file with comments | « content/browser/speech/speech_recognition_browsertest.cc ('k') | content/browser/speech/speech_recognition_engine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698