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

Side by Side 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: 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/public/renderer/media_stream_audio_sink.h" 5 #include "content/public/renderer/media_stream_audio_sink.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/renderer/media/media_stream_track.h" 8 #include "content/renderer/media/media_stream_track.h"
9 #include "content/renderer/media/webrtc_local_audio_track.h" 9 #include "content/renderer/media/webrtc_local_audio_track.h"
10 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 10 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
11 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 11 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
12 12
13 namespace content { 13 namespace content {
14 14
15 void MediaStreamAudioSink::AddToAudioTrack( 15 void MediaStreamAudioSink::AddToAudioTrack(
16 MediaStreamAudioSink* sink, 16 MediaStreamAudioSink* sink,
17 const blink::WebMediaStreamTrack& track) { 17 const blink::WebMediaStreamTrack& track) {
18 DCHECK(track.source().type() == blink::WebMediaStreamSource::TypeAudio); 18 DCHECK(track.source().type() == blink::WebMediaStreamSource::TypeAudio);
19 MediaStreamTrack* native_track = MediaStreamTrack::GetTrack(track); 19 MediaStreamTrack* native_track = MediaStreamTrack::GetTrack(track);
20 // TODO(xians): Support remote audio track. 20 // TODO(xians): Support remote audio track.
21 DCHECK(native_track->is_local_track()); 21 if (!native_track->is_local_track()) {
22 LOG(ERROR) << "Only local audio track is supported now";
Ronghua Wu (Left Chromium) 2014/07/23 15:53:42 add info about what is "supported". E.g. Can't ad
no longer working on chromium 2014/07/24 13:23:31 Done.
23 return;
24 }
25
22 WebRtcLocalAudioTrack* audio_track = 26 WebRtcLocalAudioTrack* audio_track =
23 static_cast<WebRtcLocalAudioTrack*>(native_track); 27 static_cast<WebRtcLocalAudioTrack*>(native_track);
24 audio_track->AddSink(sink); 28 audio_track->AddSink(sink);
25 } 29 }
26 30
27 void MediaStreamAudioSink::RemoveFromAudioTrack( 31 void MediaStreamAudioSink::RemoveFromAudioTrack(
28 MediaStreamAudioSink* sink, 32 MediaStreamAudioSink* sink,
29 const blink::WebMediaStreamTrack& track) { 33 const blink::WebMediaStreamTrack& track) {
30 MediaStreamTrack* native_track = MediaStreamTrack::GetTrack(track); 34 MediaStreamTrack* native_track = MediaStreamTrack::GetTrack(track);
31 // TODO(xians): Support remote audio track. 35 // TODO(xians): Support remote audio track.
32 DCHECK(native_track->is_local_track()); 36 if (!native_track->is_local_track()) {
37 LOG(ERROR) << "Only local audio track is supported now";
Ronghua Wu (Left Chromium) 2014/07/23 15:53:42 dito
no longer working on chromium 2014/07/24 13:23:31 Done.
38 return;
39 }
40
33 WebRtcLocalAudioTrack* audio_track = 41 WebRtcLocalAudioTrack* audio_track =
34 static_cast<WebRtcLocalAudioTrack*>(native_track); 42 static_cast<WebRtcLocalAudioTrack*>(native_track);
35 audio_track->RemoveSink(sink); 43 audio_track->RemoveSink(sink);
36 } 44 }
37 45
38 } // namespace content 46 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698