Revert 187936 "Pass more detailed audio hardware configuration i..."

media/base/audio_converter.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 "media/base/audio_converter.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 12 matching lines @@
       input_channel_count_(input_params.channels()) {
   CHECK(input_params.IsValid());
   CHECK(output_params.IsValid());
 
   // Handle different input and output channel layouts.
   if (input_params.channel_layout() != output_params.channel_layout()) {
     DVLOG(1) << "Remixing channel layout from " << input_params.channel_layout()
              << " to " << output_params.channel_layout() << "; from "
              << input_params.channels() << " channels to "
              << output_params.channels() << " channels.";
-    channel_mixer_.reset(new ChannelMixer(input_params, output_params));
+    channel_mixer_.reset(new ChannelMixer(
+        input_params.channel_layout(), output_params.channel_layout()));
 
     // Pare off data as early as we can for efficiency.
     downmix_early_ = input_params.channels() > output_params.channels();
     if (downmix_early_) {
       DVLOG(1) << "Remixing channel layout prior to resampling.";
       // |unmixed_audio_| will be allocated on the fly.
     } else {
       // Instead, if we're not downmixing early we need a temporary AudioBus
       // which matches the input channel count but uses the output frame size
       // since we'll mix into the AudioBus from the output stream.
@@ skipping 159 matching lines @@
 
 void AudioConverter::ProvideInput(int resampler_frame_delay, AudioBus* dest) {
   resampler_frame_delay_ = resampler_frame_delay;
   if (audio_fifo_)
     audio_fifo_->Consume(dest, dest->frames());
   else
     SourceCallback(0, dest);
 }
 
 }  // namespace media