From cb35b5868421cd0e9a897a3f29ebf950cb13dddd Mon Sep 17 00:00:00 2001 From: Fedor Date: Mon, 25 May 2020 08:51:01 +0300 Subject: [PATCH] Webrtc fix: mPtrViEBase set to nullptr but still used. --- media/webrtc/signaling/src/media-conduit/VideoConduit.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp index b406fded5..732682538 100644 --- a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp +++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp @@ -106,9 +106,6 @@ WebrtcVideoConduit::~WebrtcVideoConduit() { NS_ASSERTION(NS_IsMainThread(), "Only call on main thread"); 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."); } @@ -523,6 +520,7 @@ WebrtcVideoConduit::DeleteStreams() mVideoCodecStat = nullptr; // We can't delete the VideoEngine until all these are released! // And we can't use a Scoped ptr, since the order is arbitrary + SyncTo(nullptr); mPtrViEBase = nullptr; mPtrViECapture = nullptr; mPtrViECodec = nullptr;