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

Side by Side Diff: webrtc/pc/test/fakeaudiocapturemodule_unittest.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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 15 matching lines...) Expand all
26 26
27 FakeAdmTest() 27 FakeAdmTest()
28 : push_iterations_(0), 28 : push_iterations_(0),
29 pull_iterations_(0), 29 pull_iterations_(0),
30 rec_buffer_bytes_(0) { 30 rec_buffer_bytes_(0) {
31 memset(rec_buffer_, 0, sizeof(rec_buffer_)); 31 memset(rec_buffer_, 0, sizeof(rec_buffer_));
32 } 32 }
33 33
34 void SetUp() override { 34 void SetUp() override {
35 fake_audio_capture_module_ = FakeAudioCaptureModule::Create(); 35 fake_audio_capture_module_ = FakeAudioCaptureModule::Create();
36 EXPECT_TRUE(fake_audio_capture_module_.get() != NULL); 36 EXPECT_TRUE(fake_audio_capture_module_.get() != nullptr);
37 } 37 }
38 38
39 // Callbacks inherited from webrtc::AudioTransport. 39 // Callbacks inherited from webrtc::AudioTransport.
40 // ADM is pushing data. 40 // ADM is pushing data.
41 int32_t RecordedDataIsAvailable(const void* audioSamples, 41 int32_t RecordedDataIsAvailable(const void* audioSamples,
42 const size_t nSamples, 42 const size_t nSamples,
43 const size_t nBytesPerSample, 43 const size_t nBytesPerSample,
44 const size_t nChannels, 44 const size_t nChannels,
45 const uint32_t samplesPerSec, 45 const uint32_t samplesPerSec,
46 const uint32_t totalDelayMS, 46 const uint32_t totalDelayMS,
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 205
206 EXPECT_EQ(0, fake_audio_capture_module_->InitRecording()); 206 EXPECT_EQ(0, fake_audio_capture_module_->InitRecording());
207 EXPECT_EQ(0, fake_audio_capture_module_->StartRecording()); 207 EXPECT_EQ(0, fake_audio_capture_module_->StartRecording());
208 208
209 EXPECT_TRUE_WAIT(push_iterations() > 0, kMsInSecond); 209 EXPECT_TRUE_WAIT(push_iterations() > 0, kMsInSecond);
210 EXPECT_TRUE_WAIT(pull_iterations() > 0, kMsInSecond); 210 EXPECT_TRUE_WAIT(pull_iterations() > 0, kMsInSecond);
211 211
212 EXPECT_EQ(0, fake_audio_capture_module_->StopPlayout()); 212 EXPECT_EQ(0, fake_audio_capture_module_->StopPlayout());
213 EXPECT_EQ(0, fake_audio_capture_module_->StopRecording()); 213 EXPECT_EQ(0, fake_audio_capture_module_->StopRecording());
214 } 214 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698