Remove (in practice) the voice engine channel limit.
There's really no reason for this limit. I've bumped it to a
practically unreachable ceiling, with a TODO for removing it
entirely.
TBR=henrika
BUG=b/8122300
Review URL: https://webrtc-codereview.appspot.com/1070014
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3459 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/voice_engine/voice_engine_defines.h b/voice_engine/voice_engine_defines.h
index a5f96a2..c2d9a42 100644
--- a/voice_engine/voice_engine_defines.h
+++ b/voice_engine/voice_engine_defines.h
@@ -23,8 +23,10 @@
// Enumerators
// ----------------------------------------------------------------------------
-namespace webrtc
-{
+namespace webrtc {
+
+// TODO(ajm): There's not really a reason for this limitation. Remove it.
+enum { kVoiceEngineMaxNumChannels = 100 };
// VolumeControl
enum { kMinVolumeLevel = 0 };
@@ -255,18 +257,6 @@
#endif
// ----------------------------------------------------------------------------
-// Enumerators
-// ----------------------------------------------------------------------------
-
-namespace webrtc
-{
-// Max number of supported channels
-enum { kVoiceEngineMaxNumOfChannels = 32 };
-// Max number of channels which can be played out simultaneously
-enum { kVoiceEngineMaxNumOfActiveChannels = 16 };
-} // namespace webrtc
-
-// ----------------------------------------------------------------------------
// Defines
// ----------------------------------------------------------------------------
@@ -341,18 +331,6 @@
#ifdef ANDROID
// ----------------------------------------------------------------------------
-// Enumerators
-// ----------------------------------------------------------------------------
-
-namespace webrtc
-{
- // Max number of supported channels
- enum { kVoiceEngineMaxNumOfChannels = 32 };
- // Max number of channels which can be played out simultaneously
- enum { kVoiceEngineMaxNumOfActiveChannels = 16 };
-} // namespace webrtc
-
-// ----------------------------------------------------------------------------
// Defines
// ----------------------------------------------------------------------------
@@ -384,17 +362,6 @@
return -1;
#else // LINUX PC
-// ----------------------------------------------------------------------------
-// Enumerators
-// ----------------------------------------------------------------------------
-
-namespace webrtc
-{
- // Max number of supported channels
- enum { kVoiceEngineMaxNumOfChannels = 32 };
- // Max number of channels which can be played out simultaneously
- enum { kVoiceEngineMaxNumOfActiveChannels = 16 };
-} // namespace webrtc
// ----------------------------------------------------------------------------
// Defines
@@ -467,18 +434,6 @@
#if defined(WEBRTC_IOS)
// ----------------------------------------------------------------------------
-// Enumerators
-// ----------------------------------------------------------------------------
-
-namespace webrtc
-{
- // Max number of supported channels
- enum { kVoiceEngineMaxNumOfChannels = 2 };
- // Max number of channels which can be played out simultaneously
- enum { kVoiceEngineMaxNumOfActiveChannels = 2 };
-} // namespace webrtc
-
-// ----------------------------------------------------------------------------
// Defines
// ----------------------------------------------------------------------------
@@ -511,14 +466,6 @@
// Enumerators
// ----------------------------------------------------------------------------
-namespace webrtc
-{
- // Max number of supported channels
- enum { kVoiceEngineMaxNumOfChannels = 32 };
- // Max number of channels which can be played out simultaneously
- enum { kVoiceEngineMaxNumOfActiveChannels = 16 };
-} // namespace webrtc
-
// ----------------------------------------------------------------------------
// Defines
// ----------------------------------------------------------------------------
@@ -530,6 +477,4 @@
#define IPHONE_NOT_SUPPORTED(stat)
#endif // #ifdef WEBRTC_MAC
-
-
#endif // WEBRTC_VOICE_ENGINE_VOICE_ENGINE_DEFINES_H