Fix WebAudio support for discrete channel layouts.

content/renderer/media/renderer_webaudiodevice_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_RENDERER_WEBAUDIODEVICE_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_RENDERER_WEBAUDIODEVICE_IMPL_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
@@ skipping 17 matching lines @@
 
 namespace content {
 class CONTENT_EXPORT RendererWebAudioDeviceImpl
     : NON_EXPORTED_BASE(public blink::WebAudioDevice),
       NON_EXPORTED_BASE(public media::AudioRendererSink::RenderCallback) {
  public:
   ~RendererWebAudioDeviceImpl() override;
 
   static RendererWebAudioDeviceImpl* Create(
       media::ChannelLayout layout,
+      int channels,
       const blink::WebAudioLatencyHint& latency_hint,
       blink::WebAudioDevice::RenderCallback* callback,
       int session_id,
       const url::Origin& security_origin);
 
   // blink::WebAudioDevice implementation.
   void start() override;
   void stop() override;
   double sampleRate() override;
   int framesPerBuffer() override;
 
   // AudioRendererSink::RenderCallback implementation.
   int Render(base::TimeDelta delay,
              base::TimeTicks delay_timestamp,
              int prior_frames_skipped,
              media::AudioBus* dest) override;
 
   void OnRenderError() override;
 
   void SetMediaTaskRunnerForTesting(
       const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner);
 
+  const media::AudioParameters& get_sink_params_for_testing() {
+    return sink_params_;
+  }
+
  protected:
   // Callback to get output device params (for tests).
   using OutputDeviceParamsCallback = base::Callback<media::AudioParameters(
       int frame_id,
       int session_id,
       const std::string& device_id,
       const url::Origin& security_origin)>;
 
   // Callback get render frame ID for current context (for tests).
   using RenderFrameIdCallback = base::Callback<int()>;
 
   RendererWebAudioDeviceImpl(media::ChannelLayout layout,
+                             int channels,
                              const blink::WebAudioLatencyHint& latency_hint,
                              blink::WebAudioDevice::RenderCallback* callback,
                              int session_id,
                              const url::Origin& security_origin,
                              const OutputDeviceParamsCallback& device_params_cb,
                              const RenderFrameIdCallback& render_frame_id_cb);
 
  private:
   const scoped_refptr<base::SingleThreadTaskRunner>& GetMediaTaskRunner();
 
@@ skipping 25 matching lines @@
 
   // Allow unit tests to set a custom MediaThreadTaskRunner.
   scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererWebAudioDeviceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_RENDERER_WEBAUDIODEVICE_IMPL_H_