Snapshot of all changes to get jumbo in blink and content.

content/browser/speech/endpointer/endpointer.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/endpointer/endpointer.h"
 
 #include "base/time/time.h"
 #include "content/browser/speech/audio_buffer.h"
 
-using base::Time;
+//using base::Time; // Collides with typedef Time in X11
 
 namespace {
 const int kFrameRate = 50;  // 1 frame = 20ms of audio.
 }
 
 namespace content {
 
 Endpointer::Endpointer(int sample_rate)
     : speech_input_possibly_complete_silence_length_us_(-1),
       speech_input_complete_silence_length_us_(-1),
       audio_frame_time_us_(0),
       sample_rate_(sample_rate),
       frame_size_(0) {
   Reset();
 
   frame_size_ = static_cast<int>(sample_rate / static_cast<float>(kFrameRate));
 
   speech_input_minimum_length_us_ =
-      static_cast<int64_t>(1.7 * Time::kMicrosecondsPerSecond);
+    static_cast<int64_t>(1.7 * base::Time::kMicrosecondsPerSecond);
   speech_input_complete_silence_length_us_ =
-      static_cast<int64_t>(0.5 * Time::kMicrosecondsPerSecond);
+    static_cast<int64_t>(0.5 * base::Time::kMicrosecondsPerSecond);
   long_speech_input_complete_silence_length_us_ = -1;
   long_speech_length_us_ = -1;
   speech_input_possibly_complete_silence_length_us_ =
-      1 * Time::kMicrosecondsPerSecond;
+    1 * base::Time::kMicrosecondsPerSecond;
 
   // Set the default configuration for Push To Talk mode.
   EnergyEndpointerParams ep_config;
   ep_config.set_frame_period(1.0f / static_cast<float>(kFrameRate));
   ep_config.set_frame_duration(1.0f / static_cast<float>(kFrameRate));
   ep_config.set_endpoint_margin(0.2f);
   ep_config.set_onset_window(0.15f);
   ep_config.set_speech_on_window(0.4f);
   ep_config.set_offset_window(0.15f);
   ep_config.set_onset_detect_dur(0.09f);
@@ skipping 52 matching lines @@
   // frames at the end (which is ok since typically the caller will be recording
   // audio in multiples of our frame size).
   int sample_index = 0;
   while (sample_index + frame_size_ <= num_samples) {
     // Have the endpointer process the frame.
     energy_endpointer_.ProcessAudioFrame(audio_frame_time_us_,
                                          audio_data + sample_index,
                                          frame_size_,
                                          rms_out);
     sample_index += frame_size_;
-    audio_frame_time_us_ += (frame_size_ * Time::kMicrosecondsPerSecond) /
+    audio_frame_time_us_ += (frame_size_ * base::Time::kMicrosecondsPerSecond) /
                          sample_rate_;
 
     // Get the status of the endpointer.
     int64_t ep_time;
     ep_status = energy_endpointer_.Status(&ep_time);
 
     // Handle state changes.
     if ((EP_SPEECH_PRESENT == ep_status) &&
         (EP_POSSIBLE_ONSET == old_ep_status_)) {
       speech_end_time_us_ = -1;
@@ skipping 41 matching lines @@
           speech_input_complete_ = true;
         }
       }
     }
     old_ep_status_ = ep_status;
   }
   return ep_status;
 }
 
 }  // namespace content