From f5657efd31db5b35962f4aa883d14a421b3e8f1b Mon Sep 17 00:00:00 2001 From: "phoglund@webrtc.org" Date: Mon, 7 May 2012 07:59:32 +0000 Subject: [PATCH] Rolled back r2177 since it breaks vie_auto_test. I'm not sure what is the right thing to do here. That would probably be to call Release() the right amount of times and ensuring that the last call returns 0 (e.g. all references have been released), but I'll leave it up to the CL author to investigate that. TBR=elham@webrtc.org BUG= TEST= Review URL: https://webrtc-codereview.appspot.com/569005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2183 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/video_engine/test/auto_test/source/vie_autotest_file.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/video_engine/test/auto_test/source/vie_autotest_file.cc b/src/video_engine/test/auto_test/source/vie_autotest_file.cc index d425828f6..e82fb9c82 100644 --- a/src/video_engine/test/auto_test/source/vie_autotest_file.cc +++ b/src/video_engine/test/auto_test/source/vie_autotest_file.cc @@ -464,8 +464,9 @@ void ViEAutoTest::ViEFileStandardTest() EXPECT_EQ(0, ptrViEBase->DisconnectAudioChannel(videoChannel)); EXPECT_EQ(0, ptrViEBase->SetVoiceEngine(NULL)); EXPECT_EQ(0, ptrVEBase->DeleteChannel(audioChannel)); - EXPECT_EQ(0, ptrVEBase->Release()); - EXPECT_EQ(0, ptrVECodec->Release()); + // VoE reference counting is per-object, so we use EXPECT_NE + EXPECT_NE(0, ptrVEBase->Release()); + EXPECT_NE(0, ptrVECodec->Release()); EXPECT_TRUE(webrtc::VoiceEngine::Delete(ptrVEEngine)); EXPECT_EQ(0, ptrViEBase->StopReceive(videoChannel));