Move ChannelLayout into media namespace.

media/mp4/aac.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/mp4/aac.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "media/base/bit_reader.h"
 #include "media/mp4/rcheck.h"
 
 // The following conversion table is extracted from ISO 14496 Part 3 -
 // Table 1.16 - Sampling Frequency Index.
 static const int kFrequencyMap[] = {
   96000, 88200, 64000, 48000, 44100, 32000, 24000,
   22050, 16000, 12000, 11025, 8000, 7350
 };
 
+namespace media {
+
 static ChannelLayout GetChannelLayout(uint8 channel_config) {
   switch (channel_config) {
     case 1:
       return CHANNEL_LAYOUT_MONO;
     case 2:
       return CHANNEL_LAYOUT_STEREO;
     case 3:
       return CHANNEL_LAYOUT_SURROUND;
     case 4:
       return CHANNEL_LAYOUT_4_0;
     case 5:
       return CHANNEL_LAYOUT_5_0;
     case 6:
       return CHANNEL_LAYOUT_5_1;
     case 8:
       return CHANNEL_LAYOUT_7_1;
     default:
       break;
   }
 
   return CHANNEL_LAYOUT_UNSUPPORTED;
 }
 
-namespace media {
-
 namespace mp4 {
 
 AAC::AAC()
     : profile_(0), frequency_index_(0), channel_config_(0), frequency_(0),
       extension_frequency_(0), channel_layout_(CHANNEL_LAYOUT_UNSUPPORTED) {
 }
 
 AAC::~AAC() {
 }
 
@@ skipping 199 matching lines @@
 
     RCHECK(bit_reader->ReadBits(1, &dummy));  // extensionFlag3
   }
 
   return true;
 }
 
 }  // namespace mp4
 
 }  // namespace media