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

Unified Diff: media/audio/audio_parameters.cc

Issue 518433002: Revert of Revert of Remove the last piece of deprecated synchronous IO code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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
« no previous file with comments | « media/audio/audio_parameters.h ('k') | media/audio/cras/audio_manager_cras.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_parameters.cc
diff --git a/media/audio/audio_parameters.cc b/media/audio/audio_parameters.cc
index 62b825ff0e55de481a9346e6789350ac2c21028d..7532f34077efe659e32b05b71a806ffeca61ae9e 100644
--- a/media/audio/audio_parameters.cc
+++ b/media/audio/audio_parameters.cc
@@ -16,7 +16,6 @@
bits_per_sample_(0),
frames_per_buffer_(0),
channels_(0),
- input_channels_(0),
effects_(NO_EFFECTS) {
}
@@ -29,12 +28,10 @@
bits_per_sample_(bits_per_sample),
frames_per_buffer_(frames_per_buffer),
channels_(ChannelLayoutToChannelCount(channel_layout)),
- input_channels_(0),
effects_(NO_EFFECTS) {
}
AudioParameters::AudioParameters(Format format, ChannelLayout channel_layout,
- int input_channels,
int sample_rate, int bits_per_sample,
int frames_per_buffer, int effects)
: format_(format),
@@ -43,37 +40,33 @@
bits_per_sample_(bits_per_sample),
frames_per_buffer_(frames_per_buffer),
channels_(ChannelLayoutToChannelCount(channel_layout)),
- input_channels_(input_channels),
effects_(effects) {
}
AudioParameters::AudioParameters(Format format, ChannelLayout channel_layout,
- int channels, int input_channels,
- int sample_rate, int bits_per_sample,
- int frames_per_buffer, int effects)
+ int channels, int sample_rate,
+ int bits_per_sample, int frames_per_buffer,
+ int effects)
: format_(format),
channel_layout_(channel_layout),
sample_rate_(sample_rate),
bits_per_sample_(bits_per_sample),
frames_per_buffer_(frames_per_buffer),
channels_(channels),
- input_channels_(input_channels),
effects_(effects) {
if (channel_layout != CHANNEL_LAYOUT_DISCRETE)
DCHECK_EQ(channels, ChannelLayoutToChannelCount(channel_layout));
}
void AudioParameters::Reset(Format format, ChannelLayout channel_layout,
- int channels, int input_channels,
- int sample_rate, int bits_per_sample,
- int frames_per_buffer) {
+ int channels, int sample_rate,
+ int bits_per_sample, int frames_per_buffer) {
if (channel_layout != CHANNEL_LAYOUT_DISCRETE)
DCHECK_EQ(channels, ChannelLayoutToChannelCount(channel_layout));
format_ = format;
channel_layout_ = channel_layout;
channels_ = channels;
- input_channels_ = input_channels;
sample_rate_ = sample_rate;
bits_per_sample_ = bits_per_sample;
frames_per_buffer_ = frames_per_buffer;
@@ -86,8 +79,6 @@
(channels_ <= media::limits::kMaxChannels) &&
(channel_layout_ > CHANNEL_LAYOUT_UNSUPPORTED) &&
(channel_layout_ <= CHANNEL_LAYOUT_MAX) &&
- (input_channels_ >= 0) &&
- (input_channels_ <= media::limits::kMaxChannels) &&
(sample_rate_ >= media::limits::kMinSampleRate) &&
(sample_rate_ <= media::limits::kMaxSampleRate) &&
(bits_per_sample_ > 0) &&
« no previous file with comments | « media/audio/audio_parameters.h ('k') | media/audio/cras/audio_manager_cras.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698