Move SwizzleCoreAudioLayout5_1() closer to where it's called.

media/audio/audio_util.h

 // Copyright (c) 2010 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.
 
 #ifndef MEDIA_AUDIO_AUDIO_UTIL_H_
 #define MEDIA_AUDIO_AUDIO_UTIL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 56 matching lines @@
 // InterleaveFloatToInt16 scales, clips, and interleaves the planar
 // floating-point audio contained in |source| to the int16 |destination|.
 // The floating-point data is in a canonical range of -1.0 -> +1.0.
 // The size of the |source| vector determines the number of channels.
 // The |destination| buffer is assumed to be large enough to hold the
 // result. Thus it must be at least size: number_of_frames * source.size()
 void InterleaveFloatToInt16(const std::vector<float*>& source,
                             int16* destination,
                             size_t number_of_frames);
 
-// Reorder PCM from AAC layout to Core Audio 5.1 layout.
-// TODO(fbarchard): Switch layout when ffmpeg is updated.
-template<class Format>
-void SwizzleCoreAudioLayout5_1(Format* b, uint32 filled) {
-  static const int kNumSurroundChannels = 6;
-  Format aac[kNumSurroundChannels];
-  for (uint32 i = 0; i < filled; i += sizeof(aac), b += kNumSurroundChannels) {
-    memcpy(aac, b, sizeof(aac));
-    b[0] = aac[1];  // L
-    b[1] = aac[2];  // R
-    b[2] = aac[0];  // C
-    b[3] = aac[5];  // LFE
-    b[4] = aac[3];  // Ls
-    b[5] = aac[4];  // Rs
-  }
-}
-
 // Returns the default audio hardware sample-rate.
 double GetAudioHardwareSampleRate();
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_UTIL_H_