OLD | NEW |
---|---|
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/remote_media_stream_impl.h" | |
perkj_chrome
2015/12/11 12:31:38
why this include? Shouldn't be needed.
tommi (sloooow) - chröme
2015/12/11 15:36:51
Ah, thanks. Removed. Was probably there from some
| |
9 #include "content/renderer/media/webrtc_local_audio_track.h" | 10 #include "content/renderer/media/webrtc_local_audio_track.h" |
perkj_chrome
2015/12/11 12:31:38
and remove this webrtc_local_audio_track.h"?
tommi (sloooow) - chröme
2015/12/11 15:36:51
Done.
| |
10 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" | 11 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" |
11 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" | 12 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" |
12 | 13 |
13 namespace content { | 14 namespace content { |
14 | 15 |
15 void MediaStreamAudioSink::AddToAudioTrack( | 16 void MediaStreamAudioSink::AddToAudioTrack( |
16 MediaStreamAudioSink* sink, | 17 MediaStreamAudioSink* sink, |
17 const blink::WebMediaStreamTrack& track) { | 18 const blink::WebMediaStreamTrack& track) { |
18 DCHECK(track.source().type() == blink::WebMediaStreamSource::TypeAudio); | 19 DCHECK(track.source().type() == blink::WebMediaStreamSource::TypeAudio); |
19 MediaStreamTrack* native_track = MediaStreamTrack::GetTrack(track); | 20 MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::GetTrack(track); |
20 // TODO(xians): Support remote audio track. | 21 native_track->AddSink(sink); |
21 if (!native_track->is_local_track()) { | |
22 LOG(ERROR) << "Can't add the sink to a remote audio track"; | |
23 return; | |
24 } | |
25 | |
26 WebRtcLocalAudioTrack* audio_track = | |
27 static_cast<WebRtcLocalAudioTrack*>(native_track); | |
28 audio_track->AddSink(sink); | |
29 } | 22 } |
30 | 23 |
31 void MediaStreamAudioSink::RemoveFromAudioTrack( | 24 void MediaStreamAudioSink::RemoveFromAudioTrack( |
32 MediaStreamAudioSink* sink, | 25 MediaStreamAudioSink* sink, |
33 const blink::WebMediaStreamTrack& track) { | 26 const blink::WebMediaStreamTrack& track) { |
34 MediaStreamTrack* native_track = MediaStreamTrack::GetTrack(track); | 27 MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::GetTrack(track); |
35 // TODO(xians): Support remote audio track. | 28 native_track->RemoveSink(sink); |
36 if (!native_track->is_local_track()) { | |
37 LOG(ERROR) << "Can't remove the sink from a remote audio track"; | |
38 return; | |
39 } | |
40 | |
41 WebRtcLocalAudioTrack* audio_track = | |
42 static_cast<WebRtcLocalAudioTrack*>(native_track); | |
43 audio_track->RemoveSink(sink); | |
44 } | 29 } |
45 | 30 |
46 media::AudioParameters MediaStreamAudioSink::GetFormatFromAudioTrack( | 31 media::AudioParameters MediaStreamAudioSink::GetFormatFromAudioTrack( |
47 const blink::WebMediaStreamTrack& track) { | 32 const blink::WebMediaStreamTrack& track) { |
48 MediaStreamTrack* native_track = MediaStreamTrack::GetTrack(track); | 33 MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::GetTrack(track); |
49 if (!native_track->is_local_track()) { | 34 return native_track->GetOutputFormat(); |
50 LOG(ERROR) << "Can't get format from a remote audio track"; | |
51 return media::AudioParameters(); | |
52 } | |
53 | |
54 WebRtcLocalAudioTrack* audio_track = | |
55 static_cast<WebRtcLocalAudioTrack*>(native_track); | |
56 return audio_track->GetOutputFormat(); | |
57 } | 35 } |
58 | 36 |
59 } // namespace content | 37 } // namespace content |
OLD | NEW |