Chromium Code Reviews| 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 36e37eac9132463ce0917649d061db66189e25db..a6ab827db2e2bfc08e2604c30a3b5571a61946fc 100644 |
| --- a/content/renderer/media/webrtc_audio_device_impl.h |
| +++ b/content/renderer/media/webrtc_audio_device_impl.h |
| @@ -254,13 +254,23 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl |
| void SetSessionId(int session_id); |
| // Accessors. |
| - size_t input_buffer_size() const { return input_buffer_size_; } |
| - size_t output_buffer_size() const { return output_buffer_size_; } |
| - int input_channels() const { return input_channels_; } |
| - int output_channels() const { return output_channels_; } |
| - int input_sample_rate() const { return static_cast<int>(input_sample_rate_); } |
| + size_t input_buffer_size() const { |
| + return input_audio_parameters_.samples_per_packet(); |
| + } |
| + size_t output_buffer_size() const { |
| + return input_audio_parameters_.samples_per_packet(); |
| + } |
| + int input_channels() const { |
| + return input_audio_parameters_.channels(); |
| + } |
| + int output_channels() const { |
| + return output_audio_parameters_.channels(); |
| + } |
| + int input_sample_rate() const { |
| + return static_cast<int>(input_audio_parameters_.samples_per_second()); |
|
tommi (sloooow) - chröme
2012/03/10 10:11:32
remove the cast?
vrk (LEFT CHROMIUM)
2012/03/16 18:30:41
Good catch! Done.
|
| + } |
| int output_sample_rate() const { |
| - return static_cast<int>(output_sample_rate_); |
| + return static_cast<int>(output_audio_parameters_.samples_per_second()); |
|
tommi (sloooow) - chröme
2012/03/10 10:11:32
remove the cast?
vrk (LEFT CHROMIUM)
2012/03/16 18:30:41
Done.
|
| } |
| int input_delay_ms() const { return input_delay_ms_; } |
| int output_delay_ms() const { return output_delay_ms_; } |
| @@ -295,12 +305,8 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl |
| webrtc::AudioTransport* audio_transport_callback_; |
| // Cached values of utilized audio parameters. Platform dependent. |
| - size_t input_buffer_size_; |
| - size_t output_buffer_size_; |
| - int input_channels_; |
| - int output_channels_; |
| - double input_sample_rate_; |
| - double output_sample_rate_; |
| + AudioParameters input_audio_parameters_; |
| + AudioParameters output_audio_parameters_; |
|
tommi (sloooow) - chröme
2012/03/10 10:11:32
nice!
vrk (LEFT CHROMIUM)
2012/03/16 18:30:41
:)
|
| // Cached value of the current audio delay on the input/capture side. |
| int input_delay_ms_; |