diff options
Diffstat (limited to 'chromium/media/base/audio_buffer_converter.cc')
| -rw-r--r-- | chromium/media/base/audio_buffer_converter.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/media/base/audio_buffer_converter.cc b/chromium/media/base/audio_buffer_converter.cc index 0297ff6a3d2..8c5ec1c734c 100644 --- a/chromium/media/base/audio_buffer_converter.cc +++ b/chromium/media/base/audio_buffer_converter.cc @@ -11,8 +11,8 @@ #include "media/base/audio_bus.h" #include "media/base/audio_decoder_config.h" #include "media/base/audio_timestamp_helper.h" -#include "media/base/buffers.h" #include "media/base/sinc_resampler.h" +#include "media/base/timestamp_constants.h" #include "media/base/vector_math.h" namespace media { @@ -141,7 +141,6 @@ void AudioBufferConverter::ResetConverter( input_params_.Reset( input_params_.format(), buffer->channel_layout(), - buffer->channel_count(), buffer->sample_rate(), input_params_.bits_per_sample(), // If resampling is needed and the FIFO disabled, the AudioConverter will @@ -150,6 +149,7 @@ void AudioBufferConverter::ResetConverter( buffer->sample_rate() == output_params_.sample_rate() ? output_params_.frames_per_buffer() : SincResampler::kDefaultRequestSize); + input_params_.set_channels_for_discrete(buffer->channel_count()); io_sample_rate_ratio_ = static_cast<double>(input_params_.sample_rate()) / output_params_.sample_rate(); |