Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(882)

Unified Diff: media/base/audio_converter.cc

Issue 177333003: Add support for midstream audio configuration changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ABS
Patch Set: Back to the original approach, but with working splicer timestamps. Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/base/audio_converter.cc
diff --git a/media/base/audio_converter.cc b/media/base/audio_converter.cc
index 195a227e58aa7c72f79b86af46ab09060622acd1..aa0be4f0470c511512022c9f6d33e27eb2d104ff 100644
--- a/media/base/audio_converter.cc
+++ b/media/base/audio_converter.cc
@@ -25,7 +25,7 @@ namespace media {
AudioConverter::AudioConverter(const AudioParameters& input_params,
const AudioParameters& output_params,
bool disable_fifo)
- : chunk_size_(output_params.frames_per_buffer()),
+ : chunk_size_(input_params.frames_per_buffer()),
downmix_early_(false),
resampler_frame_delay_(0),
input_channel_count_(input_params.channels()) {
@@ -48,15 +48,16 @@ AudioConverter::AudioConverter(const AudioParameters& input_params,
if (input_params.sample_rate() != output_params.sample_rate()) {
DVLOG(1) << "Resampling from " << input_params.sample_rate() << " to "
<< output_params.sample_rate();
- const double io_sample_rate_ratio = input_params.sample_rate() /
- static_cast<double>(output_params.sample_rate());
const int request_size = disable_fifo ? SincResampler::kDefaultRequestSize :
input_params.frames_per_buffer();
+ const double io_sample_rate_ratio =
+ input_params.sample_rate() /
+ static_cast<double>(output_params.sample_rate());
resampler_.reset(new MultiChannelResampler(
- downmix_early_ ? output_params.channels() :
- input_params.channels(),
- io_sample_rate_ratio, request_size, base::Bind(
- &AudioConverter::ProvideInput, base::Unretained(this))));
+ downmix_early_ ? output_params.channels() : input_params.channels(),
+ io_sample_rate_ratio,
+ request_size,
+ base::Bind(&AudioConverter::ProvideInput, base::Unretained(this))));
}
input_frame_duration_ = base::TimeDelta::FromMicroseconds(

Powered by Google App Engine
This is Rietveld 408576698