| Index: media/audio/mac/audio_output_mac.cc
|
| diff --git a/media/audio/mac/audio_output_mac.cc b/media/audio/mac/audio_output_mac.cc
|
| index 615fa5e9f8eb5fa4d04a1ff22d464b10e1d5e44e..ab96bd63ad6d72a1fb332caac94251a825ad0aaf 100644
|
| --- a/media/audio/mac/audio_output_mac.cc
|
| +++ b/media/audio/mac/audio_output_mac.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 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.
|
|
|
| @@ -9,16 +9,12 @@
|
| #include "media/audio/audio_util.h"
|
| #include "media/audio/mac/audio_manager_mac.h"
|
|
|
| -namespace {
|
| -
|
| // A custom data structure to store information an AudioQueue buffer.
|
| struct AudioQueueUserData {
|
| AudioQueueUserData() : empty_buffer(false) {}
|
| bool empty_buffer;
|
| };
|
|
|
| -} // namespace
|
| -
|
| // Overview of operation:
|
| // 1) An object of PCMQueueOutAudioOutputStream is created by the AudioManager
|
| // factory: audio_man->MakeAudioStream(). This just fills some structure.
|
| @@ -178,7 +174,6 @@ void PCMQueueOutAudioOutputStream::GetVolume(double* volume) {
|
|
|
| // Reorder PCM from AAC layout to Core Audio layout.
|
| // TODO(fbarchard): Switch layout when ffmpeg is updated.
|
| -namespace {
|
| template<class Format>
|
| static void SwizzleLayout(Format* b, uint32 filled) {
|
| static const int kNumSurroundChannels = 6;
|
| @@ -193,7 +188,6 @@ static void SwizzleLayout(Format* b, uint32 filled) {
|
| b[5] = aac[4]; // Rs
|
| }
|
| }
|
| -} // namespace
|
|
|
| // Note to future hackers of this function: Do not add locks here because we
|
| // call out to third party source that might do crazy things including adquire
|
|
|