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

Side by Side Diff: components/copresence/mediums/audio/audio_recorder_unittest.cc

Issue 691223002: Replacing NULL with nullptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Using EXPECT_THAT Created 6 years, 1 month 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/copresence/mediums/audio/audio_recorder.h" 5 #include "components/copresence/mediums/audio/audio_recorder.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/aligned_memory.h" 8 #include "base/memory/aligned_memory.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "components/copresence/mediums/audio/audio_recorder_impl.h" 10 #include "components/copresence/mediums/audio/audio_recorder_impl.h"
11 #include "components/copresence/public/copresence_constants.h" 11 #include "components/copresence/public/copresence_constants.h"
12 #include "components/copresence/test/audio_test_support.h" 12 #include "components/copresence/test/audio_test_support.h"
13 #include "content/public/test/test_browser_thread_bundle.h" 13 #include "content/public/test/test_browser_thread_bundle.h"
14 #include "media/audio/audio_manager.h" 14 #include "media/audio/audio_manager.h"
15 #include "media/audio/audio_manager_base.h" 15 #include "media/audio/audio_manager_base.h"
16 #include "media/base/audio_bus.h" 16 #include "media/base/audio_bus.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 18
19 namespace { 19 namespace {
20 20
21 class TestAudioInputStream : public media::AudioInputStream { 21 class TestAudioInputStream : public media::AudioInputStream {
22 public: 22 public:
23 TestAudioInputStream(const media::AudioParameters& params, 23 TestAudioInputStream(const media::AudioParameters& params,
24 const std::vector<float*> channel_data, 24 const std::vector<float*> channel_data,
25 size_t samples) 25 size_t samples)
26 : callback_(NULL), params_(params) { 26 : callback_(nullptr), params_(params) {
27 buffer_ = media::AudioBus::CreateWrapper(2); 27 buffer_ = media::AudioBus::CreateWrapper(2);
28 for (size_t i = 0; i < channel_data.size(); ++i) 28 for (size_t i = 0; i < channel_data.size(); ++i)
29 buffer_->SetChannelData(i, channel_data[i]); 29 buffer_->SetChannelData(i, channel_data[i]);
30 buffer_->set_frames(samples); 30 buffer_->set_frames(samples);
31 } 31 }
32 32
33 ~TestAudioInputStream() override {} 33 ~TestAudioInputStream() override {}
34 34
35 bool Open() override { return true; } 35 bool Open() override { return true; }
36 void Start(AudioInputCallback* callback) override { 36 void Start(AudioInputCallback* callback) override {
(...skipping 29 matching lines...) Expand all
66 66
67 DISALLOW_COPY_AND_ASSIGN(TestAudioInputStream); 67 DISALLOW_COPY_AND_ASSIGN(TestAudioInputStream);
68 }; 68 };
69 69
70 } // namespace 70 } // namespace
71 71
72 namespace copresence { 72 namespace copresence {
73 73
74 class AudioRecorderTest : public testing::Test { 74 class AudioRecorderTest : public testing::Test {
75 public: 75 public:
76 AudioRecorderTest() : total_samples_(0), recorder_(NULL) { 76 AudioRecorderTest() : total_samples_(0), recorder_(nullptr) {
77 if (!media::AudioManager::Get()) 77 if (!media::AudioManager::Get())
78 media::AudioManager::CreateForTesting(); 78 media::AudioManager::CreateForTesting();
79 } 79 }
80 80
81 ~AudioRecorderTest() override { 81 ~AudioRecorderTest() override {
82 DeleteRecorder(); 82 DeleteRecorder();
83 for (size_t i = 0; i < channel_data_.size(); ++i) 83 for (size_t i = 0; i < channel_data_.size(); ++i)
84 base::AlignedFree(channel_data_[i]); 84 base::AlignedFree(channel_data_[i]);
85 } 85 }
86 86
(...skipping 27 matching lines...) Expand all
114 new TestAudioInputStream(params_, channel_data_, samples)); 114 new TestAudioInputStream(params_, channel_data_, samples));
115 recorder_->set_params_for_testing(new media::AudioParameters(params_)); 115 recorder_->set_params_for_testing(new media::AudioParameters(params_));
116 recorder_->Initialize( 116 recorder_->Initialize(
117 base::Bind(&AudioRecorderTest::DecodeSamples, base::Unretained(this))); 117 base::Bind(&AudioRecorderTest::DecodeSamples, base::Unretained(this)));
118 } 118 }
119 119
120 void DeleteRecorder() { 120 void DeleteRecorder() {
121 if (!recorder_) 121 if (!recorder_)
122 return; 122 return;
123 recorder_->Finalize(); 123 recorder_->Finalize();
124 recorder_ = NULL; 124 recorder_ = nullptr;
125 } 125 }
126 126
127 void RecordAndVerifySamples() { 127 void RecordAndVerifySamples() {
128 received_samples_.clear(); 128 received_samples_.clear();
129 run_loop_.reset(new base::RunLoop()); 129 run_loop_.reset(new base::RunLoop());
130 recorder_->Record(); 130 recorder_->Record();
131 run_loop_->Run(); 131 run_loop_->Run();
132 } 132 }
133 133
134 void DecodeSamples(const std::string& samples) { 134 void DecodeSamples(const std::string& samples) {
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 kDefaultChannels, kDefaultSampleRate, kDefaultBitsPerSample, kNumSamples); 246 kDefaultChannels, kDefaultSampleRate, kDefaultBitsPerSample, kNumSamples);
247 247
248 RecordAndVerifySamples(); 248 RecordAndVerifySamples();
249 249
250 DeleteRecorder(); 250 DeleteRecorder();
251 } 251 }
252 252
253 // TODO(rkc): Add tests with recording different sample rates. 253 // TODO(rkc): Add tests with recording different sample rates.
254 254
255 } // namespace copresence 255 } // namespace copresence
OLDNEW
« no previous file with comments | « components/copresence/mediums/audio/audio_recorder_impl.cc ('k') | components/copresence/rpc/rpc_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698