MediaStream audio: Refactor 3 separate "glue" implementations into one.

content/renderer/media/media_stream_center.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/media/media_stream_center.h"
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/media_stream_audio_sink.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/renderer/media/media_stream.h"
 #include "content/renderer/media/media_stream_audio_track.h"
 #include "content/renderer/media/media_stream_source.h"
 #include "content/renderer/media/media_stream_video_source.h"
 #include "content/renderer/media/media_stream_video_track.h"
-#include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
+#include "content/renderer/media/webaudio_media_stream_source.h"
 #include "content/renderer/media/webrtc_local_audio_source_provider.h"
 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
 #include "third_party/WebKit/public/platform/WebMediaStream.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamCenterClient.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h"
 #include "third_party/WebKit/public/platform/WebSourceInfo.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 
 using blink::WebFrame;
 using blink::WebView;
 
 namespace content {
 
 namespace {
 
 void CreateNativeAudioMediaStreamTrack(
-    const blink::WebMediaStreamTrack& track,
-    PeerConnectionDependencyFactory* factory) {
-  DCHECK(!MediaStreamAudioTrack::From(track));
+    const blink::WebMediaStreamTrack& track) {
   blink::WebMediaStreamSource source = track.source();
-  DCHECK_EQ(source.getType(), blink::WebMediaStreamSource::TypeAudio);
-  if (source.remote()) {
-    factory->CreateRemoteAudioTrack(track);
-  } else {
-    factory->CreateLocalAudioTrack(track);
+  MediaStreamAudioSource* media_stream_source =
+      MediaStreamAudioSource::From(source);
+
+  // At this point, a MediaStreamAudioSource instance must exist. The one
+  // exception is when a WebAudio destination node is acting as a source of
+  // audio.
+  //
+  // TODO(miu): This needs to be moved to an appropriate location. A WebAudio

[tommi (sloooow) - chröme, 2016/04/25 21:07:16]

Can you test your cl with go/wa-rtc and see if getting remote audio from webrtc
into webaudio, works? You should get bars for both the local and remote end.
(just ping me if you have questions)

[miu, 2016/04/28 20:18:49]

Done. Yep, works perfectly!  :)

+  // source should have been created before this method was called so that this
+  // special case code isn't needed here.
+  if (!media_stream_source && source.requiresAudioConsumer()) {
+    DVLOG(1) << "Creating WebAudio media stream source.";
+    media_stream_source = new WebAudioMediaStreamSource(&source);
+    source.setExtraData(media_stream_source);  // Takes ownership.
   }
+
+  if (media_stream_source)
+    media_stream_source->ConnectToTrack(track);
+  else
+    LOG(DFATAL) << "WebMediaStreamSource missing its MediaStreamAudioSource.";
 }
 
 void CreateNativeVideoMediaStreamTrack(
     const blink::WebMediaStreamTrack& track) {
   DCHECK(track.getExtraData() == NULL);
   blink::WebMediaStreamSource source = track.source();
   DCHECK_EQ(source.getType(), blink::WebMediaStreamSource::TypeVideo);
   MediaStreamVideoSource* native_source =
       MediaStreamVideoSource::GetVideoSource(source);
   DCHECK(native_source);
   blink::WebMediaStreamTrack writable_track(track);
   // TODO(perkj): The constraints to use here should be passed from blink when
   // a new track is created. For cloning, it should be the constraints of the
   // cloned track and not the originating source.
   // Also - source.constraints() returns an uninitialized constraint if the
   // source is coming from a remote video track. See http://crbug/287805.
   blink::WebMediaConstraints constraints = source.constraints();
   if (constraints.isNull())
     constraints.initialize();
   writable_track.setExtraData(
       new MediaStreamVideoTrack(native_source, constraints,
                                 MediaStreamVideoSource::ConstraintsCallback(),
                                 track.isEnabled()));
 }
 
-void CreateNativeMediaStreamTrack(const blink::WebMediaStreamTrack& track,
-                                  PeerConnectionDependencyFactory* factory) {
+}  // namespace
+
+MediaStreamCenter::MediaStreamCenter(
+    blink::WebMediaStreamCenterClient* client,
+    PeerConnectionDependencyFactory* factory) {}
+
+MediaStreamCenter::~MediaStreamCenter() {}
+
+void MediaStreamCenter::didCreateMediaStreamTrack(
+    const blink::WebMediaStreamTrack& track) {
+  DVLOG(1) << "MediaStreamCenter::didCreateMediaStreamTrack";
   DCHECK(!track.isNull() && !track.getExtraData());
   DCHECK(!track.source().isNull());
 
   switch (track.source().getType()) {
     case blink::WebMediaStreamSource::TypeAudio:
-      CreateNativeAudioMediaStreamTrack(track, factory);
+      CreateNativeAudioMediaStreamTrack(track);
       break;
     case blink::WebMediaStreamSource::TypeVideo:
       CreateNativeVideoMediaStreamTrack(track);
       break;
   }
 }
 
-}  // namespace
-
-MediaStreamCenter::MediaStreamCenter(blink::WebMediaStreamCenterClient* client,
-                                     PeerConnectionDependencyFactory* factory)
-    : rtc_factory_(factory) {}
-
-MediaStreamCenter::~MediaStreamCenter() {}
-
-void MediaStreamCenter::didCreateMediaStreamTrack(
-    const blink::WebMediaStreamTrack& track) {
-  DVLOG(1) << "MediaStreamCenter::didCreateMediaStreamTrack";
-  CreateNativeMediaStreamTrack(track, rtc_factory_);
-}
-
 void MediaStreamCenter::didEnableMediaStreamTrack(
     const blink::WebMediaStreamTrack& track) {
   MediaStreamTrack* native_track =
       MediaStreamTrack::GetTrack(track);
   if (native_track)
     native_track->SetEnabled(true);
 }
 
 void MediaStreamCenter::didDisableMediaStreamTrack(
     const blink::WebMediaStreamTrack& track) {
@@ skipping 19 matching lines @@
       static_cast<MediaStreamTrack*>(track.getExtraData());
   if (!media_stream_track) {
     DLOG(ERROR) << "Native track missing for webaudio source.";
     return nullptr;
   }
 
   blink::WebMediaStreamSource source = track.source();
   DCHECK_EQ(source.getType(), blink::WebMediaStreamSource::TypeAudio);
 
   // TODO(tommi): Rename WebRtcLocalAudioSourceProvider to
-  // WebRtcAudioSourceProvider since it's not specific to local.
+  // WebAudioMediaStreamSink since it's not specific to any particular source.
+  // http://crbug.com/577874
   return new WebRtcLocalAudioSourceProvider(track);
 }
 
 void MediaStreamCenter::didStopLocalMediaStream(
     const blink::WebMediaStream& stream) {
   DVLOG(1) << "MediaStreamCenter::didStopLocalMediaStream";
   MediaStream* native_stream = MediaStream::GetMediaStream(stream);
   if (!native_stream) {
     NOTREACHED();
     return;
@@ skipping 29 matching lines @@
 
 bool MediaStreamCenter::didRemoveMediaStreamTrack(
     const blink::WebMediaStream& stream,
     const blink::WebMediaStreamTrack& track) {
   DVLOG(1) << "MediaStreamCenter::didRemoveMediaStreamTrack";
   MediaStream* native_stream = MediaStream::GetMediaStream(stream);
   return native_stream->RemoveTrack(track);
 }
 
 }  // namespace content