content/renderer/media/media_stream_renderer_factory_impl.cc - Issue 1834323002: MediaStream audio: Refactor 3 separate "glue" implementations into one.

Unified Diff: content/renderer/media/media_stream_renderer_factory_impl.cc

Issue 1834323002: MediaStream audio: Refactor 3 separate "glue" implementations into one. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed comments from PS2: AudioInputDevice --> AudioCapturerSource, and refptr foo in WebRtcMedi… Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/renderer/media/media_stream_center.cc ('K') | « content/renderer/media/media_stream_center.cc ('k') | content/renderer/media/media_stream_source.h » ('j') | content/renderer/media/media_stream_source.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/media_stream_renderer_factory_impl.cc

diff --git a/content/renderer/media/media_stream_renderer_factory_impl.cc b/content/renderer/media/media_stream_renderer_factory_impl.cc

index f31dde18b370555d140bdb992a46c82e1e33ca42..a7388e058a0f4b6afa927c327d0c99bdc843df90 100644

--- a/content/renderer/media/media_stream_renderer_factory_impl.cc

+++ b/content/renderer/media/media_stream_renderer_factory_impl.cc

@@ -11,6 +11,7 @@

#include "content/renderer/media/media_stream_video_track.h"

#include "content/renderer/media/track_audio_renderer.h"

#include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"

+#include "content/renderer/media/webrtc/peer_connection_remote_audio_source.h"

#include "content/renderer/media/webrtc_audio_renderer.h"

#include "content/renderer/render_thread_impl.h"

#include "media/base/audio_hardware_config.h"

@@ -120,11 +121,7 @@ MediaStreamRendererFactoryImpl::GetAudioRenderer(

// If the track has a local source, or is a remote track that does not use the

// WebRTC audio pipeline, return a new TrackAudioRenderer instance.

- //

- // TODO(miu): In a soon up-coming change, I'll introduce a cleaner way (i.e.,

- // rather than calling GetAudioAdapter()) to determine whether a remote source

- // is via WebRTC or something else.

- if (audio_track->is_local_track() || !audio_track->GetAudioAdapter()) {

+ if (!PeerConnectionRemoteAudioTrack::From(audio_track)) {

perkj_chrome 2016/04/08 14:05:42 PeerConnectionRemoteAudioTrack is probably not nee

miu 2016/04/19 00:40:22 Acknowledged.

// TODO(xians): Add support for the case where the media stream contains

// multiple audio tracks.

DVLOG(1) << "Creating TrackAudioRenderer for "