generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added destructors for tests to control destruct order

Browse Source 
TBR=mflodman
Review URL: https://webrtc-codereview.appspot.com/1197005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3667 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pwestin@webrtc.org 2013-03-13 21:36:10 +00:00
parent 15960c2b67
commit 2dc0367406
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
webrtc/video_engine/test/auto_test/source/vie_autotest_base.cc
View File

@ -161,17 +161,17 @@ void ViEAutoTest::ViEBaseAPITest() {
EXPECT_EQ(0, vie_rtp->SetLocalSSRC(video_channel, 2));
EXPECT_EQ(0, vie_rtp->SetLocalSSRC(video_channel, 3));
webrtc::scoped_ptr<webrtc::VideoChannelTransport> video_channel_transport_1(
new webrtc::VideoChannelTransport(vie_network, video_channel));
webrtc::VideoChannelTransport* video_channel_transport_1 =
new webrtc::VideoChannelTransport(vie_network, video_channel);
ASSERT_EQ(0, video_channel_transport_1->SetSendDestination(ip_address,
send_port));
webrtc::scoped_ptr<webrtc::VideoChannelTransport> video_channel_transport_2(
new webrtc::VideoChannelTransport(vie_network, video_channel2));
webrtc::VideoChannelTransport* video_channel_transport_2 =
new webrtc::VideoChannelTransport(vie_network, video_channel2);
webrtc::scoped_ptr<webrtc::VideoChannelTransport> video_channel_transport_3(
new webrtc::VideoChannelTransport(vie_network, video_channel3));
webrtc::VideoChannelTransport* video_channel_transport_3 =
new webrtc::VideoChannelTransport(vie_network, video_channel3);
ASSERT_EQ(0, video_channel_transport_3->SetSendDestination(ip_address,
send_port + 4));
@ -231,6 +231,9 @@ void ViEAutoTest::ViEBaseAPITest() {
EXPECT_FALSE(webrtc::VideoEngine::Delete(video_engine)) <<
"Should fail since there are interfaces left.";
delete video_channel_transport_1;
delete video_channel_transport_2;
delete video_channel_transport_3;
EXPECT_EQ(0, vie_base->Release());
EXPECT_TRUE(webrtc::VideoEngine::Delete(video_engine));
}

3
webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc
View File

@ -931,6 +931,9 @@ int ViEAutoTest::ViECustomCall() {
// Now tear down the ViE engine.
error = vie_base->DisconnectAudioChannel(video_channel);
voice_channel_transport.reset(NULL);
video_channel_transport.reset(NULL);
// If Encoder/Decoder Observer is running, delete them.
if (codec_encoder_observer) {
error = vie_codec->DeregisterEncoderObserver(video_channel);

6
webrtc/video_engine/test/auto_test/source/vie_autotest_loopback.cc
View File

@ -474,8 +474,8 @@ int VideoEngineSampleCode(void* window1, void* window2)
// Setting External transport
TbExternalTransport extTransport(*(ptrViENetwork), videoChannel, NULL);
webrtc::scoped_ptr<webrtc::VideoChannelTransport> video_channel_transport(
new webrtc::VideoChannelTransport(ptrViENetwork, videoChannel));
webrtc::VideoChannelTransport* video_channel_transport =
new webrtc::VideoChannelTransport(ptrViENetwork, videoChannel);
int testMode = 0;
std::cout << std::endl;
@ -642,7 +642,7 @@ int VideoEngineSampleCode(void* window1, void* window2)
printf("ERROR in ViEBase::DeleteChannel\n");
return -1;
}
delete video_channel_transport;
int remainingInterfaces = 0;
remainingInterfaces = ptrViECodec->Release();
remainingInterfaces += ptrViECapture->Release();

5
webrtc/video_engine/test/auto_test/source/vie_autotest_record.cc
View File

@ -359,8 +359,8 @@ int VideoEngineSampleRecordCode(void* window1, void* window2) {
printf("ERROR in ViENetwork::GetInterface\n");
return -1;
}
webrtc::scoped_ptr<webrtc::VideoChannelTransport> video_channel_transport(
new webrtc::VideoChannelTransport(ptrViENetwork, videoChannel));
webrtc::VideoChannelTransport* video_channel_transport =
new webrtc::VideoChannelTransport(ptrViENetwork, videoChannel);
error = video_channel_transport->SetSendDestination(ipAddress, rtpPort);
if (error == -1) {
@ -526,6 +526,7 @@ int VideoEngineSampleRecordCode(void* window1, void* window2) {
printf("ERROR in ViEBase::DeleteChannel\n");
return -1;
}
delete video_channel_transport;
int remainingInterfaces = 0;
remainingInterfaces = ptrViECodec->Release();