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

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

Issue 1647773002: MediaStream audio sourcing: Bypass audio processing for non-WebRTC cases. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: NOT FOR REVIEW -- This will be broken-up across multiple CLs. Created 4 years, 10 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_audio_renderer.cc
diff --git a/content/renderer/media/webrtc_audio_renderer.cc b/content/renderer/media/webrtc_audio_renderer.cc
index 49fc1857f83b3771212249d1dc3dec6efa067201..e993dc26f74fb923a5a3fb1211e366e2783fb65d 100644
--- a/content/renderer/media/webrtc_audio_renderer.cc
+++ b/content/renderer/media/webrtc_audio_renderer.cc
@@ -15,6 +15,7 @@
#include "content/renderer/media/media_stream_audio_track.h"
#include "content/renderer/media/media_stream_dispatcher.h"
#include "content/renderer/media/media_stream_track.h"
+#include "content/renderer/media/webrtc/peer_connection_remote_audio_source.h"
#include "content/renderer/media/webrtc_audio_device_impl.h"
#include "content/renderer/media/webrtc_logging.h"
#include "content/renderer/render_frame_impl.h"
@@ -586,14 +587,17 @@ void WebRtcAudioRenderer::OnPlayStateChanged(
media_stream.audioTracks(web_tracks);
for (const blink::WebMediaStreamTrack& web_track : web_tracks) {
- MediaStreamAudioTrack* track = MediaStreamAudioTrack::GetTrack(web_track);
// WebRtcAudioRenderer can only render audio tracks received from a remote
// peer. Since the actual MediaStream is mutable from JavaScript, we need
// to make sure |web_track| is actually a remote track.
- if (track->is_local_track())
+ PeerConnectionRemoteAudioTrack* const remote_track =
+ PeerConnectionRemoteAudioTrack::From(
+ MediaStreamAudioTrack::Get(web_track));
+ if (!remote_track)
continue;
webrtc::AudioSourceInterface* source =
- track->GetAudioAdapter()->GetSource();
+ static_cast<webrtc::AudioTrackInterface*>(remote_track->track_interface())
+ ->GetSource();
DCHECK(source);
if (!state->playing()) {
if (RemovePlayingState(source, state))
« no previous file with comments | « content/renderer/media/webrtc_audio_device_impl.cc ('k') | content/renderer/media/webrtc_local_audio_source_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698