diff options
Diffstat (limited to 'webrtc/modules/audio_processing/vad')
6 files changed, 12 insertions, 9 deletions
diff --git a/webrtc/modules/audio_processing/vad/pitch_based_vad.cc b/webrtc/modules/audio_processing/vad/pitch_based_vad.cc index 39ec37e6ec..fce144de6b 100644 --- a/webrtc/modules/audio_processing/vad/pitch_based_vad.cc +++ b/webrtc/modules/audio_processing/vad/pitch_based_vad.cc @@ -18,7 +18,7 @@ #include "webrtc/modules/audio_processing/vad/common.h" #include "webrtc/modules/audio_processing/vad/noise_gmm_tables.h" #include "webrtc/modules/audio_processing/vad/voice_gmm_tables.h" -#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/include/module_common_types.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/vad/standalone_vad.cc b/webrtc/modules/audio_processing/vad/standalone_vad.cc index 468b8ff3f0..1209526a92 100644 --- a/webrtc/modules/audio_processing/vad/standalone_vad.cc +++ b/webrtc/modules/audio_processing/vad/standalone_vad.cc @@ -12,8 +12,8 @@ #include <assert.h> -#include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/modules/utility/interface/audio_frame_operations.h" +#include "webrtc/modules/include/module_common_types.h" +#include "webrtc/modules/utility/include/audio_frame_operations.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/vad/standalone_vad_unittest.cc b/webrtc/modules/audio_processing/vad/standalone_vad_unittest.cc index 942008e733..1d1dcc7066 100644 --- a/webrtc/modules/audio_processing/vad/standalone_vad_unittest.cc +++ b/webrtc/modules/audio_processing/vad/standalone_vad_unittest.cc @@ -14,9 +14,8 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/include/module_common_types.h" #include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/test/testsupport/gtest_disable.h" namespace webrtc { @@ -55,7 +54,11 @@ TEST(StandaloneVadTest, Api) { EXPECT_EQ(kMode, vad->mode()); } -TEST(StandaloneVadTest, DISABLED_ON_IOS(ActivityDetection)) { +#if defined(WEBRTC_IOS) +TEST(StandaloneVadTest, DISABLED_ActivityDetection) { +#else +TEST(StandaloneVadTest, ActivityDetection) { +#endif rtc::scoped_ptr<StandaloneVad> vad(StandaloneVad::Create()); const size_t kDataLength = kLength10Ms; int16_t data[kDataLength] = {0}; diff --git a/webrtc/modules/audio_processing/vad/vad_audio_proc.cc b/webrtc/modules/audio_processing/vad/vad_audio_proc.cc index 8535d1ff57..1a595597b6 100644 --- a/webrtc/modules/audio_processing/vad/vad_audio_proc.cc +++ b/webrtc/modules/audio_processing/vad/vad_audio_proc.cc @@ -23,7 +23,7 @@ extern "C" { #include "webrtc/modules/audio_coding/codecs/isac/main/source/pitch_estimator.h" #include "webrtc/modules/audio_coding/codecs/isac/main/source/structs.h" } -#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/include/module_common_types.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/vad/vad_audio_proc_unittest.cc b/webrtc/modules/audio_processing/vad/vad_audio_proc_unittest.cc index f509af476f..a8a4ead2e3 100644 --- a/webrtc/modules/audio_processing/vad/vad_audio_proc_unittest.cc +++ b/webrtc/modules/audio_processing/vad/vad_audio_proc_unittest.cc @@ -21,7 +21,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_processing/vad/common.h" -#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/include/module_common_types.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/vad/voice_activity_detector.cc b/webrtc/modules/audio_processing/vad/voice_activity_detector.cc index ef56a3574c..fc9d103918 100644 --- a/webrtc/modules/audio_processing/vad/voice_activity_detector.cc +++ b/webrtc/modules/audio_processing/vad/voice_activity_detector.cc @@ -18,7 +18,7 @@ namespace webrtc { namespace { const size_t kMaxLength = 320; -const int kNumChannels = 1; +const size_t kNumChannels = 1; const double kDefaultVoiceValue = 1.0; const double kNeutralProbability = 0.5; |