move the APM to chrome.

content/renderer/media/webrtc_audio_device_impl.cc

 // Copyright 2013 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/renderer/media/webrtc_audio_device_impl.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/win/windows_version.h"
@@ skipping 33 matching lines @@
 }
 
 int32_t WebRtcAudioDeviceImpl::Release() {
   DCHECK(thread_checker_.CalledOnValidThread());
   int ret = base::subtle::Barrier_AtomicIncrement(&ref_count_, -1);
   if (ret == 0) {
     delete this;
   }
   return ret;
 }
-int WebRtcAudioDeviceImpl::CaptureData(const std::vector<int>& channels,
-                                       const int16* audio_data,
-                                       int sample_rate,
-                                       int number_of_channels,
-                                       int number_of_frames,
-                                       int audio_delay_milliseconds,
-                                       int current_volume,
-                                       bool need_audio_processing,
-                                       bool key_pressed) {
-  int total_delay_ms = 0;
+void WebRtcAudioDeviceImpl::CaptureData(const std::vector<int>& channels,
+                                        const int16* audio_data,
+                                        int sample_rate,
+                                        int number_of_channels,
+                                        int number_of_frames) {
   {
     base::AutoLock auto_lock(lock_);
     // Return immediately when not recording or |channels| is empty.
     // See crbug.com/274017: renderer crash dereferencing invalid channels[0].
     if (!recording_ || channels.empty())
-      return 0;
-
-    // Store the reported audio delay locally.
-    input_delay_ms_ = audio_delay_milliseconds;
-    total_delay_ms = input_delay_ms_ + output_delay_ms_;
-    DVLOG(2) << "total delay: " << input_delay_ms_ + output_delay_ms_;
+      return;
   }
 
-  // Write audio samples in blocks of 10 milliseconds to the registered
-  // webrtc::AudioTransport sink. Keep writing until our internal byte
-  // buffer is empty.
-  const int16* audio_buffer = audio_data;
-  const int samples_per_10_msec = (sample_rate / 100);
-  int accumulated_audio_samples = 0;
-  uint32_t new_volume = 0;
-  while (accumulated_audio_samples < number_of_frames) {
-    // Deliver 10ms of recorded 16-bit linear PCM audio.
-    int new_mic_level = audio_transport_callback_->OnDataAvailable(
-        &channels[0],
-        channels.size(),
-        audio_buffer,
-        sample_rate,
-        number_of_channels,
-        samples_per_10_msec,
-        total_delay_ms,
-        current_volume,
-        key_pressed,
-        need_audio_processing);
-
-    accumulated_audio_samples += samples_per_10_msec;
-    audio_buffer += samples_per_10_msec * number_of_channels;
-
-    // The latest non-zero new microphone level will be returned.
-    if (new_mic_level)
-      new_volume = new_mic_level;
-  }
-
-  return new_volume;
+  // Deliver 10ms of recorded 16-bit linear PCM audio.
+  audio_transport_callback_->OnDataAvailable(
+      &channels[0], channels.size(), audio_data, sample_rate,
+      number_of_channels, number_of_frames, 0, 0, false, false);
 }
 
 void WebRtcAudioDeviceImpl::SetCaptureFormat(
     const media::AudioParameters& params) {
   DVLOG(1) << "WebRtcAudioDeviceImpl::SetCaptureFormat()";
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 void WebRtcAudioDeviceImpl::RenderData(uint8* audio_data,
                                        int number_of_channels,
@@ skipping 358 matching lines @@
   for (CapturerList::const_iterator iter = capturers_.begin();
        iter != capturers_.end(); ++iter) {
     if (!(*iter)->device_id().empty())
       return *iter;
   }
 
   return NULL;
 }
 
 }  // namespace content