Update RendererWebKitPlatformSupportImpl::createAudioDevice() to handle |input_channels|

content/renderer/renderer_webkitplatformsupport_impl.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 "content/renderer/renderer_webkitplatformsupport_impl.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
@@ skipping 544 matching lines @@
 }
 
 double RendererWebKitPlatformSupportImpl::audioHardwareSampleRate() {
   return GetAudioOutputSampleRate();
 }
 
 size_t RendererWebKitPlatformSupportImpl::audioHardwareBufferSize() {
   return GetAudioOutputBufferSize();
 }
 
+// TODO(crogers): remove deprecated API as soon as WebKit calls new API.
+WebAudioDevice*
+RendererWebKitPlatformSupportImpl::createAudioDevice(
+    size_t buffer_size,
+    unsigned channels,
+    double sample_rate,
+    WebAudioDevice::RenderCallback* callback) {
+  return createAudioDevice(buffer_size, 0, channels, sample_rate, callback);
+}
+
 WebAudioDevice*
 RendererWebKitPlatformSupportImpl::createAudioDevice(
-    size_t bufferSize,
-    unsigned numberOfChannels,
-    double sampleRate,
+    size_t buffer_size,
+    unsigned input_channels,
+    unsigned channels,
+    double sample_rate,
     WebAudioDevice::RenderCallback* callback) {
   media::ChannelLayout layout = media::CHANNEL_LAYOUT_UNSUPPORTED;
 
-  // The |numberOfChannels| does not exactly identify the channel layout of the
+  // The |channels| does not exactly identify the channel layout of the
   // device. The switch statement below assigns a best guess to the channel
   // layout based on number of channels.
   // TODO(crogers): WebKit should give the channel layout instead of the hard
   // channel count.
-  switch (numberOfChannels) {
+  switch (channels) {
     case 1:
       layout = media::CHANNEL_LAYOUT_MONO;
       break;
     case 2:
       layout = media::CHANNEL_LAYOUT_STEREO;
       break;
     case 3:
       layout = media::CHANNEL_LAYOUT_2_1;
       break;
     case 4:
@@ skipping 10 matching lines @@
       break;
     case 8:
       layout = media::CHANNEL_LAYOUT_7_1;
       break;
     default:
       layout = media::CHANNEL_LAYOUT_STEREO;
   }
 
   media::AudioParameters params(
       media::AudioParameters::AUDIO_PCM_LOW_LATENCY, layout,
-      static_cast<int>(sampleRate), 16, bufferSize);
+      static_cast<int>(sample_rate), 16, buffer_size);
 
-  return new RendererWebAudioDeviceImpl(params, callback);
+  return new RendererWebAudioDeviceImpl(params, input_channels, callback);
 }
 
 //------------------------------------------------------------------------------
 
 WebKit::WebString
 RendererWebKitPlatformSupportImpl::signedPublicKeyAndChallengeString(
     unsigned key_size_index,
     const WebKit::WebString& challenge,
     const WebKit::WebURL& url) {
   std::string signed_public_key;
@@ skipping 128 matching lines @@
     size_t before_index,
     const WebKit::WebString& locale) {
   // Crash if WebKit calls this function when canHyphenate returns false.
   DCHECK(locale.isEmpty() || locale.equals("en-US"));
   DCHECK(hyphenator_.get());
   return hyphenator_->ComputeLastHyphenLocation(string16(characters, length),
                                                 before_index);
 }
 
 }  // namespace content