Move ChannelLayout into media namespace.

Also moves kChannelOrderings extern into a function for export compatibility
with MSVC++ and the shared_memory_support target.

BUG=none
TEST=compiles.

Review URL: https://codereview.chromium.org/11198018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162502 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 32 insertions, 28 deletions

diff --git a/content/renderer/media/audio_hardware.cc b/content/renderer/media/audio_hardware.cc
index a7322a0..f0ff736 100644
--- a/content/renderer/media/audio_hardware.cc
+++ b/content/renderer/media/audio_hardware.cc
@@ -8,6 +8,9 @@
 #include "content/common/view_messages.h"
 #include "content/renderer/render_thread_impl.h"
 
+using media::ChannelLayout;
+using media::CHANNEL_LAYOUT_NONE;
+
 static int output_sample_rate = 0;
 static int input_sample_rate = 0;
 static size_t output_buffer_size = 0;
diff --git a/content/renderer/media/audio_hardware.h b/content/renderer/media/audio_hardware.h
index 9202a62..f78fee6 100644
--- a/content/renderer/media/audio_hardware.h
+++ b/content/renderer/media/audio_hardware.h
@@ -29,7 +29,7 @@ CONTENT_EXPORT size_t GetOutputBufferSize();
 
 // Fetch the audio channel layout for the default input device.
 // Must be called from RenderThreadImpl::current().
-CONTENT_EXPORT ChannelLayout GetInputChannelLayout();
+CONTENT_EXPORT media::ChannelLayout GetInputChannelLayout();
 
 // Forces the next call to any of the Get functions to query the hardware
 // and repopulate the cache.
