Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1327)

Unified Diff: content/renderer/media/audio_input_device.cc

Issue 9805001: Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/audio_input_device.h ('k') | content/renderer/media/audio_renderer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/audio_input_device.cc
diff --git a/content/renderer/media/audio_input_device.cc b/content/renderer/media/audio_input_device.cc
index 11a3938c0026b412229bdaadbd9699bb5ce5844b..09c0ba73fecde8721e8b9be71fa72fb092a4fe29 100644
--- a/content/renderer/media/audio_input_device.cc
+++ b/content/renderer/media/audio_input_device.cc
@@ -21,7 +21,7 @@
class AudioInputDevice::AudioThreadCallback
: public AudioDeviceThread::Callback {
public:
- AudioThreadCallback(const AudioParameters& audio_parameters,
+ AudioThreadCallback(const media::AudioParameters& audio_parameters,
base::SharedMemoryHandle memory,
int memory_length,
CaptureCallback* capture_callback);
@@ -37,7 +37,7 @@ class AudioInputDevice::AudioThreadCallback
DISALLOW_COPY_AND_ASSIGN(AudioThreadCallback);
};
-AudioInputDevice::AudioInputDevice(const AudioParameters& params,
+AudioInputDevice::AudioInputDevice(const media::AudioParameters& params,
CaptureCallback* callback,
CaptureEventHandler* event_handler)
: ScopedLoopObserver(ChildProcess::current()->io_message_loop()),
@@ -117,7 +117,8 @@ void AudioInputDevice::InitializeOnIOThread() {
// and create the stream when getting a OnDeviceReady() callback.
if (!session_id_) {
Send(new AudioInputHostMsg_CreateStream(
- stream_id_, audio_parameters_, AudioManagerBase::kDefaultDeviceId,
+ stream_id_, audio_parameters_,
+ media::AudioManagerBase::kDefaultDeviceId,
agc_is_enabled_));
} else {
Send(new AudioInputHostMsg_StartDevice(stream_id_, session_id_));
@@ -297,7 +298,7 @@ void AudioInputDevice::WillDestroyCurrentMessageLoop() {
// AudioInputDevice::AudioThreadCallback
AudioInputDevice::AudioThreadCallback::AudioThreadCallback(
- const AudioParameters& audio_parameters,
+ const media::AudioParameters& audio_parameters,
base::SharedMemoryHandle memory,
int memory_length,
CaptureCallback* capture_callback)
@@ -316,10 +317,10 @@ void AudioInputDevice::AudioThreadCallback::Process(int pending_data) {
// The shared memory represents parameters, size of the data buffer and the
// actual data buffer containing audio data. Map the memory into this
// structure and parse out parameters and the data area.
- AudioInputBuffer* buffer =
- reinterpret_cast<AudioInputBuffer*>(shared_memory_.memory());
+ media::AudioInputBuffer* buffer =
+ reinterpret_cast<media::AudioInputBuffer*>(shared_memory_.memory());
uint32 size = buffer->params.size;
- DCHECK_EQ(size, memory_length_ - sizeof(AudioInputBufferParameters));
+ DCHECK_EQ(size, memory_length_ - sizeof(media::AudioInputBufferParameters));
double volume = buffer->params.volume;
int audio_delay_milliseconds = pending_data / bytes_per_ms_;
« no previous file with comments | « content/renderer/media/audio_input_device.h ('k') | content/renderer/media/audio_renderer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698