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

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: Fixed according to Satish review. 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/public/common/speech_recognition_grammar.h"
13 13
14 namespace content { 14 namespace content {
15 struct SpeechRecognitionResult; 15 struct SpeechRecognitionResult;
16 struct SpeechRecognitionError; 16 struct SpeechRecognitionError;
17 } 17 }
18 18
19 namespace speech { 19 namespace speech {
20 20
21 class AudioChunk; 21 class AudioChunk;
22 22
23 // This interface models the basic contract that a speech recognition engine, 23 // This interface models the basic contract that a speech recognition engine,
24 // either working locally or relying on a remote web-service, must obey. 24 // either working locally or relying on a remote web-service, must obey.
25 // The expected call sequence for exported methods is: 25 // The expected call sequence for exported methods is:
26 // StartRecognition Mandatory at beginning of SR. 26 // StartRecognition Mandatory at beginning of SR.
27 // TakeAudioChunk For every audio chunk pushed. 27 // TakeAudioChunk For every audio chunk pushed.
28 // AudioChunksEnded Finalize the audio stream (omitted in case of errors). 28 // AudioChunksEnded Finalize the audio stream (omitted in case of errors).
29 // EndRecognition Mandatory at end of SR (even on errors). 29 // EndRecognition Mandatory at end of SR (even on errors).
30 // No delegate callback is allowed before Initialize() or after Cleanup(). 30 // No delegate callbacks are allowed before StartRecognition or after
31 // EndRecognition. If a recognition was started, the caller can free the
32 // SpeechRecognitionEngine only after calling EndRecognition.
31 class SpeechRecognitionEngine { 33 class SpeechRecognitionEngine {
32 public: 34 public:
33 // Interface for receiving callbacks from this object. 35 // Interface for receiving callbacks from this object.
34 class Delegate { 36 class Delegate {
35 public: 37 public:
36 // Called whenever a result is retrieved. It might be issued several times, 38 // Called whenever a result is retrieved. It might be issued several times,
37 // (e.g., in the case of continuous speech recognition engine 39 // (e.g., in the case of continuous speech recognition engine
38 // implementations). 40 // implementations).
39 virtual void OnSpeechRecognitionEngineResult( 41 virtual void OnSpeechRecognitionEngineResult(
40 const content::SpeechRecognitionResult& result) = 0; 42 const content::SpeechRecognitionResult& result) = 0;
41 virtual void OnSpeechRecognitionEngineError( 43 virtual void OnSpeechRecognitionEngineError(
42 const content::SpeechRecognitionError& error) = 0; 44 const content::SpeechRecognitionError& error) = 0;
43 45
44 protected: 46 protected:
45 virtual ~Delegate() {} 47 virtual ~Delegate() {}
46 }; 48 };
47 49
50 // Remove engine configuration.
51 struct Config {
52 Config();
53 ~Config();
54
55 std::string language;
56 content::SpeechRecognitionGrammarArray grammars;
57 bool filter_profanities;
58 std::string hardware_info;
59 std::string origin_url;
60 int audio_sample_rate;
61 int audio_num_bits_per_sample;
62 };
63
48 virtual ~SpeechRecognitionEngine() {} 64 virtual ~SpeechRecognitionEngine() {}
49 65
66 // Set/change the recognition engine configuration. It is not allowed to call
67 // this function while a recognition is ongoing.
68 virtual void SetConfig(const Config& config) = 0;
69
50 // Called when the speech recognition begins, before any TakeAudioChunk call. 70 // Called when the speech recognition begins, before any TakeAudioChunk call.
51 virtual void StartRecognition() = 0; 71 virtual void StartRecognition() = 0;
52 72
53 // End any recognition activity and don't make any further callback. 73 // End any recognition activity and don't make any further callback.
54 // Must be always called to close the corresponding StartRecognition call, 74 // Must be always called to close the corresponding StartRecognition call,
55 // even in case of errors. 75 // even in case of errors.
56 // No further TakeAudioChunk/AudioChunksEnded calls are allowed after this. 76 // No further TakeAudioChunk/AudioChunksEnded calls are allowed after this.
57 virtual void EndRecognition() = 0; 77 virtual void EndRecognition() = 0;
58 78
59 // Push a chunk of uncompressed audio data, where the chunk length agrees with 79 // 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. 94 // set_delegate detached from constructor for lazy dependency injection.
75 void set_delegate(Delegate* delegate) { delegate_ = delegate; } 95 void set_delegate(Delegate* delegate) { delegate_ = delegate; }
76 96
77 protected: 97 protected:
78 Delegate* delegate() const { return delegate_; } 98 Delegate* delegate() const { return delegate_; }
79 99
80 private: 100 private:
81 Delegate* delegate_; 101 Delegate* delegate_;
82 }; 102 };
83 103
84 // This typedef is to workaround the issue with certain versions of 104 // These typedefs are to workaround the issue with certain versions of
85 // Visual Studio where it gets confused between multiple Delegate 105 // Visual Studio where it gets confused between multiple Delegate
86 // classes and gives a C2500 error. (I saw this error on the try bots - 106 // classes and gives a C2500 error.
87 // the workaround was not needed for my machine).
88 typedef SpeechRecognitionEngine::Delegate SpeechRecognitionEngineDelegate; 107 typedef SpeechRecognitionEngine::Delegate SpeechRecognitionEngineDelegate;
108 typedef SpeechRecognitionEngine::Config SpeechRecognitionEngineConfig;
89 109
90 } // namespace speech 110 } // namespace speech
91 111
92 #endif // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_ENGINE_H_ 112 #endif // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_ENGINE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698