Switching MediaStreamManager from using AudioManager to AudioSystem

content/browser/renderer_host/media/media_stream_manager.cc

 // 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.
 
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 27 matching lines @@
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/desktop_media_id.h"
 #include "content/public/browser/media_observer.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents_media_capture_id.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/media_stream_request.h"
 #include "crypto/hmac.h"
 #include "media/audio/audio_device_description.h"
-#include "media/audio/audio_manager.h"
+#include "media/audio/audio_system.h"
 #include "media/base/audio_parameters.h"
 #include "media/base/channel_layout.h"
 #include "media/base/media_switches.h"
 #include "media/capture/video/video_capture_device_factory.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_com_initializer.h"
 #endif
@@ skipping 326 matching lines @@
 
   MediaStreamManager* msm = g_media_stream_manager_tls_ptr.Pointer()->Get();
   if (!msm) {
     DLOG(ERROR) << "No MediaStreamManager on the IO thread. " << message;
     return;
   }
 
   msm->AddLogMessageOnIOThread(message);
 }
 
-MediaStreamManager::MediaStreamManager(media::AudioManager* audio_manager)
-    : audio_manager_(audio_manager),
+MediaStreamManager::MediaStreamManager(media::AudioSystem* audio_system)
+    : audio_system_(audio_system),
 #if defined(OS_WIN)
       video_capture_thread_("VideoCaptureThread"),
 #endif
       use_fake_ui_(base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUseFakeUIForMediaStream)) {
-  DCHECK(audio_manager_);
+  DCHECK(audio_system_);
 
   // Some unit tests create the MSM in the IO thread and assumes the
   // initialization is done synchronously.
   if (BrowserThread::CurrentlyOn(BrowserThread::IO)) {
     InitializeDeviceManagersOnIOThread();
   } else {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&MediaStreamManager::InitializeDeviceManagersOnIOThread,
                    base::Unretained(this)));
   }
 
   base::PowerMonitor* power_monitor = base::PowerMonitor::Get();
   // BrowserMainLoop always creates the PowerMonitor instance before creating
   // MediaStreamManager, but power_monitor may be NULL in unit tests.
   if (power_monitor)
     power_monitor->AddObserver(this);
 }
 
 MediaStreamManager::~MediaStreamManager() {
   DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::IO));
   DVLOG(1) << "~MediaStreamManager";
   DCHECK(requests_.empty());
