diff options
Diffstat (limited to 'chromium/content/browser/renderer_host/media/audio_sync_reader.h')
-rw-r--r-- | chromium/content/browser/renderer_host/media/audio_sync_reader.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/chromium/content/browser/renderer_host/media/audio_sync_reader.h b/chromium/content/browser/renderer_host/media/audio_sync_reader.h index f3a2833b14e..d596d1b4c0e 100644 --- a/chromium/content/browser/renderer_host/media/audio_sync_reader.h +++ b/chromium/content/browser/renderer_host/media/audio_sync_reader.h @@ -5,7 +5,6 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_SYNC_READER_H_ #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_SYNC_READER_H_ -#include "base/file_descriptor_posix.h" #include "base/process/process.h" #include "base/sync_socket.h" #include "base/synchronization/lock.h" @@ -13,6 +12,10 @@ #include "media/audio/audio_output_controller.h" #include "media/base/audio_bus.h" +#if defined(OS_POSIX) +#include "base/file_descriptor_posix.h" +#endif + namespace base { class SharedMemory; } @@ -26,15 +29,13 @@ namespace content { class AudioSyncReader : public media::AudioOutputController::SyncReader { public: AudioSyncReader(base::SharedMemory* shared_memory, - const media::AudioParameters& params, - int input_channels); + const media::AudioParameters& params); virtual ~AudioSyncReader(); // media::AudioOutputController::SyncReader implementations. virtual void UpdatePendingBytes(uint32 bytes) OVERRIDE; - virtual void Read(const media::AudioBus* source, - media::AudioBus* dest) OVERRIDE; + virtual void Read(media::AudioBus* dest) OVERRIDE; virtual void Close() OVERRIDE; bool Init(); @@ -52,9 +53,6 @@ class AudioSyncReader : public media::AudioOutputController::SyncReader { const base::SharedMemory* const shared_memory_; - // Number of input channels for synchronized I/O. - const int input_channels_; - // Mutes all incoming samples. This is used to prevent audible sound // during automated testing. const bool mute_audio_; @@ -69,9 +67,6 @@ class AudioSyncReader : public media::AudioOutputController::SyncReader { // Shared memory wrapper used for transferring audio data to Read() callers. scoped_ptr<media::AudioBus> output_bus_; - // Shared memory wrapper used for transferring audio data from Read() callers. - scoped_ptr<media::AudioBus> input_bus_; - // Maximum amount of audio data which can be transferred in one Read() call. const int packet_size_; |