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

Side by Side Diff: webrtc/common_audio/vad/vad_core_unittest.cc

Issue 2719733002: Replace NULL with nullptr or null in webrtc/audio/ and common_audio/. (Closed)
Patch Set: Fixing test. Created 3 years, 9 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
« no previous file with comments | « webrtc/common_audio/vad/vad_core.h ('k') | webrtc/common_audio/wav_file.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 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
11 #include <stdlib.h> 11 #include <stdlib.h>
12 12
13 #include "webrtc/common_audio/vad/vad_unittest.h" 13 #include "webrtc/common_audio/vad/vad_unittest.h"
14 #include "webrtc/test/gtest.h" 14 #include "webrtc/test/gtest.h"
15 #include "webrtc/typedefs.h" 15 #include "webrtc/typedefs.h"
16 16
17 extern "C" { 17 extern "C" {
18 #include "webrtc/common_audio/vad/vad_core.h" 18 #include "webrtc/common_audio/vad/vad_core.h"
19 } 19 }
20 20
21 namespace { 21 namespace {
22 22
23 TEST_F(VadTest, InitCore) { 23 TEST_F(VadTest, InitCore) {
24 // Test WebRtcVad_InitCore(). 24 // Test WebRtcVad_InitCore().
25 VadInstT* self = reinterpret_cast<VadInstT*>(malloc(sizeof(VadInstT))); 25 VadInstT* self = reinterpret_cast<VadInstT*>(malloc(sizeof(VadInstT)));
26 26
27 // NULL pointer test. 27 // null pointer test.
28 EXPECT_EQ(-1, WebRtcVad_InitCore(NULL)); 28 EXPECT_EQ(-1, WebRtcVad_InitCore(nullptr));
29 29
30 // Verify return = 0 for non-NULL pointer. 30 // Verify return = 0 for non-null pointer.
31 EXPECT_EQ(0, WebRtcVad_InitCore(self)); 31 EXPECT_EQ(0, WebRtcVad_InitCore(self));
32 // Verify init_flag is set. 32 // Verify init_flag is set.
33 EXPECT_EQ(42, self->init_flag); 33 EXPECT_EQ(42, self->init_flag);
34 34
35 free(self); 35 free(self);
36 } 36 }
37 37
38 TEST_F(VadTest, set_mode_core) { 38 TEST_F(VadTest, set_mode_core) {
39 VadInstT* self = reinterpret_cast<VadInstT*>(malloc(sizeof(VadInstT))); 39 VadInstT* self = reinterpret_cast<VadInstT*>(malloc(sizeof(VadInstT)));
40 40
41 // TODO(bjornv): Add NULL pointer check if we take care of it in 41 // TODO(bjornv): Add null pointer check if we take care of it in
42 // vad_core.c 42 // vad_core.c
43 43
44 ASSERT_EQ(0, WebRtcVad_InitCore(self)); 44 ASSERT_EQ(0, WebRtcVad_InitCore(self));
45 // Test WebRtcVad_set_mode_core(). 45 // Test WebRtcVad_set_mode_core().
46 // Invalid modes should return -1. 46 // Invalid modes should return -1.
47 EXPECT_EQ(-1, WebRtcVad_set_mode_core(self, -1)); 47 EXPECT_EQ(-1, WebRtcVad_set_mode_core(self, -1));
48 EXPECT_EQ(-1, WebRtcVad_set_mode_core(self, 1000)); 48 EXPECT_EQ(-1, WebRtcVad_set_mode_core(self, 1000));
49 // Valid modes should return 0. 49 // Valid modes should return 0.
50 for (size_t j = 0; j < kModesSize; ++j) { 50 for (size_t j = 0; j < kModesSize; ++j) {
51 EXPECT_EQ(0, WebRtcVad_set_mode_core(self, kModes[j])); 51 EXPECT_EQ(0, WebRtcVad_set_mode_core(self, kModes[j]));
52 } 52 }
53 53
54 free(self); 54 free(self);
55 } 55 }
56 56
57 TEST_F(VadTest, CalcVad) { 57 TEST_F(VadTest, CalcVad) {
58 VadInstT* self = reinterpret_cast<VadInstT*>(malloc(sizeof(VadInstT))); 58 VadInstT* self = reinterpret_cast<VadInstT*>(malloc(sizeof(VadInstT)));
59 int16_t speech[kMaxFrameLength]; 59 int16_t speech[kMaxFrameLength];
60 60
61 // TODO(bjornv): Add NULL pointer check if we take care of it in 61 // TODO(bjornv): Add null pointer check if we take care of it in
62 // vad_core.c 62 // vad_core.c
63 63
64 // Test WebRtcVad_CalcVadXXkhz() 64 // Test WebRtcVad_CalcVadXXkhz()
65 // Verify that all zeros in gives VAD = 0 out. 65 // Verify that all zeros in gives VAD = 0 out.
66 memset(speech, 0, sizeof(speech)); 66 memset(speech, 0, sizeof(speech));
67 ASSERT_EQ(0, WebRtcVad_InitCore(self)); 67 ASSERT_EQ(0, WebRtcVad_InitCore(self));
68 for (size_t j = 0; j < kFrameLengthsSize; ++j) { 68 for (size_t j = 0; j < kFrameLengthsSize; ++j) {
69 if (ValidRatesAndFrameLengths(8000, kFrameLengths[j])) { 69 if (ValidRatesAndFrameLengths(8000, kFrameLengths[j])) {
70 EXPECT_EQ(0, WebRtcVad_CalcVad8khz(self, speech, kFrameLengths[j])); 70 EXPECT_EQ(0, WebRtcVad_CalcVad8khz(self, speech, kFrameLengths[j]));
71 } 71 }
(...skipping 24 matching lines...) Expand all
96 EXPECT_EQ(1, WebRtcVad_CalcVad32khz(self, speech, kFrameLengths[j])); 96 EXPECT_EQ(1, WebRtcVad_CalcVad32khz(self, speech, kFrameLengths[j]));
97 } 97 }
98 if (ValidRatesAndFrameLengths(48000, kFrameLengths[j])) { 98 if (ValidRatesAndFrameLengths(48000, kFrameLengths[j])) {
99 EXPECT_EQ(1, WebRtcVad_CalcVad48khz(self, speech, kFrameLengths[j])); 99 EXPECT_EQ(1, WebRtcVad_CalcVad48khz(self, speech, kFrameLengths[j]));
100 } 100 }
101 } 101 }
102 102
103 free(self); 103 free(self);
104 } 104 }
105 } // namespace 105 } // namespace
OLDNEW
« no previous file with comments | « webrtc/common_audio/vad/vad_core.h ('k') | webrtc/common_audio/wav_file.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698