Clean up histogram'd media enum max values.

media/base/channel_layout.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/channel_layout.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 
 namespace media {
@@ skipping 30 matching lines @@
     8,   // CHANNEL_LAYOUT_OCTAGONAL
     0,   // CHANNEL_LAYOUT_DISCRETE
 };
 
 // The channel orderings for each layout as specified by FFmpeg.  Each value
 // represents the index of each channel in each layout.  Values of -1 mean the
 // channel at that index is not used for that layout.For example, the left side
 // 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
     {  -1 , -1 , -1 , -1  , -1 , -1 , -1    , -1    , -1 , -1 , -1 },
 
     // CHANNEL_LAYOUT_UNSUPPORTED
     {  -1 , -1 , -1 , -1  , -1 , -1 , -1    , -1    , -1 , -1 , -1 },
 
     // CHANNEL_LAYOUT_MONO
     {  -1 , -1 , 0  , -1  , -1 , -1 , -1    , -1    , -1 , -1 , -1 },
@@ skipping 177 matching lines @@
     case CHANNEL_LAYOUT_6_1_FRONT:
       return "6.1_FRONT";
     case CHANNEL_LAYOUT_7_0_FRONT:
       return "7.0_FRONT";
     case CHANNEL_LAYOUT_7_1_WIDE_BACK:
       return "7.1_WIDE_BACK";
     case CHANNEL_LAYOUT_OCTAGONAL:
       return "OCTAGONAL";
     case CHANNEL_LAYOUT_DISCRETE:
       return "DISCRETE";
-    case CHANNEL_LAYOUT_MAX:
-      break;
   }
   NOTREACHED() << "Invalid channel layout provided: " << layout;
   return "";
 }
 
 }  // namespace media