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

Unified Diff: media/base/channel_mixer_unittest.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/base/audio_buffer_converter_unittest.cc ('k') | media/cast/test/fake_media_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/channel_mixer_unittest.cc
diff --git a/media/base/channel_mixer_unittest.cc b/media/base/channel_mixer_unittest.cc
index 911866ac806ddaa7387448c71824b87494bd8e61..ac228e661dd39bb5869b4e98ddafa624807cdc4a 100644
--- a/media/base/channel_mixer_unittest.cc
+++ b/media/base/channel_mixer_unittest.cc
@@ -107,7 +107,6 @@
input_layout == CHANNEL_LAYOUT_DISCRETE ?
input_channels :
ChannelLayoutToChannelCount(input_layout),
- 0,
AudioParameters::kAudioCDSampleRate, 16,
kFrames,
AudioParameters::NO_EFFECTS);
@@ -118,9 +117,8 @@
AudioParameters output_audio(AudioParameters::AUDIO_PCM_LINEAR,
output_layout,
output_layout == CHANNEL_LAYOUT_DISCRETE ?
- output_channels :
- ChannelLayoutToChannelCount(output_layout),
- 0,
+ output_channels :
+ ChannelLayoutToChannelCount(output_layout),
AudioParameters::kAudioCDSampleRate, 16,
kFrames,
AudioParameters::NO_EFFECTS);
« no previous file with comments | « media/base/audio_buffer_converter_unittest.cc ('k') | media/cast/test/fake_media_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698