Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1649)

Unified Diff: content/renderer/media/webrtc/webrtc_media_stream_adapter.cc

Issue 1780653002: Revert of MediaStream audio object graph untangling and clean-ups. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: content/renderer/media/webrtc/webrtc_media_stream_adapter.cc
diff --git a/content/renderer/media/webrtc/webrtc_media_stream_adapter.cc b/content/renderer/media/webrtc/webrtc_media_stream_adapter.cc
index 3c34d794dded57cd712436cbad564dca909e531b..a89530a2b081e8714a726df5a69f62d2f5c42e73 100644
--- a/content/renderer/media/webrtc/webrtc_media_stream_adapter.cc
+++ b/content/renderer/media/webrtc/webrtc_media_stream_adapter.cc
@@ -78,7 +78,7 @@
DCHECK_EQ(track.source().getType(), blink::WebMediaStreamSource::TypeAudio);
// A media stream is connected to a peer connection, enable the
// peer connection mode for the sources.
- MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::From(track);
+ MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::GetTrack(track);
if (!native_track) {
DLOG(ERROR) << "No native track for blink audio track.";
return;
@@ -92,9 +92,10 @@
if (native_track->is_local_track()) {
const blink::WebMediaStreamSource& source = track.source();
- MediaStreamAudioSource* audio_source = MediaStreamAudioSource::From(source);
- if (audio_source && audio_source->audio_capturer())
- audio_source->audio_capturer()->EnablePeerConnectionMode();
+ MediaStreamAudioSource* audio_source =
+ static_cast<MediaStreamAudioSource*>(source.getExtraData());
+ if (audio_source && audio_source->GetAudioCapturer().get())
+ audio_source->GetAudioCapturer()->EnablePeerConnectionMode();
}
webrtc_media_stream_->AddTrack(audio_track);

Powered by Google App Engine
This is Rietveld 408576698