Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_RENDERER_WEBAUDIODEVICE_IMPL_H_ | 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_RENDERER_WEBAUDIODEVICE_IMPL_H_ |
| 6 #define CONTENT_RENDERER_MEDIA_MEDIA_RENDERER_WEBAUDIODEVICE_IMPL_H_ | 6 #define CONTENT_RENDERER_MEDIA_MEDIA_RENDERER_WEBAUDIODEVICE_IMPL_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
| 11 #include "content/renderer/media/audio_device.h" | 11 #include "media/base/audio_renderer_sink.h" |
| 12 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebAudioDevi ce.h" | 12 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebAudioDevi ce.h" |
| 13 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" | 13 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" |
| 14 | 14 |
| 15 class AudioDeviceFactoryInterface; | |
| 16 | |
| 15 namespace media { | 17 namespace media { |
| 16 class AudioParameters; | 18 class AudioRendererSink; |
| 17 } | 19 } |
| 18 | 20 |
| 19 class RendererWebAudioDeviceImpl | 21 class RendererWebAudioDeviceImpl |
| 20 : public WebKit::WebAudioDevice, | 22 : public WebKit::WebAudioDevice, |
| 21 public AudioDevice::RenderCallback { | 23 public media::AudioRendererSink::RenderCallback { |
| 22 public: | 24 public: |
| 23 RendererWebAudioDeviceImpl(const media::AudioParameters& params, | 25 RendererWebAudioDeviceImpl(AudioDeviceFactoryInterface* audio_device_factory, |
|
Chris Rogers
2012/06/14 17:41:44
This seems unnecessarily complex to require a fact
| |
| 26 const media::AudioParameters& params, | |
| 24 WebKit::WebAudioDevice::RenderCallback* callback); | 27 WebKit::WebAudioDevice::RenderCallback* callback); |
| 25 virtual ~RendererWebAudioDeviceImpl(); | 28 virtual ~RendererWebAudioDeviceImpl(); |
| 26 | 29 |
| 27 // WebKit::WebAudioDevice implementation. | 30 // WebKit::WebAudioDevice implementation. |
| 28 virtual void start(); | 31 virtual void start(); |
| 29 virtual void stop(); | 32 virtual void stop(); |
| 30 virtual double sampleRate(); | 33 virtual double sampleRate(); |
| 31 | 34 |
| 32 // AudioDevice::RenderCallback implementation. | 35 // AudioRendererSink::RenderCallback implementation. |
| 33 virtual int Render(const std::vector<float*>& audio_data, | 36 virtual int Render(const std::vector<float*>& audio_data, |
| 34 int number_of_frames, | 37 int number_of_frames, |
| 35 int audio_delay_milliseconds) OVERRIDE; | 38 int audio_delay_milliseconds) OVERRIDE; |
| 36 virtual void OnRenderError() OVERRIDE; | 39 virtual void OnRenderError() OVERRIDE; |
| 37 | 40 |
| 38 private: | 41 private: |
| 39 scoped_refptr<AudioDevice> audio_device_; | 42 scoped_refptr<media::AudioRendererSink> audio_device_; |
| 40 bool is_running_; | 43 bool is_running_; |
| 41 | 44 |
| 42 // Weak reference to the callback into WebKit code. | 45 // Weak reference to the callback into WebKit code. |
| 43 WebKit::WebAudioDevice::RenderCallback* client_callback_; | 46 WebKit::WebAudioDevice::RenderCallback* client_callback_; |
| 44 | 47 |
| 45 DISALLOW_COPY_AND_ASSIGN(RendererWebAudioDeviceImpl); | 48 DISALLOW_COPY_AND_ASSIGN(RendererWebAudioDeviceImpl); |
| 46 }; | 49 }; |
| 47 | 50 |
| 48 #endif // CONTENT_RENDERER_MEDIA_MEDIA_RENDERER_WEBAUDIODEVICE_IMPL_H_ | 51 #endif // CONTENT_RENDERER_MEDIA_MEDIA_RENDERER_WEBAUDIODEVICE_IMPL_H_ |
| OLD | NEW |