summaryrefslogtreecommitdiffstats
path: root/chromium/media/base/channel_layout.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/media/base/channel_layout.h')
-rw-r--r--chromium/media/base/channel_layout.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/chromium/media/base/channel_layout.h b/chromium/media/base/channel_layout.h
index 9354eee850d..12319ecb3ac 100644
--- a/chromium/media/base/channel_layout.h
+++ b/chromium/media/base/channel_layout.h
@@ -99,8 +99,14 @@ enum ChannelLayout {
// Channels are not explicitly mapped to speakers.
CHANNEL_LAYOUT_DISCRETE = 29,
- // Total number of layouts.
- CHANNEL_LAYOUT_MAX // Must always be last!
+ // Front L, Front R, Front C. Front C contains the keyboard mic audio. This
+ // layout is only intended for input for WebRTC. The Front C channel
+ // is stripped away in the WebRTC audio input pipeline and never seen outside
+ // of that.
+ CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC = 30,
+
+ // Max value, must always equal the largest entry ever logged.
+ CHANNEL_LAYOUT_MAX = CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC
};
enum Channels {
@@ -115,7 +121,7 @@ enum Channels {
BACK_CENTER,
SIDE_LEFT,
SIDE_RIGHT,
- CHANNELS_MAX
+ CHANNELS_MAX = SIDE_RIGHT, // Must always equal the largest value ever logged.
};
// Returns the expected channel position in an interleaved stream. Values of -1