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

Unified Diff: media/base/channel_layout.cc

Issue 148553003: Clean up histogram'd media enum max values. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix naming collision Created 6 years, 10 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.h ('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_layout.cc
diff --git a/media/base/channel_layout.cc b/media/base/channel_layout.cc
index 958430ac4e7768f10c45f00120d6fd8d10e98928..4cb3a56b9f91fe45b961657a2e67beb93e760b21 100644
--- a/media/base/channel_layout.cc
+++ b/media/base/channel_layout.cc
@@ -48,7 +48,7 @@ static const int kLayoutToChannels[] = {
// surround sound channel in FFmpeg's 5.1 layout is in the 5th position (because
// the order is L, R, C, LFE, LS, RS), so
// kChannelOrderings[CHANNEL_LAYOUT_5POINT1][SIDE_LEFT] = 4;
-static const int kChannelOrderings[CHANNEL_LAYOUT_MAX][CHANNELS_MAX] = {
+static const int kChannelOrderings[CHANNEL_LAYOUT_MAX + 1][CHANNELS_MAX + 1] = {
// FL | FR | FC | LFE | BL | BR | FLofC | FRofC | BC | SL | SR
// CHANNEL_LAYOUT_NONE
@@ -246,8 +246,6 @@ const char* ChannelLayoutToString(ChannelLayout layout) {
return "OCTAGONAL";
case CHANNEL_LAYOUT_DISCRETE:
return "DISCRETE";
- case CHANNEL_LAYOUT_MAX:
- break;
}
NOTREACHED() << "Invalid channel layout provided: " << layout;
return "";
« no previous file with comments | « media/base/channel_layout.h ('k') | media/base/channel_mixer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698