Switch LiveAudio to source provider solution.

content/renderer/media/webaudio_capturer_source.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_WEBAUDIO_CAPTURER_SOURCE_H_
 #define CONTENT_RENDERER_MEDIA_WEBAUDIO_CAPTURER_SOURCE_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "media/audio/audio_parameters.h"
-#include "media/base/audio_capturer_source.h"
 #include "media/base/audio_fifo.h"
 #include "third_party/WebKit/public/platform/WebAudioDestinationConsumer.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 
 namespace content {
 
-class WebRtcAudioCapturer;
+class WebRtcLocalAudioTrack;
+class WebRtcLocalAudioSourceProvider;
 
 // WebAudioCapturerSource is the missing link between
-// WebAudio's MediaStreamAudioDestinationNode and WebRtcAudioCapturer.
+// WebAudio's MediaStreamAudioDestinationNode and WebRtcLocalAudioTrack.
 //
 // 1. WebKit calls the setFormat() method setting up the basic stream format
 //    (channels, and sample-rate).  At this time, it dispatches this information
 //    to the WebRtcAudioCapturer by calling its SetCapturerSource() method.
-// 2. Initialize() is called, where we should get back the same
-//    stream format information as (1).  We also get the CaptureCallback here.
 // 3. consumeAudio() is called periodically by WebKit which dispatches the
 //    audio stream to the CaptureCallback::Capture() method.
 class WebAudioCapturerSource
-    : public media::AudioCapturerSource,
-      public WebKit::WebAudioDestinationConsumer {
+    :  public base::RefCountedThreadSafe<WebAudioCapturerSource>,
+       public WebKit::WebAudioDestinationConsumer {
  public:
-  explicit WebAudioCapturerSource(WebRtcAudioCapturer* capturer);
+  WebAudioCapturerSource();
 
   // WebAudioDestinationConsumer implementation.
   // setFormat() is called early on, so that we can configure the capturer.
   virtual void setFormat(size_t number_of_channels, float sample_rate) OVERRIDE;
   // MediaStreamAudioDestinationNode periodically calls consumeAudio().
   virtual void consumeAudio(const WebKit::WebVector<const float*>& audio_data,
       size_t number_of_frames) OVERRIDE;
 
-  // AudioCapturerSource implementation.
-  virtual void Initialize(
-      const media::AudioParameters& params,
-      media::AudioCapturerSource::CaptureCallback* callback,
-      int session_id) OVERRIDE;
+  // Called when the WebAudioCapturerSource is hooking to a media audio track.
+  void Start(WebRtcLocalAudioTrack* track,

[tommi (sloooow) - chröme, 2013/09/06 11:20:30]

can you add documentation about the parameters and how they are linked?

[no longer working on chromium, 2013/09/10 12:43:15]

Done.

+             WebRtcLocalAudioSourceProvider* source_provider);
 
-  virtual void Start() OVERRIDE;
-  virtual void Stop() OVERRIDE;
-  virtual void SetVolume(double volume) OVERRIDE { }
-  virtual void SetAutomaticGainControl(bool enable) OVERRIDE { }
+  // Called when the media audio track is stopping.
+  void Stop();
+
+ protected:
+   friend class base::RefCountedThreadSafe<WebAudioCapturerSource>;

[tommi (sloooow) - chröme, 2013/09/06 11:20:30]

indent seems off

[no longer working on chromium, 2013/09/10 12:43:15]

Done.

+   virtual ~WebAudioCapturerSource();
 
  private:
-  virtual ~WebAudioCapturerSource();
+  // a weak pointer to the audio track this WebAudioCapturerSource is feeding

[tommi (sloooow) - chröme, 2013/09/06 11:20:30]

this isn't a weak pointer, it's a raw pointer. "weak pointer" refers to WeakPtr.
 How is ownership managed?  If the track object is reference counted, why aren't
we using scoped_refptr? etc (please add comments that explain all of this)

[no longer working on chromium, 2013/09/10 12:43:15]

Done.

+  // data to.
+  WebRtcLocalAudioTrack* track_;
 
-  WebRtcAudioCapturer* capturer_;
+  // A weak pointer to the source provider to get the delay, volume,
+  // key_pressed information.
+  WebRtcLocalAudioSourceProvider* source_provider_;

[tommi (sloooow) - chröme, 2013/09/06 11:20:30]

this is also a raw pointer.  please add comments that explain lifetime
management.

[no longer working on chromium, 2013/09/10 12:43:15]

Done.

 
-  int set_format_channels_;
   media::AudioParameters params_;
-  media::AudioCapturerSource::CaptureCallback* callback_;
 
   // Wraps data coming from HandleCapture().
   scoped_ptr<media::AudioBus> wrapper_bus_;
 
   // Bus for reading from FIFO and calling the CaptureCallback.
   scoped_ptr<media::AudioBus> capture_bus_;
 
   // Handles mismatch between WebAudio buffer size and WebRTC.
   scoped_ptr<media::AudioFifo> fifo_;
 
   // Synchronizes HandleCapture() with AudioCapturerSource calls.
   base::Lock lock_;
   bool started_;
 
   DISALLOW_COPY_AND_ASSIGN(WebAudioCapturerSource);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBAUDIO_CAPTURER_SOURCE_H_