summaryrefslogtreecommitdiffstats
path: root/content/browser/speech/endpointer
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser/speech/endpointer')
-rw-r--r--content/browser/speech/endpointer/endpointer.cc4
-rw-r--r--content/browser/speech/endpointer/endpointer.h6
-rw-r--r--content/browser/speech/endpointer/endpointer_unittest.cc6
-rw-r--r--content/browser/speech/endpointer/energy_endpointer.cc4
-rw-r--r--content/browser/speech/endpointer/energy_endpointer.h6
-rw-r--r--content/browser/speech/endpointer/energy_endpointer_params.cc6
-rw-r--r--content/browser/speech/endpointer/energy_endpointer_params.h6
7 files changed, 19 insertions, 19 deletions
diff --git a/content/browser/speech/endpointer/endpointer.cc b/content/browser/speech/endpointer/endpointer.cc
index 69c79a6..fe3e0bf 100644
--- a/content/browser/speech/endpointer/endpointer.cc
+++ b/content/browser/speech/endpointer/endpointer.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
@@ -12,7 +12,7 @@ namespace {
static const int kFrameRate = 50; // 1 frame = 20ms of audio.
}
-namespace speech_input {
+namespace speech {
Endpointer::Endpointer(int sample_rate)
: speech_input_possibly_complete_silence_length_us_(-1),
diff --git a/content/browser/speech/endpointer/endpointer.h b/content/browser/speech/endpointer/endpointer.h
index 2d74839..9ba2018 100644
--- a/content/browser/speech/endpointer/endpointer.h
+++ b/content/browser/speech/endpointer/endpointer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -11,7 +11,7 @@
class EpStatus;
-namespace speech_input {
+namespace speech {
// A simple interface to the underlying energy-endpointer implementation, this
// class lets callers provide audio as being recorded and let them poll to find
@@ -147,6 +147,6 @@ class CONTENT_EXPORT Endpointer {
int32 frame_size_;
};
-} // namespace speech_input
+} // namespace speech
#endif // CONTENT_BROWSER_SPEECH_ENDPOINTER_ENDPOINTER_H_
diff --git a/content/browser/speech/endpointer/endpointer_unittest.cc b/content/browser/speech/endpointer/endpointer_unittest.cc
index b71c01a..240e5dc 100644
--- a/content/browser/speech/endpointer/endpointer_unittest.cc
+++ b/content/browser/speech/endpointer/endpointer_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
@@ -15,7 +15,7 @@ const int kFrameSize = kSampleRate / kFrameRate; // 160 samples.
COMPILE_ASSERT(kFrameSize == 160, invalid_frame_size);
}
-namespace speech_input {
+namespace speech {
class FrameProcessor {
public:
@@ -142,4 +142,4 @@ TEST(EndpointerTest, TestEmbeddedEndpointerEvents) {
endpointer.EndSession();
}
-} // namespace speech_input
+} // namespace speech
diff --git a/content/browser/speech/endpointer/energy_endpointer.cc b/content/browser/speech/endpointer/energy_endpointer.cc
index 39cf617..b88d7a3 100644
--- a/content/browser/speech/endpointer/energy_endpointer.cc
+++ b/content/browser/speech/endpointer/energy_endpointer.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
//
@@ -41,7 +41,7 @@ float GetDecibel(float value) {
} // namespace
-namespace speech_input {
+namespace speech {
// Stores threshold-crossing histories for making decisions about the speech
// state.
diff --git a/content/browser/speech/endpointer/energy_endpointer.h b/content/browser/speech/endpointer/energy_endpointer.h
index b440c4d..9db927a 100644
--- a/content/browser/speech/endpointer/energy_endpointer.h
+++ b/content/browser/speech/endpointer/energy_endpointer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -44,7 +44,7 @@
#include "content/browser/speech/endpointer/energy_endpointer_params.h"
#include "content/common/content_export.h"
-namespace speech_input {
+namespace speech {
// Endpointer status codes
enum EpStatus {
@@ -150,6 +150,6 @@ class CONTENT_EXPORT EnergyEndpointer {
DISALLOW_COPY_AND_ASSIGN(EnergyEndpointer);
};
-} // namespace speech_input
+} // namespace speech
#endif // CONTENT_BROWSER_SPEECH_ENDPOINTER_ENERGY_ENDPOINTER_H_
diff --git a/content/browser/speech/endpointer/energy_endpointer_params.cc b/content/browser/speech/endpointer/energy_endpointer_params.cc
index e110b24..89852f1 100644
--- a/content/browser/speech/endpointer/energy_endpointer_params.cc
+++ b/content/browser/speech/endpointer/energy_endpointer_params.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/energy_endpointer_params.h"
-namespace speech_input {
+namespace speech {
EnergyEndpointerParams::EnergyEndpointerParams() {
SetDefaults();
@@ -50,4 +50,4 @@ void EnergyEndpointerParams::operator=(const EnergyEndpointerParams& source) {
contamination_rejection_period_ = source.contamination_rejection_period();
}
-} // namespace speech_input
+} // namespace speech
diff --git a/content/browser/speech/endpointer/energy_endpointer_params.h b/content/browser/speech/endpointer/energy_endpointer_params.h
index 5a3ea42..9641d9d 100644
--- a/content/browser/speech/endpointer/energy_endpointer_params.h
+++ b/content/browser/speech/endpointer/energy_endpointer_params.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -8,7 +8,7 @@
#include "base/basictypes.h"
#include "content/common/content_export.h"
-namespace speech_input {
+namespace speech {
// Input parameters for the EnergyEndpointer class.
class CONTENT_EXPORT EnergyEndpointerParams {
@@ -133,6 +133,6 @@ class CONTENT_EXPORT EnergyEndpointerParams {
float contamination_rejection_period_;
};
-} // namespace speech_input
+} // namespace speech
#endif // CONTENT_BROWSER_SPEECH_ENDPOINTER_ENERGY_ENDPOINTER_PARAMS_H_