summaryrefslogtreecommitdiffstats
path: root/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-07-01 12:57:51 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-07-01 12:57:51 +0200
commitca3a3b63eed0de7d86291dab8479dcc3e4fc4b8f (patch)
tree3265beacca87ccdcf598c270456b06664b8d6eaa /media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
parent8d29394b4bc27b3575141685647df1509d687441 (diff)
downloadUXP-ca3a3b63eed0de7d86291dab8479dcc3e4fc4b8f.tar
UXP-ca3a3b63eed0de7d86291dab8479dcc3e4fc4b8f.tar.gz
UXP-ca3a3b63eed0de7d86291dab8479dcc3e4fc4b8f.tar.lz
UXP-ca3a3b63eed0de7d86291dab8479dcc3e4fc4b8f.tar.xz
UXP-ca3a3b63eed0de7d86291dab8479dcc3e4fc4b8f.zip
WebRTC: Add DeleteStreams to media conduits.
Diffstat (limited to 'media/webrtc/signaling/src/media-conduit/VideoConduit.cpp')
-rwxr-xr-xmedia/webrtc/signaling/src/media-conduit/VideoConduit.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
index 3f0445122..b406fded5 100755
--- a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
@@ -109,7 +109,7 @@ WebrtcVideoConduit::~WebrtcVideoConduit()
// Release AudioConduit first by dropping reference on MainThread, where it expects to be
SyncTo(nullptr);
- Destroy();
+ MOZ_ASSERT(!mSendStream && !mRecvStream, "Call DeleteStreams prior to ~WebrtcVideoConduit.");
}
bool WebrtcVideoConduit::SetLocalSSRC(unsigned int ssrc)
@@ -478,7 +478,7 @@ WebrtcVideoConduit::Init()
}
void
-WebrtcVideoConduit::Destroy()
+WebrtcVideoConduit::DeleteStreams()
{
// The first one of a pair to be deleted shuts down media for both
//Deal with External Capturer