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

Unified Diff: content/public/renderer/media_stream_audio_sink.cc

Issue 411903002: Fixed the crash when adding a chromium sink to remote audio track or (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed the comments. Created 6 years, 5 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
« no previous file with comments | « content/browser/renderer_host/media/media_stream_track_metrics_host.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/renderer/media_stream_audio_sink.cc
diff --git a/content/public/renderer/media_stream_audio_sink.cc b/content/public/renderer/media_stream_audio_sink.cc
index 9d105d9c36f4b893790a40554e280aab438cf2fd..5b14f95b4f254c09a5b98c95811fc7f8695ddb52 100644
--- a/content/public/renderer/media_stream_audio_sink.cc
+++ b/content/public/renderer/media_stream_audio_sink.cc
@@ -18,7 +18,11 @@ void MediaStreamAudioSink::AddToAudioTrack(
DCHECK(track.source().type() == blink::WebMediaStreamSource::TypeAudio);
MediaStreamTrack* native_track = MediaStreamTrack::GetTrack(track);
// TODO(xians): Support remote audio track.
- DCHECK(native_track->is_local_track());
+ if (!native_track->is_local_track()) {
+ LOG(ERROR) << "Can't add the sink to a remote audio track";
+ return;
+ }
+
WebRtcLocalAudioTrack* audio_track =
static_cast<WebRtcLocalAudioTrack*>(native_track);
audio_track->AddSink(sink);
@@ -29,7 +33,11 @@ void MediaStreamAudioSink::RemoveFromAudioTrack(
const blink::WebMediaStreamTrack& track) {
MediaStreamTrack* native_track = MediaStreamTrack::GetTrack(track);
// TODO(xians): Support remote audio track.
- DCHECK(native_track->is_local_track());
+ if (!native_track->is_local_track()) {
+ LOG(ERROR) << "Can't remove the sink from a remote audio track";
+ return;
+ }
+
WebRtcLocalAudioTrack* audio_track =
static_cast<WebRtcLocalAudioTrack*>(native_track);
audio_track->RemoveSink(sink);
« no previous file with comments | « content/browser/renderer_host/media/media_stream_track_metrics_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698