-  DCHECK(!device_task_runner_.get());
 
   base::PowerMonitor* power_monitor = base::PowerMonitor::Get();
   // The PowerMonitor instance owned by BrowserMainLoops always outlives the
   // MediaStreamManager, but it may be NULL in unit tests.
   if (power_monitor)
     power_monitor->RemoveObserver(this);
 }
 
 VideoCaptureManager* MediaStreamManager::video_capture_manager() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ skipping 465 matching lines @@
 void MediaStreamManager::ReadOutputParamsAndPostRequestToUI(
     const std::string& label,
     DeviceRequest* request,
     const MediaDeviceEnumeration& enumeration) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // Actual audio parameters are required only for MEDIA_TAB_AUDIO_CAPTURE.
   // TODO(guidou): MEDIA_TAB_AUDIO_CAPTURE should not be a special case. See
   // crbug.com/584287.
   if (request->audio_type() == MEDIA_TAB_AUDIO_CAPTURE) {
-    // Read output parameters on the correct thread for native audio OS calls.
-    // Using base::Unretained is safe since |audio_manager_| is deleted after
-    // its task runner, and MediaStreamManager is deleted on the UI thread,
-    // after the IO thread has been stopped.
-    base::PostTaskAndReplyWithResult(
-        audio_manager_->GetTaskRunner(), FROM_HERE,
-        base::Bind(&media::AudioManager::GetDefaultOutputStreamParameters,
-                   base::Unretained(audio_manager_)),
+    // Using base::Unretained is safe: |audio_system_| will post
+    // PostRequestToUI() to IO thread, and MediaStreamManager is deleted on the
+    // UI thread, after the IO thread has been stopped.
+    audio_system_->GetOutputStreamParameters(
+        media::AudioDeviceDescription::kDefaultDeviceId,
         base::Bind(&MediaStreamManager::PostRequestToUI, base::Unretained(this),
                    label, request, enumeration));
   } else {
     PostRequestToUI(label, request, enumeration, media::AudioParameters());
   }
 }
 
 void MediaStreamManager::PostRequestToUI(
     const std::string& label,
     DeviceRequest* request,
@@ skipping 296 matching lines @@
   // attaching to the VM is required and we may have to access the MSM from
   // callback threads that we don't own and don't want to attach.
   g_media_stream_manager_tls_ptr.Pointer()->Set(this);
 
   // TODO(dalecurtis): Remove ScopedTracker below once crbug.com/457525 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile1(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "457525 MediaStreamManager::InitializeDeviceManagersOnIOThread 1"));
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  DCHECK(!device_task_runner_.get());
-  device_task_runner_ = audio_manager_->GetTaskRunner();
 
   // TODO(dalecurtis): Remove ScopedTracker below once crbug.com/457525 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile2(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "457525 MediaStreamManager::InitializeDeviceManagersOnIOThread 2"));
-  audio_input_device_manager_ = new AudioInputDeviceManager(audio_manager_);
+  audio_input_device_manager_ =
+      new AudioInputDeviceManager(audio_system_->GetAudioManager());
   audio_input_device_manager_->RegisterListener(this);
 
   // TODO(dalecurtis): Remove ScopedTracker below once crbug.com/457525 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile3(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "457525 MediaStreamManager::InitializeDeviceManagersOnIOThread 3"));
   // We want to be notified of IO message loop destruction to delete the thread
   // and the device managers.
   base::MessageLoop::current()->AddDestructionObserver(this);
 
   // TODO(dalecurtis): Remove ScopedTracker below once crbug.com/457525 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile4(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "457525 MediaStreamManager::InitializeDeviceManagersOnIOThread 4"));
 #if defined(OS_WIN)
   // Use an STA Video Capture Thread to try to avoid crashes on enumeration of
   // buggy third party Direct Show modules, http://crbug.com/428958.
   video_capture_thread_.init_com_with_mta(false);
   CHECK(video_capture_thread_.Start());
   video_capture_manager_ = new VideoCaptureManager(
       media::VideoCaptureDeviceFactory::CreateFactory(
           BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)),
       video_capture_thread_.task_runner());
 #else
   video_capture_manager_ = new VideoCaptureManager(
       media::VideoCaptureDeviceFactory::CreateFactory(
           BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)),
-      device_task_runner_);
+      audio_system_->GetTaskRunner());
 #endif
 
   video_capture_manager_->RegisterListener(this);
 
-  media_devices_manager_.reset(
-      new MediaDevicesManager(audio_manager_, video_capture_manager_, this));
+  media_devices_manager_.reset(new MediaDevicesManager(
+      audio_system_->GetAudioManager(), video_capture_manager_, this));
 }
 
 void MediaStreamManager::Opened(MediaStreamType stream_type,
                                 int capture_session_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DVLOG(1) << "Opened({stream_type = " << stream_type <<  "} "
            << "{capture_session_id = " << capture_session_id << "})";
   // Find the request(s) containing this device and mark it as used.
   // It can be used in several requests since the same device can be
   // requested from the same web page.
@@ skipping 262 matching lines @@
   DVLOG(3) << "MediaStreamManager::WillDestroyCurrentMessageLoop()";
   DCHECK(CalledOnIOThread());
   DCHECK(requests_.empty());
   if (media_devices_manager_)
     media_devices_manager_->StopMonitoring();
   if (video_capture_manager_)
     video_capture_manager_->UnregisterListener(this);
   if (audio_input_device_manager_)
     audio_input_device_manager_->UnregisterListener(this);
 
-  device_task_runner_ = nullptr;
   audio_input_device_manager_ = nullptr;
   video_capture_manager_ = nullptr;
   media_devices_manager_ = nullptr;
   g_media_stream_manager_tls_ptr.Pointer()->Set(nullptr);
 }
 
 void MediaStreamManager::NotifyDevicesChanged(
     MediaDeviceType device_type,
     const MediaDeviceInfoArray& devices) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ skipping 200 matching lines @@
     request->ui_proxy->OnStarted(
         base::Bind(&MediaStreamManager::StopMediaStreamFromBrowser,
                    base::Unretained(this), label),
         base::Bind(&MediaStreamManager::OnMediaStreamUIWindowId,
                    base::Unretained(this), request->video_type(),
                    request->devices));
   }
 }
 
 }  // namespace content