MediaStream audio sourcing: Bypass audio processing for non-WebRTC cases.

content/renderer/media/user_media_client_impl.cc

Index: content/renderer/media/user_media_client_impl.cc
diff --git a/content/renderer/media/user_media_client_impl.cc b/content/renderer/media/user_media_client_impl.cc
index 15e096b6469d9b1bc061d68be7d41c99bb18666c..6175c8a4697799548d6369591954e7d8fc40e888 100644
--- a/content/renderer/media/user_media_client_impl.cc
+++ b/content/renderer/media/user_media_client_impl.cc
@@ -19,14 +19,15 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/public/renderer/render_frame.h"
+#include "content/renderer/media/local_media_stream_audio_source.h"
 #include "content/renderer/media/media_stream.h"
-#include "content/renderer/media/media_stream_audio_source.h"
+#include "content/renderer/media/media_stream_audio_processor.h"
 #include "content/renderer/media/media_stream_dispatcher.h"
 #include "content/renderer/media/media_stream_video_capturer_source.h"
 #include "content/renderer/media/media_stream_video_track.h"
 #include "content/renderer/media/peer_connection_tracker.h"
+#include "content/renderer/media/webrtc/processed_local_audio_source.h"
 #include "content/renderer/media/webrtc/webrtc_video_capturer_adapter.h"
-#include "content/renderer/media/webrtc_audio_capturer.h"
 #include "content/renderer/media/webrtc_logging.h"
 #include "content/renderer/media/webrtc_uma_histograms.h"
 #include "content/renderer/render_thread_impl.h"
@@ -598,14 +599,33 @@ void UserMediaClientImpl::InitializeSourceObject(
                        weak_factory_.GetWeakPtr())));
   } else {
     DCHECK_EQ(blink::WebMediaStreamSource::TypeAudio, type);
-    MediaStreamAudioSource* audio_source(
-        new MediaStreamAudioSource(
-            RenderFrameObserver::routing_id(),
-            device,
-            base::Bind(&UserMediaClientImpl::OnLocalSourceStopped,
-                       weak_factory_.GetWeakPtr()),
-            dependency_factory_));
-    webkit_source->setExtraData(audio_source);
+    MediaStreamAudioSource* audio_source;
+    if (!RenderFrameObserver::render_frame()) {
+      // Special handling note: When no RenderFrame was provided, assume
+      // UserMediaClientImpl is running in non-browser unit tests (e.g.,
+      // user_media_client_impl_unittest.cc) with the WebRTC audio pipeline
+      // mocked out.
+      CHECK(!RenderThreadImpl::current());
+      ProcessedLocalAudioSource* source =
+          new ProcessedLocalAudioSource(-1, device, dependency_factory_);
+      source->SetAllowInvalidRenderFrameIdForTesting(true);
+      source->SetSourceConstraints(constraints);
+      audio_source = source;
+    } else if (IsContentCaptureMediaType(device.device.type) ||
+               !MediaStreamAudioProcessor::ShouldRouteAudioThroughProcessor(
+                   constraints, device.device.input.effects)) {
+      audio_source = new LocalMediaStreamAudioSource(
+          RenderFrameObserver::routing_id(), device);
+    } else {
+      ProcessedLocalAudioSource* source = new ProcessedLocalAudioSource(
+          RenderFrameObserver::routing_id(), device, dependency_factory_);
+      source->SetSourceConstraints(constraints);
+      audio_source = source;
+    }
+    audio_source->SetStopCallback(
+        base::Bind(&UserMediaClientImpl::OnLocalSourceStopped,
+                   weak_factory_.GetWeakPtr()));
+    webkit_source->setExtraData(audio_source);  // Takes ownership.
   }
   local_sources_.push_back(*webkit_source);
 }
@@ -672,7 +692,7 @@ void UserMediaClientImpl::CreateAudioTracks(
                            constraints,
                            &webkit_source);
     (*webkit_tracks)[i].initialize(webkit_source);
-    request->StartAudioTrack((*webkit_tracks)[i], constraints);
+    request->StartAudioTrack((*webkit_tracks)[i]);
   }
 }
 
@@ -1046,8 +1066,7 @@ UserMediaClientImpl::UserMediaRequestInfo::~UserMediaRequestInfo() {
 }
 
 void UserMediaClientImpl::UserMediaRequestInfo::StartAudioTrack(
-    const blink::WebMediaStreamTrack& track,
-    const blink::WebMediaConstraints& constraints) {
+    const blink::WebMediaStreamTrack& track) {
   DCHECK(track.source().type() == blink::WebMediaStreamSource::TypeAudio);
   MediaStreamAudioSource* native_source =
       static_cast <MediaStreamAudioSource*>(track.source().extraData());
@@ -1055,10 +1074,10 @@ void UserMediaClientImpl::UserMediaRequestInfo::StartAudioTrack(
 
   sources_.push_back(track.source());
   sources_waiting_for_callback_.push_back(native_source);
-  native_source->AddTrack(
-      track, constraints, base::Bind(
-          &UserMediaClientImpl::UserMediaRequestInfo::OnTrackStarted,
-          AsWeakPtr()));
+  if (native_source->ConnectToTrack(track))
+    OnTrackStarted(native_source, MEDIA_DEVICE_OK, "");
+  else
+    OnTrackStarted(native_source, MEDIA_DEVICE_TRACK_START_FAILURE, "");
 }
 
 blink::WebMediaStreamTrack