Update webrtc/libjingle 5268:5288.

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 215 matching lines @@
           switches::kEnableAudioTrackProcessing)) {
     return;
   }
 
   const bool enable_aec = GetPropertyFromConstraints(
       constraints, MediaConstraintsInterface::kEchoCancellation);
   const bool enable_ns = GetPropertyFromConstraints(
       constraints, MediaConstraintsInterface::kNoiseSuppression);
   const bool enable_high_pass_filter = GetPropertyFromConstraints(
       constraints, MediaConstraintsInterface::kHighpassFilter);
-  const bool start_aec_dump = GetPropertyFromConstraints(
-      constraints, MediaConstraintsInterface::kInternalAecDump);
 #if defined(IOS) || defined(ANDROID)
   const bool enable_experimental_aec = false;
   const bool enable_typing_detection = false;
 #else
   const bool enable_experimental_aec = GetPropertyFromConstraints(
       constraints, MediaConstraintsInterface::kExperimentalEchoCancellation);
   const bool enable_typing_detection = GetPropertyFromConstraints(
       constraints, MediaConstraintsInterface::kTypingNoiseDetection);
 #endif
 
@@ skipping 15 matching lines @@
 
   if (enable_ns)
     EnableNoiseSuppression(audio_processing_.get());
 
   if (enable_high_pass_filter)
     EnableHighPassFilter(audio_processing_.get());
 
   if (enable_typing_detection)
     EnableTypingDetection(audio_processing_.get());
 
-  if (enable_aec && start_aec_dump)
-    StartAecDump(audio_processing_.get());
 
   // Configure the audio format the audio processing is running on. This
   // has to be done after all the needed components are enabled.
   CHECK_EQ(audio_processing_->set_sample_rate_hz(kAudioProcessingSampleRate),
            0);
   CHECK_EQ(audio_processing_->set_num_channels(kAudioProcessingNumberOfChannel,
                                                kAudioProcessingNumberOfChannel),
            0);
 }
 
@@ skipping 60 matching lines @@
   DCHECK_EQ(err, 0) << "ProcessStream() error: " << err;
 
   // TODO(xians): Add support for AGC, typing detection, audio level
   // calculation, stereo swapping.
 }
 
 void MediaStreamAudioProcessor::StopAudioProcessing() {
   if (!audio_processing_.get())
     return;
 
-  // It is safe to stop the AEC dump even it is not started.
-  StopAecDump(audio_processing_.get());
-
   audio_processing_.reset();
 }
 
 }  // namespace content