Feed the render data to MediaStreamAudioProcessor and used AudioBus in render callback

content/renderer/media/webrtc_audio_capturer.cc

 // 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/renderer/media/webrtc_audio_capturer.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
@@ skipping 279 matching lines @@
   // Dispatch the new parameters both to the sink(s) and to the new source,
   // also apply the new |constraints|.
   // The idea is to get rid of any dependency of the microphone parameters
   // which would normally be used by default.
   // bits_per_sample is always 16 for now.
   int buffer_size = GetBufferSize(sample_rate);
   media::AudioParameters params(media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
                                 channel_layout, 0, sample_rate,
                                 16, buffer_size, effects);
   scoped_refptr<MediaStreamAudioProcessor> new_audio_processor(
-      new MediaStreamAudioProcessor(params, constraints, effects));
+      new MediaStreamAudioProcessor(params, constraints, effects,
+                                    audio_device_));
   {
     base::AutoLock auto_lock(lock_);
     audio_processor_ = new_audio_processor;
     need_audio_processing_ = NeedsAudioProcessing(constraints, effects);
 
     // Notify all tracks about the new format.
     tracks_.TagAll();
   }
 
   if (source.get())
@@ skipping 232 matching lines @@
 }
 
 void WebRtcAudioCapturer::GetAudioProcessingParams(
     base::TimeDelta* delay, int* volume, bool* key_pressed) {
   base::AutoLock auto_lock(lock_);
   *delay = audio_delay_;
   *volume = volume_;
   *key_pressed = key_pressed_;
 }
 
-void WebRtcAudioCapturer::FeedRenderDataToAudioProcessor(
-    const int16* render_audio,
-    int sample_rate,
-    int number_of_channels,
-    int number_of_frames,
-    base::TimeDelta render_delay) {
-  scoped_refptr<MediaStreamAudioProcessor> audio_processor;
-  {
-    base::AutoLock auto_lock(lock_);
-    if (!running_)
-      return;
-
-    audio_processor = audio_processor_;
-  }
-
-  audio_processor->PushRenderData(render_audio, sample_rate,
-                                  number_of_channels,
-                                  number_of_frames,
-                                  render_delay);
-}
-
 void WebRtcAudioCapturer::SetCapturerSourceForTesting(
     const scoped_refptr<media::AudioCapturerSource>& source,
     media::AudioParameters params) {
   // Create a new audio stream as source which uses the new source.
   SetCapturerSource(source, params.channel_layout(),
                     static_cast<float>(params.sample_rate()),
                     params.effects(),
                     constraints_);
 }
 
 }  // namespace content