Move media/audio files into media namespace

BUG=115187
TEST=compiles and runs without breaking audio tag; media_unittests, content_unittests

Review URL: https://chromiumcodereview.appspot.com/9805001

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

11 files changed, 55 insertions, 18 deletions

diff --git a/media/audio/linux/alsa_input.cc b/media/audio/linux/alsa_input.cc
index e28867f..84d2933 100644
--- a/media/audio/linux/alsa_input.cc
+++ b/media/audio/linux/alsa_input.cc
@@ -15,6 +15,8 @@
 #include "media/audio/linux/alsa_wrapper.h"
 #include "media/audio/linux/audio_manager_linux.h"
 
+namespace media {
+
 static const int kNumPacketsInRingBuffer = 3;
 
 static const char kDefaultDevice1[] = "default";
@@ -341,3 +343,5 @@ void AlsaPcmInputStream::HandleError(const char* method, int error) {
   LOG(WARNING) << method << ": " << wrapper_->StrError(error);
   callback_->OnError(this, error);
 }
+
+}  // namespace media
diff --git a/media/audio/linux/alsa_input.h b/media/audio/linux/alsa_input.h
index 6f6a981..ae027d4 100644
--- a/media/audio/linux/alsa_input.h
+++ b/media/audio/linux/alsa_input.h
@@ -17,6 +17,8 @@
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
+namespace media {
+
 class AlsaWrapper;
 class AudioManagerLinux;
 
@@ -85,4 +87,6 @@ class AlsaPcmInputStream : public AudioInputStreamImpl {
   DISALLOW_COPY_AND_ASSIGN(AlsaPcmInputStream);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_LINUX_ALSA_INPUT_H_
diff --git a/media/audio/linux/alsa_output.cc b/media/audio/linux/alsa_output.cc
index fc74180..d940be9 100644
--- a/media/audio/linux/alsa_output.cc
+++ b/media/audio/linux/alsa_output.cc
@@ -49,6 +49,8 @@
 #include "media/base/data_buffer.h"
 #include "media/base/seekable_buffer.h"
 
+namespace media {
+
 // Amount of time to wait if we've exhausted the data source.  This is to avoid
 // busy looping.
 static const uint32 kNoDataSleepMilliseconds = 10;
@@ -797,3 +799,5 @@ void AlsaPcmOutputStream::set_source_callback(AudioSourceCallback* callback) {
   DCHECK(IsOnAudioThread());
   source_callback_ = callback;
 }
+
+}  // namespace media
diff --git a/media/audio/linux/alsa_output.h b/media/audio/linux/alsa_output.h
index ee257eb..43e75bb 100644
--- a/media/audio/linux/alsa_output.h
+++ b/media/audio/linux/alsa_output.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 //
@@ -32,13 +32,13 @@
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
+class MessageLoop;
+
 namespace media {
-class SeekableBuffer;
-};  // namespace media
 
 class AlsaWrapper;
 class AudioManagerLinux;
-class MessageLoop;
+class SeekableBuffer;
 
 class MEDIA_EXPORT AlsaPcmOutputStream : public AudioOutputStream {
  public:
@@ -210,4 +210,6 @@ class MEDIA_EXPORT AlsaPcmOutputStream : public AudioOutputStream {
 MEDIA_EXPORT std::ostream& operator<<(std::ostream& os,
                                       AlsaPcmOutputStream::InternalState);
 
+};  // namespace media
+
 #endif  // MEDIA_AUDIO_LINUX_ALSA_OUTPUT_H_
diff --git a/media/audio/linux/alsa_output_unittest.cc b/media/audio/linux/alsa_output_unittest.cc
index ab9a654..be605c1 100644
--- a/media/audio/linux/alsa_output_unittest.cc
+++ b/media/audio/linux/alsa_output_unittest.cc
@@ -29,6 +29,8 @@ using testing::StrictMock;
 using testing::StrEq;
 using testing::Unused;
 
+namespace media {
+
 class MockAlsaWrapper : public AlsaWrapper {
  public:
   MOCK_METHOD3(DeviceNameHint, int(int card,
@@ -824,3 +826,5 @@ TEST_F(AlsaPcmOutputStreamTest, ScheduleNextWrite_StopStream) {
   test_stream->TransitionTo(AlsaPcmOutputStream::kIsClosed);
   test_stream->Close();
 }
+
+}  // namespace media
diff --git a/media/audio/linux/alsa_util.cc b/media/audio/linux/alsa_util.cc
index 5137119..176ef69 100644
--- a/media/audio/linux/alsa_util.cc
+++ b/media/audio/linux/alsa_util.cc
@@ -11,7 +11,7 @@
 
 namespace alsa_util {
 
-static snd_pcm_t* OpenDevice(AlsaWrapper* wrapper,
+static snd_pcm_t* OpenDevice(media::AlsaWrapper* wrapper,
                              const char* device_name,
                              snd_pcm_stream_t type,
                              int channels,
@@ -81,7 +81,7 @@ snd_pcm_format_t BitsToFormat(int bits_per_sample) {
   }
 }
 
-int CloseDevice(AlsaWrapper* wrapper, snd_pcm_t* handle) {
+int CloseDevice(media::AlsaWrapper* wrapper, snd_pcm_t* handle) {
   std::string device_name = wrapper->PcmName(handle);
   int error = wrapper->PcmClose(handle);
   if (error < 0) {
@@ -92,7 +92,7 @@ int CloseDevice(AlsaWrapper* wrapper, snd_pcm_t* handle) {
   return error;
 }
 
-snd_pcm_t* OpenCaptureDevice(AlsaWrapper* wrapper,
+snd_pcm_t* OpenCaptureDevice(media::AlsaWrapper* wrapper,
                              const char* device_name,
                              int channels,
                              int sample_rate,
@@ -102,7 +102,7 @@ snd_pcm_t* OpenCaptureDevice(AlsaWrapper* wrapper,
                     sample_rate, pcm_format, latency_us);
 }
 
-snd_pcm_t* OpenPlaybackDevice(AlsaWrapper* wrapper,
+snd_pcm_t* OpenPlaybackDevice(media::AlsaWrapper* wrapper,
                               const char* device_name,
                               int channels,
                               int sample_rate,
@@ -112,7 +112,7 @@ snd_pcm_t* OpenPlaybackDevice(AlsaWrapper* wrapper,
                     sample_rate, pcm_format, latency_us);
 }
 
-snd_mixer_t* OpenMixer(AlsaWrapper* wrapper,
+snd_mixer_t* OpenMixer(media::AlsaWrapper* wrapper,
                        const std::string& device_name) {
   snd_mixer_t* mixer = NULL;
 
@@ -143,7 +143,7 @@ snd_mixer_t* OpenMixer(AlsaWrapper* wrapper,
   return mixer;
 }
 
-void CloseMixer(AlsaWrapper* wrapper, snd_mixer_t* mixer,
+void CloseMixer(media::AlsaWrapper* wrapper, snd_mixer_t* mixer,
                 const std::string& device_name) {
   if (!mixer)
     return;
@@ -166,7 +166,7 @@ void CloseMixer(AlsaWrapper* wrapper, snd_mixer_t* mixer,
   }
 }
 
-snd_mixer_elem_t* LoadCaptureMixerElement(AlsaWrapper* wrapper,
+snd_mixer_elem_t* LoadCaptureMixerElement(media::AlsaWrapper* wrapper,
                                           snd_mixer_t* mixer) {
   if (!mixer)
     return NULL;
diff --git a/media/audio/linux/alsa_util.h b/media/audio/linux/alsa_util.h
index 054d24d..53cf80a 100644
--- a/media/audio/linux/alsa_util.h
+++ b/media/audio/linux/alsa_util.h
@@ -8,37 +8,40 @@
 #include <alsa/asoundlib.h>
 #include <string>
 
+namespace media {
 class AlsaWrapper;
+}
 
 namespace alsa_util {
 
 snd_pcm_format_t BitsToFormat(int bits_per_sample);
 
-snd_pcm_t* OpenCaptureDevice(AlsaWrapper* wrapper,
+snd_pcm_t* OpenCaptureDevice(media::AlsaWrapper* wrapper,
                              const char* device_name,
                              int channels,
                              int sample_rate,
                              snd_pcm_format_t pcm_format,
                              int latency_us);
 
-snd_pcm_t* OpenPlaybackDevice(AlsaWrapper* wrapper,
+snd_pcm_t* OpenPlaybackDevice(media::AlsaWrapper* wrapper,
                               const char* device_name,
                               int channels,
                               int sample_rate,
                               snd_pcm_format_t pcm_format,
                               int latency_us);
 
-int CloseDevice(AlsaWrapper* wrapper, snd_pcm_t* handle);
+int CloseDevice(media::AlsaWrapper* wrapper, snd_pcm_t* handle);
 
-snd_mixer_t* OpenMixer(AlsaWrapper* wrapper, const std::string& device_name);
+snd_mixer_t* OpenMixer(media::AlsaWrapper* wrapper,
+                       const std::string& device_name);
 
-void CloseMixer(AlsaWrapper* wrapper,
+void CloseMixer(media::AlsaWrapper* wrapper,
                 snd_mixer_t* mixer,
                 const std::string& device_name);
 
-snd_mixer_elem_t* LoadCaptureMixerElement(AlsaWrapper* wrapper,
+snd_mixer_elem_t* LoadCaptureMixerElement(media::AlsaWrapper* wrapper,
                                           snd_mixer_t* mixer);
 
-}
+}  // namespace alsa_util
 
 #endif  // MEDIA_AUDIO_LINUX_ALSA_UTIL_H_
diff --git a/media/audio/linux/alsa_wrapper.cc b/media/audio/linux/alsa_wrapper.cc
index 9e056d8..67331b4 100644
--- a/media/audio/linux/alsa_wrapper.cc
+++ b/media/audio/linux/alsa_wrapper.cc
@@ -6,6 +6,8 @@
 
 #include <alsa/asoundlib.h>
 
+namespace media {
+
 AlsaWrapper::AlsaWrapper() {
 }
 
@@ -226,3 +228,5 @@ int AlsaWrapper::MixerSelemGetCaptureVolumeRange(snd_mixer_elem_t* elem,
                                                  long* min, long* max) {
   return snd_mixer_selem_get_capture_volume_range(elem, min, max);
 }
+
+}  // namespace media
diff --git a/media/audio/linux/alsa_wrapper.h b/media/audio/linux/alsa_wrapper.h
index 49d64b2..30d9463 100644
--- a/media/audio/linux/alsa_wrapper.h
+++ b/media/audio/linux/alsa_wrapper.h
@@ -11,6 +11,8 @@
 #include "base/basictypes.h"
 #include "media/base/media_export.h"
 
+namespace media {
+
 class MEDIA_EXPORT AlsaWrapper {
  public:
   AlsaWrapper();
@@ -75,3 +77,5 @@ class MEDIA_EXPORT AlsaWrapper {
                         int soft_resample, unsigned int latency);
   DISALLOW_COPY_AND_ASSIGN(AlsaWrapper);
 };
+
+}  // namespace media
diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc
index 27d5749..0b34aaa 100644
--- a/media/audio/linux/audio_manager_linux.cc
+++ b/media/audio/linux/audio_manager_linux.cc
@@ -23,6 +23,8 @@
 #include "media/base/limits.h"
 #include "media/base/media_switches.h"
 
+namespace media {
+
 // Maximum number of output streams that can be open simultaneously.
 static const int kMaxOutputStreams = 50;
 
@@ -309,3 +311,5 @@ AudioInputStream* AudioManagerLinux::MakeInputStream(
 AudioManager* CreateAudioManager() {
   return new AudioManagerLinux();
 }
+
+}  // namespace media
diff --git a/media/audio/linux/audio_manager_linux.h b/media/audio/linux/audio_manager_linux.h
index 81e53c4..d62d361 100644
--- a/media/audio/linux/audio_manager_linux.h
+++ b/media/audio/linux/audio_manager_linux.h
@@ -11,6 +11,8 @@
 #include "base/threading/thread.h"
 #include "media/audio/audio_manager_base.h"
 
+namespace media {
+
 class AlsaWrapper;
 
 class MEDIA_EXPORT AudioManagerLinux : public AudioManagerBase {
@@ -73,4 +75,6 @@ class MEDIA_EXPORT AudioManagerLinux : public AudioManagerBase {
   DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_