Bug 1453030 - Only create RTCDTMFSender on audio RTCRtpSender senders…

…; r=bwc MozReview-Commit-ID: KsnUYCs8IYU --HG-- extra : rebase_source : 2bee2f713ef65ef5baaa6cd37a3f9521beaa9a73
dothq · Apr 10, 2018 · 30d5029 · 30d5029
1 parent e4e06ef
commit 30d5029
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/dom/media/PeerConnection.js b/dom/media/PeerConnection.js
@@ -1915,9 +1915,11 @@ setupPrototype(RTCDTMFSender, {
 });
 
 class RTCRtpSender {
-  constructor(pc, transceiverImpl, transceiver, track, streams) {
-    let dtmf = pc._win.RTCDTMFSender._create(
-        pc._win, new RTCDTMFSender(this));
+  constructor(pc, transceiverImpl, transceiver, track, kind, streams) {
+    let dtmf = null;
+    if (kind == "audio") {
+      dtmf = pc._win.RTCDTMFSender._create(pc._win, new RTCDTMFSender(this));
+    }
 
     Object.assign(this, {
       _pc: pc,
@@ -2225,7 +2227,7 @@ class RTCRtpTransceiver {
         pc._win, new RTCRtpReceiver(pc, transceiverImpl, kind));
     let streams = (init && init.streams) || [];
     let sender = pc._win.RTCRtpSender._create(
-        pc._win, new RTCRtpSender(pc, transceiverImpl, this, sendTrack, streams));
+        pc._win, new RTCRtpSender(pc, transceiverImpl, this, sendTrack, kind, streams));
 
     let direction = (init && init.direction) || "sendrecv";
     Object.assign(this,

diff --git a/media/webrtc/signaling/src/peerconnection/TransceiverImpl.cpp b/media/webrtc/signaling/src/peerconnection/TransceiverImpl.cpp
@@ -572,6 +572,8 @@ TransceiverImpl::InsertDTMFTone(int tone, uint32_t duration)
     return;
   }
 
+  MOZ_ASSERT(mConduit->type() == MediaSessionConduit::AUDIO);
+
   RefPtr<AudioSessionConduit> conduit(static_cast<AudioSessionConduit*>(
         mConduit.get()));
   mStsThread->Dispatch(WrapRunnableNM([conduit, tone, duration] () {