Move AudioDevice and AudioInputDevice to media.

media/audio/audio_device_thread.h

 // 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.
 
-#ifndef CONTENT_RENDERER_MEDIA_AUDIO_DEVICE_THREAD_H_
-#define CONTENT_RENDERER_MEDIA_AUDIO_DEVICE_THREAD_H_
+#ifndef MEDIA_AUDIO_AUDIO_DEVICE_THREAD_H_
+#define MEDIA_AUDIO_AUDIO_DEVICE_THREAD_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/shared_memory.h"
 #include "base/sync_socket.h"
 #include "base/synchronization/lock.h"
-#include "content/common/content_export.h"
+#include "media/base/media_export.h"
 #include "media/audio/audio_parameters.h"
 
 class MessageLoop;
 
+namespace media {
+
 // Data transfer between browser and render process uses a combination
 // of sync sockets and shared memory. To read from the socket and render
 // data, we use a worker thread, a.k.a. the AudioDeviceThread, which reads
 // data from the browser via the socket and fills the shared memory from the
 // audio thread via the AudioDeviceThread::Callback interface/class.
 // For more details see the documentation in audio_device.h.
 //
 // TODO(tommi): Multiple Audio[Input]Device instances should be able to share
 // the same thread instead of spinning one per instance.
-class CONTENT_EXPORT AudioDeviceThread {
+class MEDIA_EXPORT AudioDeviceThread {
  public:
   // This is the callback interface/base class that Audio[Input]Device
   // implements to render input/output data. The callback happens on the
-  // AudioDevice thread.
+  // AudioOutputDevice thread.

[henrika (OOO until Aug 14), 2012/07/27 11:08:57]

Add AudioInputDevice thread and update AudioInputDevice class.

[tommi (sloooow) - chröme, 2012/07/27 11:40:05]

Done.

   class Callback {
    public:
-    Callback(const media::AudioParameters& audio_parameters,
+    Callback(const AudioParameters& audio_parameters,
              base::SharedMemoryHandle memory,
              int memory_length);
     virtual ~Callback();
 
     // One time initialization for the callback object on the audio thread.
     void InitializeOnAudioThread();
 
     // Derived implementations must call shared_memory_.Map appropriately
     // before Process can be called.
     virtual void MapSharedMemory() = 0;
 
     // Called whenever we receive notifications about pending data.
     virtual void Process(int pending_data) = 0;
 
    protected:
     // Protected so that derived classes can access directly.
     // The variables are 'const' since values are calculated/set in the
     // constructor and must never change.
-    const media::AudioParameters audio_parameters_;
+    const AudioParameters audio_parameters_;
     const int samples_per_ms_;
     const int bytes_per_ms_;
 
     // Audio buffers that are allocated in InitializeOnAudioThread() based on
     // info from audio_parameters_.
     std::vector<float*> audio_data_;
     base::SharedMemory shared_memory_;
     const int memory_length_;
 
    private:
@@ skipping 31 matching lines @@
   //    while still synchronized with SimpleThread::Start() to provide
   //    reliable initialization.
   class Thread;
 
   base::Lock thread_lock_;
   scoped_refptr<AudioDeviceThread::Thread> thread_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioDeviceThread);
 };
 
-#endif  // CONTENT_RENDERER_MEDIA_AUDIO_DEVICE_THREAD_H_
+}  // namespace media.
+
+#endif  // MEDIA_AUDIO_AUDIO_DEVICE_THREAD_H_