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

Side by Side Diff: content/renderer/media/rtc_peer_connection_handler.cc

Issue 1834323002: MediaStream audio: Refactor 3 separate "glue" implementations into one. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
OLDNEW
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
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_constraints_util.h" 25 #include "content/renderer/media/media_stream_constraints_util.h"
26 #include "content/renderer/media/media_stream_track.h" 26 #include "content/renderer/media/media_stream_track.h"
27 #include "content/renderer/media/peer_connection_tracker.h" 27 #include "content/renderer/media/peer_connection_tracker.h"
28 #include "content/renderer/media/remote_media_stream_impl.h" 28 #include "content/renderer/media/remote_media_stream_impl.h"
29 #include "content/renderer/media/rtc_certificate.h" 29 #include "content/renderer/media/rtc_certificate.h"
30 #include "content/renderer/media/rtc_data_channel_handler.h" 30 #include "content/renderer/media/rtc_data_channel_handler.h"
31 #include "content/renderer/media/rtc_dtmf_sender_handler.h" 31 #include "content/renderer/media/rtc_dtmf_sender_handler.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/WebRTCAnswerOptions.h" 41 #include "third_party/WebKit/public/platform/WebRTCAnswerOptions.h"
41 #include "third_party/WebKit/public/platform/WebRTCConfiguration.h" 42 #include "third_party/WebKit/public/platform/WebRTCConfiguration.h"
42 #include "third_party/WebKit/public/platform/WebRTCDataChannelInit.h" 43 #include "third_party/WebKit/public/platform/WebRTCDataChannelInit.h"
43 #include "third_party/WebKit/public/platform/WebRTCICECandidate.h" 44 #include "third_party/WebKit/public/platform/WebRTCICECandidate.h"
44 #include "third_party/WebKit/public/platform/WebRTCOfferOptions.h" 45 #include "third_party/WebKit/public/platform/WebRTCOfferOptions.h"
(...skipping 1448 matching lines...) Expand 10 before | Expand all | Expand 10 after
1493 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::createDTMFSender"); 1494 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::createDTMFSender");
1494 DVLOG(1) << "createDTMFSender."; 1495 DVLOG(1) << "createDTMFSender.";
1495 1496
1496 MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::From(track); 1497 MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::From(track);
1497 if (!native_track || !native_track->is_local_track() || 1498 if (!native_track || !native_track->is_local_track() ||
1498 track.source().getType() != blink::WebMediaStreamSource::TypeAudio) { 1499 track.source().getType() != blink::WebMediaStreamSource::TypeAudio) {
1499 DLOG(ERROR) << "The DTMF sender requires a local audio track."; 1500 DLOG(ERROR) << "The DTMF sender requires a local audio track.";
1500 return nullptr; 1501 return nullptr;
1501 } 1502 }
1502 1503
1503 scoped_refptr<webrtc::AudioTrackInterface> audio_track = 1504 ProcessedLocalAudioTrack* const rtc_audio_track =
1504 native_track->GetAudioAdapter(); 1505 ProcessedLocalAudioTrack::From(native_track);
1506 if (!rtc_audio_track) {
1507 DLOG(ERROR) << "WebRTC features are not available on this audio track.";
1508 return nullptr;
1509 }
1510
1505 rtc::scoped_refptr<webrtc::DtmfSenderInterface> sender( 1511 rtc::scoped_refptr<webrtc::DtmfSenderInterface> sender(
1506 native_peer_connection_->CreateDtmfSender(audio_track.get())); 1512 native_peer_connection_->CreateDtmfSender(
1513 rtc_audio_track->adapter().get()));
1507 if (!sender) { 1514 if (!sender) {
1508 DLOG(ERROR) << "Could not create native DTMF sender."; 1515 DLOG(ERROR) << "Could not create native DTMF sender.";
1509 return nullptr; 1516 return nullptr;
1510 } 1517 }
1511 if (peer_connection_tracker_) 1518 if (peer_connection_tracker_)
1512 peer_connection_tracker_->TrackCreateDTMFSender(this, track); 1519 peer_connection_tracker_->TrackCreateDTMFSender(this, track);
1513 1520
1514 return new RtcDtmfSenderHandler(sender); 1521 return new RtcDtmfSenderHandler(sender);
1515 } 1522 }
1516 1523
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
1800 } 1807 }
1801 1808
1802 void RTCPeerConnectionHandler::ResetUMAStats() { 1809 void RTCPeerConnectionHandler::ResetUMAStats() {
1803 DCHECK(thread_checker_.CalledOnValidThread()); 1810 DCHECK(thread_checker_.CalledOnValidThread());
1804 num_local_candidates_ipv6_ = 0; 1811 num_local_candidates_ipv6_ = 0;
1805 num_local_candidates_ipv4_ = 0; 1812 num_local_candidates_ipv4_ = 0;
1806 ice_connection_checking_start_ = base::TimeTicks(); 1813 ice_connection_checking_start_ = base::TimeTicks();
1807 memset(ice_state_seen_, 0, sizeof(ice_state_seen_)); 1814 memset(ice_state_seen_, 0, sizeof(ice_state_seen_));
1808 } 1815 }
1809 } // namespace content 1816 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698