summaryrefslogtreecommitdiff
path: root/chromium/media/audio/audio_opus_encoder.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/media/audio/audio_opus_encoder.cc')
-rw-r--r--chromium/media/audio/audio_opus_encoder.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/chromium/media/audio/audio_opus_encoder.cc b/chromium/media/audio/audio_opus_encoder.cc
index eff6da899d7..235a2356b6f 100644
--- a/chromium/media/audio/audio_opus_encoder.cc
+++ b/chromium/media/audio/audio_opus_encoder.cc
@@ -1,4 +1,4 @@
-// Copyright 2020 The Chromium Authors. All rights reserved.
+// Copyright 2020 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -46,9 +46,8 @@ AudioParameters CreateInputParams(const AudioEncoder::Options& options) {
kOpusPreferredBufferDurationMs /
base::Time::kMillisecondsPerSecond;
AudioParameters result(media::AudioParameters::AUDIO_PCM_LINEAR,
- media::CHANNEL_LAYOUT_DISCRETE, options.sample_rate,
- frames_per_buffer);
- result.set_channels_for_discrete(options.channels);
+ {media::CHANNEL_LAYOUT_DISCRETE, options.channels},
+ options.sample_rate, frames_per_buffer);
return result;
}
@@ -68,9 +67,10 @@ AudioParameters CreateOpusCompatibleParams(const AudioParameters& params) {
const int frames_per_buffer = used_rate * kOpusPreferredBufferDurationMs /
base::Time::kMillisecondsPerSecond;
- AudioParameters result(AudioParameters::AUDIO_PCM_LOW_LATENCY,
- GuessChannelLayout(std::min(params.channels(), 2)),
- used_rate, frames_per_buffer);
+ AudioParameters result(
+ AudioParameters::AUDIO_PCM_LOW_LATENCY,
+ ChannelLayoutConfig::Guess(std::min(params.channels(), 2)), used_rate,
+ frames_per_buffer);
return result;
}