Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / browser / renderer_host / media / audio_input_device_manager.cc

diff --git a/src/content/browser/renderer_host/media/audio_input_device_manager.cc b/src/content/browser/renderer_host/media/audio_input_device_manager.cc
index 00cd435..8d0377d 100644 (file)
--- a/src/content/browser/renderer_host/media/audio_input_device_manager.cc
+++ b/src/content/browser/renderer_host/media/audio_input_device_manager.cc
@@ -45,7 +45,7 @@ AudioInputDeviceManager::~AudioInputDeviceManager() {
 
 const StreamDeviceInfo* AudioInputDeviceManager::GetOpenedDeviceInfoById(
     int session_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   StreamDeviceList::iterator device = GetDevice(session_id);
   if (device == devices_.end())
     return NULL;
@@ -55,12 +55,12 @@ const StreamDeviceInfo* AudioInputDeviceManager::GetOpenedDeviceInfoById(
 
 void AudioInputDeviceManager::Register(
     MediaStreamProviderListener* listener,
-    base::MessageLoopProxy* device_thread_loop) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+    const scoped_refptr<base::SingleThreadTaskRunner>& device_task_runner) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(!listener_);
-  DCHECK(!device_loop_.get());
+  DCHECK(!device_task_runner_);
   listener_ = listener;
-  device_loop_ = device_thread_loop;
+  device_task_runner_ = device_task_runner;
 }
 
 void AudioInputDeviceManager::Unregister() {
@@ -69,20 +69,20 @@ void AudioInputDeviceManager::Unregister() {
 }
 
 void AudioInputDeviceManager::EnumerateDevices(MediaStreamType stream_type) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(listener_);
 
-  device_loop_->PostTask(
+  device_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&AudioInputDeviceManager::EnumerateOnDeviceThread,
                  this, stream_type));
 }
 
 int AudioInputDeviceManager::Open(const StreamDeviceInfo& device) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   // Generate a new id for this device.
   int session_id = next_capture_session_id_++;
-  device_loop_->PostTask(
+  device_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&AudioInputDeviceManager::OpenOnDeviceThread,
                  this, session_id, device));
@@ -91,7 +91,7 @@ int AudioInputDeviceManager::Open(const StreamDeviceInfo& device) {
 }
 
 void AudioInputDeviceManager::Close(int session_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(listener_);
   StreamDeviceList::iterator device = GetDevice(session_id);
   if (device == devices_.end())
@@ -109,12 +109,12 @@ void AudioInputDeviceManager::Close(int session_id) {
 }
 
 void AudioInputDeviceManager::UseFakeDevice() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   use_fake_device_ = true;
 }
 
 bool AudioInputDeviceManager::ShouldUseFakeDevice() const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   return use_fake_device_;
 }
 
@@ -187,6 +187,7 @@ void AudioInputDeviceManager::OpenOnDeviceThread(
     input_params.sample_rate = params.sample_rate();
     input_params.channel_layout = params.channel_layout();
     input_params.frames_per_buffer = params.frames_per_buffer();
+    input_params.effects = params.effects();
 
     // Add preferred output device information if a matching output device
     // exists.
@@ -214,7 +215,7 @@ void AudioInputDeviceManager::OpenOnDeviceThread(
 void AudioInputDeviceManager::DevicesEnumeratedOnIOThread(
     MediaStreamType stream_type,
     scoped_ptr<StreamDeviceInfoArray> devices) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   // Ensure that |devices| gets deleted on exit.
   if (listener_)
     listener_->DevicesEnumerated(stream_type, *devices);
@@ -222,7 +223,7 @@ void AudioInputDeviceManager::DevicesEnumeratedOnIOThread(
 
 void AudioInputDeviceManager::OpenedOnIOThread(int session_id,
                                                const StreamDeviceInfo& info) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK_EQ(session_id, info.session_id);
   DCHECK(GetDevice(session_id) == devices_.end());
 
@@ -234,13 +235,13 @@ void AudioInputDeviceManager::OpenedOnIOThread(int session_id,
 
 void AudioInputDeviceManager::ClosedOnIOThread(MediaStreamType stream_type,
                                                int session_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (listener_)
     listener_->Closed(stream_type, session_id);
 }
 
 bool AudioInputDeviceManager::IsOnDeviceThread() const {
-  return device_loop_->BelongsToCurrentThread();
+  return device_task_runner_->BelongsToCurrentThread();
 }
 
 AudioInputDeviceManager::StreamDeviceList::iterator