| Index: media/audio/audio_parameters.cc
|
| diff --git a/media/audio/audio_parameters.cc b/media/audio/audio_parameters.cc
|
| index b7ea4870c23c2bf5f6b51c2bfbfaa5279c566ef1..131d1fb5c141135092ac1a1c3c54d5480d04198d 100644
|
| --- a/media/audio/audio_parameters.cc
|
| +++ b/media/audio/audio_parameters.cc
|
| @@ -16,7 +16,8 @@ AudioParameters::AudioParameters()
|
| bits_per_sample_(0),
|
| frames_per_buffer_(0),
|
| channels_(0),
|
| - input_channels_(0) {
|
| + input_channels_(0),
|
| + use_platform_aec_(false) {
|
| }
|
|
|
| AudioParameters::AudioParameters(Format format, ChannelLayout channel_layout,
|
| @@ -28,7 +29,8 @@ AudioParameters::AudioParameters(Format format, ChannelLayout channel_layout,
|
| bits_per_sample_(bits_per_sample),
|
| frames_per_buffer_(frames_per_buffer),
|
| channels_(ChannelLayoutToChannelCount(channel_layout)),
|
| - input_channels_(0) {
|
| + input_channels_(0),
|
| + use_platform_aec_(false) {
|
| }
|
|
|
| AudioParameters::AudioParameters(Format format, ChannelLayout channel_layout,
|
| @@ -41,7 +43,8 @@ AudioParameters::AudioParameters(Format format, ChannelLayout channel_layout,
|
| bits_per_sample_(bits_per_sample),
|
| frames_per_buffer_(frames_per_buffer),
|
| channels_(ChannelLayoutToChannelCount(channel_layout)),
|
| - input_channels_(input_channels) {
|
| + input_channels_(input_channels),
|
| + use_platform_aec_(false) {
|
| }
|
|
|
| void AudioParameters::Reset(Format format, ChannelLayout channel_layout,
|
| @@ -60,6 +63,15 @@ void AudioParameters::Reset(Format format, ChannelLayout channel_layout,
|
| frames_per_buffer_ = frames_per_buffer;
|
| }
|
|
|
| +void AudioParameters::Reset(Format format, ChannelLayout channel_layout,
|
| + int channels, int input_channels,
|
| + int sample_rate, int bits_per_sample,
|
| + int frames_per_buffer, bool use_platform_aec) {
|
| + use_platform_aec_ = use_platform_aec;
|
| + Reset(format, channel_layout, channels, input_channels, sample_rate,
|
| + bits_per_sample, frames_per_buffer);
|
| +}
|
| +
|
| bool AudioParameters::IsValid() const {
|
| return (format_ >= AUDIO_PCM_LINEAR) &&
|
| (format_ < AUDIO_LAST_FORMAT) &&
|
|
|