Merge branch 'master' into quic-protocol

jianjunz · web-flow · commit fbb963d6aca3 · 2020-12-22T12:46:31.000+08:00
diff --git a/source/core/owt_base/selector/AudioRanker.cpp b/source/core/owt_base/selector/AudioRanker.cpp
@@ -287,7 +287,9 @@ void AudioRanker::AudioLevelProcessor::setLinkedOutput(FrameDestination* output)
         removeAudioDestination(m_linkedOutput);
     }
     m_linkedOutput = output;
-    addAudioDestination(m_linkedOutput);
+    if (m_linkedOutput) {
+        addAudioDestination(m_linkedOutput);
+    }
     deliverOwnerData();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,9 @@ void AudioRanker::AudioLevelProcessor::setLinkedOutput(FrameDestination* output)`
`287`	`287`	`removeAudioDestination(m_linkedOutput);`
`288`	`288`	`}`
`289`	`289`	`m_linkedOutput = output;`
`290`		`- addAudioDestination(m_linkedOutput);`
	`290`	`+ if (m_linkedOutput) {`
	`291`	`+ addAudioDestination(m_linkedOutput);`
	`292`	`+ }`
`291`	`293`	`deliverOwnerData();`
`292`	`294`	`}`
`293`	`295`