Minor fixes to the capturer and the processor

content/renderer/media/media_stream_audio_processor.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/media_stream_audio_processor.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "content/public/common/content_switches.h"
 #include "content/renderer/media/media_stream_audio_processor_options.h"
@@ skipping 147 matching lines @@
   DCHECK(main_thread_checker_.CalledOnValidThread());
   StopAudioProcessing();
 }
 
 void MediaStreamAudioProcessor::PushCaptureData(media::AudioBus* audio_source) {
   DCHECK(capture_thread_checker_.CalledOnValidThread());
   if (audio_mirroring_ &&
       capture_converter_->source_parameters().channel_layout() ==
           media::CHANNEL_LAYOUT_STEREO) {
     // Swap the first and second channels.
     audio_source->SwapChannels(0, 1);

[no longer working on chromium, 2014/03/06 08:35:14]

FYI, audio_mirroring is done without the APM.

   }
 
   capture_converter_->Push(audio_source);
 }
 
 bool MediaStreamAudioProcessor::ProcessAndConsumeData(
     base::TimeDelta capture_delay, int volume, bool key_pressed,
     int* new_volume, int16** out) {
   DCHECK(capture_thread_checker_.CalledOnValidThread());
   TRACE_EVENT0("audio", "MediaStreamAudioProcessor::ProcessAndConsumeData");
@@ skipping 85 matching lines @@
         MediaConstraintsInterface::kExperimentalNoiseSuppression);
   const bool enable_high_pass_filter = GetPropertyFromConstraints(
       &native_constraints, MediaConstraintsInterface::kHighpassFilter);
 
   audio_mirroring_ = GetPropertyFromConstraints(
       &native_constraints, webrtc::MediaConstraintsInterface::kAudioMirroring);
 
   // Return immediately if no audio processing component is enabled.
   if (!enable_aec && !enable_experimental_aec && !enable_ns &&
       !enable_high_pass_filter && !enable_typing_detection && !enable_agc &&
-      !audio_mirroring_ && !enable_experimental_ns) {
+      !enable_experimental_ns) {

[Henrik Grunell, 2014/03/06 07:59:10]

I can't say if this is correct, since I don't understand the reason for the
change. :)

[no longer working on chromium, 2014/03/06 08:35:14]

I can confirm that this is correct, since the mirroring is done without the APM,
I pointed out where the mirroring is done.

[Henrik Grunell, 2014/03/06 09:50:09]

OK, thanks for clarifying.

     return;
   }
 
   // Create and configure the webrtc::AudioProcessing.
   audio_processing_.reset(webrtc::AudioProcessing::Create(0));
 
   // Enable the audio processing components.
   if (enable_aec) {
     EnableEchoCancellation(audio_processing_.get());
     if (enable_experimental_aec)
@@ skipping 146 matching lines @@
   if (!audio_processing_.get())
     return;
 
   if (playout_data_source_)
     playout_data_source_->RemovePlayoutSink(this);
 
   audio_processing_.reset();
 }
 
 }  // namespace content