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

Side by Side Diff: talk/media/base/streamparams_unittest.cc

Issue 1405023016: Convert usage of ARRAY_SIZE to arraysize. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: static_cast<int> Created 5 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
« no previous file with comments | « talk/media/base/capturemanager_unittest.cc ('k') | talk/media/base/testutils.h » ('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 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation 11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution. 12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products 13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include "talk/media/base/streamparams.h" 28 #include "talk/media/base/streamparams.h"
29 #include "talk/media/base/testutils.h" 29 #include "talk/media/base/testutils.h"
30 #include "webrtc/base/arraysize.h"
30 #include "webrtc/base/gunit.h" 31 #include "webrtc/base/gunit.h"
31 32
32 static const uint32_t kSsrcs1[] = {1}; 33 static const uint32_t kSsrcs1[] = {1};
33 static const uint32_t kSsrcs2[] = {1, 2}; 34 static const uint32_t kSsrcs2[] = {1, 2};
34 static const uint32_t kSsrcs3[] = {1, 2, 3}; 35 static const uint32_t kSsrcs3[] = {1, 2, 3};
35 static const uint32_t kRtxSsrcs3[] = {4, 5, 6}; 36 static const uint32_t kRtxSsrcs3[] = {4, 5, 6};
36 37
37 static cricket::StreamParams CreateStreamParamsWithSsrcGroup( 38 static cricket::StreamParams CreateStreamParamsWithSsrcGroup(
38 const std::string& semantics, 39 const std::string& semantics,
39 const uint32_t ssrcs_in[], 40 const uint32_t ssrcs_in[],
40 size_t len) { 41 size_t len) {
41 cricket::StreamParams stream; 42 cricket::StreamParams stream;
42 std::vector<uint32_t> ssrcs(ssrcs_in, ssrcs_in + len); 43 std::vector<uint32_t> ssrcs(ssrcs_in, ssrcs_in + len);
43 cricket::SsrcGroup sg(semantics, ssrcs); 44 cricket::SsrcGroup sg(semantics, ssrcs);
44 stream.ssrcs = ssrcs; 45 stream.ssrcs = ssrcs;
45 stream.ssrc_groups.push_back(sg); 46 stream.ssrc_groups.push_back(sg);
46 return stream; 47 return stream;
47 } 48 }
48 49
49 TEST(SsrcGroup, EqualNotEqual) { 50 TEST(SsrcGroup, EqualNotEqual) {
50 cricket::SsrcGroup ssrc_groups[] = { 51 cricket::SsrcGroup ssrc_groups[] = {
51 cricket::SsrcGroup("ABC", MAKE_VECTOR(kSsrcs1)), 52 cricket::SsrcGroup("ABC", MAKE_VECTOR(kSsrcs1)),
52 cricket::SsrcGroup("ABC", MAKE_VECTOR(kSsrcs2)), 53 cricket::SsrcGroup("ABC", MAKE_VECTOR(kSsrcs2)),
53 cricket::SsrcGroup("Abc", MAKE_VECTOR(kSsrcs2)), 54 cricket::SsrcGroup("Abc", MAKE_VECTOR(kSsrcs2)),
54 cricket::SsrcGroup("abc", MAKE_VECTOR(kSsrcs2)), 55 cricket::SsrcGroup("abc", MAKE_VECTOR(kSsrcs2)),
55 }; 56 };
56 57
57 for (size_t i = 0; i < ARRAY_SIZE(ssrc_groups); ++i) { 58 for (size_t i = 0; i < arraysize(ssrc_groups); ++i) {
58 for (size_t j = 0; j < ARRAY_SIZE(ssrc_groups); ++j) { 59 for (size_t j = 0; j < arraysize(ssrc_groups); ++j) {
59 EXPECT_EQ((ssrc_groups[i] == ssrc_groups[j]), (i == j)); 60 EXPECT_EQ((ssrc_groups[i] == ssrc_groups[j]), (i == j));
60 EXPECT_EQ((ssrc_groups[i] != ssrc_groups[j]), (i != j)); 61 EXPECT_EQ((ssrc_groups[i] != ssrc_groups[j]), (i != j));
61 } 62 }
62 } 63 }
63 } 64 }
64 65
65 TEST(SsrcGroup, HasSemantics) { 66 TEST(SsrcGroup, HasSemantics) {
66 cricket::SsrcGroup sg1("ABC", MAKE_VECTOR(kSsrcs1)); 67 cricket::SsrcGroup sg1("ABC", MAKE_VECTOR(kSsrcs1));
67 EXPECT_TRUE(sg1.has_semantics("ABC")); 68 EXPECT_TRUE(sg1.has_semantics("ABC"));
68 69
(...skipping 16 matching lines...) Expand all
85 EXPECT_EQ(ssrc, one_sp.first_ssrc()); 86 EXPECT_EQ(ssrc, one_sp.first_ssrc());
86 EXPECT_TRUE(one_sp.has_ssrcs()); 87 EXPECT_TRUE(one_sp.has_ssrcs());
87 EXPECT_TRUE(one_sp.has_ssrc(ssrc)); 88 EXPECT_TRUE(one_sp.has_ssrc(ssrc));
88 EXPECT_FALSE(one_sp.has_ssrc(ssrc+1)); 89 EXPECT_FALSE(one_sp.has_ssrc(ssrc+1));
89 EXPECT_FALSE(one_sp.has_ssrc_groups()); 90 EXPECT_FALSE(one_sp.has_ssrc_groups());
90 EXPECT_EQ(0U, one_sp.ssrc_groups.size()); 91 EXPECT_EQ(0U, one_sp.ssrc_groups.size());
91 } 92 }
92 93
93 TEST(StreamParams, HasSsrcGroup) { 94 TEST(StreamParams, HasSsrcGroup) {
94 cricket::StreamParams sp = 95 cricket::StreamParams sp =
95 CreateStreamParamsWithSsrcGroup("XYZ", kSsrcs2, ARRAY_SIZE(kSsrcs2)); 96 CreateStreamParamsWithSsrcGroup("XYZ", kSsrcs2, arraysize(kSsrcs2));
96 EXPECT_EQ(2U, sp.ssrcs.size()); 97 EXPECT_EQ(2U, sp.ssrcs.size());
97 EXPECT_EQ(kSsrcs2[0], sp.first_ssrc()); 98 EXPECT_EQ(kSsrcs2[0], sp.first_ssrc());
98 EXPECT_TRUE(sp.has_ssrcs()); 99 EXPECT_TRUE(sp.has_ssrcs());
99 EXPECT_TRUE(sp.has_ssrc(kSsrcs2[0])); 100 EXPECT_TRUE(sp.has_ssrc(kSsrcs2[0]));
100 EXPECT_TRUE(sp.has_ssrc(kSsrcs2[1])); 101 EXPECT_TRUE(sp.has_ssrc(kSsrcs2[1]));
101 EXPECT_TRUE(sp.has_ssrc_group("XYZ")); 102 EXPECT_TRUE(sp.has_ssrc_group("XYZ"));
102 EXPECT_EQ(1U, sp.ssrc_groups.size()); 103 EXPECT_EQ(1U, sp.ssrc_groups.size());
103 EXPECT_EQ(2U, sp.ssrc_groups[0].ssrcs.size()); 104 EXPECT_EQ(2U, sp.ssrc_groups[0].ssrcs.size());
104 EXPECT_EQ(kSsrcs2[0], sp.ssrc_groups[0].ssrcs[0]); 105 EXPECT_EQ(kSsrcs2[0], sp.ssrc_groups[0].ssrcs[0]);
105 EXPECT_EQ(kSsrcs2[1], sp.ssrc_groups[0].ssrcs[1]); 106 EXPECT_EQ(kSsrcs2[1], sp.ssrc_groups[0].ssrcs[1]);
106 } 107 }
107 108
108 TEST(StreamParams, GetSsrcGroup) { 109 TEST(StreamParams, GetSsrcGroup) {
109 cricket::StreamParams sp = 110 cricket::StreamParams sp =
110 CreateStreamParamsWithSsrcGroup("XYZ", kSsrcs2, ARRAY_SIZE(kSsrcs2)); 111 CreateStreamParamsWithSsrcGroup("XYZ", kSsrcs2, arraysize(kSsrcs2));
111 EXPECT_EQ(NULL, sp.get_ssrc_group("xyz")); 112 EXPECT_EQ(NULL, sp.get_ssrc_group("xyz"));
112 EXPECT_EQ(&sp.ssrc_groups[0], sp.get_ssrc_group("XYZ")); 113 EXPECT_EQ(&sp.ssrc_groups[0], sp.get_ssrc_group("XYZ"));
113 } 114 }
114 115
115 TEST(StreamParams, EqualNotEqual) { 116 TEST(StreamParams, EqualNotEqual) {
116 cricket::StreamParams l1 = cricket::StreamParams::CreateLegacy(1); 117 cricket::StreamParams l1 = cricket::StreamParams::CreateLegacy(1);
117 cricket::StreamParams l2 = cricket::StreamParams::CreateLegacy(2); 118 cricket::StreamParams l2 = cricket::StreamParams::CreateLegacy(2);
118 cricket::StreamParams sg1 = 119 cricket::StreamParams sg1 =
119 CreateStreamParamsWithSsrcGroup("ABC", kSsrcs1, ARRAY_SIZE(kSsrcs1)); 120 CreateStreamParamsWithSsrcGroup("ABC", kSsrcs1, arraysize(kSsrcs1));
120 cricket::StreamParams sg2 = 121 cricket::StreamParams sg2 =
121 CreateStreamParamsWithSsrcGroup("ABC", kSsrcs2, ARRAY_SIZE(kSsrcs2)); 122 CreateStreamParamsWithSsrcGroup("ABC", kSsrcs2, arraysize(kSsrcs2));
122 cricket::StreamParams sg3 = 123 cricket::StreamParams sg3 =
123 CreateStreamParamsWithSsrcGroup("Abc", kSsrcs2, ARRAY_SIZE(kSsrcs2)); 124 CreateStreamParamsWithSsrcGroup("Abc", kSsrcs2, arraysize(kSsrcs2));
124 cricket::StreamParams sg4 = 125 cricket::StreamParams sg4 =
125 CreateStreamParamsWithSsrcGroup("abc", kSsrcs2, ARRAY_SIZE(kSsrcs2)); 126 CreateStreamParamsWithSsrcGroup("abc", kSsrcs2, arraysize(kSsrcs2));
126 cricket::StreamParams sps[] = {l1, l2, sg1, sg2, sg3, sg4}; 127 cricket::StreamParams sps[] = {l1, l2, sg1, sg2, sg3, sg4};
127 128
128 for (size_t i = 0; i < ARRAY_SIZE(sps); ++i) { 129 for (size_t i = 0; i < arraysize(sps); ++i) {
129 for (size_t j = 0; j < ARRAY_SIZE(sps); ++j) { 130 for (size_t j = 0; j < arraysize(sps); ++j) {
130 EXPECT_EQ((sps[i] == sps[j]), (i == j)); 131 EXPECT_EQ((sps[i] == sps[j]), (i == j));
131 EXPECT_EQ((sps[i] != sps[j]), (i != j)); 132 EXPECT_EQ((sps[i] != sps[j]), (i != j));
132 } 133 }
133 } 134 }
134 } 135 }
135 136
136 TEST(StreamParams, FidFunctions) { 137 TEST(StreamParams, FidFunctions) {
137 uint32_t fid_ssrc; 138 uint32_t fid_ssrc;
138 139
139 cricket::StreamParams sp = cricket::StreamParams::CreateLegacy(1); 140 cricket::StreamParams sp = cricket::StreamParams::CreateLegacy(1);
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 EXPECT_EQ(1u, primary_ssrcs[0]); 189 EXPECT_EQ(1u, primary_ssrcs[0]);
189 EXPECT_EQ(2u, primary_ssrcs[1]); 190 EXPECT_EQ(2u, primary_ssrcs[1]);
190 EXPECT_EQ(3u, primary_ssrcs[2]); 191 EXPECT_EQ(3u, primary_ssrcs[2]);
191 ASSERT_EQ(2u, fid_ssrcs.size()); 192 ASSERT_EQ(2u, fid_ssrcs.size());
192 EXPECT_EQ(10u, fid_ssrcs[0]); 193 EXPECT_EQ(10u, fid_ssrcs[0]);
193 EXPECT_EQ(20u, fid_ssrcs[1]); 194 EXPECT_EQ(20u, fid_ssrcs[1]);
194 } 195 }
195 196
196 TEST(StreamParams, ToString) { 197 TEST(StreamParams, ToString) {
197 cricket::StreamParams sp = 198 cricket::StreamParams sp =
198 CreateStreamParamsWithSsrcGroup("XYZ", kSsrcs2, ARRAY_SIZE(kSsrcs2)); 199 CreateStreamParamsWithSsrcGroup("XYZ", kSsrcs2, arraysize(kSsrcs2));
199 EXPECT_STREQ("{ssrcs:[1,2];ssrc_groups:{semantics:XYZ;ssrcs:[1,2]};}", 200 EXPECT_STREQ("{ssrcs:[1,2];ssrc_groups:{semantics:XYZ;ssrcs:[1,2]};}",
200 sp.ToString().c_str()); 201 sp.ToString().c_str());
201 } 202 }
202 203
203 204
204 TEST(StreamParams, TestIsOneSsrcStream_LegacyStream) { 205 TEST(StreamParams, TestIsOneSsrcStream_LegacyStream) {
205 EXPECT_TRUE( 206 EXPECT_TRUE(
206 cricket::IsOneSsrcStream(cricket::StreamParams::CreateLegacy(13))); 207 cricket::IsOneSsrcStream(cricket::StreamParams::CreateLegacy(13)));
207 } 208 }
208 209
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 cricket::StreamParams stream3 = 276 cricket::StreamParams stream3 =
276 cricket::CreateSimStreamParams("cname", MAKE_VECTOR(kSsrcs2)); 277 cricket::CreateSimStreamParams("cname", MAKE_VECTOR(kSsrcs2));
277 std::vector<uint32_t> sim_ssrcs = MAKE_VECTOR(kRtxSsrcs3); 278 std::vector<uint32_t> sim_ssrcs = MAKE_VECTOR(kRtxSsrcs3);
278 cricket::SsrcGroup sg(cricket::kSimSsrcGroupSemantics, sim_ssrcs); 279 cricket::SsrcGroup sg(cricket::kSimSsrcGroupSemantics, sim_ssrcs);
279 for (size_t i = 0; i < sim_ssrcs.size(); i++) { 280 for (size_t i = 0; i < sim_ssrcs.size(); i++) {
280 stream3.add_ssrc(sim_ssrcs[i]); 281 stream3.add_ssrc(sim_ssrcs[i]);
281 } 282 }
282 stream3.ssrc_groups.push_back(sg); 283 stream3.ssrc_groups.push_back(sg);
283 EXPECT_FALSE(cricket::IsSimulcastStream(stream3)); 284 EXPECT_FALSE(cricket::IsSimulcastStream(stream3));
284 } 285 }
OLDNEW
« no previous file with comments | « talk/media/base/capturemanager_unittest.cc ('k') | talk/media/base/testutils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698