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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/remote_media_stream_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: Reworked unit tests around structural changes, and added exhaustive media_stream_audio_unittest.cc. Created 4 years, 8 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/mock_audio_device_factory.cc ('K') | « content/renderer/media/mock_media_stream_registry.cc ('k') | content/renderer/media/rtc_peer_connection_handler.cc » ('j') | content/renderer/media/webrtc/processed_local_audio_source_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/remote_media_stream_impl.cc

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

index 35a3cb492800cc0c7d1e275fe81c658e946c410b..cad1b01bce04210799577405e18664feca29ecf8 100644

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

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

@@ -18,9 +18,9 @@

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

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

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

-#include "content/renderer/media/webrtc/media_stream_remote_audio_track.h"

#include "content/renderer/media/webrtc/media_stream_remote_video_source.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/track_observer.h"

#include "third_party/WebKit/public/platform/WebMediaStreamSource.h"

#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"

@@ -239,11 +239,10 @@ void RemoteAudioTrackAdapter::Unregister() {

void RemoteAudioTrackAdapter::InitializeWebkitAudioTrack() {

InitializeWebkitTrack(blink::WebMediaStreamSource::TypeAudio);

- webkit_track()->source().setExtraData(

- new MediaStreamRemoteAudioSource(observed_track().get()));

- webkit_track()->setExtraData(

- new MediaStreamRemoteAudioTrack(

- webkit_track()->source(), webkit_track()->isEnabled()));

+ MediaStreamAudioSource* const source =

+ new PeerConnectionRemoteAudioSource(observed_track().get());

+ webkit_track()->source().setExtraData(source); // Takes ownership.

+ source->ConnectToTrack(*(webkit_track()));

}

void RemoteAudioTrackAdapter::OnChanged() {