Merge changes I7bbf776e,I1b827825

am: fe8b4a6579

* commit 'fe8b4a657979b49e1701bd92f6d5814a99e0b2be': (7237 commits)
  WIP: Changes after merge commit 'cb3f9bd'
  Make the nonlinear beamformer steerable
  Utilize bitrate above codec max to protect video.
  Enable VP9 internal resize by default.
  Filter overlapping RTP header extensions.
  Make VCMEncodedFrameCallback const.
  MediaCodecVideoEncoder: Add number of quality resolution downscales to Encoded callback.
  Remove redudant encoder rate calls.
  Create isolate files for nonparallel tests.
  Register header extensions in RtpRtcpObserver to avoid log spam.
  Make an enum class out of NetEqDecoder, and hide the neteq_decoders_ table
  ACM: Move NACK functionality inside NetEq
  Fix chromium-style warnings in webrtc/sound/.
  Create a 'webrtc_nonparallel_tests' target.
  Update scalability structure data according to updates in the RTP payload profile.
  audio_coding: rename interface -> include
  Rewrote perform_action_on_all_files to be parallell.
  Update reference indices according to updates in the RTP payload profile.
  Disable P2PTransport...TestFailoverControlledSide on Memcheck
  pass clangcl compile options to ignore warnings in gflags.cc
  ...

1 files changed, 176 insertions, 0 deletions

diff --git a/webrtc/modules/audio_processing/voice_detection_impl.cc b/webrtc/modules/audio_processing/voice_detection_impl.cc
new file mode 100644
index 0000000000..374189e709
--- /dev/null
+++ b/webrtc/modules/audio_processing/voice_detection_impl.cc
@@ -0,0 +1,176 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "webrtc/modules/audio_processing/voice_detection_impl.h"
+
+#include <assert.h>
+
+#include "webrtc/common_audio/vad/include/webrtc_vad.h"
+#include "webrtc/modules/audio_processing/audio_buffer.h"
+#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
+
+namespace webrtc {
+
+typedef VadInst Handle;
+
+namespace {
+int MapSetting(VoiceDetection::Likelihood likelihood) {
+  switch (likelihood) {
+    case VoiceDetection::kVeryLowLikelihood:
+      return 3;
+    case VoiceDetection::kLowLikelihood:
+      return 2;
+    case VoiceDetection::kModerateLikelihood:
+      return 1;
+    case VoiceDetection::kHighLikelihood:
+      return 0;
+  }
+  assert(false);
+  return -1;
+}
+}  // namespace
+
+VoiceDetectionImpl::VoiceDetectionImpl(const AudioProcessing* apm,
+                                       CriticalSectionWrapper* crit)
+  : ProcessingComponent(),
+    apm_(apm),
+    crit_(crit),
+    stream_has_voice_(false),
+    using_external_vad_(false),
+    likelihood_(kLowLikelihood),
+    frame_size_ms_(10),
+    frame_size_samples_(0) {}
+
+VoiceDetectionImpl::~VoiceDetectionImpl() {}
+
+int VoiceDetectionImpl::ProcessCaptureAudio(AudioBuffer* audio) {
+  if (!is_component_enabled()) {
+    return apm_->kNoError;
+  }
+
+  if (using_external_vad_) {
+    using_external_vad_ = false;
+    return apm_->kNoError;
+  }
+  assert(audio->num_frames_per_band() <= 160);
+
+  // TODO(ajm): concatenate data in frame buffer here.
+
+  int vad_ret = WebRtcVad_Process(static_cast<Handle*>(handle(0)),
+                                  apm_->proc_split_sample_rate_hz(),
+                                  audio->mixed_low_pass_data(),
+                                  frame_size_samples_);
+  if (vad_ret == 0) {
+    stream_has_voice_ = false;
+    audio->set_activity(AudioFrame::kVadPassive);
+  } else if (vad_ret == 1) {
+    stream_has_voice_ = true;
+    audio->set_activity(AudioFrame::kVadActive);
+  } else {
+    return apm_->kUnspecifiedError;
+  }
+
+  return apm_->kNoError;
+}
+
+int VoiceDetectionImpl::Enable(bool enable) {
+  CriticalSectionScoped crit_scoped(crit_);
+  return EnableComponent(enable);
+}
+
+bool VoiceDetectionImpl::is_enabled() const {
+  return is_component_enabled();
+}
+
+int VoiceDetectionImpl::set_stream_has_voice(bool has_voice) {
+  using_external_vad_ = true;
+  stream_has_voice_ = has_voice;
+  return apm_->kNoError;
+}
+
+bool VoiceDetectionImpl::stream_has_voice() const {
+  // TODO(ajm): enable this assertion?
+  //assert(using_external_vad_ || is_component_enabled());
+  return stream_has_voice_;
+}
+
+int VoiceDetectionImpl::set_likelihood(VoiceDetection::Likelihood likelihood) {
+  CriticalSectionScoped crit_scoped(crit_);
+  if (MapSetting(likelihood) == -1) {
+    return apm_->kBadParameterError;
+  }
+
+  likelihood_ = likelihood;
+  return Configure();
+}
+
+VoiceDetection::Likelihood VoiceDetectionImpl::likelihood() const {
+  return likelihood_;
+}
+
+int VoiceDetectionImpl::set_frame_size_ms(int size) {
+  CriticalSectionScoped crit_scoped(crit_);
+  assert(size == 10); // TODO(ajm): remove when supported.
+  if (size != 10 &&
+      size != 20 &&
+      size != 30) {
+    return apm_->kBadParameterError;
+  }
+
+  frame_size_ms_ = size;
+
+  return Initialize();
+}
+
+int VoiceDetectionImpl::frame_size_ms() const {
+  return frame_size_ms_;
+}
+
+int VoiceDetectionImpl::Initialize() {
+  int err = ProcessingComponent::Initialize();
+  if (err != apm_->kNoError || !is_component_enabled()) {
+    return err;
+  }
+
+  using_external_vad_ = false;
+  frame_size_samples_ = static_cast<size_t>(
+      frame_size_ms_ * apm_->proc_split_sample_rate_hz() / 1000);
+  // TODO(ajm): intialize frame buffer here.
+
+  return apm_->kNoError;
+}
+
+void* VoiceDetectionImpl::CreateHandle() const {
+  return WebRtcVad_Create();
+}
+
+void VoiceDetectionImpl::DestroyHandle(void* handle) const {
+  WebRtcVad_Free(static_cast<Handle*>(handle));
+}
+
+int VoiceDetectionImpl::InitializeHandle(void* handle) const {
+  return WebRtcVad_Init(static_cast<Handle*>(handle));
+}
+
+int VoiceDetectionImpl::ConfigureHandle(void* handle) const {
+  return WebRtcVad_set_mode(static_cast<Handle*>(handle),
+                            MapSetting(likelihood_));
+}
+
+int VoiceDetectionImpl::num_handles_required() const {
+  return 1;
+}
+
+int VoiceDetectionImpl::GetHandleError(void* handle) const {
+  // The VAD has no get_error() function.
+  assert(handle != NULL);
+  return apm_->kUnspecifiedError;
+}
+}  // namespace webrtc