Introducing new data types and IPC messages for scripted JS speech recognition APIs (Speech CL2.0)

content/browser/speech/google_one_shot_remote_engine.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/speech/google_one_shot_remote_engine.h"
 
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/string_number_conversions.h"
@@ skipping 17 matching lines @@
 
 const char* const kDefaultSpeechRecognitionUrl =
     "https://www.google.com/speech-api/v1/recognize?xjerr=1&client=chromium&";
 const char* const kStatusString = "status";
 const char* const kHypothesesString = "hypotheses";
 const char* const kUtteranceString = "utterance";
 const char* const kConfidenceString = "confidence";
 const int kWebServiceStatusNoError = 0;
 const int kWebServiceStatusNoSpeech = 4;
 const int kWebServiceStatusNoMatch = 5;
-const int kDefaultConfigSampleRate = 8000;
-const int kDefaultConfigBitsPerSample = 16;
 const speech::AudioEncoder::Codec kDefaultAudioCodec =
     speech::AudioEncoder::CODEC_FLAC;
 // TODO(satish): Remove this hardcoded value once the page is allowed to
 // set this via an attribute.
 const int kMaxResults = 6;
 
 bool ParseServerResponse(const std::string& response_body,
                          SpeechRecognitionResult* result,
                          SpeechRecognitionError* error) {
   if (response_body.empty()) {
@@ skipping 99 matching lines @@
   return true;
 }
 
 }  // namespace
 
 namespace speech {
 
 const int GoogleOneShotRemoteEngine::kAudioPacketIntervalMs = 100;
 int GoogleOneShotRemoteEngine::url_fetcher_id_for_tests = 0;
 
-GoogleOneShotRemoteEngineConfig::GoogleOneShotRemoteEngineConfig()
-    : filter_profanities(false),
-      audio_sample_rate(kDefaultConfigSampleRate),
-      audio_num_bits_per_sample(kDefaultConfigBitsPerSample) {
-}
-
-GoogleOneShotRemoteEngineConfig::~GoogleOneShotRemoteEngineConfig() {}
-
 GoogleOneShotRemoteEngine::GoogleOneShotRemoteEngine(
     net::URLRequestContextGetter* context)
     : url_context_(context) {
 }
 
 GoogleOneShotRemoteEngine::~GoogleOneShotRemoteEngine() {}
 
 void GoogleOneShotRemoteEngine::SetConfig(
-    const GoogleOneShotRemoteEngineConfig& config) {
+    const SpeechRecognitionEngineConfig& config) {
   config_ = config;
 }
 
 void GoogleOneShotRemoteEngine::StartRecognition() {
   DCHECK(delegate());
   DCHECK(!url_fetcher_.get());
   std::string lang_param = config_.language;
 
   if (lang_param.empty() && url_context_) {
     // If no language is provided then we use the first from the accepted
     // language list. If this list is empty then it defaults to "en-US".
     // Example of the contents of this list: "es,en-GB;q=0.8", ""
     net::URLRequestContext* request_context =
         url_context_->GetURLRequestContext();
     DCHECK(request_context);
     std::string accepted_language_list = request_context->accept_language();
     size_t separator = accepted_language_list.find_first_of(",;");
     lang_param = accepted_language_list.substr(0, separator);
   }
 
   if (lang_param.empty())
     lang_param = "en-US";
 
   std::vector<std::string> parts;
   parts.push_back("lang=" + net::EscapeQueryParamValue(lang_param, true));
 
-  if (!config_.grammar.empty())
-    parts.push_back("lm=" + net::EscapeQueryParamValue(config_.grammar, true));
+  if (!config_.grammars.empty()) {
+    DCHECK_EQ(config_.grammars.size(), 1U);
+    parts.push_back("lm=" + net::EscapeQueryParamValue(config_.grammars[0].url,
+                                                       true));
+  }
 
   if (!config_.hardware_info.empty())
     parts.push_back("xhw=" + net::EscapeQueryParamValue(config_.hardware_info,
                                                         true));
   parts.push_back("maxresults=" + base::IntToString(kMaxResults));
   parts.push_back(config_.filter_profanities ? "pfilter=2" : "pfilter=0");
 
   GURL url(std::string(kDefaultSpeechRecognitionUrl) + JoinString(parts, '&'));
 
   encoder_.reset(AudioEncoder::Create(kDefaultAudioCodec,
@@ skipping 78 matching lines @@
 
 bool GoogleOneShotRemoteEngine::IsRecognitionPending() const {
   return url_fetcher_ != NULL;
 }
 
 int GoogleOneShotRemoteEngine::GetDesiredAudioChunkDurationMs() const {
   return kAudioPacketIntervalMs;
 }
 
 }  // namespace speech