Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1320)

Unified Diff: webrtc/modules/audio_coding/test/TestStereo.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_coding/test/TestStereo.cc
diff --git a/webrtc/modules/audio_coding/test/TestStereo.cc b/webrtc/modules/audio_coding/test/TestStereo.cc
index f18166b7dd83502a807fa5c41343620c007a4ddc..646ea94d6d9ae25652ddb0b747995d0e72a1b6e1 100644
--- a/webrtc/modules/audio_coding/test/TestStereo.cc
+++ b/webrtc/modules/audio_coding/test/TestStereo.cc
@@ -27,15 +27,14 @@ namespace webrtc {
// Class for simulating packet handling
TestPackStereo::TestPackStereo()
- : receiver_acm_(NULL),
+ : receiver_acm_(nullptr),
seq_no_(0),
timestamp_diff_(0),
last_in_timestamp_(0),
total_bytes_(0),
payload_size_(0),
codec_mode_(kNotSet),
- lost_packet_(false) {
-}
+ lost_packet_(false) {}
TestPackStereo::~TestPackStereo() {
}
@@ -111,33 +110,37 @@ void TestPackStereo::set_lost_packet(bool lost) {
TestStereo::TestStereo(int test_mode)
: acm_a_(AudioCodingModule::Create(0)),
acm_b_(AudioCodingModule::Create(1)),
- channel_a2b_(NULL),
+ channel_a2b_(nullptr),
test_cntr_(0),
pack_size_samp_(0),
pack_size_bytes_(0),
counter_(0)
#ifdef WEBRTC_CODEC_G722
- , g722_pltype_(0)
+ ,
+ g722_pltype_(0)
#endif
- , l16_8khz_pltype_(-1)
- , l16_16khz_pltype_(-1)
- , l16_32khz_pltype_(-1)
+ ,
+ l16_8khz_pltype_(-1),
+ l16_16khz_pltype_(-1),
+ l16_32khz_pltype_(-1)
#ifdef PCMA_AND_PCMU
- , pcma_pltype_(-1)
- , pcmu_pltype_(-1)
+ ,
+ pcma_pltype_(-1),
+ pcmu_pltype_(-1)
#endif
#ifdef WEBRTC_CODEC_OPUS
- , opus_pltype_(-1)
+ ,
+ opus_pltype_(-1)
#endif
- {
+{
// test_mode = 0 for silent test (auto test)
test_mode_ = test_mode;
}
TestStereo::~TestStereo() {
- if (channel_a2b_ != NULL) {
+ if (channel_a2b_ != nullptr) {
delete channel_a2b_;
- channel_a2b_ = NULL;
+ channel_a2b_ = nullptr;
}
}
@@ -163,7 +166,7 @@ void TestStereo::Perform() {
in_file_mono_->ReadStereo(false);
// Create and initialize two ACMs, one for each side of a one-to-one call.
- ASSERT_TRUE((acm_a_.get() != NULL) && (acm_b_.get() != NULL));
+ ASSERT_TRUE((acm_a_.get() != nullptr) && (acm_b_.get() != nullptr));
EXPECT_EQ(0, acm_a_->InitializeReceiver());
EXPECT_EQ(0, acm_b_->InitializeReceiver());
@@ -707,7 +710,7 @@ void TestStereo::RegisterSendCodec(char side, char* codec_name,
0.875);
// 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();
@@ -720,7 +723,7 @@ void TestStereo::RegisterSendCodec(char side, char* codec_name,
default:
break;
}
- ASSERT_TRUE(my_acm != NULL);
+ ASSERT_TRUE(my_acm != nullptr);
CodecInst my_codec_param;
// Get all codec parameters before registering

Powered by Google App Engine
This is Rietveld 408576698