diff --git a/content/renderer/media/audio_renderer_mixer_manager_unittest.cc b/content/renderer/media/audio_renderer_mixer_manager_unittest.cc
index 818bed8..40b642e 100644
--- a/content/renderer/media/audio_renderer_mixer_manager_unittest.cc
+++ b/content/renderer/media/audio_renderer_mixer_manager_unittest.cc
@@ -17,7 +17,7 @@ namespace content {
 static const int kBitsPerChannel = 16;
 static const int kSampleRate = 48000;
 static const int kBufferSize = 8192;
-static const ChannelLayout kChannelLayout = CHANNEL_LAYOUT_STEREO;
+static const media::ChannelLayout kChannelLayout = media::CHANNEL_LAYOUT_STEREO;
 
 // By sub-classing AudioDeviceFactory we've overridden the factory to use our
 // CreateAudioDevice() method globally.
diff --git a/content/renderer/media/webrtc_audio_device_impl.cc b/content/renderer/media/webrtc_audio_device_impl.cc
index 820a409..9fea501 100644
--- a/content/renderer/media/webrtc_audio_device_impl.cc
+++ b/content/renderer/media/webrtc_audio_device_impl.cc
@@ -17,6 +17,7 @@
 
 using content::AudioDeviceFactory;
 using media::AudioParameters;
+using media::ChannelLayout;
 
 static const int64 kMillisecondsBetweenProcessCalls = 5000;
 static const double kMaxVolumeLevel = 255.0;
@@ -452,7 +453,7 @@ int32_t WebRtcAudioDeviceImpl::Init() {
   // This request is based on a synchronous IPC message.
   ChannelLayout in_channel_layout = audio_hardware::GetInputChannelLayout();
   DVLOG(1) << "Audio input hardware channels: " << in_channel_layout;
-  ChannelLayout out_channel_layout = CHANNEL_LAYOUT_MONO;
+  ChannelLayout out_channel_layout = media::CHANNEL_LAYOUT_MONO;
 
   AudioParameters::Format in_format = AudioParameters::AUDIO_PCM_LINEAR;
   int in_buffer_size = 0;
@@ -464,7 +465,7 @@ int32_t WebRtcAudioDeviceImpl::Init() {
 // Windows
 #if defined(OS_WIN)
   // Always use stereo rendering on Windows.
-  out_channel_layout = CHANNEL_LAYOUT_STEREO;
+  out_channel_layout = media::CHANNEL_LAYOUT_STEREO;
 
   DVLOG(1) << "Using AUDIO_PCM_LOW_LATENCY as input mode on Windows.";
   in_format = AudioParameters::AUDIO_PCM_LOW_LATENCY;
@@ -511,7 +512,7 @@ int32_t WebRtcAudioDeviceImpl::Init() {
 
 // Mac OS X
 #elif defined(OS_MACOSX)
-  out_channel_layout = CHANNEL_LAYOUT_MONO;
+  out_channel_layout = media::CHANNEL_LAYOUT_MONO;
 
   DVLOG(1) << "Using AUDIO_PCM_LOW_LATENCY as input mode on Mac OS X.";
   in_format = AudioParameters::AUDIO_PCM_LOW_LATENCY;
@@ -545,8 +546,8 @@ int32_t WebRtcAudioDeviceImpl::Init() {
   }
 // Linux
 #elif defined(OS_LINUX) || defined(OS_OPENBSD)
-  in_channel_layout = CHANNEL_LAYOUT_STEREO;
-  out_channel_layout = CHANNEL_LAYOUT_MONO;
+  in_channel_layout = media::CHANNEL_LAYOUT_STEREO;
+  out_channel_layout = media::CHANNEL_LAYOUT_MONO;
 
   // Based on tests using the current ALSA implementation in Chrome, we have
   // found that the best combination is 20ms on the input side and 10ms on the
@@ -575,9 +576,9 @@ int32_t WebRtcAudioDeviceImpl::Init() {
   audio_input_device_->Initialize(input_audio_parameters_, this, this);
 
   UMA_HISTOGRAM_ENUMERATION("WebRTC.AudioOutputChannelLayout",
-                            out_channel_layout, CHANNEL_LAYOUT_MAX);
+                            out_channel_layout, media::CHANNEL_LAYOUT_MAX);
   UMA_HISTOGRAM_ENUMERATION("WebRTC.AudioInputChannelLayout",
-                            in_channel_layout, CHANNEL_LAYOUT_MAX);
+                            in_channel_layout, media::CHANNEL_LAYOUT_MAX);
   AddHistogramFramesPerBuffer(kAudioOutput, out_buffer_size);
   AddHistogramFramesPerBuffer(kAudioInput, in_buffer_size);
 
diff --git a/content/renderer/media/webrtc_audio_device_unittest.cc b/content/renderer/media/webrtc_audio_device_unittest.cc
index 1a542f5..3235385 100644
--- a/content/renderer/media/webrtc_audio_device_unittest.cc
+++ b/content/renderer/media/webrtc_audio_device_unittest.cc
@@ -35,7 +35,7 @@ class AudioUtil : public AudioUtilInterface {
       const std::string& device_id) OVERRIDE {
     return media::GetAudioInputHardwareSampleRate(device_id);
   }
-  virtual ChannelLayout GetAudioInputHardwareChannelLayout(
+  virtual media::ChannelLayout GetAudioInputHardwareChannelLayout(
       const std::string& device_id) OVERRIDE {
     return media::GetAudioInputHardwareChannelLayout(device_id);
   }
@@ -46,7 +46,7 @@ class AudioUtil : public AudioUtilInterface {
 class AudioUtilNoHardware : public AudioUtilInterface {
  public:
   AudioUtilNoHardware(int output_rate, int input_rate,
-                      ChannelLayout input_channel_layout)
+                      media::ChannelLayout input_channel_layout)
       : output_rate_(output_rate),
         input_rate_(input_rate),
         input_channel_layout_(input_channel_layout) {
@@ -59,7 +59,7 @@ class AudioUtilNoHardware : public AudioUtilInterface {
       const std::string& device_id) OVERRIDE {
     return input_rate_;
   }
-  virtual ChannelLayout GetAudioInputHardwareChannelLayout(
+  virtual media::ChannelLayout GetAudioInputHardwareChannelLayout(
       const std::string& device_id) OVERRIDE {
     return input_channel_layout_;
   }
@@ -67,7 +67,7 @@ class AudioUtilNoHardware : public AudioUtilInterface {
  private:
   int output_rate_;
   int input_rate_;
-  ChannelLayout input_channel_layout_;
+  media::ChannelLayout input_channel_layout_;
   DISALLOW_COPY_AND_ASSIGN(AudioUtilNoHardware);
 };
 
@@ -221,7 +221,7 @@ TEST_F(WebRTCAudioDeviceTest, TestValidOutputRates) {
 // Basic test that instantiates and initializes an instance of
 // WebRtcAudioDeviceImpl.
 TEST_F(WebRTCAudioDeviceTest, Construct) {
-  AudioUtilNoHardware audio_util(48000, 48000, CHANNEL_LAYOUT_MONO);
+  AudioUtilNoHardware audio_util(48000, 48000, media::CHANNEL_LAYOUT_MONO);
   SetAudioUtilCallback(&audio_util);
   scoped_refptr<WebRtcAudioDeviceImpl> webrtc_audio_device(
       new WebRtcAudioDeviceImpl());
diff --git a/content/renderer/pepper/pepper_platform_audio_input_impl.cc b/content/renderer/pepper/pepper_platform_audio_input_impl.cc
index 61b8804..94b9e92 100644
--- a/content/renderer/pepper/pepper_platform_audio_input_impl.cc
+++ b/content/renderer/pepper/pepper_platform_audio_input_impl.cc
@@ -157,8 +157,8 @@ bool PepperPlatformAudioInputImpl::Initialize(
   plugin_delegate_ = plugin_delegate;
   client_ = client;
 
-  params_.Reset(media::AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO,
-                sample_rate, 16, frames_per_buffer);
+  params_.Reset(media::AudioParameters::AUDIO_PCM_LINEAR,
+                media::CHANNEL_LAYOUT_MONO, sample_rate, 16, frames_per_buffer);
 
   if (device_id.empty()) {
     // Use the default device.
diff --git a/content/renderer/pepper/pepper_platform_audio_output_impl.cc b/content/renderer/pepper/pepper_platform_audio_output_impl.cc
index d196102..843569f 100644
--- a/content/renderer/pepper/pepper_platform_audio_output_impl.cc
+++ b/content/renderer/pepper/pepper_platform_audio_output_impl.cc
@@ -139,8 +139,8 @@ bool PepperPlatformAudioOutputImpl::Initialize(
     format = media::AudioParameters::AUDIO_PCM_LINEAR;
   }
 
-  media::AudioParameters params(format, CHANNEL_LAYOUT_STEREO, sample_rate, 16,
-                                frames_per_buffer);
+  media::AudioParameters params(format, media::CHANNEL_LAYOUT_STEREO,
+                                sample_rate, 16, frames_per_buffer);
 
   ChildProcess::current()->io_message_loop()->PostTask(
       FROM_HERE,
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index c9d6e41..b2b4386 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -570,7 +570,7 @@ RendererWebKitPlatformSupportImpl::createAudioDevice(
     unsigned numberOfChannels,
     double sampleRate,
     WebAudioDevice::RenderCallback* callback) {
-  ChannelLayout layout = CHANNEL_LAYOUT_UNSUPPORTED;
+  media::ChannelLayout layout = media::CHANNEL_LAYOUT_UNSUPPORTED;
 
   // The |numberOfChannels| does not exactly identify the channel layout of the
   // device. The switch statement below assigns a best guess to the channel
@@ -579,31 +579,31 @@ RendererWebKitPlatformSupportImpl::createAudioDevice(
   // channel count.
   switch (numberOfChannels) {
     case 1:
-      layout = CHANNEL_LAYOUT_MONO;
+      layout = media::CHANNEL_LAYOUT_MONO;
       break;
     case 2:
-      layout = CHANNEL_LAYOUT_STEREO;
+      layout = media::CHANNEL_LAYOUT_STEREO;
       break;
     case 3:
-      layout = CHANNEL_LAYOUT_2_1;
+      layout = media::CHANNEL_LAYOUT_2_1;
       break;
     case 4:
-      layout = CHANNEL_LAYOUT_4_0;
+      layout = media::CHANNEL_LAYOUT_4_0;
       break;
     case 5:
-      layout = CHANNEL_LAYOUT_5_0;
+      layout = media::CHANNEL_LAYOUT_5_0;
       break;
     case 6:
-      layout = CHANNEL_LAYOUT_5_1;
+      layout = media::CHANNEL_LAYOUT_5_1;
       break;
     case 7:
-      layout = CHANNEL_LAYOUT_7_0;
+      layout = media::CHANNEL_LAYOUT_7_0;
       break;
     case 8:
-      layout = CHANNEL_LAYOUT_7_1;
+      layout = media::CHANNEL_LAYOUT_7_1;
       break;
     default:
-      layout = CHANNEL_LAYOUT_STEREO;
+      layout = media::CHANNEL_LAYOUT_STEREO;
   }
 
   media::AudioParameters params(