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

Make the destructor of AudioCodingModule public.

Browse Source 
This allows the type to be used with a scoped_ptr. Remove all calls to
the deprecated Destroy() from tests.

R=turaj@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4731 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org
2013-09-12 01:27:43 +00:00
parent 5eb997a2fd
commit 89df092807
24 changed files with 107 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/modules/audio_coding/main/test/opus_test.cc
View File

@ -29,7 +29,7 @@
namespace webrtc {
OpusTest::OpusTest()
: acm_receiver_(NULL),
: acm_receiver_(AudioCodingModule::Create(0)),
channel_a2b_(NULL),
counter_(0),
payload_type_(255),
@ -37,10 +37,6 @@ OpusTest::OpusTest()
}
OpusTest::~OpusTest() {
if (acm_receiver_ != NULL) {
AudioCodingModule::Destroy(acm_receiver_);
acm_receiver_ = NULL;
}
if (channel_a2b_ != NULL) {
delete channel_a2b_;
channel_a2b_ = NULL;
@ -93,9 +89,7 @@ void OpusTest::Perform() {
ASSERT_GT(WebRtcOpus_DecoderInitNew(opus_mono_decoder_), -1);
ASSERT_GT(WebRtcOpus_DecoderInitNew(opus_stereo_decoder_), -1);
// Create and initialize one ACM, to be used as receiver.
acm_receiver_ = AudioCodingModule::Create(0);
ASSERT_TRUE(acm_receiver_ != NULL);
ASSERT_TRUE(acm_receiver_.get() != NULL);
EXPECT_EQ(0, acm_receiver_->InitializeReceiver());
// Register Opus stereo as receiving codec.
@ -107,7 +101,7 @@ void OpusTest::Perform() {
// Create and connect the channel.
channel_a2b_ = new TestPackStereo;
channel_a2b_->RegisterReceiverACM(acm_receiver_);
channel_a2b_->RegisterReceiverACM(acm_receiver_.get());
//
// Test Stereo.