Make channel mixing checks explicit.

audio_low_latency_output_win.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/audio/win/audio_low_latency_output_win.h"
 
 #include <Functiondiscoverykeys_devpkey.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 357 matching lines @@
 
     return ((out_channels / static_cast<double> (in_channels)) *
         number_of_input_bytes);
   }
 
   LOG(ERROR) << "Down-mixing " << out_channels << "->"
              << in_channels << " is not supported.";
   return 0;
 }
 
+static bool ChannelMixingSupported(int bytes_per_sample, int in_channels,
+                                   int out_channels) {
+  return bytes_per_sample == 2 &&
+         ((in_channels == 1 && out_channels == 2) ||
+          (in_channels == 1 && out_channels == 8) ||
+          (in_channels == 2 && out_channels == 6) ||
+          (in_channels == 2 && out_channels == 8) ||
+          (in_channels == 2 && out_channels == 1));
+}
+
 // static
 AUDCLNT_SHAREMODE WASAPIAudioOutputStream::GetShareMode() {
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
   if (cmd_line->HasSwitch(switches::kEnableExclusiveAudio))
     return AUDCLNT_SHAREMODE_EXCLUSIVE;
   return AUDCLNT_SHAREMODE_SHARED;
 }
 
 WASAPIAudioOutputStream::WASAPIAudioOutputStream(AudioManagerWin* manager,
                                                  const AudioParameters& params,
@@ skipping 98 matching lines @@
   DCHECK(stream_switch_event_.IsValid());
 }
 
 WASAPIAudioOutputStream::~WASAPIAudioOutputStream() {}
 
 bool WASAPIAudioOutputStream::Open() {
   DCHECK_EQ(GetCurrentThreadId(), creating_thread_id_);
   if (opened_)
     return true;
 
-  // Down-mixing is currently not supported. The number of channels provided
-  // by the audio source must be less than or equal to the number of native
-  // channels (given by endpoint_channel_count()) which is the channel count
-  // used when opening the default endpoint device.
-  if (channel_factor() < 1 && channel_factor() != 0.5f) {
-    LOG(ERROR) << "Channel down-mixing is not supported";
-    RecordFallbackStats();
-    return false;
-  }
-
-  // Only 16-bit audio is supported in combination with channel up-mixing.
-  if (channel_factor() > 1 && (format_.Format.wBitsPerSample != 16)) {
-    LOG(ERROR) << "16-bit audio is required when channel up-mixing is active.";
+  if (format_.Format.nChannels != client_channel_count_ &&

[henrika (OOO until Aug 14), 2012/11/08 08:27:42]

We could perhaps keep some comments. You removed them all.

[DaleCurtis, 2012/11/08 18:39:30]

The old ones are out of date and the LOG(ERROR) explains what the check is
doing.

+      !ChannelMixingSupported(
+          format_.Format.wBitsPerSample / 8, client_channel_count_,
+          format_.Format.nChannels)) {
+    LOG(ERROR) << "Channel mixing is not supported.";
     RecordFallbackStats();
     return false;
   }
 
   // Create an IMMDeviceEnumerator interface and obtain a reference to
   // the IMMDevice interface of the default rendering device with the
   // specified role.
   HRESULT hr = SetRenderDevice();
   if (FAILED(hr)) {
     RecordFallbackStats();
@@ skipping 894 matching lines @@
   // are now re-initiated and it is now possible to re-start audio rendering.
 
   // Start rendering again using the new default audio endpoint.
   hr = audio_client_->Start();
 
   restart_rendering_mode_ = false;
   return SUCCEEDED(hr);
 }
 
 }  // namespace media