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

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

Issue 1514143003: Add support for unmixed audio from remote WebRTC remote tracks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1343 matching lines...) Expand 10 before | Expand all | Expand 10 after
1354 return new RtcDataChannelHandler(base::ThreadTaskRunnerHandle::Get(), 1354 return new RtcDataChannelHandler(base::ThreadTaskRunnerHandle::Get(),
1355 webrtc_channel); 1355 webrtc_channel);
1356 } 1356 }
1357 1357
1358 blink::WebRTCDTMFSenderHandler* RTCPeerConnectionHandler::createDTMFSender( 1358 blink::WebRTCDTMFSenderHandler* RTCPeerConnectionHandler::createDTMFSender(
1359 const blink::WebMediaStreamTrack& track) { 1359 const blink::WebMediaStreamTrack& track) {
1360 DCHECK(thread_checker_.CalledOnValidThread()); 1360 DCHECK(thread_checker_.CalledOnValidThread());
1361 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::createDTMFSender"); 1361 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::createDTMFSender");
1362 DVLOG(1) << "createDTMFSender."; 1362 DVLOG(1) << "createDTMFSender.";
1363 1363
1364 MediaStreamTrack* native_track = MediaStreamTrack::GetTrack(track); 1364 MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::GetTrack(track);
1365 if (!native_track || !native_track->is_local_track() || 1365 if (!native_track || !native_track->is_local_track() ||
1366 track.source().type() != blink::WebMediaStreamSource::TypeAudio) { 1366 track.source().type() != blink::WebMediaStreamSource::TypeAudio) {
1367 DLOG(ERROR) << "The DTMF sender requires a local audio track."; 1367 DLOG(ERROR) << "The DTMF sender requires a local audio track.";
1368 return nullptr; 1368 return nullptr;
1369 } 1369 }
1370 1370
1371 scoped_refptr<webrtc::AudioTrackInterface> audio_track = 1371 scoped_refptr<webrtc::AudioTrackInterface> audio_track =
1372 native_track->GetAudioAdapter(); 1372 native_track->GetAudioAdapter();
1373 rtc::scoped_refptr<webrtc::DtmfSenderInterface> sender( 1373 rtc::scoped_refptr<webrtc::DtmfSenderInterface> sender(
1374 native_peer_connection_->CreateDtmfSender(audio_track.get())); 1374 native_peer_connection_->CreateDtmfSender(audio_track.get()));
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
1668 } 1668 }
1669 1669
1670 void RTCPeerConnectionHandler::ResetUMAStats() { 1670 void RTCPeerConnectionHandler::ResetUMAStats() {
1671 DCHECK(thread_checker_.CalledOnValidThread()); 1671 DCHECK(thread_checker_.CalledOnValidThread());
1672 num_local_candidates_ipv6_ = 0; 1672 num_local_candidates_ipv6_ = 0;
1673 num_local_candidates_ipv4_ = 0; 1673 num_local_candidates_ipv4_ = 0;
1674 ice_connection_checking_start_ = base::TimeTicks(); 1674 ice_connection_checking_start_ = base::TimeTicks();
1675 memset(ice_state_seen_, 0, sizeof(ice_state_seen_)); 1675 memset(ice_state_seen_, 0, sizeof(ice_state_seen_));
1676 } 1676 }
1677 } // namespace content 1677 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698