OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/renderer/media/rtc_peer_connection_handler.h" | 5 #include "content/renderer/media/rtc_peer_connection_handler.h" |
6 | 6 |
7 #include <string.h> | 7 #include <string.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "content/public/common/content_switches.h" | 23 #include "content/public/common/content_switches.h" |
24 #include "content/renderer/media/media_stream_audio_track.h" | 24 #include "content/renderer/media/media_stream_audio_track.h" |
25 #include "content/renderer/media/media_stream_track.h" | 25 #include "content/renderer/media/media_stream_track.h" |
26 #include "content/renderer/media/peer_connection_tracker.h" | 26 #include "content/renderer/media/peer_connection_tracker.h" |
27 #include "content/renderer/media/remote_media_stream_impl.h" | 27 #include "content/renderer/media/remote_media_stream_impl.h" |
28 #include "content/renderer/media/rtc_certificate.h" | 28 #include "content/renderer/media/rtc_certificate.h" |
29 #include "content/renderer/media/rtc_data_channel_handler.h" | 29 #include "content/renderer/media/rtc_data_channel_handler.h" |
30 #include "content/renderer/media/rtc_dtmf_sender_handler.h" | 30 #include "content/renderer/media/rtc_dtmf_sender_handler.h" |
31 #include "content/renderer/media/rtc_media_constraints.h" | 31 #include "content/renderer/media/rtc_media_constraints.h" |
32 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" | 32 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" |
| 33 #include "content/renderer/media/webrtc/processed_local_audio_track.h" |
| 34 #include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h" |
33 #include "content/renderer/media/webrtc/webrtc_media_stream_adapter.h" | 35 #include "content/renderer/media/webrtc/webrtc_media_stream_adapter.h" |
34 #include "content/renderer/media/webrtc_audio_capturer.h" | |
35 #include "content/renderer/media/webrtc_audio_device_impl.h" | 36 #include "content/renderer/media/webrtc_audio_device_impl.h" |
36 #include "content/renderer/media/webrtc_uma_histograms.h" | 37 #include "content/renderer/media/webrtc_uma_histograms.h" |
37 #include "content/renderer/render_thread_impl.h" | 38 #include "content/renderer/render_thread_impl.h" |
38 #include "media/base/media_switches.h" | 39 #include "media/base/media_switches.h" |
39 #include "third_party/WebKit/public/platform/WebMediaConstraints.h" | 40 #include "third_party/WebKit/public/platform/WebMediaConstraints.h" |
40 #include "third_party/WebKit/public/platform/WebRTCConfiguration.h" | 41 #include "third_party/WebKit/public/platform/WebRTCConfiguration.h" |
41 #include "third_party/WebKit/public/platform/WebRTCDataChannelInit.h" | 42 #include "third_party/WebKit/public/platform/WebRTCDataChannelInit.h" |
42 #include "third_party/WebKit/public/platform/WebRTCICECandidate.h" | 43 #include "third_party/WebKit/public/platform/WebRTCICECandidate.h" |
43 #include "third_party/WebKit/public/platform/WebRTCOfferOptions.h" | 44 #include "third_party/WebKit/public/platform/WebRTCOfferOptions.h" |
44 #include "third_party/WebKit/public/platform/WebRTCSessionDescription.h" | 45 #include "third_party/WebKit/public/platform/WebRTCSessionDescription.h" |
(...skipping 1312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1357 return new RtcDataChannelHandler(base::ThreadTaskRunnerHandle::Get(), | 1358 return new RtcDataChannelHandler(base::ThreadTaskRunnerHandle::Get(), |
1358 webrtc_channel); | 1359 webrtc_channel); |
1359 } | 1360 } |
1360 | 1361 |
1361 blink::WebRTCDTMFSenderHandler* RTCPeerConnectionHandler::createDTMFSender( | 1362 blink::WebRTCDTMFSenderHandler* RTCPeerConnectionHandler::createDTMFSender( |
1362 const blink::WebMediaStreamTrack& track) { | 1363 const blink::WebMediaStreamTrack& track) { |
1363 DCHECK(thread_checker_.CalledOnValidThread()); | 1364 DCHECK(thread_checker_.CalledOnValidThread()); |
1364 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::createDTMFSender"); | 1365 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::createDTMFSender"); |
1365 DVLOG(1) << "createDTMFSender."; | 1366 DVLOG(1) << "createDTMFSender."; |
1366 | 1367 |
1367 MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::GetTrack(track); | 1368 MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::Get(track); |
1368 if (!native_track || !native_track->is_local_track() || | 1369 if (!native_track || !native_track->is_local_track() || |
1369 track.source().type() != blink::WebMediaStreamSource::TypeAudio) { | 1370 track.source().type() != blink::WebMediaStreamSource::TypeAudio) { |
1370 DLOG(ERROR) << "The DTMF sender requires a local audio track."; | 1371 DLOG(ERROR) << "The DTMF sender requires a local audio track."; |
1371 return nullptr; | 1372 return nullptr; |
1372 } | 1373 } |
1373 | 1374 |
1374 scoped_refptr<webrtc::AudioTrackInterface> audio_track = | 1375 ProcessedLocalAudioTrack* const rtc_audio_track = |
1375 native_track->GetAudioAdapter(); | 1376 ProcessedLocalAudioTrack::From(native_track); |
| 1377 if (!rtc_audio_track) { |
| 1378 DLOG(ERROR) << "WebRTC features are not available on this audio track."; |
| 1379 return nullptr; |
| 1380 } |
| 1381 |
1376 rtc::scoped_refptr<webrtc::DtmfSenderInterface> sender( | 1382 rtc::scoped_refptr<webrtc::DtmfSenderInterface> sender( |
1377 native_peer_connection_->CreateDtmfSender(audio_track.get())); | 1383 native_peer_connection_->CreateDtmfSender(rtc_audio_track->adapter())); |
1378 if (!sender) { | 1384 if (!sender) { |
1379 DLOG(ERROR) << "Could not create native DTMF sender."; | 1385 DLOG(ERROR) << "Could not create native DTMF sender."; |
1380 return nullptr; | 1386 return nullptr; |
1381 } | 1387 } |
1382 if (peer_connection_tracker_) | 1388 if (peer_connection_tracker_) |
1383 peer_connection_tracker_->TrackCreateDTMFSender(this, track); | 1389 peer_connection_tracker_->TrackCreateDTMFSender(this, track); |
1384 | 1390 |
1385 return new RtcDtmfSenderHandler(sender); | 1391 return new RtcDtmfSenderHandler(sender); |
1386 } | 1392 } |
1387 | 1393 |
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1671 } | 1677 } |
1672 | 1678 |
1673 void RTCPeerConnectionHandler::ResetUMAStats() { | 1679 void RTCPeerConnectionHandler::ResetUMAStats() { |
1674 DCHECK(thread_checker_.CalledOnValidThread()); | 1680 DCHECK(thread_checker_.CalledOnValidThread()); |
1675 num_local_candidates_ipv6_ = 0; | 1681 num_local_candidates_ipv6_ = 0; |
1676 num_local_candidates_ipv4_ = 0; | 1682 num_local_candidates_ipv4_ = 0; |
1677 ice_connection_checking_start_ = base::TimeTicks(); | 1683 ice_connection_checking_start_ = base::TimeTicks(); |
1678 memset(ice_state_seen_, 0, sizeof(ice_state_seen_)); | 1684 memset(ice_state_seen_, 0, sizeof(ice_state_seen_)); |
1679 } | 1685 } |
1680 } // namespace content | 1686 } // namespace content |
OLD | NEW |