| Index: content/renderer/media/webrtc_audio_device_impl.h
|
| diff --git a/content/renderer/media/webrtc_audio_device_impl.h b/content/renderer/media/webrtc_audio_device_impl.h
|
| index 6d4442ade71d561f6db0e78db942babeae2263ee..765a172ac8ece09ad02c2d831439631e33d64464 100644
|
| --- a/content/renderer/media/webrtc_audio_device_impl.h
|
| +++ b/content/renderer/media/webrtc_audio_device_impl.h
|
| @@ -16,10 +16,12 @@
|
| #include "base/message_loop_proxy.h"
|
| #include "base/time.h"
|
| #include "content/common/content_export.h"
|
| -#include "content/renderer/media/audio_device.h"
|
| #include "content/renderer/media/audio_input_device.h"
|
| +#include "media/base/audio_renderer_sink.h"
|
| #include "third_party/webrtc/modules/audio_device/main/interface/audio_device.h"
|
|
|
| +class AudioDeviceFactoryInterface;
|
| +
|
| // A WebRtcAudioDeviceImpl instance implements the abstract interface
|
| // webrtc::AudioDeviceModule which makes it possible for a user (e.g. webrtc::
|
| // VoiceEngine) to register this class as an external AudioDeviceModule (ADM).
|
| @@ -209,7 +211,7 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl
|
| public AudioInputDevice::CaptureEventHandler {
|
| public:
|
| // Methods called on main render thread.
|
| - WebRtcAudioDeviceImpl();
|
| + WebRtcAudioDeviceImpl(AudioDeviceFactoryInterface* audio_device_factory);
|
|
|
| // webrtc::RefCountedModule implementation.
|
| // The creator must call AddRef() after construction and use Release()
|
| @@ -220,7 +222,7 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl
|
| // We need this one to support runnable method tasks.
|
| static bool ImplementsThreadSafeReferenceCounting() { return true; }
|
|
|
| - // AudioDevice::RenderCallback implementation.
|
| + // media::AudioRendererSink::RenderCallback implementation.
|
| virtual int Render(const std::vector<float*>& audio_data,
|
| int number_of_frames,
|
| int audio_delay_milliseconds) OVERRIDE;
|
| @@ -407,7 +409,7 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl
|
| scoped_refptr<AudioInputDevice> audio_input_device_;
|
|
|
| // Provides access to the native audio output layer in the browser process.
|
| - scoped_refptr<AudioDevice> audio_output_device_;
|
| + scoped_refptr<media::AudioRendererSink> audio_output_device_;
|
|
|
| // Weak reference to the audio callback.
|
| // The webrtc client defines |audio_transport_callback_| by calling
|
|
|