zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove old_factory from WebRtcVideoEngine.

Browse Source 
Minor pending cleanup.

R=pthatcher@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/28239004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7875 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2014-12-11 13:14:30 +00:00
parent 128fabaf7b
commit 13518951e3
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
talk/media/webrtc/webrtcvideoengine.cc
View File

@ -1153,10 +1153,6 @@ WebRtcVideoEngine::~WebRtcVideoEngine() {
Terminate(); Terminate();
} }
if (simulcast_encoder_factory_) {
SetExternalEncoderFactory(NULL);
}
tracing_->SetTraceCallback(NULL); tracing_->SetTraceCallback(NULL);
// Test to see if the media processor was deregistered properly. // Test to see if the media processor was deregistered properly.
ASSERT(SignalMediaFrame.is_empty()); ASSERT(SignalMediaFrame.is_empty());
@ -1675,10 +1671,13 @@ void WebRtcVideoEngine::SetExternalDecoderFactory(
void WebRtcVideoEngine::SetExternalEncoderFactory( void WebRtcVideoEngine::SetExternalEncoderFactory(
WebRtcVideoEncoderFactory* encoder_factory) { WebRtcVideoEncoderFactory* encoder_factory) {
// Deleted after WebRtcVideoEngine::SetExternalEncoderFactory is if (encoder_factory_ == encoder_factory)
// completed, which will remove the references to it. return;
rtc::scoped_ptr<WebRtcVideoEncoderFactory> old_factory(
simulcast_encoder_factory_.release()); // No matter what happens we shouldn't hold on to a stale
// SimulcastEncoderFactory.
simulcast_encoder_factory_.reset();
if (encoder_factory) { if (encoder_factory) {
const std::vector<WebRtcVideoEncoderFactory::VideoCodec>& codecs = const std::vector<WebRtcVideoEncoderFactory::VideoCodec>& codecs =
encoder_factory->codecs(); encoder_factory->codecs();
@ -1689,9 +1688,6 @@ void WebRtcVideoEngine::SetExternalEncoderFactory(
} }
} }
if (encoder_factory_ == encoder_factory)
return;
encoder_factory_ = encoder_factory; encoder_factory_ = encoder_factory;
// Rebuild codec list while reapplying the current default codec format. // Rebuild codec list while reapplying the current default codec format.