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

Side by Side Diff: webrtc/media/base/streamparams_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 (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
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 EXPECT_TRUE(sp.has_ssrc_group("XYZ")); 85 EXPECT_TRUE(sp.has_ssrc_group("XYZ"));
86 EXPECT_EQ(1U, sp.ssrc_groups.size()); 86 EXPECT_EQ(1U, sp.ssrc_groups.size());
87 EXPECT_EQ(2U, sp.ssrc_groups[0].ssrcs.size()); 87 EXPECT_EQ(2U, sp.ssrc_groups[0].ssrcs.size());
88 EXPECT_EQ(kSsrcs2[0], sp.ssrc_groups[0].ssrcs[0]); 88 EXPECT_EQ(kSsrcs2[0], sp.ssrc_groups[0].ssrcs[0]);
89 EXPECT_EQ(kSsrcs2[1], sp.ssrc_groups[0].ssrcs[1]); 89 EXPECT_EQ(kSsrcs2[1], sp.ssrc_groups[0].ssrcs[1]);
90 } 90 }
91 91
92 TEST(StreamParams, GetSsrcGroup) { 92 TEST(StreamParams, GetSsrcGroup) {
93 cricket::StreamParams sp = 93 cricket::StreamParams sp =
94 CreateStreamParamsWithSsrcGroup("XYZ", kSsrcs2, arraysize(kSsrcs2)); 94 CreateStreamParamsWithSsrcGroup("XYZ", kSsrcs2, arraysize(kSsrcs2));
95 EXPECT_EQ(NULL, sp.get_ssrc_group("xyz")); 95 EXPECT_EQ(nullptr, sp.get_ssrc_group("xyz"));
96 EXPECT_EQ(&sp.ssrc_groups[0], sp.get_ssrc_group("XYZ")); 96 EXPECT_EQ(&sp.ssrc_groups[0], sp.get_ssrc_group("XYZ"));
97 } 97 }
98 98
99 TEST(StreamParams, EqualNotEqual) { 99 TEST(StreamParams, EqualNotEqual) {
100 cricket::StreamParams l1 = cricket::StreamParams::CreateLegacy(1); 100 cricket::StreamParams l1 = cricket::StreamParams::CreateLegacy(1);
101 cricket::StreamParams l2 = cricket::StreamParams::CreateLegacy(2); 101 cricket::StreamParams l2 = cricket::StreamParams::CreateLegacy(2);
102 cricket::StreamParams sg1 = 102 cricket::StreamParams sg1 =
103 CreateStreamParamsWithSsrcGroup("ABC", kSsrcs1, arraysize(kSsrcs1)); 103 CreateStreamParamsWithSsrcGroup("ABC", kSsrcs1, arraysize(kSsrcs1));
104 cricket::StreamParams sg2 = 104 cricket::StreamParams sg2 =
105 CreateStreamParamsWithSsrcGroup("ABC", kSsrcs2, arraysize(kSsrcs2)); 105 CreateStreamParamsWithSsrcGroup("ABC", kSsrcs2, arraysize(kSsrcs2));
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 cricket::StreamParams stream3 = 301 cricket::StreamParams stream3 =
302 cricket::CreateSimStreamParams("cname", MAKE_VECTOR(kSsrcs2)); 302 cricket::CreateSimStreamParams("cname", MAKE_VECTOR(kSsrcs2));
303 std::vector<uint32_t> sim_ssrcs = MAKE_VECTOR(kRtxSsrcs3); 303 std::vector<uint32_t> sim_ssrcs = MAKE_VECTOR(kRtxSsrcs3);
304 cricket::SsrcGroup sg(cricket::kSimSsrcGroupSemantics, sim_ssrcs); 304 cricket::SsrcGroup sg(cricket::kSimSsrcGroupSemantics, sim_ssrcs);
305 for (size_t i = 0; i < sim_ssrcs.size(); i++) { 305 for (size_t i = 0; i < sim_ssrcs.size(); i++) {
306 stream3.add_ssrc(sim_ssrcs[i]); 306 stream3.add_ssrc(sim_ssrcs[i]);
307 } 307 }
308 stream3.ssrc_groups.push_back(sg); 308 stream3.ssrc_groups.push_back(sg);
309 EXPECT_FALSE(cricket::IsSimulcastStream(stream3)); 309 EXPECT_FALSE(cricket::IsSimulcastStream(stream3));
310 } 310 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698