Feodor2
/
Mypal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Webrtc fix: mPtrViEBase set to nullptr but still used.

master
Fedor 2020-05-25 08:51:01 +03:00
parent 2c2e50bc2c
commit cb35b58684
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
View File

@ -106,9 +106,6 @@ WebrtcVideoConduit::~WebrtcVideoConduit()
{ {
NS_ASSERTION(NS_IsMainThread(), "Only call on main thread"); NS_ASSERTION(NS_IsMainThread(), "Only call on main thread");
CSFLogDebug(logTag, "%s ", __FUNCTION__); CSFLogDebug(logTag, "%s ", __FUNCTION__);
// Release AudioConduit first by dropping reference on MainThread, where it expects to be
SyncTo(nullptr);
MOZ_ASSERT(!mSendStream && !mRecvStream, "Call DeleteStreams prior to ~WebrtcVideoConduit."); MOZ_ASSERT(!mSendStream && !mRecvStream, "Call DeleteStreams prior to ~WebrtcVideoConduit.");
} }
@ -523,6 +520,7 @@ WebrtcVideoConduit::DeleteStreams()
mVideoCodecStat = nullptr; mVideoCodecStat = nullptr;
// We can't delete the VideoEngine until all these are released! // We can't delete the VideoEngine until all these are released!
// And we can't use a Scoped ptr, since the order is arbitrary // And we can't use a Scoped ptr, since the order is arbitrary
SyncTo(nullptr);
mPtrViEBase = nullptr; mPtrViEBase = nullptr;
mPtrViECapture = nullptr; mPtrViECapture = nullptr;
mPtrViECodec = nullptr; mPtrViECodec = nullptr;