Merge AudioRendererImpl and AudioRendererBase; add NullAudioSink

content/renderer/media/webrtc_audio_device_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_WEBRTC_AUDIO_DEVICE_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_DEVICE_IMPL_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 94 matching lines @@
   // webrtc::RefCountedModule implementation.
   // The creator must call AddRef() after construction and use Release()
   // to release the reference and delete this object.
   virtual int32_t AddRef() OVERRIDE;
   virtual int32_t Release() OVERRIDE;
 
   // We need this one to support runnable method tasks.
   static bool ImplementsThreadSafeReferenceCounting() { return true; }
 
   // AudioDevice::RenderCallback implementation.
-  virtual size_t Render(const std::vector<float*>& audio_data,
-                        size_t number_of_frames,
-                        size_t audio_delay_milliseconds) OVERRIDE;
+  virtual int Render(const std::vector<float*>& audio_data,
+                     int number_of_frames,
+                     int audio_delay_milliseconds) OVERRIDE;
   virtual void OnRenderError() OVERRIDE;
 
   // AudioInputDevice::CaptureCallback implementation.
   virtual void Capture(const std::vector<float*>& audio_data,
-                       size_t number_of_frames,
-                       size_t audio_delay_milliseconds) OVERRIDE;
+                       int number_of_frames,
+                       int audio_delay_milliseconds) OVERRIDE;
   virtual void OnCaptureError() OVERRIDE;
 
   // AudioInputDevice::CaptureEventHandler implementation.
   virtual void OnDeviceStarted(const std::string& device_id) OVERRIDE;
   virtual void OnDeviceStopped() OVERRIDE;
 
   // webrtc::Module implementation.
   virtual int32_t ChangeUniqueId(const int32_t id) OVERRIDE;
   virtual int32_t TimeUntilNextProcess() OVERRIDE;
   virtual int32_t Process() OVERRIDE;
@@ skipping 113 matching lines @@
   virtual int32_t PlayoutSampleRate(uint32_t* samples_per_sec) const OVERRIDE;
 
   virtual int32_t ResetAudioDevice() OVERRIDE;
   virtual int32_t SetLoudspeakerStatus(bool enable) OVERRIDE;
   virtual int32_t GetLoudspeakerStatus(bool* enabled) const OVERRIDE;
 
   // Sets the session id.
   void SetSessionId(int session_id);
 
   // Accessors.
-  size_t input_buffer_size() const {
+  int input_buffer_size() const {
     return input_audio_parameters_.frames_per_buffer();
   }
-  size_t output_buffer_size() const {
+  int output_buffer_size() const {
     return input_audio_parameters_.frames_per_buffer();

[tommi (sloooow) - chröme, 2012/03/26 10:57:25]

fyi - this has been fixed on trunk.

[vrk (LEFT CHROMIUM), 2012/04/02 21:17:54]

D'oh! Thanks :)

   }
   int input_channels() const {
     return input_audio_parameters_.channels();
   }
   int output_channels() const {
     return output_audio_parameters_.channels();
   }
   int input_sample_rate() const {
     return input_audio_parameters_.sample_rate();
   }
@@ skipping 61 matching lines @@
   int bytes_per_sample_;
 
   bool initialized_;
   bool playing_;
   bool recording_;
 
   DISALLOW_COPY_AND_ASSIGN(WebRtcAudioDeviceImpl);
 };
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_DEVICE_IMPL_H_