Adds AudioDevice factory for all audio clients in Chrome

content/renderer/render_view_impl.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/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 53 matching lines @@
 #include "content/renderer/devtools_agent.h"
 #include "content/renderer/dom_automation_controller.h"
 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
 #include "content/renderer/external_popup_menu.h"
 #include "content/renderer/geolocation_dispatcher.h"
 #include "content/renderer/gpu/compositor_thread.h"
 #include "content/renderer/idle_user_detector.h"
 #include "content/renderer/input_tag_speech_dispatcher.h"
 #include "content/renderer/java/java_bridge_dispatcher.h"
 #include "content/renderer/load_progress_tracker.h"
+#include "content/renderer/media/audio_device.h"
+#include "content/renderer/media/audio_device_factory.h"
 #include "content/renderer/media/audio_message_filter.h"
 #include "content/renderer/media/media_stream_dependency_factory.h"
 #include "content/renderer/media/media_stream_dispatcher.h"
 #include "content/renderer/media/media_stream_impl.h"
 #include "content/renderer/media/render_audiosourceprovider.h"
 #include "content/renderer/media/render_media_log.h"
 #include "content/renderer/media/renderer_gpu_video_decoder_factories.h"
 #include "content/renderer/mhtml_generator.h"
 #include "content/renderer/notification_provider.h"
 #include "content/renderer/p2p/socket_dispatcher.h"
@@ skipping 474 matching lines @@
 
   // Ensure we start with a valid next_page_id_ from the browser.
   DCHECK_GE(next_page_id_, 0);
 
 #if defined(ENABLE_NOTIFICATIONS)
   notification_provider_ = new NotificationProvider(this);
 #else
   notification_provider_ = NULL;
 #endif
 
+  // Create the audio device factory to ensure that it can be injected into
+  // WebRTC, WebAudio and HTML5 <audio>/<video> clients.
+  audio_device_factory_.reset(
+      new AudioDeviceFactory<AudioDevice, AudioMessageFilter>(
+          RenderThreadImpl::current()->audio_message_filter()));
+
   webwidget_ = WebView::create(this);
   webwidget_mouse_lock_target_.reset(new WebWidgetLockTarget(webwidget_));
 
   if (counter) {
     shared_popup_counter_ = counter;
     // Only count this if it isn't swapped out upon creation.
     if (!swapped_out)
       shared_popup_counter_->data++;
     decrement_shared_popup_at_destruction_ = true;
   } else {
@@ skipping 1744 matching lines @@
     return new WebSharedWorkerProxy(RenderThreadImpl::current(),
                                     document_id,
                                     exists,
                                     route_id,
                                     routing_id_);
   }
 }
 
 WebMediaPlayer* RenderViewImpl::createMediaPlayer(
     WebFrame* frame, WebMediaPlayerClient* client) {
+  DVLOG(1) << "RenderViewImpl::createMediaPlayer()";
   FOR_EACH_OBSERVER(
       RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client));
 
 #if defined(OS_ANDROID)
   // TODO(qinmin): upstream the implementation of StreamTextureFactoryImpl
   // to replace the NULL param here.
   return new webkit_media::WebMediaPlayerAndroid(
       frame, client, cookieJar(frame), media_player_manager_.get(), NULL);
 #endif
 
   media::MessageLoopFactory* message_loop_factory =
       new media::MessageLoopFactory();
   media::FilterCollection* collection = new media::FilterCollection();
   RenderMediaLog* render_media_log = new RenderMediaLog();
 
   RenderAudioSourceProvider* audio_source_provider = NULL;
 
   // Add in any custom filter factories first.
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
   if (!cmd_line->HasSwitch(switches::kDisableAudio)) {
     // audio_source_provider is a "provider" to WebKit, and a sink
     // from the perspective of the audio renderer.
-    audio_source_provider = new RenderAudioSourceProvider();
+    audio_source_provider = new RenderAudioSourceProvider(
+        audio_device_factory());
 
     // Add the chrome specific audio renderer, using audio_source_provider
     // as the sink.
     media::AudioRendererImpl* audio_renderer =
         new media::AudioRendererImpl(audio_source_provider);
     collection->AddAudioRenderer(audio_renderer);
   }
 
   // Currently only cros/arm has any HW video decode support in
   // GpuVideoDecodeAccelerator so we don't even try to use it on other
@@ skipping 1125 matching lines @@
     return;
 
 #if defined(ENABLE_WEBRTC)
   if (!p2p_socket_dispatcher_)
     p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
 
   if (!media_stream_dispatcher_)
     media_stream_dispatcher_ = new MediaStreamDispatcher(this);
 
   if (!media_stream_impl_) {
+    DCHECK(audio_device_factory());
     MediaStreamDependencyFactory* factory = new MediaStreamDependencyFactory(
         RenderThreadImpl::current()->video_capture_impl_manager());
     media_stream_impl_ = new MediaStreamImpl(
         this,
         media_stream_dispatcher_,
         p2p_socket_dispatcher_,
         RenderThreadImpl::current()->video_capture_impl_manager(),
-        factory);
+        factory,
+        audio_device_factory());
   }
 #endif
 }
 
 void RenderViewImpl::didChangeContentsSize(WebFrame* frame,
                                            const WebSize& size) {
   if (webview()->mainFrame() != frame)
     return;
   WebView* frameView = frame->view();
   if (!frameView)
@@ skipping 2061 matching lines @@
       WebKit::WebPageVisibilityStateVisible;
   WebKit::WebPageVisibilityState override_state = current_state;
   if (content::GetContentClient()->renderer()->
           ShouldOverridePageVisibilityState(this,
                                             &override_state))
     return override_state;
   return current_state;
 }
 
 WebKit::WebUserMediaClient* RenderViewImpl::userMediaClient() {
+  DVLOG(1) << "RenderViewImpl::userMediaClient()";
   EnsureMediaStreamImpl();
   return media_stream_impl_;
 }
 
 void RenderViewImpl::OnAsyncFileOpened(
     base::PlatformFileError error_code,
     IPC::PlatformFileForTransit file_for_transit,
     int message_id) {
   pepper_delegate_.OnAsyncFileOpened(
       error_code,
@@ skipping 59 matching lines @@
 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
   return !!RenderThreadImpl::current()->compositor_thread();
 }
 
 void RenderViewImpl::OnJavaBridgeInit() {
   DCHECK(!java_bridge_dispatcher_);
 #if defined(ENABLE_JAVA_BRIDGE)
   java_bridge_dispatcher_ = new JavaBridgeDispatcher(this);
 #endif
 }