| Index: webrtc/modules/audio_coding/test/APITest.cc
|
| diff --git a/webrtc/modules/audio_coding/test/APITest.cc b/webrtc/modules/audio_coding/test/APITest.cc
|
| index 1b9981341b504ff28e076727f3b1cc66f41cf5df..25fb6df8b3893b398853c61cd8b76bd1cab2375e 100644
|
| --- a/webrtc/modules/audio_coding/test/APITest.cc
|
| +++ b/webrtc/modules/audio_coding/test/APITest.cc
|
| @@ -51,17 +51,17 @@ void APITest::Wait(uint32_t waitLengthMs) {
|
| APITest::APITest()
|
| : _acmA(AudioCodingModule::Create(1)),
|
| _acmB(AudioCodingModule::Create(2)),
|
| - _channel_A2B(NULL),
|
| - _channel_B2A(NULL),
|
| + _channel_A2B(nullptr),
|
| + _channel_B2A(nullptr),
|
| _writeToFile(true),
|
| - _pullEventA(NULL),
|
| - _pushEventA(NULL),
|
| - _processEventA(NULL),
|
| - _apiEventA(NULL),
|
| - _pullEventB(NULL),
|
| - _pushEventB(NULL),
|
| - _processEventB(NULL),
|
| - _apiEventB(NULL),
|
| + _pullEventA(nullptr),
|
| + _pushEventA(nullptr),
|
| + _processEventA(nullptr),
|
| + _apiEventA(nullptr),
|
| + _pullEventB(nullptr),
|
| + _pushEventB(nullptr),
|
| + _processEventB(nullptr),
|
| + _apiEventB(nullptr),
|
| _codecCntrA(0),
|
| _codecCntrB(0),
|
| _thereIsEncoderA(false),
|
| @@ -80,8 +80,8 @@ APITest::APITest()
|
| _dotMoveDirectionA(1),
|
| _dotPositionB(39),
|
| _dotMoveDirectionB(-1),
|
| - _vadCallbackA(NULL),
|
| - _vadCallbackB(NULL),
|
| + _vadCallbackA(nullptr),
|
| + _vadCallbackB(nullptr),
|
| _apiTestRWLock(*RWLockWrapper::CreateRWLock()),
|
| _randomTest(false),
|
| _testNumA(0),
|
| @@ -270,18 +270,18 @@ int16_t APITest::SetUp() {
|
| (webrtc::test::OutputPath() + "acm_api_trace.txt").c_str());
|
|
|
| printf("\nRandom Test (y/n)?");
|
| - EXPECT_TRUE(fgets(print, 10, stdin) != NULL);
|
| + EXPECT_TRUE(fgets(print, 10, stdin) != nullptr);
|
| print[10] = '\0';
|
| - if (strstr(print, "y") != NULL) {
|
| + if (strstr(print, "y") != nullptr) {
|
| _randomTest = true;
|
| _verbose = false;
|
| _writeToFile = false;
|
| } else {
|
| _randomTest = false;
|
| printf("\nPrint Tests (y/n)? ");
|
| - EXPECT_TRUE(fgets(print, 10, stdin) != NULL);
|
| + EXPECT_TRUE(fgets(print, 10, stdin) != nullptr);
|
| print[10] = '\0';
|
| - if (strstr(print, "y") == NULL) {
|
| + if (strstr(print, "y") == nullptr) {
|
| EXPECT_TRUE(freopen("APITest_log.txt", "w", stdout) != 0);
|
| _verbose = false;
|
| }
|
| @@ -603,7 +603,7 @@ void APITest::CheckVADStatus(char side) {
|
|
|
| if (side == 'A') {
|
| _acmA->VAD(&dtxEnabled, &vadEnabled, &vadMode);
|
| - _acmA->RegisterVADCallback(NULL);
|
| + _acmA->RegisterVADCallback(nullptr);
|
| _vadCallbackA->Reset();
|
| _acmA->RegisterVADCallback(_vadCallbackA);
|
|
|
| @@ -634,7 +634,7 @@ void APITest::CheckVADStatus(char side) {
|
| } else {
|
| _acmB->VAD(&dtxEnabled, &vadEnabled, &vadMode);
|
|
|
| - _acmB->RegisterVADCallback(NULL);
|
| + _acmB->RegisterVADCallback(nullptr);
|
| _vadCallbackB->Reset();
|
| _acmB->RegisterVADCallback(_vadCallbackB);
|
|
|
|
|