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

Unified Diff: webrtc/pc/peerconnection.cc

Issue 2666853002: Move DTMF sender to RtpSender (as opposed to WebRtcSession). (Closed)
Patch Set: Merge with master Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/pc/dtmfsender_unittest.cc ('k') | webrtc/pc/rtpsender.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/peerconnection.cc
diff --git a/webrtc/pc/peerconnection.cc b/webrtc/pc/peerconnection.cc
index 14e18095af6cb212a981e125dde5de22753a615e..a38c98601bb2f66904531d8d8daf079fd3cb4e6c 100644
--- a/webrtc/pc/peerconnection.cc
+++ b/webrtc/pc/peerconnection.cc
@@ -949,20 +949,15 @@ rtc::scoped_refptr<DtmfSenderInterface> PeerConnection::CreateDtmfSender(
}
if (!track) {
LOG(LS_ERROR) << "CreateDtmfSender - track is NULL.";
- return NULL;
+ return nullptr;
}
- if (!local_streams_->FindAudioTrack(track->id())) {
- LOG(LS_ERROR) << "CreateDtmfSender is called with a non local audio track.";
- return NULL;
+ auto it = FindSenderForTrack(track);
+ if (it == senders_.end()) {
+ LOG(LS_ERROR) << "CreateDtmfSender called with a non-added track.";
+ return nullptr;
}
- rtc::scoped_refptr<DtmfSenderInterface> sender(
- DtmfSender::Create(track, signaling_thread(), session_.get()));
- if (!sender.get()) {
- LOG(LS_ERROR) << "CreateDtmfSender failed on DtmfSender::Create.";
- return NULL;
- }
- return DtmfSenderProxy::Create(signaling_thread(), sender.get());
+ return (*it)->GetDtmfSender();
}
rtc::scoped_refptr<RtpSenderInterface> PeerConnection::CreateSender(
« no previous file with comments | « webrtc/pc/dtmfsender_unittest.cc ('k') | webrtc/pc/rtpsender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698