| Index: webrtc/modules/audio_coding/test/TestAllCodecs.cc
|
| diff --git a/webrtc/modules/audio_coding/test/TestAllCodecs.cc b/webrtc/modules/audio_coding/test/TestAllCodecs.cc
|
| index 30f022660006c6a8651b72adb6556cbe1868f5fb..f96a544e53b71aab2b54d97c275224252d6a86aa 100644
|
| --- a/webrtc/modules/audio_coding/test/TestAllCodecs.cc
|
| +++ b/webrtc/modules/audio_coding/test/TestAllCodecs.cc
|
| @@ -40,13 +40,12 @@ namespace webrtc {
|
|
|
| // Class for simulating packet handling.
|
| TestPack::TestPack()
|
| - : receiver_acm_(NULL),
|
| + : receiver_acm_(nullptr),
|
| sequence_number_(0),
|
| timestamp_diff_(0),
|
| last_in_timestamp_(0),
|
| total_bytes_(0),
|
| - payload_size_(0) {
|
| -}
|
| + payload_size_(0) {}
|
|
|
| TestPack::~TestPack() {
|
| }
|
| @@ -106,7 +105,7 @@ void TestPack::reset_payload_size() {
|
| TestAllCodecs::TestAllCodecs(int test_mode)
|
| : acm_a_(AudioCodingModule::Create(0)),
|
| acm_b_(AudioCodingModule::Create(1)),
|
| - channel_a_to_b_(NULL),
|
| + channel_a_to_b_(nullptr),
|
| test_count_(0),
|
| packet_size_samples_(0),
|
| packet_size_bytes_(0) {
|
| @@ -115,9 +114,9 @@ TestAllCodecs::TestAllCodecs(int test_mode)
|
| }
|
|
|
| TestAllCodecs::~TestAllCodecs() {
|
| - if (channel_a_to_b_ != NULL) {
|
| + if (channel_a_to_b_ != nullptr) {
|
| delete channel_a_to_b_;
|
| - channel_a_to_b_ = NULL;
|
| + channel_a_to_b_ = nullptr;
|
| }
|
| }
|
|
|
| @@ -389,7 +388,7 @@ void TestAllCodecs::RegisterSendCodec(char side, char* codec_name,
|
| }
|
|
|
| // Set pointer to the ACM where to register the codec.
|
| - AudioCodingModule* my_acm = NULL;
|
| + AudioCodingModule* my_acm = nullptr;
|
| switch (side) {
|
| case 'A': {
|
| my_acm = acm_a_.get();
|
| @@ -403,7 +402,7 @@ void TestAllCodecs::RegisterSendCodec(char side, char* codec_name,
|
| break;
|
| }
|
| }
|
| - ASSERT_TRUE(my_acm != NULL);
|
| + ASSERT_TRUE(my_acm != nullptr);
|
|
|
| // Get all codec parameters before registering
|
| CodecInst my_codec_param;
|
|
|