Switch to standard integer types in content/browser/.

content/browser/speech/endpointer/energy_endpointer.h

 // 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.
 
 // The EnergyEndpointer class finds likely speech onset and offset points.
 //
 // The implementation described here is about the simplest possible.
 // It is based on timings of threshold crossings for overall signal
 // RMS. It is suitable for light weight applications.
 //
@@ skipping 19 matching lines @@
 // EnvironmentEstimation mode, for at least 200ms, before switching to
 // UserInputMode.
 // Audio feedback contamination can appear in the input audio, if not cut
 // out or handled by echo cancellation. Audio feedback can trigger a false
 // accept. The false accepts can be ignored by setting
 // ep_contamination_rejection_period.
 
 #ifndef CONTENT_BROWSER_SPEECH_ENDPOINTER_ENERGY_ENDPOINTER_H_
 #define CONTENT_BROWSER_SPEECH_ENDPOINTER_ENERGY_ENDPOINTER_H_
 
+#include <stdint.h>
+
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/speech/endpointer/energy_endpointer_params.h"
 #include "content/common/content_export.h"
 
 namespace content {
 
 // Endpointer status codes
 enum EpStatus {
   EP_PRE_SPEECH = 10,
   EP_POSSIBLE_ONSET,
@@ skipping 20 matching lines @@
   // Start environment estimation. Audio will be used for environment estimation
   // i.e. noise level estimation.
   void SetEnvironmentEstimationMode();
 
   // Start user input. This should be called when the user indicates start of
   // input, e.g. by pressing a button.
   void SetUserInputMode();
 
   // Computes the next input frame and modifies EnergyEndpointer status as
   // appropriate based on the computation.
-  void ProcessAudioFrame(int64 time_us,
-                         const int16* samples, int num_samples,
+  void ProcessAudioFrame(int64_t time_us,
+                         const int16_t* samples,
+                         int num_samples,
                          float* rms_out);
 
   // Returns the current state of the EnergyEndpointer and the time
   // corresponding to the most recently computed frame.
-  EpStatus Status(int64* status_time_us) const;
+  EpStatus Status(int64_t* status_time_us) const;
 
   bool estimating_environment() const {
     return estimating_environment_;
   }
 
   // Returns estimated noise level in dB.
   float GetNoiseLevelDb() const;
 
  private:
   class HistoryRing;
 
   // Resets the endpointer internal state.  If reset_threshold is true, the
   // state will be reset completely, including adaptive thresholds and the
   // removal of all history information.
   void Restart(bool reset_threshold);
 
   // Update internal speech and noise levels.
   void UpdateLevels(float rms);
 
   // Returns the number of frames (or frame number) corresponding to
   // the 'time' (in seconds).
   int TimeToFrame(float time) const;
 
   EpStatus status_;  // The current state of this instance.
   float offset_confirm_dur_sec_;  // max on time allowed to confirm POST_SPEECH
-  int64 endpointer_time_us_;  // Time of the most recently received audio frame.
-  int64 fast_update_frames_; // Number of frames for initial level adaptation.
-  int64 frame_counter_;  // Number of frames seen. Used for initial adaptation.
+  int64_t
+      endpointer_time_us_;  // Time of the most recently received audio frame.
+  int64_t
+      fast_update_frames_;  // Number of frames for initial level adaptation.
+  int64_t
+      frame_counter_;     // Number of frames seen. Used for initial adaptation.
   float max_window_dur_;  // Largest search window size (seconds)
   float sample_rate_;  // Sampling rate.
 
   // Ring buffers to hold the speech activity history.
   scoped_ptr<HistoryRing> history_;
 
   // Configuration parameters.
   EnergyEndpointerParams params_;
 
   // RMS which must be exceeded to conclude frame is speech.
@@ skipping 10 matching lines @@
   float rms_adapt_;
 
   // Start lag corresponds to the highest fundamental frequency.
   int start_lag_;
 
   // End lag corresponds to the lowest fundamental frequency.
   int end_lag_;
 
   // Time when mode switched from environment estimation to user input. This
   // is used to time forced rejection of audio feedback contamination.
-  int64 user_input_start_time_us_;
+  int64_t user_input_start_time_us_;
 
   DISALLOW_COPY_AND_ASSIGN(EnergyEndpointer);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SPEECH_ENDPOINTER_ENERGY_ENDPOINTER_H_