Fix incorrect AudioConverter setup for discrete channel layouts.

media/base/audio_converter.cc

Index: media/base/audio_converter.cc
diff --git a/media/base/audio_converter.cc b/media/base/audio_converter.cc
index 194111914e0d05ec14f1fb8c5e5833d150554cb1..be68ac627fa0d791584580fb628bcb397b42e56e 100644
--- a/media/base/audio_converter.cc
+++ b/media/base/audio_converter.cc
@@ -33,7 +33,8 @@ AudioConverter::AudioConverter(const AudioParameters& input_params,
   CHECK(output_params.IsValid());
 
   // Handle different input and output channel layouts.
-  if (input_params.channel_layout() != output_params.channel_layout()) {
+  if (input_params.channel_layout() != output_params.channel_layout() ||
+      input_params.channels() != output_params.channels()) {
     DVLOG(1) << "Remixing channel layout from " << input_params.channel_layout()
              << " to " << output_params.channel_layout() << "; from "
              << input_params.channels() << " channels to "