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

Unified Diff: media/base/channel_mixer.h

Issue 12662038: Revert 187936 "Pass more detailed audio hardware configuration i..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1440/src/
Patch Set: Created 7 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
« no previous file with comments | « media/base/channel_layout.cc ('k') | media/base/channel_mixer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/channel_mixer.h
===================================================================
--- media/base/channel_mixer.h (revision 189875)
+++ media/base/channel_mixer.h (working copy)
@@ -14,7 +14,6 @@
namespace media {
class AudioBus;
-class AudioParameters;
// ChannelMixer is for converting audio between channel layouts. The conversion
// matrix is built upon construction and used during each Transform() call. The
@@ -24,13 +23,9 @@
// input channels as defined in the matrix.
class MEDIA_EXPORT ChannelMixer {
public:
- ChannelMixer(ChannelLayout input_layout, ChannelLayout output_layout);
- ChannelMixer(const AudioParameters& input, const AudioParameters& output);
+ ChannelMixer(ChannelLayout input, ChannelLayout output);
~ChannelMixer();
- void Initialize(ChannelLayout input_layout, int input_channels,
- ChannelLayout output_layout, int output_channels);
-
// Transforms all channels from |input| into |output| channels.
void Transform(const AudioBus* input, AudioBus* output);
« no previous file with comments | « media/base/channel_layout.cc ('k') | media/base/channel_mixer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698