Revert 246905 "Revert 246894 "Wire up AGC to the MediaStreamAudi..."

trunk/src/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 460 matching lines @@
        it != tracks_to_notify_format.end(); ++it) {
     (*it)->OnSetFormat(output_params);
   }
 
   // Push the data to the processor for processing.
   audio_processor->PushCaptureData(audio_source);
 
   // Process and consume the data in the processor until there is not enough
   // data in the processor.
   int16* output = NULL;
+  int new_volume = 0;
   while (audio_processor->ProcessAndConsumeData(
-      audio_delay, current_volume, key_pressed, &output)) {
+      audio_delay, current_volume, key_pressed, &new_volume, &output)) {
     // Feed the post-processed data to the tracks.
     for (TrackList::ItemList::const_iterator it = tracks.begin();
          it != tracks.end(); ++it) {
       (*it)->Capture(output, audio_delay, current_volume, key_pressed,
                      need_audio_processing);
     }
-    // TODO(xians): Apply the new volume after AGC is working with the
-    // MediaStreamAudioProcessor.
+
+    if (new_volume) {
+      SetVolume(new_volume);
+
+      // Update the |current_volume| to avoid passing the old volume to AGC.
+      current_volume = new_volume;
+    }
   }
 }
 
 void WebRtcAudioCapturer::OnCaptureError() {
   NOTIMPLEMENTED();
 }
 
 media::AudioParameters WebRtcAudioCapturer::source_audio_parameters() const {
   base::AutoLock auto_lock(lock_);
   return audio_processor_ ?
@@ skipping 74 matching lines @@
     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